From c898ce2e096d77db37c3bb65a004a29190879c30 Mon Sep 17 00:00:00 2001
From: Ryan Zuwala <ryanzuwala@gmail.com>
Date: Wed, 23 Apr 2025 16:32:53 -0400
Subject: router-advert: T7380: Implement auto-ignore-prefix syntax for router
 advertisements (#4463)

---
 data/templates/router-advert/radvd.conf.j2         |  7 ++++
 debian/control                                     |  2 +-
 interface-definitions/service_router-advert.xml.in | 13 +++++++
 .../scripts/cli/test_service_router-advert.py      | 43 ++++++++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/data/templates/router-advert/radvd.conf.j2 b/data/templates/router-advert/radvd.conf.j2
index a83bd03ac..e37cfde6c 100644
--- a/data/templates/router-advert/radvd.conf.j2
+++ b/data/templates/router-advert/radvd.conf.j2
@@ -57,6 +57,13 @@ interface {{ iface }} {
     };
 {%             endfor %}
 {%         endif %}
+{%         if iface_config.auto_ignore is vyos_defined %}
+    autoignoreprefixes {
+{%             for auto_ignore_prefix in iface_config.auto_ignore %}
+        {{ auto_ignore_prefix }};
+{%             endfor %}
+    };
+{%         endif %}
 {%         if iface_config.prefix is vyos_defined %}
 {%             for prefix, prefix_options in iface_config.prefix.items() %}
     prefix {{ prefix }} {
diff --git a/debian/control b/debian/control
index ffa21f840..ec3147820 100644
--- a/debian/control
+++ b/debian/control
@@ -203,7 +203,7 @@ Depends:
   ndppd,
 # End "service ndp-proxy"
 # For "service router-advert"
-  radvd,
+  radvd (>= 2.20),
 # End "service route-advert"
 # For "load-balancing haproxy"
   haproxy,
diff --git a/interface-definitions/service_router-advert.xml.in b/interface-definitions/service_router-advert.xml.in
index 3fd33540a..7f96cdb19 100644
--- a/interface-definitions/service_router-advert.xml.in
+++ b/interface-definitions/service_router-advert.xml.in
@@ -255,6 +255,19 @@
                   </leafNode>
                 </children>
               </tagNode>
+              <leafNode name="auto-ignore">
+                <properties>
+                  <help>IPv6 prefix to be excluded in Router Advertisements (RAs) - use in conjunction with the ::/64 wildcard prefix</help>
+                  <valueHelp>
+                    <format>ipv6net</format>
+                    <description>IPv6 prefix to be excluded</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-prefix"/>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
               <tagNode name="prefix">
                 <properties>
                   <help>IPv6 prefix to be advertised in Router Advertisements (RAs)</help>
diff --git a/smoketest/scripts/cli/test_service_router-advert.py b/smoketest/scripts/cli/test_service_router-advert.py
index 6dbb6add4..83342bc72 100755
--- a/smoketest/scripts/cli/test_service_router-advert.py
+++ b/smoketest/scripts/cli/test_service_router-advert.py
@@ -252,6 +252,49 @@ class TestServiceRADVD(VyOSUnitTestSHIM.TestCase):
         tmp = get_config_value('AdvIntervalOpt')
         self.assertEqual(tmp, 'off')
 
+    def test_auto_ignore(self):
+        isp_prefix = '2001:db8::/64'
+        ula_prefixes = ['fd00::/64', 'fd01::/64']
+
+        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
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        # ensure autoignoreprefixes block is generated in config file
+        tmp = f'autoignoreprefixes' + ' {'
+        self.assertIn(tmp, config)
+
+        # ensure all three prefixes are contained in the block
+        self.assertIn(f'        {isp_prefix};', config)
+        for ula_prefix in ula_prefixes:
+            self.assertIn(f'        {ula_prefix};', config)
+        
+        # remove a prefix and verify it's gone
+        self.cli_delete(base_path + ['auto-ignore', ula_prefixes[1]])
+        
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        self.assertNotIn(f'        {ula_prefixes[1]};', config)
+
+        # ensure remaining two prefixes are still present
+        self.assertIn(f'        {ula_prefixes[0]};', config)
+        self.assertIn(f'        {isp_prefix};', config)
+
+        # remove the remaining two prefixes and verify the config block is gone
+        self.cli_delete(base_path + ['auto-ignore', ula_prefixes[0]])
+        self.cli_delete(base_path + ['auto-ignore', isp_prefix])
+
+        self.cli_commit()
+        config = read_file(RADVD_CONF)
+
+        tmp = f'autoignoreprefixes' + ' {'
+        self.assertNotIn(tmp, config)
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-- 
cgit v1.2.3