summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-07-17 21:53:49 +0200
committerChristian Poessinger <christian@poessinger.com>2020-07-17 21:53:51 +0200
commitded73c194266ee0121b2c4c06dcd78fed0758f81 (patch)
treeeba7d5bf82cf1c1e1b4122fd7f11adc7e5aa841b
parent964ef004065cc0227bfbc36ea655067fe88ad20f (diff)
downloadvyos-1x-ded73c194266ee0121b2c4c06dcd78fed0758f81.tar.gz
vyos-1x-ded73c194266ee0121b2c4c06dcd78fed0758f81.zip
bridge: support specifying bridge members via environment variable
This eases remote-testing via SSH.
-rwxr-xr-xscripts/cli/test_interfaces_bridge.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/scripts/cli/test_interfaces_bridge.py b/scripts/cli/test_interfaces_bridge.py
index 03c78c210..4402cad68 100755
--- a/scripts/cli/test_interfaces_bridge.py
+++ b/scripts/cli/test_interfaces_bridge.py
@@ -14,6 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import os
import unittest
from base_interfaces_test import BasicInterfaceTest
@@ -30,21 +31,23 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
members = []
# we need to filter out VLAN interfaces identified by a dot (.)
# in their name - just in case!
- for tmp in Section.interfaces("ethernet"):
- if not '.' in tmp:
- members.append(tmp)
+ if 'TEST_ETH' in os.environ:
+ members = os.environ['TEST_ETH'].split()
+ else:
+ for tmp in Section.interfaces("ethernet"):
+ if not '.' in tmp: members.append(tmp)
for intf in self._interfaces:
+ base = self._base_path + [intf]
+ self.session.set(base + ['stp'])
+
cost = 1000
priority = 10
-
- self.session.set(self._base_path + [intf, 'stp'])
-
# assign members to bridge interface
for member in members:
- self.session.set(self._base_path + [intf, 'member', 'interface', member])
- self.session.set(self._base_path + [intf, 'member', 'interface', member, 'cost', str(cost)])
- self.session.set(self._base_path + [intf, 'member', 'interface', member, 'priority', str(priority)])
+ base_member = base + ['member', 'interface', member]
+ self.session.set(base_member + ['cost', str(cost)])
+ self.session.set(base_member + ['priority', str(priority)])
cost += 1
priority += 1