fixing errors

Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
sonic-net · Feb 2, 2023 · 81d1f40 · 81d1f40
1 parent 190754a
commit 81d1f40
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/tests/test_mux.py b/tests/test_mux.py
@@ -551,8 +551,6 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
         self.set_mux_state(appdb, "Ethernet0", "active")
         self.add_neighbor(dvs, neigh_ip, mac)
         self.add_neighbor(dvs, neigh_ipv6, mac)
-        asicdb.wait_for_entry(self.ASIC_NEIGH_TABLE, neigh_ip)
-        asicdb.wait_for_entry(self.ASIC_NEIGH_TABLE, neigh_ipv6)
         dvs.runcmd(
             "vtysh -c \"configure terminal\" -c \"ip route " + nh_route +
             " " + neigh_ip + "\""
@@ -562,6 +560,7 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
             " " + neigh_ipv6 + "\""
         )
         apdb.wait_for_entry("ROUTE_TABLE", nh_route)
+        apdb.wait_for_entry("ROUTE_TABLE", nh_route_ipv6)
 
         rtkeys = dvs_route.check_asicdb_route_entries([nh_route])
         rtkeys_ipv6 = dvs_route.check_asicdb_route_entries([nh_route_ipv6])
@@ -575,8 +574,8 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
 
         self.del_neighbor(dvs, neigh_ip)
         self.del_neighbor(dvs, neigh_ipv6)
-        asicdb.wait_for_deleted_entry(self.ASIC_NEIGH_TABLE, neigh_ip)
-        asicdb.wait_for_deleted_entry(self.ASIC_NEIGH_TABLE, neigh_ipv6)
+        apdb.wait_for_deleted_entry(self.APP_NEIGH_TABLE, neigh_ip)
+        apdb.wait_for_deleted_entry(self.APP_NEIGH_TABLE, neigh_ipv6)
 
         self.check_nexthop_in_asic_db(asicdb, rtkeys[0], True)
         self.check_nexthop_in_asic_db(asicdb, rtkeys_ipv6[0], True)
@@ -588,8 +587,8 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
 
         self.add_neighbor(dvs, neigh_ip, mac)
         self.add_neighbor(dvs, neigh_ipv6, mac)
-        asicdb.wait_for_entry(self.ASIC_NEIGH_TABLE, neigh_ip)
-        asicdb.wait_for_entry(self.ASIC_NEIGH_TABLE, neigh_ipv6)
+        apdb.wait_for_entry(self.APP_NEIGH_TABLE, neigh_ip)
+        apdb.wait_for_entry(self.APP_NEIGH_TABLE, neigh_ipv6)
 
         self.check_nexthop_in_asic_db(asicdb, rtkeys[0])
         self.check_nexthop_in_asic_db(asicdb, rtkeys_ipv6[0])
@@ -609,8 +608,12 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
             "vtysh -c \"configure terminal\" -c \"no ipv6 route " + nh_route_ipv6 +
             " " + neigh_ipv6 + "\""
         )
+        apdb.wait_for_deleted_entry("ROUTE_TABLE", nh_route)
+        apdb.wait_for_deleted_entry("ROUTE_TABLE", nh_route_ipv6)
         self.del_neighbor(dvs, neigh_ip)
         self.del_neighbor(dvs, neigh_ipv6)
+        apdb.wait_for_deleted_entry(self.APP_NEIGH_TABLE, neigh_ip)
+        apdb.wait_for_deleted_entry(self.APP_NEIGH_TABLE, neigh_ipv6)
 
     def get_expected_sai_qualifiers(self, portlist, dvs_acl):
         expected_sai_qualifiers = {