2 files changed, 94 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_service_https.py b/smoketest/scripts/cli/test_service_https.py
index 04c4a2e51..b4fe35d81 100755
--- a/smoketest/scripts/cli/test_service_https.py
+++ b/smoketest/scripts/cli/test_service_https.py
@@ -16,6 +16,7 @@
 
 import unittest
 import json
+import psutil
 
 from requests import request
 from urllib3.exceptions import InsecureRequestWarning
@@ -113,6 +114,29 @@ class TestHTTPSService(VyOSUnitTestSHIM.TestCase):
         # Check for stopped  process
         self.assertFalse(process_named_running(PROCESS_NAME))
 
+    def test_listen_address(self):
+        test_prefix = ['192.0.2.1/26', '2001:db8:1::ffff/64']
+        test_addr = [ i.split('/')[0] for i in test_prefix ]
+        for i, addr in enumerate(test_prefix):
+            self.cli_set(['interfaces', 'dummy', f'dum{i}', 'address', addr])
+
+        key = 'MySuperSecretVyOS'
+        self.cli_set(base_path + ['api', 'keys', 'id', 'key-01', 'key', key])
+        # commit base config first, for testing update of listen-address
+        self.cli_commit()
+
+        for addr in test_addr:
+            self.cli_set(base_path + ['listen-address', addr])
+        self.cli_commit()
+
+        res = set()
+        t = psutil.net_connections(kind="tcp")
+        for c in t:
+            if c.laddr.port == 443:
+                res.add(c.laddr.ip)
+
+        self.assertEqual(res, set(test_addr))
+
     def test_certificate(self):
         cert_name = 'test_https'
         dh_name = 'dh-test'
diff --git a/smoketest/scripts/cli/test_service_router-advert.py b/smoketest/scripts/cli/test_service_router-advert.py
index 83342bc72..33ce93ef4 100755
--- a/smoketest/scripts/cli/test_service_router-advert.py
+++ b/smoketest/scripts/cli/test_service_router-advert.py
@@ -256,12 +256,17 @@ class TestServiceRADVD(VyOSUnitTestSHIM.TestCase):
         isp_prefix = '2001:db8::/64'
         ula_prefixes = ['fd00::/64', 'fd01::/64']
 
+        # configure wildcard prefix
+        self.cli_set(base_path + ['prefix', '::/64'])
+
+        # test auto-ignore CLI behaviors with no prefix overrides
+        # set auto-ignore for all three prefixes
         self.cli_set(base_path + ['auto-ignore', isp_prefix])
 
         for ula_prefix in ula_prefixes:
             self.cli_set(base_path + ['auto-ignore', ula_prefix])
         
-        # commit changes
+        # commit and reload config
         self.cli_commit()
         config = read_file(RADVD_CONF)
 
@@ -277,6 +282,7 @@ class TestServiceRADVD(VyOSUnitTestSHIM.TestCase):
         # remove a prefix and verify it's gone
         self.cli_delete(base_path + ['auto-ignore', ula_prefixes[1]])
         
+        # commit and reload config
         self.cli_commit()
         config = read_file(RADVD_CONF)
 
@@ -290,9 +296,72 @@ class TestServiceRADVD(VyOSUnitTestSHIM.TestCase):
         self.cli_delete(base_path + ['auto-ignore', ula_prefixes[0]])
         self.cli_delete(base_path + ['auto-ignore', isp_prefix])
 
+        # commit and reload config
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        tmp = f'autoignoreprefixes' + ' {'
+        self.assertNotIn(tmp, config)
+
+        # test wildcard prefix overrides, with and without auto-ignore CLI configuration
+        newline = '\n'
+        left_curly = '{'
+        right_curly = '}'
+
+        # override ULA prefixes
+        for ula_prefix in ula_prefixes:
+            self.cli_set(base_path + ['prefix', ula_prefix])
+
+        # commit and reload config
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        # ensure autoignoreprefixes block is generated in config file with both prefixes
+        tmp = f'autoignoreprefixes' + f' {left_curly}{newline}        {ula_prefixes[0]};{newline}        {ula_prefixes[1]};{newline}    {right_curly};'
+        self.assertIn(tmp, config)
+
+        # remove a ULA prefix and ensure there is only one prefix in the config block
+        self.cli_delete(base_path + ['prefix', ula_prefixes[0]])
+
+        # commit and reload config
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        # ensure autoignoreprefixes block is generated in config file with only one prefix
+        tmp = f'autoignoreprefixes' + f' {left_curly}{newline}        {ula_prefixes[1]};{newline}    {right_curly};'
+        self.assertIn(tmp, config)
+
+        # exclude a prefix with auto-ignore CLI syntax
+        self.cli_set(base_path + ['auto-ignore', ula_prefixes[0]])
+
+        # commit and reload config
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        # verify that both prefixes appear in config block once again
+        tmp = f'autoignoreprefixes' + f' {left_curly}{newline}        {ula_prefixes[0]};{newline}        {ula_prefixes[1]};{newline}    {right_curly};'
+        self.assertIn(tmp, config)
+
+        # override first ULA prefix again
+        # first ULA is auto-ignored in CLI, it must appear only once in config
+        self.cli_set(base_path + ['prefix', ula_prefixes[0]])
+
+        # commit and reload config
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        # verify that both prefixes appear uniquely
+        tmp = f'autoignoreprefixes' + f' {left_curly}{newline}        {ula_prefixes[0]};{newline}        {ula_prefixes[1]};{newline}    {right_curly};'
+        self.assertIn(tmp, config)
+
+        # remove wildcard prefix and verify config block is gone
+        self.cli_delete(base_path + ['prefix', '::/64'])
+
+        # commit and reload config
         self.cli_commit()
         config = read_file(RADVD_CONF)
 
+        # verify config block is gone
         tmp = f'autoignoreprefixes' + ' {'
         self.assertNotIn(tmp, config)