From 9ef82aa5d4db161fd70af4d015f1cf35cc984524 Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Mon, 3 Aug 2020 17:43:00 +0800
Subject: ipv6-tool: T2724: Support for IPv6 Toolset

---
 op-mode-definitions/force-ipv6-nd.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 op-mode-definitions/force-ipv6-nd.xml

(limited to 'op-mode-definitions/force-ipv6-nd.xml')

diff --git a/op-mode-definitions/force-ipv6-nd.xml b/op-mode-definitions/force-ipv6-nd.xml
new file mode 100644
index 000000000..64c8347ea
--- /dev/null
+++ b/op-mode-definitions/force-ipv6-nd.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="force">
+    <children>
+      <node name="ipv6-nd">
+        <properties>
+          <help>ICMPv6 Neighbor Discovery tool</help>
+        </properties>
+        <children>
+          <tagNode name="interface">
+            <properties>
+              <help>IPv6 Neighbor Discovery on a specific interface</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <tagNode name="address">
+                <properties>
+                  <help>The IP address of the target</help>
+                  <completionHelp>
+                    <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>ndisc6 $6 $4 -m</command>
+              </tagNode>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3


From 6301c560df544ddac9838d0489941d84748cced3 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 3 Aug 2020 19:10:10 +0200
Subject: ipv6-tool: op-mode: T2724: use full path to binary and quote
 arguments

---
 op-mode-definitions/force-ipv6-nd.xml |  8 ++++----
 op-mode-definitions/force-ipv6-rd.xml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'op-mode-definitions/force-ipv6-nd.xml')

diff --git a/op-mode-definitions/force-ipv6-nd.xml b/op-mode-definitions/force-ipv6-nd.xml
index 64c8347ea..49de097f6 100644
--- a/op-mode-definitions/force-ipv6-nd.xml
+++ b/op-mode-definitions/force-ipv6-nd.xml
@@ -4,12 +4,12 @@
     <children>
       <node name="ipv6-nd">
         <properties>
-          <help>ICMPv6 Neighbor Discovery tool</help>
+          <help>IPv6 Neighbor Discovery</help>
         </properties>
         <children>
           <tagNode name="interface">
             <properties>
-              <help>IPv6 Neighbor Discovery on a specific interface</help>
+              <help>IPv6 Neighbor Discovery on specified interface</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
@@ -17,12 +17,12 @@
             <children>
               <tagNode name="address">
                 <properties>
-                  <help>The IP address of the target</help>
+                  <help>IPv6 address of node to lookup</help>
                   <completionHelp>
                     <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>ndisc6 $6 $4 -m</command>
+                <command>/usr/bin/ndisc6 -m "$6" "$4"</command>
               </tagNode>
             </children>
           </tagNode>
diff --git a/op-mode-definitions/force-ipv6-rd.xml b/op-mode-definitions/force-ipv6-rd.xml
index 722cb67bf..8c901af25 100644
--- a/op-mode-definitions/force-ipv6-rd.xml
+++ b/op-mode-definitions/force-ipv6-rd.xml
@@ -4,26 +4,26 @@
     <children>
       <node name="ipv6-rd">
         <properties>
-          <help>IPv6 Router Discovery tool</help>
+          <help>IPv6 Router Discovery</help>
         </properties>
         <children>
           <tagNode name="interface">
             <properties>
-              <help>IPv6 Router Discovery tool on a specific interface</help>
+              <help>IPv6 Router Discovery on specified interface</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
             </properties>
-            <command>rdisc6 $4</command>
+            <command>/usr/bin/rdisc6 "$4"</command>
             <children>
               <tagNode name="address">
                 <properties>
-                  <help>The IP address of the target</help>
+                  <help>IPv6 address of target</help>
                   <completionHelp>
                     <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>rdisc6 $6 $4 -m</command>
+                <command>/usr/bin/rdisc6 -m "$6" "$4"</command>
               </tagNode>
             </children>
           </tagNode>
-- 
cgit v1.2.3