summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-04-09 19:44:44 +0200
committerChristian Poessinger <christian@poessinger.com>2021-04-09 19:44:44 +0200
commit34d789579cda1a940ac65671b41466880267944b (patch)
tree2d4fe9d38bc8d5f3a99763dc7b9a1ca4a868a277
parentb80e72a4434d62ae99c3a82805aef87381987f7a (diff)
downloadvyos-1x-34d789579cda1a940ac65671b41466880267944b.tar.gz
vyos-1x-34d789579cda1a940ac65671b41466880267944b.zip
op-mode: bgp: move common includes to include/bgp directory
This change makes it easier to group all BGP related operational level command building blocks in one place.
-rw-r--r--op-mode-definitions/include/bgp/afi-common.xml.i (renamed from op-mode-definitions/include/bgp-afi-common.xml.i)2
-rw-r--r--op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i (renamed from op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i)2
-rw-r--r--op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i (renamed from op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i)2
-rw-r--r--op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i (renamed from op-mode-definitions/include/bgp-common.xml.i)6
-rw-r--r--op-mode-definitions/show-bgp.xml.in16
-rw-r--r--op-mode-definitions/show-ip-bgp.xml.in4
6 files changed, 16 insertions, 16 deletions
diff --git a/op-mode-definitions/include/bgp-afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
index 06cfc42a5..e48482282 100644
--- a/op-mode-definitions/include/bgp-afi-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-common.xml.i -->
+<!-- included start from bgp/afi-common.xml.i -->
<tagNode name="community">
<properties>
<help>Community number where AA and NN are (0-65535)</help>
diff --git a/op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
index dc0926375..f1b699347 100644
--- a/op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-ipv4-ipv6-common.xml.i -->
+<!-- included start from bgp/afi-ipv4-ipv6-common.xml.i -->
<node name="community">
<properties>
<help>Display routes matching the community</help>
diff --git a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i b/op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i
index 224fa6b45..2d91a8253 100644
--- a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
+++ b/op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-prefix-bestpath-multipath.xml.i -->
+<!-- included start from bgp/prefix-bestpath-multipath.xml.i -->
<leafNode name="bestpath">
<properties>
<help>Display only the bestpath</help>
diff --git a/op-mode-definitions/include/bgp-common.xml.i b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
index 788fefd2c..e599bfb3f 100644
--- a/op-mode-definitions/include/bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-common.xml.i -->
+<!-- included start from bgp/show-ip-bgp-common.xml.i -->
<leafNode name="attribute-info">
<properties>
<help>Show BGP attribute information</help>
@@ -17,8 +17,8 @@
</properties>
<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
</leafNode>
-#include <include/bgp-afi-common.xml.i>
-#include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+#include <include/bgp/afi-common.xml.i>
+#include <include/bgp/afi-ipv4-ipv6-common.xml.i>
<tagNode name="prefix-list">
<properties>
<completionHelp>
diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in
index 0d0a88dfb..62abbe938 100644
--- a/op-mode-definitions/show-bgp.xml.in
+++ b/op-mode-definitions/show-bgp.xml.in
@@ -8,7 +8,7 @@
</properties>
<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
<children>
- #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+ #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
<tagNode name="ipv4">
<properties>
<help>Network in the BGP routing table to display</help>
@@ -17,7 +17,7 @@
</completionHelp>
</properties>
<children>
- #include <include/bgp-prefix-bestpath-multipath.xml.i>
+ #include <include/bgp/prefix-bestpath-multipath.xml.i>
</children>
<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
</tagNode>
@@ -26,8 +26,8 @@
<help>IPv4 Address Family</help>
</properties>
<children>
- #include <include/bgp-afi-common.xml.i>
- #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+ #include <include/bgp/afi-common.xml.i>
+ #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
</children>
</node>
<tagNode name="ipv6">
@@ -38,7 +38,7 @@
</completionHelp>
</properties>
<children>
- #include <include/bgp-prefix-bestpath-multipath.xml.i>
+ #include <include/bgp/prefix-bestpath-multipath.xml.i>
</children>
<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
</tagNode>
@@ -47,8 +47,8 @@
<help>IPv6 Address Family</help>
</properties>
<children>
- #include <include/bgp-afi-common.xml.i>
- #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+ #include <include/bgp/afi-common.xml.i>
+ #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
</children>
</node>
<node name="l2vpn">
@@ -71,7 +71,7 @@
</properties>
<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
<children>
- #include <include/bgp-afi-common.xml.i>
+ #include <include/bgp/afi-common.xml.i>
<node name="all">
<properties>
<help>Display information about all EVPN NLRIs</help>
diff --git a/op-mode-definitions/show-ip-bgp.xml.in b/op-mode-definitions/show-ip-bgp.xml.in
index 9a271b4a5..4097bcf2d 100644
--- a/op-mode-definitions/show-ip-bgp.xml.in
+++ b/op-mode-definitions/show-ip-bgp.xml.in
@@ -10,7 +10,7 @@
</properties>
<command>vtysh -c "show ip bgp"</command>
<children>
- #include <include/bgp-common.xml.i>
+ #include <include/bgp/show-ip-bgp-common.xml.i>
<tagNode name="vrf">
<properties>
<help>Show bgp routing protocol for given VRF</help>
@@ -20,7 +20,7 @@
</completionHelp>
</properties>
<children>
- #include <include/bgp-common.xml.i>
+ #include <include/bgp/show-ip-bgp-common.xml.i>
</children>
</tagNode>
</children>