summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/bgp-afi-maximum-paths.xml.i51
-rw-r--r--interface-definitions/nat66.xml.in19
-rw-r--r--interface-definitions/protocols-bgp.xml.in31
3 files changed, 45 insertions, 56 deletions
diff --git a/interface-definitions/include/bgp-afi-maximum-paths.xml.i b/interface-definitions/include/bgp-afi-maximum-paths.xml.i
index 5ee0d13a3..62133c375 100644
--- a/interface-definitions/include/bgp-afi-maximum-paths.xml.i
+++ b/interface-definitions/include/bgp-afi-maximum-paths.xml.i
@@ -1,26 +1,33 @@
<!-- included start from bgp-afi-maximum-paths.xml.i -->
-<leafNode name="maximum-paths">
+<node name="maximum-paths">
<properties>
- <help>Forward packets over multiple paths (eBGP)</help>
- <valueHelp>
- <format>u32:1-256</format>
- <description>Number of paths to consider</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 1-256"/>
- </constraint>
+ <help>Forward packets over multiple paths</help>
</properties>
-</leafNode>
-<leafNode name="maximum-paths-ibgp">
- <properties>
- <help>Forward packets over multiple paths (iBGP)</help>
- <valueHelp>
- <format>u32:1-256</format>
- <description>Number of paths to consider</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 1-256"/>
- </constraint>
- </properties>
-</leafNode>
+ <children>
+ <leafNode name="ebgp">
+ <properties>
+ <help>eBGP maximum paths</help>
+ <valueHelp>
+ <format>u32:1-256</format>
+ <description>Number of paths to consider</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 1-256"/>
+ </constraint>
+ </properties>
+ </leafNode>
+ <leafNode name="ibgp">
+ <properties>
+ <help>iBGP maximum paths</help>
+ <valueHelp>
+ <format>u32:1-256</format>
+ <description>Number of paths to consider</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 1-256"/>
+ </constraint>
+ </properties>
+ </leafNode>
+ </children>
+</node>
<!-- included end -->
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index b45ebc0a8..d5e1226f9 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -70,18 +70,31 @@
</node>
<node name="translation">
<properties>
- <help>Translated IPv6 prefix options</help>
+ <help>Translated IPv6 address options</help>
</properties>
<children>
- <leafNode name="prefix">
+ <leafNode name="address">
<properties>
- <help>IPv6 prefix to translate to</help>
+ <help>IPv6 address to translate to</help>
+ <completionHelp>
+ <list>masquerade</list>
+ </completionHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 address</description>
+ </valueHelp>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
+ <valueHelp>
+ <format>masquerade</format>
+ <description>NAT to the primary address of outbound-interface</description>
+ </valueHelp>
<constraint>
+ <validator name="ipv6-address"/>
<validator name="ipv6-prefix"/>
+ <regex>(masquerade)</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index c2a123313..96a0b1315 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -350,37 +350,6 @@
</node>
</children>
</node>
- <node name="maximum-paths">
- <properties>
- <help>BGP multipaths</help>
- </properties>
- <children>
- <leafNode name="ebgp">
- <properties>
- <help>Maximum ebgp multipaths</help>
- <valueHelp>
- <format>u32:1-255</format>
- <description>EBGP multipaths</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 1-255"/>
- </constraint>
- </properties>
- </leafNode>
- <leafNode name="ibgp">
- <properties>
- <help>Maximum ibgp multipaths</help>
- <valueHelp>
- <format>u32:1-255</format>
- <description>EBGP multipaths</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 1-255"/>
- </constraint>
- </properties>
- </leafNode>
- </children>
- </node>
<node name="listen">
<properties>
<help>Listen for and accept BGP dynamic neighbors from range</help>