smoketest: interface: enable ip/ipv6 tests on additional interfaces

(cherry picked from commit 910919d856d790ff8905d513c280fdf12f8892ef)

12 files changed, 21 insertions, 6 deletions

diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index 8b04eb337..36b085c7f 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -57,6 +57,7 @@ class BasicInterfaceTest:
         _test_vlan = False
         _test_qinq = False
         _test_ipv6 = False
+        _test_ipv6_pd = False
         _test_mirror = False
         _base_path = []
 
@@ -367,7 +368,7 @@ class BasicInterfaceTest:
 
 
         def test_dhcpv6pd_auto_sla_id(self):
-            if not self._test_ipv6:
+            if not self._test_ipv6_pd:
                 self.skipTest('not enabled')
 
             prefix_len = '56'
@@ -423,7 +424,7 @@ class BasicInterfaceTest:
                 self.session.delete(['interfaces', section, delegatee])
 
         def test_dhcpv6pd_manual_sla_id(self):
-            if not self._test_ipv6:
+            if not self._test_ipv6_pd:
                 self.skipTest('not enabled')
 
             prefix_len = '56'
diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py
index d73ff09e9..f42ec3e9b 100755
--- a/smoketest/scripts/cli/test_interfaces_bonding.py
+++ b/smoketest/scripts/cli/test_interfaces_bonding.py
@@ -27,10 +27,11 @@ from vyos.util import read_file
 class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
         self._test_ip = True
+        self._test_ipv6 = True
+        self._test_ipv6_pd = True
         self._test_mtu = True
         self._test_vlan = True
         self._test_qinq = True
-        self._test_ipv6 = True
         self._base_path = ['interfaces', 'bonding']
         self._interfaces = ['bond0']
         self._mirror_interfaces = ['dum21354']
diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py
index d47d236d0..03d8f6e9c 100755
--- a/smoketest/scripts/cli/test_interfaces_bridge.py
+++ b/smoketest/scripts/cli/test_interfaces_bridge.py
@@ -30,6 +30,7 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
         self._test_ip = True
         self._test_ipv6 = True
+        self._test_ipv6_pd = True
         self._test_vlan = True
         self._test_qinq = True
         self._base_path = ['interfaces', 'bridge']
diff --git a/smoketest/scripts/cli/test_interfaces_ethernet.py b/smoketest/scripts/cli/test_interfaces_ethernet.py
index 6a0bdf150..42c1f15df 100755
--- a/smoketest/scripts/cli/test_interfaces_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_ethernet.py
@@ -37,10 +37,11 @@ def get_wpa_supplicant_value(interface, key):
 class EthernetInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
         self._test_ip = True
+        self._test_ipv6 = True
+        self._test_ipv6_pd = True
         self._test_mtu = True
         self._test_vlan = True
         self._test_qinq = True
-        self._test_ipv6 = True
         self._base_path = ['interfaces', 'ethernet']
         self._mirror_interfaces = ['dum21354']
 
diff --git a/smoketest/scripts/cli/test_interfaces_geneve.py b/smoketest/scripts/cli/test_interfaces_geneve.py
index 98f55210f..12cded400 100755
--- a/smoketest/scripts/cli/test_interfaces_geneve.py
+++ b/smoketest/scripts/cli/test_interfaces_geneve.py
@@ -21,6 +21,8 @@ from base_interfaces_test import BasicInterfaceTest
 
 class GeneveInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
+        self._test_ip = True
+        self._test_ipv6 = True
         self._base_path = ['interfaces', 'geneve']
         self._options = {
             'gnv0': ['vni 10', 'remote 127.0.1.1'],
diff --git a/smoketest/scripts/cli/test_interfaces_l2tpv3.py b/smoketest/scripts/cli/test_interfaces_l2tpv3.py
index c756bfdd5..81af6d7f4 100755
--- a/smoketest/scripts/cli/test_interfaces_l2tpv3.py
+++ b/smoketest/scripts/cli/test_interfaces_l2tpv3.py
@@ -22,6 +22,8 @@ from vyos.util import cmd
 
 class GeneveInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
+        self._test_ip = True
+        self._test_ipv6 = True
         self._base_path = ['interfaces', 'l2tpv3']
         self._options = {
             'l2tpeth10': ['local-ip 127.0.0.1', 'remote-ip 127.10.10.10',
diff --git a/smoketest/scripts/cli/test_interfaces_macsec.py b/smoketest/scripts/cli/test_interfaces_macsec.py
index d9635951f..89743e5fd 100755
--- a/smoketest/scripts/cli/test_interfaces_macsec.py
+++ b/smoketest/scripts/cli/test_interfaces_macsec.py
@@ -33,6 +33,8 @@ def get_config_value(interface, key):
 class MACsecInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
          super().setUp()
+         self._test_ip = True
+         self._test_ipv6 = True
          self._base_path = ['interfaces', 'macsec']
          self._options = { 'macsec0': ['source-interface eth0', 'security cipher gcm-aes-128'] }
 
diff --git a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
index 85e5e70bd..10bd7ca34 100755
--- a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
@@ -22,6 +22,7 @@ class PEthInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
         self._test_ip = True
         self._test_ipv6 = True
+        self._test_ipv6_pd = True
         self._test_mtu = True
         self._test_vlan = True
         self._test_qinq = True
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py
index 6115f0a07..f67b813af 100755
--- a/smoketest/scripts/cli/test_interfaces_tunnel.py
+++ b/smoketest/scripts/cli/test_interfaces_tunnel.py
@@ -63,6 +63,7 @@ def tunnel_conf(interface):
 class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
         self._test_ip = True
+        self._test_ipv6 = True
         self._test_mtu = True
         self._base_path = ['interfaces', 'tunnel']
         self.local_v4 = '192.0.2.1'
@@ -203,4 +204,4 @@ class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
         self.session.commit()
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2, failfast=True)
+    unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_interfaces_vxlan.py b/smoketest/scripts/cli/test_interfaces_vxlan.py
index a9b0fc5a1..a726aa610 100755
--- a/smoketest/scripts/cli/test_interfaces_vxlan.py
+++ b/smoketest/scripts/cli/test_interfaces_vxlan.py
@@ -21,6 +21,8 @@ from base_interfaces_test import BasicInterfaceTest
 
 class VXLANInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
+        self._test_ip = True
+        self._test_ipv6 = True
         self._test_mtu = True
         self._base_path = ['interfaces', 'vxlan']
         self._options = {
diff --git a/smoketest/scripts/cli/test_interfaces_wireless.py b/smoketest/scripts/cli/test_interfaces_wireless.py
index ffaa7d523..51d97f032 100755
--- a/smoketest/scripts/cli/test_interfaces_wireless.py
+++ b/smoketest/scripts/cli/test_interfaces_wireless.py
@@ -33,6 +33,7 @@ def get_config_value(interface, key):
 
 class WirelessInterfaceTest(BasicInterfaceTest.BaseTest):
     def setUp(self):
+        self._test_ip = True
         self._base_path = ['interfaces', 'wireless']
         self._options = {
             'wlan0':  ['physical-device phy0', 'ssid VyOS-WIFI-0',
diff --git a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
index 45cd069f4..696a6946b 100755
--- a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
+++ b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
@@ -40,7 +40,7 @@ class WWANInterfaceTest(unittest.TestCase):
         self.session.commit()
         del self.session
 
-    def test_wlm_1(self):
+    def test_wwan(self):
         for interface in self._interfaces:
             self.session.set(base_path + [interface, 'no-peer-dns'])
             self.session.set(base_path + [interface, 'connect-on-demand'])