From c4048b2047f693436b38196632cddf65beb67a86 Mon Sep 17 00:00:00 2001 From: jack9603301 Date: Thu, 10 Dec 2020 23:23:44 +0800 Subject: interfaces: T3114: Fix VLAN-aware bridge setting failure --- smoketest/scripts/cli/test_interfaces_bridge.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'smoketest/scripts/cli/test_interfaces_bridge.py') diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py index 9bddede31..0072a4d3b 100755 --- a/smoketest/scripts/cli/test_interfaces_bridge.py +++ b/smoketest/scripts/cli/test_interfaces_bridge.py @@ -45,10 +45,25 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): for tmp in Section.interfaces("ethernet"): if not '.' in tmp: self._members.append(tmp) + + self.session.set(['interfaces','dummy','dum0']) + self.session.set(['interfaces','dummy','dum1']) + self.session.commit() + self.session.set(['interfaces','bonding','bond1','member','interface','dum0']) + self.session.set(['interfaces','bonding','bond1','member','interface','dum1']) + self.session.commit() + for tmp in Section.interfaces("bonding"): + if not '.' in tmp: + self._members.append(tmp) self._options['br0'] = [] for member in self._members: self._options['br0'].append(f'member interface {member}') + + def tearDown(self): + self.session.delete(['interfaces','bonding']) + self.session.delete(['interfaces','dummy']) + super().tearDown() def test_add_remove_member(self): """ Add member interfaces to bridge and set STP cost/priority """ @@ -56,6 +71,7 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): base = self._base_path + [interface] self.session.set(base + ['stp']) self.session.set(base + ['address', '192.0.2.1/24']) + self.session.commit() cost = 1000 priority = 10 -- cgit v1.2.3 From 780573690fad3f5ff8e40e33ecf47f1264d9eb9d Mon Sep 17 00:00:00 2001 From: jack9603301 Date: Fri, 11 Dec 2020 23:32:38 +0800 Subject: smoketest: T3114: Completely remove `commit` in `setUp` --- smoketest/scripts/cli/test_interfaces_bridge.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'smoketest/scripts/cli/test_interfaces_bridge.py') diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py index 0072a4d3b..6c1efaf75 100755 --- a/smoketest/scripts/cli/test_interfaces_bridge.py +++ b/smoketest/scripts/cli/test_interfaces_bridge.py @@ -48,13 +48,9 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): self.session.set(['interfaces','dummy','dum0']) self.session.set(['interfaces','dummy','dum1']) - self.session.commit() self.session.set(['interfaces','bonding','bond1','member','interface','dum0']) self.session.set(['interfaces','bonding','bond1','member','interface','dum1']) - self.session.commit() - for tmp in Section.interfaces("bonding"): - if not '.' in tmp: - self._members.append(tmp) + self._members.append('bond1') self._options['br0'] = [] for member in self._members: @@ -71,7 +67,6 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): base = self._base_path + [interface] self.session.set(base + ['stp']) self.session.set(base + ['address', '192.0.2.1/24']) - self.session.commit() cost = 1000 priority = 10 -- cgit v1.2.3