diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-09-15 12:26:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-15 12:26:03 +0100 |
| commit | 98dfa08687bc7db3bc27df11910cea778f991fa2 (patch) | |
| tree | c4c96444dced4451227b197c2ed315e5997ec0d7 | |
| parent | 186522f7d265337c12c45509bdfd0deff08fc4fc (diff) | |
| parent | 44fd159ce2d344cdf7b08487801e077ebf59869c (diff) | |
| download | vyos-1x-98dfa08687bc7db3bc27df11910cea778f991fa2.tar.gz vyos-1x-98dfa08687bc7db3bc27df11910cea778f991fa2.zip | |
Merge pull request #4714 from c-po/dhcpv6-incorrect-sla-len
T7682: incorrect sla-len in DHCPv6 client prefix delegation (DHCPv6-PD)
| -rw-r--r-- | data/templates/dhcp-client/ipv6.j2 | 2 | ||||
| -rw-r--r-- | smoketest/scripts/cli/base_interfaces_test.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/data/templates/dhcp-client/ipv6.j2 b/data/templates/dhcp-client/ipv6.j2 index 311c856c8..00df7a0e9 100644 --- a/data/templates/dhcp-client/ipv6.j2 +++ b/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 %} diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py index 54547e62d..cde4f9fb9 100644 --- a/smoketest/scripts/cli/base_interfaces_test.py +++ b/smoketest/scripts/cli/base_interfaces_test.py @@ -1228,7 +1228,6 @@ class BasicInterfaceTest: 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 @@ class BasicInterfaceTest: 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) |