diff options
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_bonding.py | 10 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_bridge.py | 12 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_l2tpv3.py | 4 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_loopback.py | 4 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_wireless.py | 4 |
5 files changed, 16 insertions, 18 deletions
diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py index 83b549005..a7355f418 100755 --- a/smoketest/scripts/cli/test_interfaces_bonding.py +++ b/smoketest/scripts/cli/test_interfaces_bonding.py @@ -51,18 +51,16 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest): self._options['bond0'].append(f'member interface {member}') - def test_add_address_single(self): + def test_add_single_ip_address(self): """ derived method to check if member interfaces are enslaved properly """ - super().test_add_address_single() + super().test_add_single_ip_address() for interface in self._interfaces: slaves = read_file(f'/sys/class/net/{interface}/bonding/slaves').split() self.assertListEqual(slaves, self._members) - def test_8021q_vlan(self): - """ Testcase for 802.1q VLAN interfaces created on top of a lacp / bond - interface. This is the testcase for T2894 """ - super().test_8021q_vlan() + def test_8021q_vlan_interfaces(self): + super().test_8021q_vlan_interfaces() for interface in self._interfaces: slaves = read_file(f'/sys/class/net/{interface}/bonding/slaves').split() diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py index 71a81a11f..04a117edf 100755 --- a/smoketest/scripts/cli/test_interfaces_bridge.py +++ b/smoketest/scripts/cli/test_interfaces_bridge.py @@ -61,8 +61,8 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): self.session.delete(['interfaces','dummy']) super().tearDown() - def test_add_remove_member(self): - """ Add member interfaces to bridge and set STP cost/priority """ + def test_add_remove_bridge_member(self): + # Add member interfaces to bridge and set STP cost/priority for interface in self._interfaces: base = self._base_path + [interface] self.session.set(base + ['stp']) @@ -95,8 +95,8 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): self.session.commit() - def test_vlan_filter(self): - """ Add member interface to bridge and set VLAN filter """ + def test_bridge_vlan_filter(self): + # Add member interface to bridge and set VLAN filter for interface in self._interfaces: base = self._base_path + [interface] self.session.set(base + ['vif', '1','address', '192.0.2.1/24']) @@ -183,8 +183,8 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): self.session.commit() - def test_vlan_members(self): - """ T2945: ensure that VIFs are not dropped from bridge """ + def test_bridge_vlan_members(self): + # T2945: ensure that VIFs are not dropped from bridge self.session.set(['interfaces', 'ethernet', 'eth0', 'vif', '300']) self.session.set(['interfaces', 'bridge', 'br0', 'member', 'interface', 'eth0.300']) diff --git a/smoketest/scripts/cli/test_interfaces_l2tpv3.py b/smoketest/scripts/cli/test_interfaces_l2tpv3.py index d9a29a583..be9565d00 100755 --- a/smoketest/scripts/cli/test_interfaces_l2tpv3.py +++ b/smoketest/scripts/cli/test_interfaces_l2tpv3.py @@ -38,8 +38,8 @@ class GeneveInterfaceTest(BasicInterfaceTest.BaseTest): } self._interfaces = list(self._options) - def test_add_address_single(self): - super().test_add_address_single() + def test_add_single_ip_address(self): + super().test_add_single_ip_address() command = 'sudo ip -j l2tp show session' json_out = json.loads(cmd(command)) diff --git a/smoketest/scripts/cli/test_interfaces_loopback.py b/smoketest/scripts/cli/test_interfaces_loopback.py index 70758d097..549a679fc 100755 --- a/smoketest/scripts/cli/test_interfaces_loopback.py +++ b/smoketest/scripts/cli/test_interfaces_loopback.py @@ -27,8 +27,8 @@ class LoopbackInterfaceTest(BasicInterfaceTest.BaseTest): self._base_path = ['interfaces', 'loopback'] self._interfaces = ['lo'] - def test_add_address_single(self): - super().test_add_address_single() + def test_add_single_ip_address(self): + super().test_add_single_ip_address() for addr in self._loopback_addresses: self.assertTrue(is_intf_addr_assigned('lo', addr)) diff --git a/smoketest/scripts/cli/test_interfaces_wireless.py b/smoketest/scripts/cli/test_interfaces_wireless.py index d2e35b6d8..111205866 100755 --- a/smoketest/scripts/cli/test_interfaces_wireless.py +++ b/smoketest/scripts/cli/test_interfaces_wireless.py @@ -48,9 +48,9 @@ class WirelessInterfaceTest(BasicInterfaceTest.BaseTest): } self._interfaces = list(self._options) - def test_add_address_single(self): + def test_add_single_ip_address(self): """ derived method to check if member interfaces are enslaved properly """ - super().test_add_address_single() + super().test_add_single_ip_address() for option, option_value in self._options.items(): if 'type access-point' in option_value: |