If available, read port settings from Config DB first (sonic-net#723)

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
prsunny · Jan 23, 2019 · 7375015 · 7375015
1 parent 230086b
commit 7375015
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/portsyncd/portsyncd.cpp b/portsyncd/portsyncd.cpp
@@ -41,7 +41,7 @@ void usage()
 }
 
 void handlePortConfigFile(ProducerStateTable &p, string file, bool warm);
-void handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm);
+bool handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm);
 void handleVlanIntfFile(string file);
 void handlePortConfig(ProducerStateTable &p, map<string, KeyOpFieldsValuesTuple> &port_cfg_map);
 void checkPortInitDone(DBConnector *appl_db);
@@ -92,11 +92,14 @@ int main(int argc, char **argv)
         netlink.dumpRequest(RTM_GETLINK);
         cout << "Listen to link messages..." << endl;
 
-        if (!port_config_file.empty())
+        if (!handlePortConfigFromConfigDB(p, cfgDb, warm))
         {
-            handlePortConfigFile(p, port_config_file, warm);
-        } else {
-            handlePortConfigFromConfigDB(p, cfgDb, warm);
+            // if port config is missing in ConfigDB
+            // attempt to use port_config.ini
+            if (!port_config_file.empty())
+            {
+                handlePortConfigFile(p, port_config_file, warm);
+            }
         }
 
         s.addSelectable(&netlink);
@@ -175,14 +178,21 @@ static void notifyPortConfigDone(ProducerStateTable &p)
     p.set("PortConfigDone", attrs);
 }
 
-void handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm)
+bool handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm)
 {
     cout << "Get port configuration from ConfigDB..." << endl;
 
     Table table(&cfgDb, CFG_PORT_TABLE_NAME);
     std::vector<FieldValueTuple> ovalues;
     std::vector<string> keys;
     table.getKeys(keys);
+
+    if (keys.empty())
+    {
+        cout << "No port configuration in ConfigDB" << endl;
+        return false;
+    }
+
     for ( auto &k : keys )
     {
         table.get(k, ovalues);
@@ -202,6 +212,8 @@ void handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, boo
     {
         notifyPortConfigDone(p);
     }
+
+    return true;
 }
 
 void handlePortConfigFile(ProducerStateTable &p, string file, bool warm)