From b1d4be53cd133e9a63f8e29e400f1d7bf18b8384 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <vgletenko@vyos.io>
Date: Fri, 11 Mar 2022 18:11:44 +0000
Subject: bgp: T4265: Add op-mode for bgp flowspec routes

---
 .../include/bgp/afi-ipv4-ipv6-flowspec.xml.i       | 25 ++++++++++++++++++++++
 .../include/bgp/show-bgp-common.xml.i              |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i

(limited to 'op-mode-definitions/include')

diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i
new file mode 100644
index 000000000..34228fdd1
--- /dev/null
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i
@@ -0,0 +1,25 @@
+<!-- included start from bgp/afi-ipv4-ipv6-flowspec.xml.i -->
+<tagNode name="flowspec">
+  <properties>
+    <help>Network in the BGP routing table to display</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+    </completionHelp>
+  </properties>
+  <children>
+    #include <include/bgp/prefix-bestpath-multipath.xml.i>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="flowspec">
+  <properties>
+    <help>Flowspec Address Family modifier</help>
+  </properties>
+  <children>
+    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+    #include <include/vtysh-generic-detail.xml.i>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
index e81b26b3e..c9a112fca 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -20,6 +20,7 @@
   <children>
     #include <include/bgp/afi-common.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-flowspec.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-vpn.xml.i>
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-- 
cgit v1.2.3


From 8626a7b8602ea67e1286f054509a4d0dd69f363e Mon Sep 17 00:00:00 2001
From: srividya0208 <a.srividya@vyos.io>
Date: Wed, 6 Apr 2022 06:25:28 -0400
Subject: op-comm: ospf : error for ospf neighbor address command

Error received when executed the sh ip ospf neighbor address 33.33.33.33
% Unknown command: sh ip ospf neighbor address 33.33.33.33
---
 op-mode-definitions/include/ospf-common.xml.i | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'op-mode-definitions/include')

diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
index 0edc3c37f..23769c8ba 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf-common.xml.i
@@ -523,15 +523,6 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    <tagNode name="address">
-      <properties>
-        <help>Show IPv4 OSPF neighbor information for specified IP address</help>
-        <completionHelp>
-          <list>&lt;x.x.x.x&gt;</list>
-        </completionHelp>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </tagNode>
     <node name="detail">
       <properties>
         <help>Show detailed IPv4 OSPF neighbor information</help>
-- 
cgit v1.2.3