@@ -59,15 +59,21 @@ def get_created_entry(db, table, existed_entries):
59
59
return new_entries [0 ]
60
60
61
61
62
- def get_created_entries (db , table , existed_entries , count ):
62
+ def get_all_created_entries (db , table , existed_entries ):
63
63
tbl = swsscommon .Table (db , table )
64
64
entries = set (tbl .getKeys ())
65
65
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."
67
67
new_entries .sort ()
68
68
return new_entries
69
69
70
70
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
+
71
77
def get_deleted_entries (db , table , existed_entries , count ):
72
78
tbl = swsscommon .Table (db , table )
73
79
entries = set (tbl .getKeys ())
@@ -894,12 +900,16 @@ def check_vnet_routes(self, dvs, name, endpoint, tunnel, mac="", vni=0):
894
900
_vni = str (vni ) if vni != 0 else self .vnet_map [name ]['vni' ]
895
901
896
902
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 )
898
904
899
905
expected_attrs = {
900
906
"SAI_FDB_ENTRY_ATTR_TYPE" : "SAI_FDB_ENTRY_TYPE_STATIC" ,
901
907
"SAI_FDB_ENTRY_ATTR_ENDPOINT_IP" : endpoint
902
908
}
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
+
903
913
check_object (asic_db , self .ASIC_FDB_ENTRY , new_fdb , expected_attrs )
904
914
905
915
self .fdbs .add (new_fdb )
0 commit comments