summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2025-11-10 11:44:28 +0000
committerGitHub <noreply@github.com>2025-11-10 11:44:28 +0000
commit5f8c7f7d8298a9bc41185ec05480dfd48f8b5a36 (patch)
tree18136970b300a51996d36b857a954d2c538509da
parent25224cff345210aaecaa4db95a67bd759af666fb (diff)
parentb9f0a9243b50211d7c21e996766c2ee9fd3b685c (diff)
downloadvyos-1x-5f8c7f7d8298a9bc41185ec05480dfd48f8b5a36.tar.gz
vyos-1x-5f8c7f7d8298a9bc41185ec05480dfd48f8b5a36.zip
Merge pull request #4838 from c-po/pppoe-addr-dhcpv6
pppoe: T7485: make xml leafNode address a multi-type node
-rw-r--r--interface-definitions/interfaces_pppoe.xml.in1
-rwxr-xr-xsmoketest/scripts/cli/test_interfaces_pppoe.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/interface-definitions/interfaces_pppoe.xml.in b/interface-definitions/interfaces_pppoe.xml.in
index 790cee632..d38074b41 100644
--- a/interface-definitions/interfaces_pppoe.xml.in
+++ b/interface-definitions/interfaces_pppoe.xml.in
@@ -29,6 +29,7 @@
<constraint>
<regex>(dhcpv6)</regex>
</constraint>
+ <multi/>
</properties>
</leafNode>
#include <include/pppoe-access-concentrator.xml.i>
diff --git a/smoketest/scripts/cli/test_interfaces_pppoe.py b/smoketest/scripts/cli/test_interfaces_pppoe.py
index 0e05de706..b8b0429a8 100755
--- a/smoketest/scripts/cli/test_interfaces_pppoe.py
+++ b/smoketest/scripts/cli/test_interfaces_pppoe.py
@@ -230,6 +230,7 @@ class PPPoEInterfaceTest(VyOSUnitTestSHIM.TestCase):
for interface in self._interfaces:
(user, passwd) = self.u_p_dict[interface]
+ self.cli_set(base_path + [interface, 'address', 'dhcpv6'])
self.cli_set(base_path + [interface, 'source-interface', self._source_interface])
self.cli_set(base_path + [interface, 'ipv6', 'address', 'autoconf'])
self.cli_set(base_path + [interface, 'authentication', 'username', user])