Skip to content

Commit dc81a21

Browse files
Volodymyr Samotiyprsunny
Volodymyr Samotiy
authored andcommitted
[vnet]: Fix FDB related failure in "vnet_bitmap" virtual switch test (#1034)
Signed-off-by: Volodymyr Samotiy <[email protected]>
1 parent 5ae4226 commit dc81a21

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

tests/test_vnet.py

+13-3
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,21 @@ def get_created_entry(db, table, existed_entries):
5959
return new_entries[0]
6060

6161

62-
def get_created_entries(db, table, existed_entries, count):
62+
def get_all_created_entries(db, table, existed_entries):
6363
tbl = swsscommon.Table(db, table)
6464
entries = set(tbl.getKeys())
6565
new_entries = list(entries - existed_entries)
66-
assert len(new_entries) == count, "Wrong number of created entries."
66+
assert len(new_entries) > 0, "No created entries."
6767
new_entries.sort()
6868
return new_entries
6969

7070

71+
def get_created_entries(db, table, existed_entries, count):
72+
new_entries = get_all_created_entries(db, table, existed_entries)
73+
assert len(new_entries) == count, "Wrong number of created entries."
74+
return new_entries
75+
76+
7177
def get_deleted_entries(db, table, existed_entries, count):
7278
tbl = swsscommon.Table(db, table)
7379
entries = set(tbl.getKeys())
@@ -894,12 +900,16 @@ def check_vnet_routes(self, dvs, name, endpoint, tunnel, mac="", vni=0):
894900
_vni = str(vni) if vni != 0 else self.vnet_map[name]['vni']
895901

896902
if (mac,_vni) not in self.vnet_mac_vni_list:
897-
new_fdb = get_created_entry(asic_db, self.ASIC_FDB_ENTRY, self.fdbs)
903+
new_fdbs = get_all_created_entries(asic_db, self.ASIC_FDB_ENTRY, self.fdbs)
898904

899905
expected_attrs = {
900906
"SAI_FDB_ENTRY_ATTR_TYPE": "SAI_FDB_ENTRY_TYPE_STATIC",
901907
"SAI_FDB_ENTRY_ATTR_ENDPOINT_IP": endpoint
902908
}
909+
910+
new_fdb = next(iter([fdb for fdb in new_fdbs if (mac if mac != "" else "00:00:00:00:00:00") in fdb]), None)
911+
assert new_fdb, "Wrong number of created FDB entries."
912+
903913
check_object(asic_db, self.ASIC_FDB_ENTRY, new_fdb, expected_attrs)
904914

905915
self.fdbs.add(new_fdb)

0 commit comments

Comments
 (0)