Merge remote-tracking branch 'upstream/master' into syslog_telemetry_…

…shared

dockers/docker-database/docker-database-init.sh

@@ -79,7 +79,7 @@ rm $db_cfg_file_tmp
 
 # copy dump.rdb file to each instance for restoration
 DUMPFILE=/var/lib/redis/dump.rdb
-redis_inst_list=`/usr/bin/python3 -c "import swsssdk; print(' '.join(swsssdk.SonicDBConfig.get_instancelist().keys()))"`
+redis_inst_list=`/usr/bin/python3 -c "from swsscommon import swsscommon; print(' '.join(swsscommon.SonicDBConfig.getInstanceList().keys()))"`
 for inst in $redis_inst_list
 do
     mkdir -p /var/lib/$inst

dockers/docker-database/flush_unused_database

@@ -11,15 +11,15 @@ while(True):
         break
     time.sleep(1)
 
-instlists = swsscommon.SonicDBConfig.get_instancelist()
+instlists = swsscommon.SonicDBConfig.getInstanceList()
 for instname, v in instlists.items():
-    insthost = v['hostname']
-    instsocket = v['unix_socket_path']
+    insthost = v.hostname
+    instsocket = v.unixSocketPath
 
-    dblists = swsscommon.SonicDBConfig.get_dblist()
+    dblists = swsscommon.SonicDBConfig.getDbList()
     for dbname in dblists:
-        dbid = swsscommon.SonicDBConfig.get_dbid(dbname)
-        dbinst = swsscommon.SonicDBConfig.get_instancename(dbname)
+        dbid = swsscommon.SonicDBConfig.getDbId(dbname)
+        dbinst = swsscommon.SonicDBConfig.getDbInst(dbname)
 
         # this DB is on current instance, skip flush
         if dbinst == instname:

dockers/docker-platform-monitor/Dockerfile.j2

@@ -25,7 +25,8 @@ RUN apt-get update &&   \
         i2c-tools       \
         psmisc          \
         python3-jsonschema \
-        libpci3
+        libpci3         \
+        iputils-ping
 
 # On Arista devices, the sonic_platform wheel is not installed in the container.
 # Instead, the installation directory is mounted from the host OS. However, this method

src/sonic-bgpcfgd/bgpmon/bgpmon.py

@@ -27,7 +27,7 @@
 import json
 import os
 import syslog
-import swsssdk
+from swsscommon import swsscommon
 import time
 
 PIPE_BATCH_MAX_COUNT = 50
@@ -43,10 +43,9 @@ def __init__(self):
         self.new_peer_l = set()
         self.new_peer_state = {}
         self.cached_timestamp = 0
-        self.db = swsssdk.SonicV2Connector()
+        self.db = swsscommon.SonicV2Connector()
         self.db.connect(self.db.STATE_DB, False)
-        client = self.db.get_redis_client(self.db.STATE_DB)
-        self.pipe = client.pipeline()
+        self.pipe = swsscommon.RedisPipeline(self.db.get_redis_client(self.db.STATE_DB))
         self.db.delete_all_by_pattern(self.db.STATE_DB, "NEIGH_STATE_TABLE|*" )
 
     # A quick way to check if there are anything happening within BGP is to
@@ -106,11 +105,16 @@ def flush_pipe(self, data):
         for key, value in data.items():
             if value is None:
                 # delete case
-                self.pipe.delete(key)
+                command = swsscommon.RedisCommand()
+                command.formatDEL(key)
+                self.pipe.push(command)
             else:
                 # Add or Modify case
-                self.pipe.hmset(key, value)
-        self.pipe.execute()
+                command = swsscommon.RedisCommand()
+                command.formatHSET(key, value)
+                self.pipe.push(command)
+
+        self.pipe.flush()
         data.clear()
 
     def update_neigh_states(self):