add vlan config

opencomputeproject · Jun 19, 2022 · c778e57 · c778e57
1 parent 1cb0917
commit c778e57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/test/sai_test/config/fdb_configer.py b/test/sai_test/config/fdb_configer.py
@@ -20,6 +20,7 @@
 
 from sai_utils import *  # pylint: disable=wildcard-import; lgtm[py/polluting-import]
 from sai_thrift.sai_adapter import *
+import pdb
 
 
 def t0_fdb_config_helper(test_obj, is_create_fdb=True):
@@ -44,19 +45,20 @@ def t0_fdb_config_helper(test_obj, is_create_fdb=True):
     if is_create_fdb:
         configer.create_fdb_entries(
             switch_id=test_obj.switch_id, 
-            mac_list=local_server_mac_list,
+            mac_list=local_server_mac_list[0:1],
             port_oids=test_obj.bridge_port_list[0:1], 
             vlan_oid=test_obj.default_vlan_id)
         configer.create_fdb_entries(
             switch_id=test_obj.switch_id, 
-            mac_list=local_server_mac_list,
+            mac_list=local_server_mac_list[1:9],
             port_oids=test_obj.bridge_port_list[1:9], 
-            vlan_oid=test_obj.vlans[0].vlan_oid)
+            vlan_oid=test_obj.vlans[10].vlan_oid)
         configer.create_fdb_entries(
             switch_id=test_obj.switch_id, 
-            mac_list=local_server_mac_list,
+            mac_list=local_server_mac_list[9:17],
             port_oids=test_obj.bridge_port_list[9:17], 
-            vlan_oid=test_obj.vlans[1].vlan_oid)
+            vlan_oid=test_obj.vlans[20].vlan_oid)
+    pdb.set_trace()
     #Todo dynamic use the vlan_member_port_map to add data to fdb
     test_obj.local_server_mac_list = local_server_mac_list
 

diff --git a/test/sai_test/config/vlan_configer.py b/test/sai_test/config/vlan_configer.py
@@ -45,17 +45,16 @@ def t0_vlan_config_helper(test_obj, is_reset_default_vlan=True, is_create_vlan=T
 
     if is_create_vlan:
         vlan = configer.create_vlan(10, [1, 2, 3, 4, 5, 6, 7, 8])
-        vlans.update({vlan.vlan_id, vlan})
+        vlans.update({vlan.vlan_id: vlan})
         vlan = configer.create_vlan(20, [9, 10, 11, 12, 13, 14, 15, 16])
-        vlans.update({vlan.vlan_id, vlan})
+        vlans.update({vlan.vlan_id: vlan})
     #todo check and get vlan when skip create vlan
 
     if not hasattr(test_obj, 'vlans'):
         test_obj.vlans = {}
-    for vlan in vlans:
-        test_obj.vlans.update(vlan.vlan_id, vlan)
-
-    test_obj.default_vlan_id = default_vlan_id
+    for key in vlans:        
+        test_obj.vlans.update({key: vlans[key]})
+    test_obj.default_vlan_id = default_vlan_id    
 
 
 class VlanConfiger(object):