Redo RIP cli to remove interface/network requirement.

15 files changed, 1 insertions, 73 deletions

diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def
index 1c493597..a5045a05 100644
--- a/templates/protocols/rip/interface/node.def
+++ b/templates/protocols/rip/interface/node.def
@@ -1,4 +1,4 @@
-tag:
+multi:
 type: txt
 help: "Interface name"
 syntax: exec " \
@@ -7,5 +7,4 @@ syntax: exec " \
           exit 1 ; \
         fi ; "
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $(@)\" "
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $(@)\" "
 delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" -c \"no network $(@)\" "
diff --git a/templates/protocols/rip/interface/node.tag/network/node.def b/templates/protocols/rip/interface/node.tag/network/node.def
deleted file mode 100644
index 7b226a4f..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: ipv4net
-help: "RIP network"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"network $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no network $(@)\"; "
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.def
deleted file mode 100644
index 279283e3..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: u32
-help: "MD5 authentication key ID"
-syntax: $(@) >= 1 && $(@) <= 255; "ID must be between 1 and 255"
-
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.tag/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.tag/node.def
deleted file mode 100644
index 8b0f3125..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: "Authentication password"
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.tag/password/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 6bef716d..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: "Authentication password"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../../@)\" \
-          -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $(../@)\" \
-          -c \"key chain $(../@)\" -c \"key $(../@)\" -c \"key-string $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../../@)\" \
-          -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $(../@)\" \
-          -c \"no key chain $(../@)\" "
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/node.def
deleted file mode 100644
index cd07a983..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: "Authentication method"
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/simple-password/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/simple-password/node.def
deleted file mode 100644
index 2ab4fc5c..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/authentication/simple-password/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: "Simple password authentication key"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip rip authentication mode text\" -c \"ip rip authentication string $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $(@)\"; "
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/in/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/in/node.def
deleted file mode 100644
index 83b31f9c..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/in/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: "ACL to be used in redistribution"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"distribute-list $(@) $(../@) $(../../../@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no distribute-list $(@) $(../@) $(../../../@)\" "
-
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/node.def
deleted file mode 100644
index 59eacb5a..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: "Direction of redistribution"
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/out/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/out/node.def
deleted file mode 100644
index 0e7ea992..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/distribute-list/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: "ACL to be used in redistribution"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"distribute-list $(@) $(../@) $(../../../@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no distribute-list $(@) $(../@) $(../../../@)\" "
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/metric/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/metric/node.def
deleted file mode 100644
index 5beb6cb9..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/metric/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-help: "Metric for this RIP network"
-syntax: $(@) >= 1 && $(@) <= 255; "metric must be between 1 and 255"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \ 
-          -c \"distance $(@) $(../@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \ 
-          -c \"no distance $(@) $(../@)\" "
-
-
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def
deleted file mode 100644
index 4ed0d8e4..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/passive/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: "Set interface as receive only"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"passive-interface $(../@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no passive-interface $(../@)\" "
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/split-horizon/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/split-horizon/node.def
deleted file mode 100644
index cb52087d..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/split-horizon/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: "Enable split horizon on this interface"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../@)\" \
-          -c \"ip rip split-horizon\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../@)\" \
-          -c \"no ip rip split-horizon\" "
-
diff --git a/templates/protocols/rip/interface/node.tag/network/node.tag/split-horizon/poison-reverse/node.def b/templates/protocols/rip/interface/node.tag/network/node.tag/split-horizon/poison-reverse/node.def
deleted file mode 100644
index c32d7012..00000000
--- a/templates/protocols/rip/interface/node.tag/network/node.tag/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: "With poison reverse"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip rip split-horizon poisoned-reverse\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" "
diff --git a/templates/protocols/rip/interface/node.tag/node.def b/templates/protocols/rip/interface/node.tag/node.def
deleted file mode 100644
index d62d4841..00000000
--- a/templates/protocols/rip/interface/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: "Configure RIP network"