Merge branch 'current' of https://github.com/vyos/vyos-1x into current

7 files changed, 186 insertions, 47 deletions

diff --git a/op-mode-definitions/dns-forwarding.xml b/op-mode-definitions/dns-forwarding.xml
index e789f4aee..be71302cd 100644
--- a/op-mode-definitions/dns-forwarding.xml
+++ b/op-mode-definitions/dns-forwarding.xml
@@ -4,6 +4,9 @@
   <node name="show">
     <children>
       <node name="dns">
+        <properties>
+          <help>Show DNS information</help>
+        </properties>
         <children>
           <node name="forwarding">
             <properties>
diff --git a/op-mode-definitions/dynamic-dns.xml b/op-mode-definitions/dynamic-dns.xml
index c67769a83..76c473fd7 100644
--- a/op-mode-definitions/dynamic-dns.xml
+++ b/op-mode-definitions/dynamic-dns.xml
@@ -4,6 +4,9 @@
   <node name="show">
     <children>
       <node name="dns">
+        <properties>
+          <help>Show DNS information</help>
+        </properties>
         <children>
           <node name="dynamic">
             <properties>
@@ -14,7 +17,7 @@
                 <properties>
                   <help>Show Dynamic DNS status</help>
                 </properties>
-                <command>sudo ${vyos_op_scripts_dir}/dynamic_dns_status.py</command>
+                <command>sudo ${vyos_op_scripts_dir}/dynamic_dns.py --status</command>
               </leafNode>
             </children>
           </node>
@@ -22,4 +25,24 @@
       </node>
     </children>
   </node>
+  <node name="update">
+    <properties>
+      <help>Update data for a service</help>
+    </properties>
+    <children>
+      <node name="dns">
+        <properties>
+          <help>Update DNS information</help>
+        </properties>
+        <children>
+          <node name="dynamic">
+            <properties>
+              <help>Update Dynamic DNS information</help>
+            </properties>
+            <command>sudo ${vyos_op_scripts_dir}/dynamic_dns.py --update</command>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/force-arp.xml b/op-mode-definitions/force-arp.xml
new file mode 100644
index 000000000..3eadabf0a
--- /dev/null
+++ b/op-mode-definitions/force-arp.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="force">
+    <properties>
+      <help>Force an operation</help>
+    </properties>
+    <children>
+      <node name="arp">
+        <properties>
+          <help>Send gratuitous ARP request or reply</help>
+        </properties>
+        <children>
+          <node name="reply">
+            <properties>
+              <help>Send gratuitous ARP reply</help>
+            </properties>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Send gratuitous ARP reply on specified interface</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+                  </completionHelp>
+                </properties>
+                <children>
+                  <tagNode name="address">
+                    <properties>
+                      <help>Send gratuitous ARP reply for specified address</help>
+                    </properties>
+                    <command>sudo arping -I $5 -c 1 -A $7</command>
+                    <children>
+                      <tagNode name="count">
+                        <properties>
+                          <help>Send specified number of ARP replies</help>
+                        </properties>
+                        <command>sudo arping -I $5 -c $9 -A $7</command>
+                      </tagNode>
+                    </children>
+                  </tagNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
+          <node name="request">
+            <properties>
+              <help>Send gratuitous ARP request</help>
+            </properties>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Send gratuitous ARP request on specified interface</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+                  </completionHelp>
+                </properties>
+                <children>
+                  <tagNode name="address">
+                    <properties>
+                      <help>Send gratuitous ARP request for specified address</help>
+                    </properties>
+                    <command>sudo arping -I $5 -c 1 -U $7</command>
+                    <children>
+                      <tagNode name="count">
+                        <properties>
+                          <help>Send specified number of ARP requests</help>
+                        </properties>
+                        <command>sudo arping -I $5 -c $9 -U $7</command>
+                      </tagNode>
+                    </children>
+                  </tagNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml
index ff27f4f4d..e2483fefc 100644
--- a/op-mode-definitions/poweroff.xml
+++ b/op-mode-definitions/poweroff.xml
@@ -4,14 +4,14 @@
     <properties>
       <help>Poweroff the system</help>
     </properties>
