Merge branch 'master' of github.com:vyos/vyos-smoketest into vyos-smoketest-integration (T2832)

* 'master' of github.com:vyos/vyos-smoketest: (153 commits)
  pppoe-server: test some more values
  lcd: adjust to cli changes
  lcd: adapt test to new CLI design
  pppoe-server: initial smoketest with local and radius auth
  pppoe: validate dhcpv6 client will be started
  wireless: validate hostapd/wpa_supplicant is running
  pppoe: sync to new dhcpv6-pd cli
  anyconnect: T2812: add basic testing
  ethernet: check interface disable state
  router-advert: check 'infinity' option in script logic
  ssh: config file is now volatile (moved to /run)
  ipv6: link-local: test address assignment on interfaces
  router-advert: add initial test
  mdns-repeater: add basic test
  pseudo-ethernet: extend smoketests with VIFs
  l2tpv3: add initial interface test
  wireless: use library function for loading kernel modules
  ethernet: test "ip" subtree of interface for e.g. ARP settings
  pppoe: use assertEqual()
  service: bcast-relay: add initial tests
  ...

1 files changed, 70 insertions, 0 deletions

diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py
new file mode 100755
index 000000000..bc0bb69c6
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_bridge.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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
+from vyos.ifconfig import Section
+
+class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._test_ipv6 = True
+
+        self._base_path = ['interfaces', 'bridge']
+        self._interfaces = ['br0']
+
+        self._members = []
+        # we need to filter out VLAN interfaces identified by a dot (.)
+        # in their name - just in case!
+        if 'TEST_ETH' in os.environ:
+            self._members = os.environ['TEST_ETH'].split()
+        else:
+            for tmp in Section.interfaces("ethernet"):
+                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 test_add_remove_member(self):
+        for interface in self._interfaces:
+            base = self._base_path + [interface]
+            self.session.set(base + ['stp'])
+            self.session.set(base + ['address', '192.0.2.1/24'])
+
+            cost = 1000
+            priority = 10
+            # assign members to bridge interface
+            for member in self._members:
+                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
+
+        self.session.commit()
+
+        for interface in self._interfaces:
+            self.session.delete(self._base_path + [interface, 'member'])
+
+        self.session.commit()
+
+if __name__ == '__main__':
+    unittest.main()