Skip to content

Disable L3 config for some vlan and fdb tests #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhoudongxu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Disable L3 config for some vlan and fdb tests #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4eb5ec
Disable L3 config for some vlan and fdb tests
zhoudongxu Nov 3, 2022
0ca7737
fix code style
zhoudongxu Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion test/sai_test/sai_fdb_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,14 @@ 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)
Expand Down
4 changes: 4 additions & 0 deletions test/sai_test/sai_test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
46 changes: 40 additions & 6 deletions test/sai_test/sai_vlan_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,12 @@ 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")
Expand Down Expand Up @@ -305,7 +310,12 @@ 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")
Expand Down Expand Up @@ -378,7 +388,12 @@ 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")
Expand Down Expand Up @@ -424,7 +439,12 @@ 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")
Expand Down Expand Up @@ -564,7 +584,14 @@ 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)
Expand Down Expand Up @@ -604,7 +631,14 @@ 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)
Expand Down