-    <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --poweroff now</command>
+    <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --poweroff</command>
 
     <children>
       <leafNode name="now">
         <properties>
           <help>Poweroff the system without confirmation</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff now</command>
+        <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff</command>
       </leafNode>
 
       <leafNode name="cancel">
diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml
index 340c8ca82..affdffd98 100644
--- a/op-mode-definitions/reboot.xml
+++ b/op-mode-definitions/reboot.xml
@@ -4,14 +4,14 @@
     <properties>
       <help>Reboot the system</help>
     </properties>
-    <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --reboot now</command>
+    <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --reboot</command>
 
     <children>
       <leafNode name="now">
         <properties>
           <help>Reboot the system without confirmation</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot now</command>
+        <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot</command>
       </leafNode>
 
       <leafNode name="cancel">
diff --git a/op-mode-definitions/wireguard-keys.xml b/op-mode-definitions/wireguard-keys.xml
deleted file mode 100644
index 29fce33b6..000000000
--- a/op-mode-definitions/wireguard-keys.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!-- wireguard key management -->
-<interfaceDefinition>
-  <node name="generate">
-    <children>
-      <node name="wireguard">
-        <properties>
-          <help>wireguard key generation utility</help>
-        </properties>
-        <children>
-          <leafNode name="keypair">
-            <properties>
-              <help>generate a wireguard keypair</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/wireguard_key.py --genkey</command>
-          </leafNode>
-        </children>
-      </node>
-    </children>
-  </node>
-  <node name="show">
-    <children>
-      <node name="wireguard">
-        <children>
-          <leafNode name="pubkey">
-            <properties>
-              <help>show wireguard public key</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/wireguard_key.py --showpub</command>
-          </leafNode>
-          <leafNode name="privkey">
-            <properties>
-              <help>show wireguard private key</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/wireguard_key.py --showpriv</command>
-          </leafNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-
diff --git a/op-mode-definitions/wireguard.xml b/op-mode-definitions/wireguard.xml
new file mode 100644
index 000000000..a7e156d8d
--- /dev/null
+++ b/op-mode-definitions/wireguard.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!-- wireguard key management -->
+<interfaceDefinition>
+  <node name="generate">
+    <children>
+      <node name="wireguard">
+        <properties>
+          <help>wireguard key generation utility</help>
+        </properties>
+        <children>
+          <leafNode name="keypair">
+            <properties>
+              <help>generate a wireguard keypair</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/wireguard_key.py --genkey</command>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+  <node name="show">
+    <children>
+      <node name="wireguard">
+        <children>
+          <leafNode name="pubkey">
+            <properties>
+              <help>show wireguard public key</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/wireguard_key.py --showpub</command>
+          </leafNode>
+          <leafNode name="privkey">
+            <properties>
+              <help>show wireguard private key</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/wireguard_key.py --showpriv</command>
+          </leafNode>
+        </children>
+      </node>
+      <node name="interfaces">
+        <children>
+          <tagNode name="wireguard">
+            <properties>
+              <help>show wireguard interface information</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py -t wireguard</script>
+              </completionHelp>
+            </properties>
+            <command>sudo wg show "$4"</command>
+            <children>
+              <leafNode name="allowed-ips">
+                <properties>
+                  <help>show all allowed-ips for the specified interface</help>
+                </properties>
+                <command>sudo wg show "$4" allowed-ips</command>
+              </leafNode>
+              <leafNode name="endpoints">
+                <properties>
+                  <help>show all endpoints for the specified interface</help>
+                </properties>
+                <command>sudo wg show "$4" endpoints</command>
+              </leafNode>
+              <leafNode name="peers">
+                <properties>
+                  <help>show all peer IDs for the specified interface</help>
+                </properties>
+                <command>sudo wg show "$4" peers</command>
+              </leafNode>
+             <!-- more commands upon request --> 
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
+