sonic-swss : moving AISC_DB to this new DB instance

orchagent/fdborch.cpp

@@ -30,7 +30,7 @@ FdbOrch::FdbOrch(DBConnector *db, string tableName, PortsOrch *port) :
     Orch::addExecutor(flushNotifier);
 
     /* Add FDB notifications support from ASIC */
-    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
+    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::SECONDARY_UNIXSOCKET, 0);
     m_fdbNotificationConsumer = new swss::NotificationConsumer(notificationsDb, "NOTIFICATIONS");
     auto fdbNotifier = new Notifier(m_fdbNotificationConsumer, this, "FDB_NOTIFICATIONS");
     Orch::addExecutor(fdbNotifier);

orchagent/portsorch.cpp

@@ -249,7 +249,7 @@ PortsOrch::PortsOrch(DBConnector *db, vector<table_name_with_pri_t> &tableNames)
     removeDefaultBridgePorts();
 
     /* Add port oper status notification support */
-    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
+    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::SECONDARY_UNIXSOCKET, 0);
     m_portStatusNotificationConsumer = new swss::NotificationConsumer(notificationsDb, "NOTIFICATIONS");
     auto portStatusNotificatier = new Notifier(m_portStatusNotificationConsumer, this, "PORT_STATUS_NOTIFICATIONS");
     Orch::addExecutor(portStatusNotificatier);

tests/conftest.py

@@ -21,7 +21,7 @@ def pytest_addoption(parser):
 
 class AsicDbValidator(object):
     def __init__(self, dvs):
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # get default dot1q vlan id
         atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_VLAN")
@@ -131,14 +131,16 @@ def __init__(self, name=None):
                        'neighsyncd',
                        'orchagent',
                        'portsyncd',
-                       'redis-server',
+                       'redis-servers:redis-server',
+                       'redis-servers:redis-server-secondary',
                        'rsyslogd',
                        'syncd',
                        'teamsyncd',
                        'vlanmgrd',
                        'zebra']
         self.mount = "/var/run/redis-vs"
         self.redis_sock = self.mount + '/' + "redis.sock"
+        self.redis_sec_sock = self.mount + '/' + "redis-secondary.sock"
         self.client = docker.from_env()
 
         self.ctn = None

tests/test_acl.py

@@ -28,7 +28,7 @@ def verify_if_any_acl_table_created(self, dvs, adb):
         return False
 
     def clean_up_left_over(self, dvs):
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE_GROUP")
         keys = atbl.getKeys()
         for key in keys:
@@ -132,7 +132,7 @@ def verify_acl_lag_binding(self, adb, lag_ids):
 
     def test_AclTableCreation(self, dvs):
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create ACL_TABLE in config db
         bind_ports = ["Ethernet0", "Ethernet4"]
