From e4eb5ecb376be3cac139ee2b35cecf61cedbeab7 Mon Sep 17 00:00:00 2001 From: zhoudongxu Date: Thu, 3 Nov 2022 08:10:06 +0000 Subject: [PATCH 1/2] Disable L3 config for some vlan and fdb tests Signed-off-by: zhoudongxu --- test/sai_test/sai_fdb_test.py | 2 +- test/sai_test/sai_test_base.py | 4 ++++ test/sai_test/sai_vlan_test.py | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/sai_test/sai_fdb_test.py b/test/sai_test/sai_fdb_test.py index 939dff804..695004ea1 100644 --- a/test/sai_test/sai_fdb_test.py +++ b/test/sai_test/sai_fdb_test.py @@ -445,7 +445,7 @@ def setUp(self): """ Set up test """ - T0TestBase.setUp(self, is_reset_default_vlan=False) + T0TestBase.setUp(self, is_reset_default_vlan=False, is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) sai_thrift_remove_vlan_member( self.client, self.dut.vlans[10].vlan_mport_oids[1]) self.assertEqual(status, SAI_STATUS_SUCCESS) diff --git a/test/sai_test/sai_test_base.py b/test/sai_test/sai_test_base.py index f198074f8..adcf14b2a 100644 --- a/test/sai_test/sai_test_base.py +++ b/test/sai_test/sai_test_base.py @@ -359,6 +359,8 @@ def setUp(self, is_create_default_route=True, is_create_default_loopback_interface=False, is_create_lag=True, + is_create_vlan_itf=True, + is_create_route_for_vlan_itf=True, is_create_route_for_lag=True, is_create_route_for_nhopgrp=False, wait_sec=5, @@ -398,6 +400,8 @@ def setUp(self, is_create_default_route=is_create_default_route, is_create_default_loopback_interface=is_create_default_loopback_interface, is_create_route_for_lag=is_create_route_for_lag, + is_create_vlan_interface=is_create_vlan_itf, + is_create_route_for_vlan=is_create_route_for_vlan_itf, is_create_route_for_nhopgrp=is_create_route_for_nhopgrp) print("common config done, persist it") self.persist_helper.persist_dut(self.dut) diff --git a/test/sai_test/sai_vlan_test.py b/test/sai_test/sai_vlan_test.py index d7595d7dc..2aa74af24 100644 --- a/test/sai_test/sai_vlan_test.py +++ b/test/sai_test/sai_vlan_test.py @@ -271,7 +271,7 @@ class TaggedVlanFloodingTest(T0TestBase): """ def setUp(self): - super().setUp() + super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) def runTest(self): print("\nTaggedVlanFloodingTest") @@ -305,7 +305,7 @@ class UnTaggedVlanFloodingTest(T0TestBase): """ def setUp(self): - super().setUp() + super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) def runTest(self): print("\nUnTaggedVlanFloodingTest") @@ -378,7 +378,7 @@ class UntaggedMacLearningTest(T0TestBase): """ def setUp(self): - super().setUp() + super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) def runTest(self): print("\nUntaggedMacLearningTest") @@ -424,7 +424,7 @@ class TaggedMacLearningTest(T0TestBase): """ def setUp(self): - super().setUp() + super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) def runTest(self): print("\nTaggedMacLearningTest") @@ -564,7 +564,7 @@ class DisableMacLearningTaggedTest(T0TestBase): """ def setUp(self): - T0TestBase.setUp(self, is_reset_default_vlan=False) + T0TestBase.setUp(self, is_reset_default_vlan=False, is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) print("DisableMacLearningTaggedTest") sai_thrift_set_vlan_attribute( self.client, self.dut.vlans[10].oid, learn_disable=True) @@ -604,7 +604,7 @@ class DisableMacLearningUntaggedTest(T0TestBase): """ def setUp(self): - T0TestBase.setUp(self, is_reset_default_vlan=False) + T0TestBase.setUp(self, is_reset_default_vlan=False, is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) print("DisableMacLearningUntaggedTest") sai_thrift_set_vlan_attribute( self.client, self.dut.vlans[10].oid, learn_disable=True) From 0ca7737e5d405ef104ab4626d5b3f00a650fb6ee Mon Sep 17 00:00:00 2001 From: zhoudongxu Date: Thu, 3 Nov 2022 08:51:04 +0000 Subject: [PATCH 2/2] fix code style Signed-off-by: zhoudongxu --- test/sai_test/sai_fdb_test.py | 9 ++++++- test/sai_test/sai_vlan_test.py | 46 +++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/test/sai_test/sai_fdb_test.py b/test/sai_test/sai_fdb_test.py index 695004ea1..20e7557a7 100644 --- a/test/sai_test/sai_fdb_test.py +++ b/test/sai_test/sai_fdb_test.py @@ -445,7 +445,14 @@ def setUp(self): """ Set up test """ - T0TestBase.setUp(self, is_reset_default_vlan=False, is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + T0TestBase.setUp( + self, + is_reset_default_vlan=False, + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) sai_thrift_remove_vlan_member( self.client, self.dut.vlans[10].vlan_mport_oids[1]) self.assertEqual(status, SAI_STATUS_SUCCESS) diff --git a/test/sai_test/sai_vlan_test.py b/test/sai_test/sai_vlan_test.py index 2aa74af24..5f0eeb0c1 100644 --- a/test/sai_test/sai_vlan_test.py +++ b/test/sai_test/sai_vlan_test.py @@ -271,7 +271,12 @@ class TaggedVlanFloodingTest(T0TestBase): """ def setUp(self): - super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + super().setUp( + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) def runTest(self): print("\nTaggedVlanFloodingTest") @@ -305,7 +310,12 @@ class UnTaggedVlanFloodingTest(T0TestBase): """ def setUp(self): - super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + super().setUp( + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) def runTest(self): print("\nUnTaggedVlanFloodingTest") @@ -378,7 +388,12 @@ class UntaggedMacLearningTest(T0TestBase): """ def setUp(self): - super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + super().setUp( + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) def runTest(self): print("\nUntaggedMacLearningTest") @@ -424,7 +439,12 @@ class TaggedMacLearningTest(T0TestBase): """ def setUp(self): - super().setUp(is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + super().setUp( + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) def runTest(self): print("\nTaggedMacLearningTest") @@ -564,7 +584,14 @@ class DisableMacLearningTaggedTest(T0TestBase): """ def setUp(self): - T0TestBase.setUp(self, is_reset_default_vlan=False, is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + T0TestBase.setUp( + self, + is_reset_default_vlan=False, + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) print("DisableMacLearningTaggedTest") sai_thrift_set_vlan_attribute( self.client, self.dut.vlans[10].oid, learn_disable=True) @@ -604,7 +631,14 @@ class DisableMacLearningUntaggedTest(T0TestBase): """ def setUp(self): - T0TestBase.setUp(self, is_reset_default_vlan=False, is_create_vlan_itf=False, is_create_route_for_vlan_itf=False, is_create_route_for_lag=False, is_create_lag=False, is_create_default_route=False) + T0TestBase.setUp( + self, + is_reset_default_vlan=False, + is_create_vlan_itf=False, + is_create_route_for_vlan_itf=False, + is_create_route_for_lag=False, + is_create_lag=False, + is_create_default_route=False) print("DisableMacLearningUntaggedTest") sai_thrift_set_vlan_attribute( self.client, self.dut.vlans[10].oid, learn_disable=True)