From 06dae2734aee09885e34aec0df397985c2a36961 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 24 May 2021 09:38:43 +0200 Subject: smoketest: vif: T3570: fix vlan interface MTU test for pseudo-ethernet interfaces The MTU size of the source-interface must be greater or equal to the MTU of the pseudo ethernet interface. --- smoketest/scripts/cli/base_interfaces_test.py | 6 +++++- smoketest/scripts/cli/test_interfaces_bridge.py | 12 +++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py index 44f99ffab..7f69b8444 100644 --- a/smoketest/scripts/cli/base_interfaces_test.py +++ b/smoketest/scripts/cli/base_interfaces_test.py @@ -323,6 +323,10 @@ class BasicInterfaceTest: self.cli_set(base + ['mtu', mtu_1500]) for option in self._options.get(interface, []): self.cli_set(base + option.split()) + if 'source-interface' in option: + iface = option.split()[-1] + iface_type = Section.section(iface) + self.cli_set(['interfaces', iface_type, iface, 'mtu', mtu_9000]) for vlan in self._vlan_range: base = self._base_path + [interface, 'vif', vlan] @@ -350,7 +354,7 @@ class BasicInterfaceTest: self.assertEqual(tmp['mtu'], int(mtu_9000)) - def test_vif_qos_change(self): + def test_vif_8021q_qos_change(self): # XXX: This testcase is not allowed to run as first testcase, reason # is the Wireless test will first load the wifi kernel hwsim module # which creates a wlan0 and wlan1 interface which will fail the diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py index 6865d3a8a..4f7e03298 100755 --- a/smoketest/scripts/cli/test_interfaces_bridge.py +++ b/smoketest/scripts/cli/test_interfaces_bridge.py @@ -135,12 +135,18 @@ class BridgeInterfaceTest(BasicInterfaceTest.TestCase): base = self._base_path + [interface] self.cli_set(base + ['enable-vlan']) super().test_vif_8021q_lower_up_down() - - def test_vif_qos_change(self): + + def test_vif_8021q_qos_change(self): + for interface in self._interfaces: + base = self._base_path + [interface] + self.cli_set(base + ['enable-vlan']) + super().test_vif_8021q_qos_change() + + def test_vif_8021q_mtu_limits(self): for interface in self._interfaces: base = self._base_path + [interface] self.cli_set(base + ['enable-vlan']) - super().test_vif_qos_change() + super().test_vif_8021q_mtu_limits() def test_bridge_vlan_filter(self): vif_vlan = 2 -- cgit v1.2.3