Merge pull request #2321 from vyos/mergify/bp/sagitta/pr-2307vyos/1.4dev1

mdns: T5615: Allow controlling IP version to use for mDNS repeater (backport #2307)

1 files changed, 67 insertions, 7 deletions

diff --git a/smoketest/scripts/cli/test_service_mdns-repeater.py b/smoketest/scripts/cli/test_service_mdns-repeater.py
index 9a9839025..f2fb3b509 100755
--- a/smoketest/scripts/cli/test_service_mdns-repeater.py
+++ b/smoketest/scripts/cli/test_service_mdns-repeater.py
@@ -19,6 +19,7 @@ import unittest
 from base_vyostest_shim import VyOSUnitTestSHIM
 
 from configparser import ConfigParser
+from vyos.configsession import ConfigSessionError
 from vyos.utils.process import process_named_running
 
 base_path = ['service', 'mdns', 'repeater']
@@ -27,6 +28,20 @@ config_file = '/run/avahi-daemon/avahi-daemon.conf'
 
 
 class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
+    def setUp(self):
+        # Start with a clean CLI instance
+        self.cli_delete(base_path)
+
+        # Service required a configured IP address on the interface
+        self.cli_set(intf_base + ['dum10', 'address', '192.0.2.1/30'])
+        self.cli_set(intf_base + ['dum10', 'ipv6', 'address', 'no-default-link-local'])
+        self.cli_set(intf_base + ['dum20', 'address', '192.0.2.5/30'])
+        self.cli_set(intf_base + ['dum20', 'address', '2001:db8:0:2::5/64'])
+        self.cli_set(intf_base + ['dum30', 'address', '192.0.2.9/30'])
+        self.cli_set(intf_base + ['dum30', 'address', '2001:db8:0:2::9/64'])
+        self.cli_set(intf_base + ['dum40', 'address', '2001:db8:0:2::11/64'])
+        self.cli_commit()
+
     def tearDown(self):
         # Check for running process
         self.assertTrue(process_named_running('avahi-daemon'))
@@ -34,24 +49,23 @@ class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
         self.cli_delete(base_path)
         self.cli_delete(intf_base + ['dum10'])
         self.cli_delete(intf_base + ['dum20'])
+        self.cli_delete(intf_base + ['dum30'])
+        self.cli_delete(intf_base + ['dum40'])
         self.cli_commit()
 
         # Check that there is no longer a running process
         self.assertFalse(process_named_running('avahi-daemon'))
 
-    def test_service(self):
+    def test_service_dual_stack(self):
         # mDNS browsing domains in addition to the default one (local)
         domains = ['dom1.home.arpa', 'dom2.home.arpa']
 
         # mDNS services to be repeated
         services = ['_ipp._tcp', '_smb._tcp', '_ssh._tcp']
 
-        # Service required a configured IP address on the interface
-        self.cli_set(intf_base + ['dum10', 'address', '192.0.2.1/30'])
-        self.cli_set(intf_base + ['dum20', 'address', '192.0.2.5/30'])
-
-        self.cli_set(base_path + ['interface', 'dum10'])
+        self.cli_set(base_path + ['ip-version', 'both'])
         self.cli_set(base_path + ['interface', 'dum20'])
+        self.cli_set(base_path + ['interface', 'dum30'])
 
         for domain in domains:
             self.cli_set(base_path + ['browse-domain', domain])
@@ -65,10 +79,56 @@ class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
         conf = ConfigParser(delimiters='=')
         conf.read(config_file)
 
-        self.assertEqual(conf['server']['allow-interfaces'], 'dum10, dum20')
+        self.assertEqual(conf['server']['use-ipv4'], 'yes')
+        self.assertEqual(conf['server']['use-ipv6'], 'yes')
+        self.assertEqual(conf['server']['allow-interfaces'], 'dum20, dum30')
         self.assertEqual(conf['server']['browse-domains'], ', '.join(domains))
         self.assertEqual(conf['reflector']['enable-reflector'], 'yes')
         self.assertEqual(conf['reflector']['reflect-filters'], ', '.join(services))
 
+    def test_service_ipv4(self):
+        # partcipating interfaces should have IPv4 addresses
+        self.cli_set(base_path + ['ip-version', 'ipv4'])
+        self.cli_set(base_path + ['interface', 'dum10'])
+        self.cli_set(base_path + ['interface', 'dum40'])
+
+        # exception is raised if partcipating interfaces do not have IPv4 address
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+        self.cli_delete(base_path + ['interface', 'dum40'])
+        self.cli_set(base_path + ['interface', 'dum20'])
+        self.cli_commit()
+
+        # Validate configuration values
+        conf = ConfigParser(delimiters='=')
+        conf.read(config_file)
+
+        self.assertEqual(conf['server']['use-ipv4'], 'yes')
+        self.assertEqual(conf['server']['use-ipv6'], 'no')
+        self.assertEqual(conf['server']['allow-interfaces'], 'dum10, dum20')
+        self.assertEqual(conf['reflector']['enable-reflector'], 'yes')
+
+    def test_service_ipv6(self):
+        # partcipating interfaces should have IPv6 addresses
+        self.cli_set(base_path + ['ip-version', 'ipv6'])
+        self.cli_set(base_path + ['interface', 'dum10'])
+        self.cli_set(base_path + ['interface', 'dum30'])
+
+        # exception is raised if partcipating interfaces do not have IPv4 address
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+        self.cli_delete(base_path + ['interface', 'dum10'])
+        self.cli_set(base_path + ['interface', 'dum40'])
+        self.cli_commit()
+
+        # Validate configuration values
+        conf = ConfigParser(delimiters='=')
+        conf.read(config_file)
+
+        self.assertEqual(conf['server']['use-ipv4'], 'no')
+        self.assertEqual(conf['server']['use-ipv6'], 'yes')
+        self.assertEqual(conf['server']['allow-interfaces'], 'dum30, dum40')
+        self.assertEqual(conf['reflector']['enable-reflector'], 'yes')
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)