Skip to content

Commit 02c2267

Browse files
authored
[test_mux] add sleep in test_NH (sonic-net#2648)
* [test_mux] add sleep in test_NH What I did: added sleep after adding/removing neighbors in test_NH Why I did it: resolve PR failures due to timing issues between adding/deleting neighbors and them being present in the asic_db Signed-off-by: Nikola Dancejic <[email protected]>
1 parent 8de52bf commit 02c2267

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

tests/test_mux.py

+10-2
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,8 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
560560
" " + neigh_ipv6 + "\""
561561
)
562562
apdb.wait_for_entry("ROUTE_TABLE", nh_route)
563+
apdb.wait_for_entry("ROUTE_TABLE", nh_route_ipv6)
564+
563565
rtkeys = dvs_route.check_asicdb_route_entries([nh_route])
564566
rtkeys_ipv6 = dvs_route.check_asicdb_route_entries([nh_route_ipv6])
565567
self.check_nexthop_in_asic_db(asicdb, rtkeys[0])
@@ -572,16 +574,22 @@ def create_and_test_NH_routes(self, appdb, asicdb, dvs, dvs_route, mac):
572574

573575
self.del_neighbor(dvs, neigh_ip)
574576
self.del_neighbor(dvs, neigh_ipv6)
577+
apdb.wait_for_deleted_entry(self.APP_NEIGH_TABLE, neigh_ip)
578+
apdb.wait_for_deleted_entry(self.APP_NEIGH_TABLE, neigh_ipv6)
579+
asicdb.wait_for_deleted_entry(self.ASIC_NEIGH_TABLE, neigh_ip)
580+
asicdb.wait_for_deleted_entry(self.ASIC_NEIGH_TABLE, neigh_ip)
581+
575582
self.check_nexthop_in_asic_db(asicdb, rtkeys[0], True)
576583
self.check_nexthop_in_asic_db(asicdb, rtkeys_ipv6[0], True)
577584

578585
# Set state to active, learn neighbor again
579586
self.set_mux_state(appdb, "Ethernet0", "active")
580-
self.check_nexthop_in_asic_db(asicdb, rtkeys[0], True)
581-
self.check_nexthop_in_asic_db(asicdb, rtkeys_ipv6[0], True)
582587

583588
self.add_neighbor(dvs, neigh_ip, mac)
584589
self.add_neighbor(dvs, neigh_ipv6, mac)
590+
self.check_neigh_in_asic_db(asicdb, neigh_ip)
591+
self.check_neigh_in_asic_db(asicdb, neigh_ipv6)
592+
585593
self.check_nexthop_in_asic_db(asicdb, rtkeys[0])
586594
self.check_nexthop_in_asic_db(asicdb, rtkeys_ipv6[0])
587595
dvs.runcmd(

0 commit comments

Comments
 (0)