Merge pull request #4714 from c-po/dhcpv6-incorrect-sla-len

T7682: incorrect sla-len in DHCPv6 client prefix delegation (DHCPv6-PD)

Author: dmbaturin

data/templates/dhcp-client/ipv6.j2

@@ -39,12 +39,10 @@ id-assoc na 0 {
 id-assoc pd {{ pd }} {
 {#   length got a default value #}
     prefix ::/{{ pd_config.length }} infinity;
-{%         set sla_len = 64 - pd_config.length | int %}
 {%         set count = namespace(value=0) %}
 {%         if pd_config.interface is vyos_defined %}
 {%             for interface, interface_config in pd_config.interface.items() if pd_config.interface is vyos_defined %}
     prefix-interface {{ interface }} {
-        sla-len {{ sla_len }};
 {%                 if interface_config.sla_id is vyos_defined %}
         sla-id {{ interface_config.sla_id }};
 {%                 else %}

smoketest/scripts/cli/base_interfaces_test.py

@@ -1228,7 +1228,6 @@ def test_dhcpv6pd_auto_sla_id(self):
                     self.assertIn(f'prefix-interface {delegatee}' + r' {', dhcpc6_config)
                     self.assertIn(f'ifid {address};', dhcpc6_config)
                     self.assertIn(f'sla-id {sla_id};', dhcpc6_config)
-                    self.assertIn(f'sla-len {sla_len};', dhcpc6_config)
 
                     # increment sla-id
                     sla_id = str(int(sla_id) + 1)
@@ -1294,7 +1293,6 @@ def test_dhcpv6pd_manual_sla_id(self):
                     self.assertIn(f'prefix-interface {delegatee}' + r' {', dhcpc6_config)
                     self.assertIn(f'ifid {address};', dhcpc6_config)
                     self.assertIn(f'sla-id {sla_id};', dhcpc6_config)
-                    self.assertIn(f'sla-len {sla_len};', dhcpc6_config)
 
                     # increment sla-id
                     sla_id = str(int(sla_id) + 1)