Merge pull request #3745 from c-po/no-legacy

T6527: add legacy Vyatta interpreter files still in use

4 files changed, 22 insertions, 6 deletions

diff --git a/op-mode-definitions/counters.xml.in b/op-mode-definitions/clear-interfaces.xml.in
index f563cb9a0..de2c3443e 100644
--- a/op-mode-definitions/counters.xml.in
+++ b/op-mode-definitions/clear-interfaces.xml.in
@@ -1,8 +1,14 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="clear">
+    <properties>
+      <help>Clear system information</help>
+    </properties>
     <children>
       <node name="interfaces">
+        <properties>
+          <help>Clear interface information</help>
+        </properties>
         <children>
           <node name="counters">
             <properties>
@@ -10,6 +16,17 @@
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/interfaces.py clear_counters</command>
           </node>
+          <tagNode name="connection">
+            <properties>
+              <help>Bring connection-oriented network interface down and up</help>
+              <completionHelp>
+                <path>interfaces pppoe</path>
+                <path>interfaces sstpc</path>
+                <path>interfaces wwan</path>
+              </completionHelp>
+            </properties>
+            <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect --disconnect --interface "$3"</command>
+          </tagNode>
           <node name="bonding">
             <properties>
               <help>Clear Bonding interface information</help>
@@ -595,4 +612,3 @@
     </children>
   </node>
 </interfaceDefinition>
-
diff --git a/op-mode-definitions/configure.xml.in b/op-mode-definitions/configure.xml.in
index a711fa4a9..d7657289b 100644
--- a/op-mode-definitions/configure.xml.in
+++ b/op-mode-definitions/configure.xml.in
@@ -11,11 +11,11 @@
         echo "Please do it as an administrator level VyOS user instead."
     else
         if grep -q -e '^overlay.*/filesystem.squashfs' /proc/mounts; then
-        echo "WARNING: You are currently configuring a live-ISO environment, changes will not persist until installed"
+            echo "WARNING: You are currently configuring a live-ISO environment, changes will not persist until installed"
         else
             if grep -q -s '1' /tmp/vyos-config-status; then
-            echo "WARNING: There was a config error on boot: saving the configuration now could overwrite data."
-            echo "You may want to check and reload the boot config"
+                echo "WARNING: There was a config error on boot: saving the configuration now could overwrite data."
+                echo "You may want to check and reload the boot config"
             fi
         fi
         history -w
diff --git a/op-mode-definitions/connect.xml.in b/op-mode-definitions/connect.xml.in
index 116cd6231..9027056a6 100644
--- a/op-mode-definitions/connect.xml.in
+++ b/op-mode-definitions/connect.xml.in
@@ -24,7 +24,7 @@
             <path>interfaces wwan</path>
           </completionHelp>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command>
+        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect --interface "$3"</command>
       </tagNode>
     </children>
   </node>
diff --git a/op-mode-definitions/disconnect.xml.in b/op-mode-definitions/disconnect.xml.in
index 843998c4f..f0523d9b9 100644
--- a/op-mode-definitions/disconnect.xml.in
+++ b/op-mode-definitions/disconnect.xml.in
@@ -14,7 +14,7 @@
             <path>interfaces wwan</path>
           </completionHelp>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect "$3"</command>
+        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect --interface "$3"</command>
       </tagNode>
     </children>
   </node>