[nbrmgrd] added function to parse IP address from APP_DB (#1672)

* [nbrmgrd] added function to parse IP address from APP_DB
Signed-off-by: Vadym Hlushko <[email protected]>

Author: vadymhlushko-mlnx

cfgmgr/nbrmgr.cpp

@@ -190,6 +190,27 @@ bool NbrMgr::setNeighbor(const string& alias, const IpAddress& ip, const MacAddr
     return send_message(m_nl_sock, msg);
 }
 
+/**
+ * Parse APPL_DB neighbors resolve table.
+ *
+ * @param [app_db_nbr_tbl_key], key from APPL_DB - APP_NEIGH_RESOLVE_TABLE_NAME
+ * @param [delimiter], APPL_DB delimiter ":"
+ *
+ * @return the string vector which contain the VLAN alias and IP address
+ */
+vector<string> NbrMgr::parseAliasIp(const string &app_db_nbr_tbl_key, const char *delimiter)
+{
+    vector<string> ret;
+    size_t found = app_db_nbr_tbl_key.find(delimiter);
+    string alias = app_db_nbr_tbl_key.substr(0, found);
+    string ip_address = app_db_nbr_tbl_key.substr(found + 1, app_db_nbr_tbl_key.size() - 1);
+
+    ret.push_back(alias);
+    ret.push_back(ip_address);
+
+    return ret;
+}
+
 void NbrMgr::doResolveNeighTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
@@ -198,7 +219,8 @@ void NbrMgr::doResolveNeighTask(Consumer &consumer)
     while (it != consumer.m_toSync.end())
     {
         KeyOpFieldsValuesTuple    t = it->second;
-        vector<string>            keys = tokenize(kfvKey(t),delimiter);
+        vector<string>            keys = parseAliasIp(kfvKey(t), consumer.getConsumerTable()->getTableNameSeparator().c_str());
+
         MacAddress                mac;
         IpAddress                 ip(keys[1]);
         string                    alias(keys[0]);

cfgmgr/nbrmgr.h

@@ -26,6 +26,8 @@ class NbrMgr : public Orch
     bool isIntfStateOk(const std::string &alias);
     bool setNeighbor(const std::string& alias, const IpAddress& ip, const MacAddress& mac);
 
+    vector<string> parseAliasIp(const string &app_db_nbr_tbl_key, const char *delimiter);
+
     void doResolveNeighTask(Consumer &consumer);
     void doSetNeighTask(Consumer &consumer);
     void doTask(Consumer &consumer);

tests/test_neighbor.py

@@ -389,10 +389,32 @@ def test_NeighborAddRemoveIpv4WithVrf(self, dvs, testlog):
             tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY")
             current_neigh_entries_cnt = len(tbl.getKeys())
             dec_neigh_entries_cnt = (old_neigh_entries_cnt - current_neigh_entries_cnt)
-            assert dec_neigh_entries_cnt == 1
-
-
-# Add Dummy always-pass test at end as workaroud
-# for issue when Flaky fail on final test it invokes module tear-down before retrying
-def test_nonflaky_dummy():
-    pass
+            assert dec_neigh_entries_cnt == 1
+
+    def test_FlushResolveNeighborIpv6(self, dvs, testlog):
+        appl_db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
+        prod_state_tbl = swsscommon.ProducerStateTable(appl_db, swsscommon.APP_NEIGH_RESOLVE_TABLE_NAME)
+        fvs = swsscommon.FieldValuePairs([("mac", "52:54:00:25:06:E9")])
+
+        prod_state_tbl.set("Vlan2:2000:1::1", fvs)
+        time.sleep(2)
+
+        (exitcode, output) = dvs.runcmd(['sh', '-c', "supervisorctl status nbrmgrd | awk '{print $2}'"])
+        assert output == "RUNNING\n"
+
+    def test_FlushResolveNeighborIpv4(self, dvs, testlog):
+        appl_db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
+        prod_state_tbl = swsscommon.ProducerStateTable(appl_db, swsscommon.APP_NEIGH_RESOLVE_TABLE_NAME)
+        fvs = swsscommon.FieldValuePairs([("mac", "52:54:00:25:06:E9")])
+
+        prod_state_tbl.set("Vlan2:192.168.10.1", fvs)
+        time.sleep(2)
+
+        (exitcode, output) = dvs.runcmd(['sh', '-c', "supervisorctl status nbrmgrd | awk '{print $2}'"])
+        assert output == "RUNNING\n"
+
+
+# Add Dummy always-pass test at end as workaroud
+# for issue when Flaky fail on final test it invokes module tear-down before retrying
+def test_nonflaky_dummy():
+    pass