[neighorch] VOQ Inband port review comments fix 4

- Changes to avoid calling function to add encap index attribute for
inband interface host neighbor. Since encap index attribute is supplied
only for the remote neighbors and since the inband interface neighbor is
local, encap index will not be added even if this function is called. So
removed calling the api addVoqEncapIndex() while constructing neighbor
add message for inband interface host.
- Changes in vs test for system neigh delete to avoid timing issue

Signed-off-by: vedganes <vedavinayagam.ganesan@nokia.com>

Author: vedganes

orchagent/neighorch.cpp

@@ -1199,11 +1199,6 @@ bool NeighOrch::addInbandNeighbor(string alias, IpAddress ip_address)
     memcpy(attr.value.mac, inband_mac.getMac(), 6);
     neighbor_attrs.push_back(attr);
 
-    if(!addVoqEncapIndex(alias, ip_address, neighbor_attrs))
-    {
-        return false;
-    }
-
     //No host route for neighbor of the Inband IP address
     attr.id = SAI_NEIGHBOR_ENTRY_ATTR_NO_HOST_ROUTE;
     attr.value.booldata = true;

tests/test_virtual_chassis.py

@@ -278,6 +278,9 @@ def test_chassis_system_neigh(self, vct):
 
                     assert test_neigh != "", "Neigh not found in ASIC_DB"
 
+                    # Preserve test neigh asic db key for delete verification later
+                    test_neigh_asic_db_key = test_neigh
+
                     # Check for presence of encap index, retrieve and store it for sync verification
                     test_neigh_entry = asic_db.wait_for_entry("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY", test_neigh)
                     test_neigh_entry_attrs = asic_db.wait_for_fields("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY", test_neigh, ["SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX"])
@@ -308,6 +311,9 @@ def test_chassis_system_neigh(self, vct):
 
                 assert test_sysneigh != "", "Neigh is not sync-ed to chassis app db"
 
+                # Preserve test sys neigh chassis app db key for delete verification later
+                test_sysneigh_chassis_app_db_key = test_sysneigh
+
                 test_sysneigh_entry = chassis_app_db.get_entry("SYSTEM_NEIGH", test_sysneigh)
                 sys_neigh_encap_index = test_sysneigh_entry.get("encap_index")
                 assert sys_neigh_encap_index != "", "System neigh in chassis app db does not have encap index"
@@ -335,6 +341,7 @@ def test_chassis_system_neigh(self, vct):
                 if lc_switch_id != "0":
                     # Linecard other than linecard 1
                     asic_db = dvs.get_asic_db()
+                    asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY", 1)
                     neighkeys = asic_db.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY")
                     assert len(neighkeys), "No neigh entries in ASIC_DB"
 
@@ -347,6 +354,9 @@ def test_chassis_system_neigh(self, vct):
                             break
 
                     assert remote_neigh != "", "Remote neigh not found in ASIC_DB"
+
+                    # Preserve remote neigh asic db neigh key for delete verification later
+                    test_remote_neigh_asic_db_key = remote_neigh
 
                     # Check for kernel entries
 
@@ -406,16 +416,8 @@ def test_chassis_system_neigh(self, vct):
                     # Check for presence of the neighbor in ASIC_DB. The deleted neighbor should
                     # not be present in the asic db
                     asic_db = dvs.get_asic_db()
-                    neighkeys = asic_db.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY")
-                    
-                    test_neigh = ""
-                    for nkey in neighkeys:
-                        ne = ast.literal_eval(nkey)
-                        if ne['ip'] == test_neigh_ip:
-                            test_neigh = nkey
-                            break
-                        
-                    assert test_neigh == "", "Stale neigh entry found in ASIC_DB"
+                    neighkeys = asic_db.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY", test_neigh_asic_db_key)
+                    assert len(neighkeys) == 0, "Stale neigh entry found in ASIC_DB"
 
                     break
 
@@ -425,17 +427,8 @@ def test_chassis_system_neigh(self, vct):
             if name.startswith("supervisor"):
                 dvs = dvss[name]
                 chassis_app_db = DVSDatabase(swsscommon.CHASSIS_APP_DB, dvs.redis_chassis_sock)
-                sysneighkeys = chassis_app_db.get_keys("SYSTEM_NEIGH")
-                
-                test_sysneigh = ""
-                for sysnk in sysneighkeys:
-                    sysnk_tok = sysnk.split("|")
-                    assert len(sysnk_tok) == 3, "Invalid system neigh key in chassis app db"
-                    if sysnk_tok[2] == test_neigh_ip:
-                        test_sysneigh = sysnk
-                        break
-                
-                assert test_sysneigh == "", "Stale neigh entry in chassis app db"
+                sysneighkeys = chassis_app_db.wait_for_deleted_entry("SYSTEM_NEIGH", test_sysneigh_chassis_app_db_key)
+                assert len(sysneighkeys) == 0, "Stale neigh entry in chassis app db"
 
                 break
 
@@ -459,16 +452,8 @@ def test_chassis_system_neigh(self, vct):
                     # Check for presence of the remote neighbor in ASIC_DB. The remote neighbor corresponding
                     # to the deleted static neigbor should not be present
                     asic_db = dvs.get_asic_db()
-                    neighkeys = asic_db.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY")
-                    
-                    remote_neigh = ""
-                    for nkey in neighkeys:
-                        ne = ast.literal_eval(nkey)
-                        if ne['ip'] == test_neigh_ip:
-                            remote_neigh = nkey
-                            break
-                        
-                    assert remote_neigh == "", "Stale remote neigh in ASIC_DB"
+                    neighkeys = asic_db.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY", test_remote_neigh_asic_db_key)
+                    assert len(neighkeys) == 0, "Stale remote neigh in ASIC_DB"
 
                     # Check for kernel entries. Kernel entries (neigh and route) should have been removed