From f2cc87a259df1d2ab4d0a7eb366224a238422048 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 2 Aug 2020 19:36:39 +0200
Subject: op-mode: use individual XML files for connect and disconnect

---
 op-mode-definitions/connect-disconnect.xml | 46 ------------------------------
 op-mode-definitions/connect.xml            | 29 +++++++++++++++++++
 op-mode-definitions/disconnect.xml         | 20 +++++++++++++
 3 files changed, 49 insertions(+), 46 deletions(-)
 delete mode 100644 op-mode-definitions/connect-disconnect.xml
 create mode 100644 op-mode-definitions/connect.xml
 create mode 100644 op-mode-definitions/disconnect.xml

diff --git a/op-mode-definitions/connect-disconnect.xml b/op-mode-definitions/connect-disconnect.xml
deleted file mode 100644
index ea2883e0b..000000000
--- a/op-mode-definitions/connect-disconnect.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="connect">
-    <properties>
-      <help>Establish connection</help>
-    </properties>
-    <children>
-      <tagNode name="console">
-        <properties>
-          <help>Connect to device attached to serial console server</help>
-          <completionHelp>
-            <path>service console-server device</path>
-          </completionHelp>
-        </properties>
-        <command>/usr/bin/console "$3"</command>
-      </tagNode>
-      <tagNode name="interface">
-        <properties>
-          <help>Bring up a connection-oriented network interface</help>
-          <completionHelp>
-            <path>interfaces pppoe</path>
-            <path>interfaces wirelessmodem</path>
-          </completionHelp>
-        </properties>
-        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command>
-      </tagNode>
-    </children>
-  </node>
-  <node name="disconnect">
-    <properties>
-      <help>Take down a connection</help>
-    </properties>
-    <children>
-      <tagNode name="interface">
-        <properties>
-          <help>Take down a connection-oriented network interface</help>
-          <completionHelp>
-            <path>interfaces pppoe</path>
-            <path>interfaces wirelessmodem</path>
-          </completionHelp>
-        </properties>
-        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect "$3"</command>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/connect.xml b/op-mode-definitions/connect.xml
new file mode 100644
index 000000000..1ec62949a
--- /dev/null
+++ b/op-mode-definitions/connect.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="connect">
+    <properties>
+      <help>Establish connection</help>
+    </properties>
+    <children>
+      <tagNode name="console">
+        <properties>
+          <help>Connect to device attached to serial console server</help>
+          <completionHelp>
+            <path>service console-server device</path>
+          </completionHelp>
+        </properties>
+        <command>/usr/bin/console "$3"</command>
+      </tagNode>
+      <tagNode name="interface">
+        <properties>
+          <help>Bring up a connection-oriented network interface</help>
+          <completionHelp>
+            <path>interfaces pppoe</path>
+            <path>interfaces wirelessmodem</path>
+          </completionHelp>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/disconnect.xml b/op-mode-definitions/disconnect.xml
new file mode 100644
index 000000000..bf2c37b89
--- /dev/null
+++ b/op-mode-definitions/disconnect.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="disconnect">
+    <properties>
+      <help>Take down a connection</help>
+    </properties>
+    <children>
+      <tagNode name="interface">
+        <properties>
+          <help>Take down a connection-oriented network interface</help>
+          <completionHelp>
+            <path>interfaces pppoe</path>
+            <path>interfaces wirelessmodem</path>
+          </completionHelp>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect "$3"</command>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3