Test pipeline

.azure-pipelines/build-docker-sonic-vs-template.yml

@@ -62,6 +62,9 @@ jobs:
     displayName: "Download sonic-buildimage docker-sonic-vs"
   - script: |
       set -ex
+
+      sudo apt-get install -y uuid-dev libboost-serialization-dev
+
       echo $(Build.DefinitionName).$(Build.BuildNumber)
 
       docker load < $(Build.ArtifactStagingDirectory)/download/target/docker-sonic-vs.gz

azure-pipelines.yml

@@ -30,12 +30,12 @@ resources:
   repositories:
   - repository: sonic-sairedis
     type: github
-    name: Azure/sonic-sairedis
-    endpoint: build
+    name: sonic-net/sonic-sairedis
+    endpoint: sonic-net
   - repository: sonic-swss
     type: github
-    name: Azure/sonic-swss
-    endpoint: build
+    name: sonic-net/sonic-swss
+    endpoint: sonic-net
 
 parameters:
   - name: debian_version

common/configdb.cpp

@@ -24,7 +24,7 @@ void ConfigDBConnector_Native::db_connect(string db_name, bool wait_for_init, bo
     if (wait_for_init)
     {
         auto& client = get_redis_client(m_db_name);
-        auto pubsub = client.pubsub();
+        auto pubsub = make_shared<PubSub>(&client);
         auto initialized = client.get(INIT_INDICATOR);
         if (!initialized || initialized->empty())
         {

common/dbconnector.h

@@ -174,6 +174,9 @@ class DBConnector : public RedisContext
     /* Create new context to DB */
     DBConnector *newConnector(unsigned int timeout) const;
 
+#ifndef SWIG
+    __attribute__((deprecated))
+#endif
     PubSub *pubsub();
 
     int64_t del(const std::string &key);

common/schema.h

@@ -110,6 +110,12 @@ namespace swss {
 #define APP_MUX_CABLE_COMMAND_TABLE_NAME    "MUX_CABLE_COMMAND_TABLE"
 #define APP_MUX_CABLE_RESPONSE_TABLE_NAME   "MUX_CABLE_RESPONSE_TABLE"
 
+#define APP_FORWARDING_STATE_COMMAND_TABLE_NAME  "FORWARDING_STATE_COMMAND"
+#define APP_FORWARDING_STATE_RESPONSE_TABLE_NAME "FORWARDING_STATE_RESPONSE"
+
+#define APP_PEER_PORT_TABLE_NAME             "PORT_TABLE_PEER"
+#define APP_PEER_HW_FORWARDING_STATE_TABLE_NAME    "HW_FORWARDING_STATE_PEER"
+
 #define APP_SYSTEM_PORT_TABLE_NAME          "SYSTEM_PORT_TABLE"
 
 #define APP_MACSEC_PORT_TABLE_NAME          "MACSEC_PORT_TABLE"
@@ -445,6 +451,11 @@ namespace swss {
 #define STATE_HW_MUX_CABLE_TABLE_NAME               "HW_MUX_CABLE_TABLE"
 #define STATE_MUX_LINKMGR_TABLE_NAME                "MUX_LINKMGR_TABLE"
 #define STATE_MUX_METRICS_TABLE_NAME                "MUX_METRICS_TABLE"
+#define STATE_MUX_CABLE_INFO_TABLE_NAME             "MUX_CABLE_INFO"
+#define STATE_LINK_PROBE_STATS_TABLE_NAME           "LINK_PROBE_STATS"
+
+#define STATE_PEER_MUX_METRICS_TABLE_NAME           "MUX_METRICS_TABLE_PEER"
+#define STATE_PEER_HW_FORWARDING_STATE_TABLE_NAME   "HW_MUX_CABLE_TABLE_PEER"
 
 #define STATE_SYSTEM_NEIGH_TABLE_NAME               "SYSTEM_NEIGH_TABLE"
 

tests/test_redis_ut.py

@@ -381,6 +381,7 @@ def test_ConfigDBConnector():
 def test_ConfigDBConnectorSeparator():
     db = swsscommon.DBConnector("APPL_DB", 0, True)
     config_db = ConfigDBConnector()
+    # set wait for init to True to cover wait_for_init code.
     config_db.db_connect("APPL_DB", False, False)
     config_db.get_redis_client(config_db.APPL_DB).flushdb()
     config_db.set_entry("TEST_PORT", "Ethernet222", {"alias": "etp2x"})
@@ -696,3 +697,18 @@ def test_SonicV2Connector():
     db.set("TEST_DB", "test_key", "field1", 1)
     value = db.get("TEST_DB", "test_key", "field1")
     assert value == "1"
+
+def test_ConfigDBWaitInit():
+    config_db = ConfigDBConnector()
+    config_db.connect(wait_for_init=False)
+    client = config_db.get_redis_client(config_db.CONFIG_DB)
+    suc = client.set(config_db.INIT_INDICATOR, 1)
+    assert suc
+
+    # set wait for init to True to cover wait_for_init code.
+    config_db = ConfigDBConnector()
+    config_db.db_connect(config_db.CONFIG_DB, True, False)
+
+    config_db.set_entry("TEST_PORT", "Ethernet111", {"alias": "etp1x"})
+    allconfig = config_db.get_config()
+    assert allconfig["TEST_PORT"]["Ethernet111"]["alias"] == "etp1x"