Merge pull request #2030 from indrajitr/mdns-improvements-3

mdns: T5227: Refactor smoke tests for mdns-repeater

3 files changed, 33 insertions, 4 deletions

diff --git a/data/templates/mdns-repeater/avahi-daemon.j2 b/data/templates/mdns-repeater/avahi-daemon.j2
index 3aaa7fc82..e0dfd897e 100644
--- a/data/templates/mdns-repeater/avahi-daemon.j2
+++ b/data/templates/mdns-repeater/avahi-daemon.j2
@@ -1,3 +1,4 @@
+### Autogenerated by service_mdns-repeater.py ###
 [server]
 use-ipv4=yes
 use-ipv6=yes
diff --git a/interface-definitions/service-mdns-repeater.xml.in b/interface-definitions/service-mdns-repeater.xml.in
index 4aab9a558..653dbbbe4 100644
--- a/interface-definitions/service-mdns-repeater.xml.in
+++ b/interface-definitions/service-mdns-repeater.xml.in
@@ -38,6 +38,7 @@
                   <constraint>
                     <regex>[-_.a-zA-Z0-9]+</regex>
                   </constraint>
+                  <constraintErrorMessage>Service name must be alphanumeric and can contain hyphens and underscores</constraintErrorMessage>
                   <multi/>
                 </properties>
               </leafNode>
diff --git a/smoketest/scripts/cli/test_service_mdns-repeater.py b/smoketest/scripts/cli/test_service_mdns-repeater.py
index f99a98da1..880c13043 100755
--- a/smoketest/scripts/cli/test_service_mdns-repeater.py
+++ b/smoketest/scripts/cli/test_service_mdns-repeater.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -18,30 +18,57 @@ import unittest
 
 from base_vyostest_shim import VyOSUnitTestSHIM
 
+from configparser import ConfigParser
 from vyos.util import process_named_running
 
 base_path = ['service', 'mdns', 'repeater']
 intf_base = ['interfaces', 'dummy']
+config_file = '/run/avahi-daemon/avahi-daemon.conf'
+
 
 class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
     def tearDown(self):
+        # Check for running process
+        self.assertTrue(process_named_running('avahi-daemon'))
+
         self.cli_delete(base_path)
         self.cli_delete(intf_base + ['dum10'])
         self.cli_delete(intf_base + ['dum20'])
         self.cli_commit()
 
+        # Check that there is no longer a running process
+        self.assertFalse(process_named_running('avahi-daemon'))
+
     def test_service(self):
-        # Service required a configured IP address on the interface
+        # 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 + ['interface', 'dum20'])
+
+        for domain in domains:
+            self.cli_set(base_path + ['browse-domain', domain])
+
+        for service in services:
+            self.cli_set(base_path + ['allow-service', service])
+
         self.cli_commit()
 
-        # Check for running process
-        self.assertTrue(process_named_running('avahi-daemon'))
+        # Validate configuration values
+        conf = ConfigParser(delimiters='=')
+        conf.read(config_file)
+
+        self.assertEqual(conf['server']['allow-interfaces'], 'dum10, dum20')
+        self.assertEqual(conf['server']['browse-domains'], ', '.join(domains))
+        self.assertEqual(conf['reflector']['enable-reflector'], 'yes')
+        self.assertEqual(conf['reflector']['reflect-filters'], ', '.join(services))
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)