summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-04 14:05:50 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-04 14:05:50 +0100
commita03b8e122cb639876e325603726fbe05c492088e (patch)
treed9f56b474b3ee90d0fc8f42747971c83c051e287
parentf8c01ef3cf31e9d0fe57a51e32a7352079d0d7e7 (diff)
downloadvyos-1x-a03b8e122cb639876e325603726fbe05c492088e.tar.gz
vyos-1x-a03b8e122cb639876e325603726fbe05c492088e.zip
pppoe: T1579: reorganize "ipv6" CLI node include files
Switch to common source file for "ipv6 address autoconf"
-rw-r--r--interface-definitions/include/ipv6-address-autoconf.xml.i8
-rw-r--r--interface-definitions/include/ipv6-address-eui64.xml.i15
-rw-r--r--interface-definitions/include/ipv6-address-no-default-link-local.xml.i8
-rw-r--r--interface-definitions/include/ipv6-address.xml.i31
-rw-r--r--interface-definitions/interfaces-pppoe.xml.in10
5 files changed, 41 insertions, 31 deletions
diff --git a/interface-definitions/include/ipv6-address-autoconf.xml.i b/interface-definitions/include/ipv6-address-autoconf.xml.i
new file mode 100644
index 000000000..580f060d7
--- /dev/null
+++ b/interface-definitions/include/ipv6-address-autoconf.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from ipv6-address-autoconf.xml.i -->
+<leafNode name="autoconf">
+ <properties>
+ <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
+ <valueless/>
+ </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ipv6-address-eui64.xml.i b/interface-definitions/include/ipv6-address-eui64.xml.i
new file mode 100644
index 000000000..093a1dc79
--- /dev/null
+++ b/interface-definitions/include/ipv6-address-eui64.xml.i
@@ -0,0 +1,15 @@
+<!-- included start from ipv6-address-eui64.xml.i -->
+<leafNode name="eui64">
+ <properties>
+ <help>Prefix for IPv6 address with MAC-based EUI-64</help>
+ <valueHelp>
+ <format>ipv6net</format>
+ <description>IPv6 network and prefix length</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv6-prefix"/>
+ </constraint>
+ <multi/>
+ </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i b/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
new file mode 100644
index 000000000..1c9e832dc
--- /dev/null
+++ b/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from ipv6-address-no-default-link-local.xml.i -->
+<leafNode name="no-default-link-local">
+ <properties>
+ <help>Remove the default link-local address from the interface</help>
+ <valueless/>
+ </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/ipv6-address.xml.i b/interface-definitions/include/ipv6-address.xml.i
index 26ac1d374..276456248 100644
--- a/interface-definitions/include/ipv6-address.xml.i
+++ b/interface-definitions/include/ipv6-address.xml.i
@@ -1,31 +1,12 @@
<!-- included start from ipv6-address.xml.i -->
<node name="address">
+ <properties>
+ <help>IPv6 address configuration modes</help>
+ </properties>
<children>
- <leafNode name="autoconf">
- <properties>
- <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
- <valueless/>
- </properties>
- </leafNode>
- <leafNode name="eui64">
- <properties>
- <help>Prefix for IPv6 address with MAC-based EUI-64</help>
- <valueHelp>
- <format>ipv6net</format>
- <description>IPv6 network and prefix length</description>
- </valueHelp>
- <constraint>
- <validator name="ipv6-prefix"/>
- </constraint>
- <multi/>
- </properties>
- </leafNode>
- <leafNode name="no-default-link-local">
- <properties>
- <help>Remove the default link-local address from the interface</help>
- <valueless/>
- </properties>
- </leafNode>
+ #include <include/ipv6-address-autoconf.xml.i>
+ #include <include/ipv6-address-eui64.xml.i>
+ #include <include/ipv6-address-no-default-link-local.xml.i>
</children>
</node>
<!-- included end -->
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index acb26b18b..38c01d434 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -90,18 +90,16 @@
</children>
</node>
<node name="ipv6">
+ <properties>
+ <help>IPv6 routing parameters</help>
+ </properties>
<children>
<node name="address">
<properties>
<help>IPv6 address configuration modes</help>
</properties>
<children>
- <leafNode name="autoconf">
- <properties>
- <help>Enable Stateless Address Autoconfiguration (SLAAC)</help>
- <valueless/>
- </properties>
- </leafNode>
+ #include <include/ipv6-address-autoconf.xml.i>
</children>
</node>
<leafNode name="enable">