summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i10
-rw-r--r--interface-definitions/include/bgp/bgp-common-config.xml.i24
-rw-r--r--interface-definitions/include/bgp/bgp-peer-group.xml.i2
-rw-r--r--interface-definitions/include/isis/isis-redistribute-ipv4.xml.i18
-rw-r--r--interface-definitions/include/ospf/ospf-common-config.xml.i1
-rw-r--r--interface-definitions/include/route-map.xml.i14
-rw-r--r--interface-definitions/include/static/static-route-map.xml.i10
-rw-r--r--interface-definitions/include/vni.xml.i26
-rw-r--r--interface-definitions/interfaces-tunnel.xml.in12
-rw-r--r--interface-definitions/protocols-bgp.xml.in1
-rw-r--r--interface-definitions/protocols-isis.xml.in1
-rw-r--r--interface-definitions/protocols-ospf.xml.in1
-rw-r--r--interface-definitions/protocols-rip.xml.in1
-rw-r--r--interface-definitions/protocols-static.xml.in2
-rw-r--r--interface-definitions/vrf.xml.in1
15 files changed, 67 insertions, 57 deletions
diff --git a/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i b/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i
new file mode 100644
index 000000000..caf0b6b31
--- /dev/null
+++ b/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from bgp/bgp-afi-l2vpn-advertise.xml.i -->
+<node name="unicast">
+ <properties>
+ <help>IPv4 address family</help>
+ </properties>
+ <children>
+ #include <include/route-map.xml.i>
+ </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/bgp-common-config.xml.i
index c89e2288e..813da097c 100644
--- a/interface-definitions/include/bgp/bgp-common-config.xml.i
+++ b/interface-definitions/include/bgp/bgp-common-config.xml.i
@@ -215,6 +215,29 @@
<help>L2VPN EVPN BGP settings</help>
</properties>
<children>
+ <node name="advertise">
+ <properties>
+ <help>Advertise prefix routes</help>
+ </properties>
+ <children>
+ <node name="ipv4">
+ <properties>
+ <help>IPv4 address family</help>
+ </properties>
+ <children>
+ #include <include/bgp/bgp-afi-l2vpn-advertise.xml.i>
+ </children>
+ </node>
+ <node name="ipv6">
+ <properties>
+ <help>IPv6 address family</help>
+ </properties>
+ <children>
+ #include <include/bgp/bgp-afi-l2vpn-advertise.xml.i>
+ </children>
+ </node>
+ </children>
+ </node>
<leafNode name="advertise-all-vni">
<properties>
<help>Advertise All local VNIs</help>
@@ -824,7 +847,6 @@
#include <include/bgp/bgp-update-source.xml.i>
</children>
</tagNode>
-#include <include/route-map.xml.i>
<node name="timers">
<properties>
<help>BGP protocol timers</help>
diff --git a/interface-definitions/include/bgp/bgp-peer-group.xml.i b/interface-definitions/include/bgp/bgp-peer-group.xml.i
index 8fc50794d..77dab4a8b 100644
--- a/interface-definitions/include/bgp/bgp-peer-group.xml.i
+++ b/interface-definitions/include/bgp/bgp-peer-group.xml.i
@@ -3,7 +3,7 @@
<properties>
<help>Peer group for this peer</help>
<completionHelp>
- <script>${vyos_completion_dir}/list_bgp_peer_groups.sh</script>
+ <path>protocols bgp peer-group</path>
</completionHelp>
<valueHelp>
<format>txt</format>
diff --git a/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
index df48b4d28..15c8c0b0b 100644
--- a/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
+++ b/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
@@ -16,14 +16,7 @@
</constraint>
</properties>
</leafNode>
- <leafNode name="route-map">
- <properties>
- <help>Route map reference</help>
- <completionHelp>
- <path>policy route-map</path>
- </completionHelp>
- </properties>
- </leafNode>
+ #include <include/route-map.xml.i>
</children>
</node>
<node name="level-2">
@@ -43,14 +36,7 @@
</constraint>
</properties>
</leafNode>
- <leafNode name="route-map">
- <properties>
- <help>Route map reference</help>
- <completionHelp>
- <path>policy route-map</path>
- </completionHelp>
- </properties>
- </leafNode>
+ #include <include/route-map.xml.i>
</children>
</node>
<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/ospf-common-config.xml.i
index 7316af670..a01d1c890 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/ospf-common-config.xml.i
@@ -697,7 +697,6 @@
</leafNode>
</children>
</node>
-#include <include/route-map.xml.i>
<node name="timers">
<properties>
<help>Adjust routing timers</help>
diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i
index 5a1c137b9..edbe76892 100644
--- a/interface-definitions/include/route-map.xml.i
+++ b/interface-definitions/include/route-map.xml.i
@@ -1,14 +1,18 @@
<!-- include start from route-map.xml.i -->
<leafNode name="route-map">
<properties>
- <help>Route map reference</help>
- <valueHelp>
- <format>txt</format>
- <description>Route map reference</description>
- </valueHelp>
+ <help>Specify route-map name to use</help>
<completionHelp>
<path>policy route-map</path>
</completionHelp>
+ <valueHelp>
+ <format>txt</format>
+ <description>Route map name</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[-a-zA-Z0-9.]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Route-map name can only contain alpha-numeric letters and a hyphen</constraintErrorMessage>
</properties>
</leafNode>
<!-- include end -->
diff --git a/interface-definitions/include/static/static-route-map.xml.i b/interface-definitions/include/static/static-route-map.xml.i
deleted file mode 100644
index af825e043..000000000
--- a/interface-definitions/include/static/static-route-map.xml.i
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- include start from static/static-route-map.xml.i -->
-<leafNode name="route-map">
- <properties>
- <help>Filter routes installed in local route map</help>
- <completionHelp>
- <path>policy route-map</path>
- </completionHelp>
- </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/vni.xml.i b/interface-definitions/include/vni.xml.i
index faff4c3c3..be45c0c97 100644
--- a/interface-definitions/include/vni.xml.i
+++ b/interface-definitions/include/vni.xml.i
@@ -1,12 +1,14 @@
- <leafNode name="vni">
- <properties>
- <help>Virtual Network Identifier</help>
- <valueHelp>
- <format>0-16777214</format>
- <description>VXLAN virtual network identifier</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-16777214"/>
- </constraint>
- </properties>
- </leafNode>
+<!-- include start from vni.xml.i -->
+<leafNode name="vni">
+ <properties>
+ <help>Virtual Network Identifier</help>
+ <valueHelp>
+ <format>0-16777214</format>
+ <description>VXLAN virtual network identifier</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 0-16777214"/>
+ </constraint>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index e4bdcb3d7..536edcb99 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -158,9 +158,6 @@
<help>ERSPAN Tunnel parameters</help>
</properties>
<children>
-
-<!---
-Temporary disabled b/c of https://github.com/shemminger/iproute2/issues/41
<leafNode name="direction">
<properties>
<help>Specifies mirrored traffic direction</help>
@@ -188,12 +185,10 @@ Temporary disabled b/c of https://github.com/shemminger/iproute2/issues/41
<description>Unique identifier of ERSPAN engine</description>
</valueHelp>
<constraint>
-fix double hyphen below ...
- <validator name="numeric" argument="- -range 0-1048575"/>
+ <validator name="numeric" argument="--range 0-1048575"/>
</constraint>
</properties>
</leafNode>
--->
<leafNode name="index">
<properties>
<help>Specifify ERSPAN version 1 index field</help>
@@ -213,15 +208,12 @@ fix double hyphen below ...
<format>1</format>
<description>ERSPAN Type II</description>
</valueHelp>
-<!--
-Temporary disabled b/c of https://github.com/shemminger/iproute2/issues/41
<valueHelp>
<format>2</format>
<description>ERSPAN Type III</description>
</valueHelp>
--->
<constraint>
- <validator name="numeric" argument="--range 1-1"/>
+ <validator name="numeric" argument="--range 1-2"/>
</constraint>
</properties>
<defaultValue>1</defaultValue>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index d610f8dff..f4ebddb42 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -9,6 +9,7 @@
</properties>
<children>
#include <include/bgp/bgp-common-config.xml.i>
+ #include <include/route-map.xml.i>
</children>
</node>
</children>
diff --git a/interface-definitions/protocols-isis.xml.in b/interface-definitions/protocols-isis.xml.in
index 1bc890446..42d5049cc 100644
--- a/interface-definitions/protocols-isis.xml.in
+++ b/interface-definitions/protocols-isis.xml.in
@@ -9,6 +9,7 @@
</properties>
<children>
#include <include/isis/isis-common-config.xml.i>
+ #include <include/route-map.xml.i>
</children>
</node>
</children>
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in
index d9c3325ec..4431a1772 100644
--- a/interface-definitions/protocols-ospf.xml.in
+++ b/interface-definitions/protocols-ospf.xml.in
@@ -9,6 +9,7 @@
</properties>
<children>
#include <include/ospf/ospf-common-config.xml.i>
+ #include <include/route-map.xml.i>
</children>
</node>
</children>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index fd1a84bb8..4fcfcfc27 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -225,6 +225,7 @@
</properties>
</leafNode>
#include <include/rip/rip-timers.xml.i>
+ #include <include/route-map.xml.i>
</children>
</node>
</children>
diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in
index baf13777a..3cc28e296 100644
--- a/interface-definitions/protocols-static.xml.in
+++ b/interface-definitions/protocols-static.xml.in
@@ -11,7 +11,7 @@
<priority>480</priority>
</properties>
<children>
- #include <include/static/static-route-map.xml.i>
+ #include <include/route-map.xml.i>
#include <include/static/static-route.xml.i>
#include <include/static/static-route6.xml.i>
<tagNode name="table">
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 8a56b1bc0..a1ef45868 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -85,6 +85,7 @@
<constraintErrorMessage>VRF routing table must be in range from 100 to 2147483647</constraintErrorMessage>
</properties>
</leafNode>
+ #include <include/vni.xml.i>
</children>
</tagNode>
</children>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 16:35:36 +0000