@@ -165,7 +165,7 @@ def test_AclRuleL4SrcPort(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -216,7 +216,7 @@ def test_AclRuleInOutPorts(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -273,7 +273,7 @@ def test_AclRuleInOutPorts(self, dvs):
     def test_AclTableDeletion(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # get ACL_TABLE in config db
         tbl = swsscommon.Table(db, "ACL_TABLE")
@@ -289,7 +289,7 @@ def test_AclTableDeletion(self, dvs):
     def test_V6AclTableCreation(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         bind_ports = ["Ethernet0", "Ethernet4", "Ethernet8"]
         # create ACL_TABLE in config db
@@ -365,7 +365,7 @@ def test_V6AclRuleIPv6Any(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -416,7 +416,7 @@ def test_V6AclRuleIPv6AnyDrop(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -467,7 +467,7 @@ def test_V6AclRuleIpProtocol(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -518,7 +518,7 @@ def test_V6AclRuleSrcIPv6(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -569,7 +569,7 @@ def test_V6AclRuleDstIPv6(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -620,7 +620,7 @@ def test_V6AclRuleL4SrcPort(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -671,7 +671,7 @@ def test_V6AclRuleL4DstPort(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -722,7 +722,7 @@ def test_V6AclRuleTCPFlags(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -773,7 +773,7 @@ def test_V6AclRuleL4SrcPortRange(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -838,7 +838,7 @@ def test_V6AclRuleL4DstPortRange(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -900,7 +900,7 @@ def test_V6AclRuleL4DstPortRange(self, dvs):
     def test_V6AclTableDeletion(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # get ACL_TABLE in config db
         tbl = swsscommon.Table(db, "ACL_TABLE")
@@ -930,7 +930,7 @@ def check_rule_existence(self, entry, rules, verifs):
 
     def test_InsertAclRuleBetweenPriorities(self, dvs):
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         bind_ports = ["Ethernet0", "Ethernet4"]
         # create ACL_TABLE in config db
@@ -1028,7 +1028,7 @@ def test_InsertAclRuleBetweenPriorities(self, dvs):
 
     def test_RulesWithDiffMaskLengths(self, dvs):
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         bind_ports = ["Ethernet0", "Ethernet4"]
         # create ACL_TABLE in config db
@@ -1115,7 +1115,7 @@ def test_AclTableCreationOnLAGMember(self, dvs):
         # prepare db and tables
         self.clean_up_left_over(dvs)
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         apldb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
 
         # create port channel
@@ -1143,7 +1143,7 @@ def test_AclTableCreationOnLAG(self, dvs):
         # prepare db and tables
         self.clean_up_left_over(dvs)
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         apldb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
 
         #create port channel
@@ -1193,7 +1193,7 @@ def test_AclTableCreationBeforeLAG(self, dvs):
         # prepare db and tables
         self.clean_up_left_over(dvs)
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         apldb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
 
         # create acl table

tests/test_crm.py

@@ -18,14 +18,14 @@ def getCrmCounterValue(dvs, key, counter):
 
 def setReadOnlyAttr(dvs, obj, attr, val):
 
-    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     tbl = swsscommon.Table(db, "ASIC_STATE:{0}".format(obj))
     keys = tbl.getKeys()
 
     assert len(keys) == 1
 
     swVid = keys[0]
-    r = redis.Redis(unix_socket_path=dvs.redis_sock, db=swsscommon.ASIC_DB)
+    r = redis.Redis(unix_socket_path=dvs.redis_sec_sock, db=swsscommon.ASIC_DB)
     swRid = r.hget("VIDTORID", swVid)
 
     assert swRid is not None
@@ -482,7 +482,7 @@ def test_CrmNexthopGroupMember(dvs):
 def test_CrmAcl(dvs):
 
     db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     dvs.runcmd("crm config polling interval 1")
 

tests/test_dirbcast.py

@@ -6,7 +6,7 @@
 def test_DirectedBroadcast(dvs):
 
     db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     # create vlan in config db
     tbl = swsscommon.Table(db, "VLAN")

tests/test_dtel.py

@@ -9,7 +9,7 @@ class TestDtel(object):
     def test_DtelGlobalAttribs(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create DTel global attributes in config db
         tbl = swsscommon.Table(db, "DTEL")
@@ -89,7 +89,7 @@ def test_DtelGlobalAttribs(self, dvs):
     def test_DtelReportSessionAttribs(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create DTel report session attributes in config db
         tbl = swsscommon.Table(db, "DTEL_REPORT_SESSION")
@@ -130,7 +130,7 @@ def test_DtelReportSessionAttribs(self, dvs):
     def test_DtelINTSessionAttribs(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create DTel INT session attributes in config db
         tbl = swsscommon.Table(db, "DTEL_INT_SESSION")
@@ -174,7 +174,7 @@ def test_DtelINTSessionAttribs(self, dvs):
     def test_DtelQueueReportAttribs(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create DTel queue report attributes in config db
         tbl = swsscommon.Table(db, "DTEL_QUEUE_REPORT")
@@ -215,7 +215,7 @@ def test_DtelQueueReportAttribs(self, dvs):
     def test_DtelEventAttribs(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # first create DTel report session in config db
         rtbl = swsscommon.Table(db, "DTEL_REPORT_SESSION")

tests/test_fdb.py

@@ -77,7 +77,7 @@ def is_fdb_entry_exists(db, table, key_values, attributes):
 
 def test_FDBAddedAfterMemberCreated(dvs):
     appl_db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     # create a FDB entry in Application DB

tests/test_interface.py

@@ -6,7 +6,7 @@
 class TestRouterInterfaceIpv4(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
     def add_ip_address(self, interface, ip):
@@ -128,7 +128,7 @@ def test_InterfaceSetMtu(self, dvs):
 class TestLagRouterInterfaceIpv4(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
     # TODO: below three functions will be replaced with configuration

tests/test_mirror.py

@@ -11,7 +11,7 @@
 class TestMirror(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
         self.sdb = swsscommon.DBConnector(6, dvs.redis_sock, 0)
 

tests/test_nhg.py

@@ -32,7 +32,7 @@ def test_route_nhg(dvs):
 
     # check if route was propagated to ASIC DB
 
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     rtbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY")
     nhgtbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP")

tests/test_pfc.py

@@ -48,7 +48,7 @@ def getPortOid(dvs, port_name):
 
 def getPortAttr(dvs, port_oid, port_attr):
 
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     port_tbl = swsscommon.Table(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_PORT:{0}'.format(port_oid))
 
     for k in port_tbl.get('')[1]:

tests/test_port.py

@@ -6,7 +6,7 @@
 class TestPort(object):
     def test_PortMtu(self, dvs):
         pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
         # set MTU to port
@@ -76,7 +76,7 @@ def test_PortFec(dvs):
     time.sleep(1)
 
     db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     tbl = swsscommon.Table(db, "PORT_TABLE")
     ptbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")