From ffabc3f80faae407a558c5827fe114254c686b98 Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Thu, 7 Jun 2018 23:36:46 +0200
Subject: T689: onvert show arp to new syntax

---
 op-mode-definitions/show-arp.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 op-mode-definitions/show-arp.xml

(limited to 'op-mode-definitions/show-arp.xml')

diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
new file mode 100644
index 000000000..00b68a331
--- /dev/null
+++ b/op-mode-definitions/show-arp.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+    <node name="arp">
+      <properties>
+        <help>Show Address Resolution Protocol (ARP) information</help>
+      </properties>
+      <command>/usr/sbin/arp -e -n</command>
+    </node>
+    <tagNode name="arp">
+      <properties>
+        <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
+        <completionHelp>
+          <script>${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet</script>
+          <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
+          <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bonding</script>
+        </completionHelp>
+      </properties>
+      <command>/usr/sbin/arp -e -n -i '$3'</command>
+      
+    </tagNode>
+
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3


From f1568230e946f2c0c2b364d8313a4c0563cdd926 Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Fri, 8 Jun 2018 00:10:35 +0200
Subject: T689: updated edge nodes to leafNode instead of node.

---
 op-mode-definitions/show-arp.xml    |  4 ++--
 op-mode-definitions/show-bridge.xml | 12 ++++++------
 op-mode-definitions/show-date.xml   |  4 ++--
 op-mode-definitions/show-disk.xml   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'op-mode-definitions/show-arp.xml')

diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
index 00b68a331..3d40db728 100644
--- a/op-mode-definitions/show-arp.xml
+++ b/op-mode-definitions/show-arp.xml
@@ -2,12 +2,12 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-    <node name="arp">
+    <leafNode name="arp">
       <properties>
         <help>Show Address Resolution Protocol (ARP) information</help>
       </properties>
       <command>/usr/sbin/arp -e -n</command>
-    </node>
+    </leafNode>
     <tagNode name="arp">
       <properties>
         <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml
index 53fe9175d..0d80de86e 100644
--- a/op-mode-definitions/show-bridge.xml
+++ b/op-mode-definitions/show-bridge.xml
@@ -2,12 +2,12 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-      <node name="bridge">
+      <leafNode name="bridge">
         <properties>
           <help>Show bridging information</help>
         </properties>
         <command>/sbin/brctl show</command>
-      </node>
+      </leafNode>
       <tagNode name="bridge">
         <properties>
           <help>Show bridge information for a given bridge interface</help>
@@ -17,18 +17,18 @@
         </properties>
         <command>/sbin/brctl show '$3'</command>
         <children>
-          <node name="macs">
+          <leafNode name="macs">
             <properties>
               <help>Show bridge Media Access Control (MAC) address table</help>
             </properties>
             <command>/sbin/brctl showmacs '$3'</command>
-          </node>
-          <node name="spanning-tree">
+          </leafNode>
+          <leafNode name="spanning-tree">
             <properties>
               <help>Show bridge spanning tree information</help>
             </properties>
             <command>/sbin/brctl showstp '$3'</command>
-          </node>
+          </leafNode>
         </children>
     </tagNode>
 
diff --git a/op-mode-definitions/show-date.xml b/op-mode-definitions/show-date.xml
index 0edb4b1ff..dddecd2fb 100644
--- a/op-mode-definitions/show-date.xml
+++ b/op-mode-definitions/show-date.xml
@@ -14,12 +14,12 @@
         </properties>
         <command>/bin/date -u</command>
         <children>
-          <node name="maya">
+          <leafNode name="maya">
             <properties>
               <help>Show UTC date in Maya calendar format</help>
             </properties>
             <command>${vyatta_bindir}/maya-date.py $(date +%s)</command>
-          </node>
+          </leafNode>
         </children>
       </node>
       </children>
diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml
index 243a3656a..db473959a 100644
--- a/op-mode-definitions/show-disk.xml
+++ b/op-mode-definitions/show-disk.xml
@@ -10,12 +10,12 @@
         </completionHelp>
       </properties>
       <children>
-        <node name="format">
+        <leafNode name="format">
           <properties>
             <help>Show disk drive formatting</help>
           </properties>
           <command>${vyos_op_scripts_dir}/show-disk-format.sh $3</command>
-        </node>
+        </leafNode>
       </children>
     </tagNode>
 
-- 
cgit v1.2.3


From 06b807f9b898c6bef55c9c0888bf5fd1c96bc9bd Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Fri, 8 Jun 2018 10:48:17 +0200
Subject: T689: Changed syntax on 'show arp XXX' to 'show arp interface XXX' to
 be compatible with the new parser

---
 op-mode-definitions/show-arp.xml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'op-mode-definitions/show-arp.xml')

diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
index 3d40db728..7256bef61 100644
--- a/op-mode-definitions/show-arp.xml
+++ b/op-mode-definitions/show-arp.xml
@@ -2,24 +2,25 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-    <leafNode name="arp">
+    <node name="arp">
       <properties>
         <help>Show Address Resolution Protocol (ARP) information</help>
       </properties>
       <command>/usr/sbin/arp -e -n</command>
-    </leafNode>
-    <tagNode name="arp">
-      <properties>
-        <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
-        <completionHelp>
-          <script>${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet</script>
-          <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
-          <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bonding</script>
-        </completionHelp>
-      </properties>
-      <command>/usr/sbin/arp -e -n -i '$3'</command>
-      
-    </tagNode>
+      <children>
+        <tagNode name="interface">
+          <properties>
+            <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
+            <completionHelp>
+              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet</script>
+              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
+              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bonding</script>
+            </completionHelp>
+          </properties>
+          <command>/usr/sbin/arp -e -n -i '$4'</command>
+        </tagNode>
+      </children>
+    </node>
 
     </children>
   </node>
-- 
cgit v1.2.3


From 863aeffa530e3ebdb6a62ebba6886cd77f95f408 Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Sat, 9 Jun 2018 22:43:17 +0200
Subject: Migrate away from vyatta-interfaces.pl

---
 op-mode-definitions/show-arp.xml    | 4 +---
 op-mode-definitions/show-bridge.xml | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'op-mode-definitions/show-arp.xml')

diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
index 7256bef61..92c231c6f 100644
--- a/op-mode-definitions/show-arp.xml
+++ b/op-mode-definitions/show-arp.xml
@@ -12,9 +12,7 @@
           <properties>
             <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
             <completionHelp>
-              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet</script>
-              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
-              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bonding</script>
+              <script>${vyos_completion_dir}/list_interfaces.py -b</script>
             </completionHelp>
           </properties>
           <command>/usr/sbin/arp -e -n -i '$4'</command>
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml
index 0d80de86e..a3241951a 100644
--- a/op-mode-definitions/show-bridge.xml
+++ b/op-mode-definitions/show-bridge.xml
@@ -12,7 +12,7 @@
         <properties>
           <help>Show bridge information for a given bridge interface</help>
           <completionHelp>
-            <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
+            <script>${vyos_completion_dir}/list_interfaces.py --type bridge</script>
           </completionHelp>
         </properties>
         <command>/sbin/brctl show '$3'</command>
-- 
cgit v1.2.3