Merge pull request #1717 from roedie/1.3-T4809

T4809: radvd: (Backport) Allow the use of AdvRASrcAddress

3 files changed, 55 insertions, 1 deletions

diff --git a/data/templates/router-advert/radvd.conf.tmpl b/data/templates/router-advert/radvd.conf.tmpl
index 88d066491..4be6797ee 100644
--- a/data/templates/router-advert/radvd.conf.tmpl
+++ b/data/templates/router-advert/radvd.conf.tmpl
@@ -43,6 +43,13 @@ interface {{ iface }} {
     };
 {%       endfor %}
 {%     endif %}
+{%         if iface_config.source_address is defined %}
+    AdvRASrcAddress {
+{%             for source_address in iface_config.source_address %}
+        {{ source_address }};
+{%             endfor %}
+    };
+{%         endif %}
 {%     if iface_config.prefix is defined and iface_config.prefix is not none %}
 {%       for prefix, prefix_options in iface_config.prefix.items() %}
     prefix {{ prefix }} {
diff --git a/interface-definitions/service_router-advert.xml.in b/interface-definitions/service_router-advert.xml.in
index 0f4009f5c..a15ce8b8f 100644
--- a/interface-definitions/service_router-advert.xml.in
+++ b/interface-definitions/service_router-advert.xml.in
@@ -276,6 +276,19 @@
                   </leafNode>
                 </children>
               </tagNode>
+              <leafNode name="source-address">
+                <properties>
+                  <help>Use IPv6 address as source address. Useful with VRRP.</help>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address to be advertized (must be configured on interface)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
               <leafNode name="reachable-time">
                 <properties>
                   <help>Time, in milliseconds, that a node assumes a neighbor is reachable after having received a reachability confirmation</help>
diff --git a/smoketest/scripts/cli/test_service_router-advert.py b/smoketest/scripts/cli/test_service_router-advert.py
index 4875fb5d1..da08421d3 100755
--- a/smoketest/scripts/cli/test_service_router-advert.py
+++ b/smoketest/scripts/cli/test_service_router-advert.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019-2020 VyOS maintainers and contributors
+# Copyright (C) 2019-2022 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
@@ -27,6 +27,7 @@ RADVD_CONF = '/run/radvd/radvd.conf'
 interface = 'eth1'
 base_path = ['service', 'router-advert', 'interface', interface]
 address_base = ['interfaces', 'ethernet', interface, 'address']
+prefix = '::/64'
 
 def get_config_value(key):
     tmp = read_file(RADVD_CONF)
@@ -113,5 +114,38 @@ class TestServiceRADVD(VyOSUnitTestSHIM.TestCase):
         tmp = 'DNSSL ' + ' '.join(dnssl) + ' {'
         self.assertIn(tmp, config)
 
+    def test_route(self):
+        route = '2001:db8:1000::/64'
+
+        self.cli_set(base_path + ['prefix', prefix])
+        self.cli_set(base_path + ['route', route])
+
+        # commit changes
+        self.cli_commit()
+
+        config = read_file(RADVD_CONF)
+
+        tmp = f'route {route}' + ' {'
+        self.assertIn(tmp, config)
+
+        self.assertIn('AdvRouteLifetime 1800;', config)
+        self.assertIn('AdvRoutePreference medium;', config)
+        self.assertIn('RemoveRoute on;', config)
+
+    def test_rasrcaddress(self):
+        ra_src = ['fe80::1', 'fe80::2']
+
+        self.cli_set(base_path + ['prefix', prefix])
+        for src in ra_src:
+            self.cli_set(base_path + ['source-address', src])
+
+        # commit changes
+        self.cli_commit()
+
+        config = read_file(RADVD_CONF)
+        self.assertIn('AdvRASrcAddress {', config)
+        for src in ra_src:
+            self.assertIn(f'        {src};', config)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)