rip: T2547: migrate to vyos-1x

47 files changed, 0 insertions, 352 deletions

diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def
deleted file mode 100644
index 6e56859e..00000000
--- a/templates/protocols/rip/default-distance/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Administrative distance
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
-val_help: u32:1-255; Administrative distance
-
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"distance $VAR(@) \" "
-
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no distance $VAR(@) \" "
diff --git a/templates/protocols/rip/default-information/node.def b/templates/protocols/rip/default-information/node.def
deleted file mode 100644
index 7d35a646..00000000
--- a/templates/protocols/rip/default-information/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Control distribution of default route
diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def
deleted file mode 100644
index 8cae1f70..00000000
--- a/templates/protocols/rip/default-information/originate/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Distribute a default route
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"default-information originate\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no default-information originate\" "
-
diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def
deleted file mode 100644
index e0da34b4..00000000
--- a/templates/protocols/rip/default-metric/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Metric of redistributed routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16"
-val_help: u32:1-16; Redistributed routes metric
-
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"default-metric $VAR(@) \"; "
-
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no default-metric $VAR(@) \"; "
diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def
deleted file mode 100644
index 0867f371..00000000
--- a/templates/protocols/rip/distribute-list/access-list/in/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Access list to apply to input packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $VAR(@) in\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $VAR(@) in\" "
-                     
diff --git a/templates/protocols/rip/distribute-list/access-list/node.def b/templates/protocols/rip/distribute-list/access-list/node.def
deleted file mode 100644
index 0cb37cd4..00000000
--- a/templates/protocols/rip/distribute-list/access-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Access list
diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def
deleted file mode 100644
index 09ede9c9..00000000
--- a/templates/protocols/rip/distribute-list/access-list/out/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Access list to apply to output packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $VAR(@) out\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $VAR(@) out\" "
-
diff --git a/templates/protocols/rip/distribute-list/interface/node.def b/templates/protocols/rip/distribute-list/interface/node.def
deleted file mode 100644
index 1a725d47..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: txt
-help: Apply filtering to an interface
-syntax:expression: exec "if [ -z \"`ip addr | grep $VAR(@) `\" ]; then                       \
-                 echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
-                 exit 1 ;                                                      \
-              fi ; "
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
deleted file mode 100644
index 2e5a609d..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Access list to apply to input packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $VAR(@) in $VAR(../../@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $VAR(@) in $VAR(../../@)\" "
-
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
deleted file mode 100644
index 0cb37cd4..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Access list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
deleted file mode 100644
index d99db7ff..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Access list to apply to output packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $VAR(@) out $VAR(../../@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $VAR(@) out $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
deleted file mode 100644
index 8395ca12..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Prefix-list to apply to input packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $VAR(@) in $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
deleted file mode 100644
index 2aa289c3..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Prefix-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
deleted file mode 100644
index 4fbcf8a9..00000000
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Prefix-list to apply to output packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $VAR(@) out $VAR(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/node.def b/templates/protocols/rip/distribute-list/node.def
deleted file mode 100644
index 34c3cd35..00000000
--- a/templates/protocols/rip/distribute-list/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Filter networks in routing updates
-
diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
deleted file mode 100644
index 577ddc94..00000000
--- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Prefix-list to apply to input packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $VAR(@) in\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $VAR(@) in\" "
-                    
diff --git a/templates/protocols/rip/distribute-list/prefix-list/node.def b/templates/protocols/rip/distribute-list/prefix-list/node.def
deleted file mode 100644
index 2aa289c3..00000000
--- a/templates/protocols/rip/distribute-list/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Prefix-list
diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
deleted file mode 100644
index ee4a7067..00000000
--- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Prefix-list to apply to output packets
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $VAR(@) out\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $VAR(@) out\" "
diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def
deleted file mode 100644
index be1db113..00000000
--- a/templates/protocols/rip/interface/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-multi:
-type: txt
-help: Interface name
-commit:expression: exec " \
-        if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
-          echo interface $VAR(@) doesn\\'t exist on this system ; \
-          exit 1 ; \
-        fi ; "
-create:vtysh -c "configure terminal" -c "router rip" -c "network $VAR(@)"
-delete:vtysh -c "configure terminal" -c "router rip" -c "no network $VAR(@)"
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def
deleted file mode 100644
index 4037c759..00000000
--- a/templates/protocols/rip/neighbor/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-multi:
-type: ipv4
-help: Neighbor router
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"neighbor $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no neighbor $VAR(@)\"; "
-
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
deleted file mode 100644
index 67d50ab7..00000000
--- a/templates/protocols/rip/network-distance/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-tag:
-type: ipv4net
-help: Source network
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-commit:expression: $VAR(./distance/) != ""; "Must specify distance for network $VAR(@)"
-delete:expression: "touch /tmp/rip-dist.$PPID"
-end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \
-	 ACL=\"$VAR(./access-list/@)\"; \
-      fi; \
-      if [ -f \"/tmp/rip-dist.$PPID\" ]; then \
-          dist=$(cat /tmp/rip-network-distance.$PPID); \
-          vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no distance $dist $VAR(@) $ACL \" ;
-          rm -f \"/tmp/rip-dist.$PPID\";
-      else \
-        vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"distance $VAR(./distance/@) $VAR(@) $ACL \" ;
-      fi; "
diff --git a/templates/protocols/rip/network-distance/node.tag/access-list/node.def b/templates/protocols/rip/network-distance/node.tag/access-list/node.def
deleted file mode 100644
index 3003e718..00000000
--- a/templates/protocols/rip/network-distance/node.tag/access-list/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Access list
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/network-distance/node.tag/distance/node.def b/templates/protocols/rip/network-distance/node.tag/distance/node.def
deleted file mode 100644
index 3816ca3f..00000000
--- a/templates/protocols/rip/network-distance/node.tag/distance/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Administrative distance for network
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
-val_help: u32:1-255; Administrative distance
-
-delete:expression: "echo $VAR(@) > /tmp/rip-network-distance.$PPID"
-
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
deleted file mode 100644
index 59af0bd8..00000000
--- a/templates/protocols/rip/network/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-multi:
-type: ipv4net
-help: RIP network
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"network $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"no network $VAR(@)\"; "
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
deleted file mode 100644
index edd3d2f7..00000000
--- a/templates/protocols/rip/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-priority: 650
-help: Routing Information Protocol (RIP) parameters
-create: vtysh -c "configure terminal" -c "router rip"
-delete: vtysh -c "configure terminal" -c "no router rip"
-end:
-  if [ "$COMMIT_ACTION" != "DELETE" ]; then
-    vtysh -d ripd -c 'sh run' > /opt/vyatta/etc/quagga/ripd.conf
-  else
-    rm -f /opt/vyatta/etc/quagga/ripd.conf
-  fi
diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def
deleted file mode 100644
index c642bc1f..00000000
--- a/templates/protocols/rip/passive-interface/node.def
+++ /dev/null
@@ -1,24 +0,0 @@
-multi:
-type: txt
-comp_help:default       Suppress routing updates on all interfaces by default\n\
-ethx            Suppress routing updates on ethx\n\
-lo              Suppress routing updates on lo\n
-syntax:expression: exec " \
-        if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \
-          echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
-          exit 1 ; \
-        fi ; "
-create: if [ x$VAR(x) == xdefault ]
-        then vtysh -c "configure terminal" -c "router rip" \
-            -c "passive-interface default"
-        else vtysh -c "configure terminal" -c "router rip" \
-            -c "passive-interface $VAR(@)"
-        fi
-delete: if [ x$VAR(x) == xdefault ]
-        then vtysh -c "configure terminal" -c "router rip" \
-            -c "no passive-interface default"
-         else vtysh -c "configure terminal" -c "router rip" \
-            -c "no passive-interface $VAR(@)"
-         fi
-allowed: echo "default" && ${vyatta_sbindir}/vyatta-interfaces.pl --show all
-
diff --git a/templates/protocols/rip/redistribute/bgp/metric/node.def b/templates/protocols/rip/redistribute/bgp/metric/node.def
deleted file mode 100644
index 8446e404..00000000
--- a/templates/protocols/rip/redistribute/bgp/metric/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-val_help: u32:1-16; Redistribute route metric
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def
deleted file mode 100644
index b7108a73..00000000
--- a/templates/protocols/rip/redistribute/bgp/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-help: Redistribute BGP routes
-delete:expression: "touch /tmp/rip-redist-bgp.$PPID" 
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no redistribute bgp \"; \
-      if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-bgp.$PPID; \
-      else \
-        if [ -n \"$VAR(./metric/@)\" ]; then \
-          COND=\"metric $VAR(./metric/@)\";
-        fi; \
-        if [ -n \"$VAR(./route-map/@)\" ]; then \
-          COND=\"$COND route-map $VAR(./route-map/@)\"; \
-        fi; \
-        vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute bgp $COND\"; \
-      fi; "
diff --git a/templates/protocols/rip/redistribute/bgp/route-map/node.def b/templates/protocols/rip/redistribute/bgp/route-map/node.def
deleted file mode 100644
index a56f5668..00000000
--- a/templates/protocols/rip/redistribute/bgp/route-map/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: txt
-help: Route map reference
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
-
diff --git a/templates/protocols/rip/redistribute/connected/metric/node.def b/templates/protocols/rip/redistribute/connected/metric/node.def
deleted file mode 100644
index 8446e404..00000000
--- a/templates/protocols/rip/redistribute/connected/metric/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-val_help: u32:1-16; Redistribute route metric
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def
deleted file mode 100644
index a8b56646..00000000
--- a/templates/protocols/rip/redistribute/connected/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-help: Redistribute connected routes
-delete:expression: "touch /tmp/rip-redist-connected.$PPID" 
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no redistribute connected \"; \
-      if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-connected.$PPID; \
-      else \
-        if [ -n \"$VAR(./metric/@)\" ]; then \
-          COND=\"metric $VAR(./metric/@)\";
-        fi; \
-        if [ -n \"$VAR(./route-map/@)\" ]; then \
-          COND=\"$COND route-map $VAR(./route-map/@)\"; \
-        fi; \
-        vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute connected $COND\"; \
-      fi; "
diff --git a/templates/protocols/rip/redistribute/connected/route-map/node.def b/templates/protocols/rip/redistribute/connected/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/rip/redistribute/connected/route-map/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Route map reference
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/kernel/metric/node.def b/templates/protocols/rip/redistribute/kernel/metric/node.def
deleted file mode 100644
index 8446e404..00000000
--- a/templates/protocols/rip/redistribute/kernel/metric/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-val_help: u32:1-16; Redistribute route metric
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def
deleted file mode 100644
index 33dd0e1a..00000000
--- a/templates/protocols/rip/redistribute/kernel/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-help: Redistribute kernel routes
-delete:expression: "touch /tmp/rip-redist-kernel.$PPID" 
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no redistribute kernel \"; \
-      if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-kernel.$PPID; \
-      else \
-        if [ -n \"$VAR(./metric/@)\" ]; then \
-          COND=\"metric $VAR(./metric/@)\";
-        fi; \
-        if [ -n \"$VAR(./route-map/@)\" ]; then \
-          COND=\"$COND route-map $VAR(./route-map/@)\"; \
-        fi; \
-        vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute kernel $COND\"; \
-      fi; "
diff --git a/templates/protocols/rip/redistribute/kernel/route-map/node.def b/templates/protocols/rip/redistribute/kernel/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/rip/redistribute/kernel/route-map/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Route map reference
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/node.def b/templates/protocols/rip/redistribute/node.def
deleted file mode 100644
index 00eefa88..00000000
--- a/templates/protocols/rip/redistribute/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute information from another routing protocol
diff --git a/templates/protocols/rip/redistribute/ospf/metric/node.def b/templates/protocols/rip/redistribute/ospf/metric/node.def
deleted file mode 100644
index 808090c7..00000000
--- a/templates/protocols/rip/redistribute/ospf/metric/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-val_help: u32:1-16; Redistribute route metric
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
-
diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def
deleted file mode 100644
index c6a90534..00000000
--- a/templates/protocols/rip/redistribute/ospf/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-help: Redistribute OSPF routes
-delete:expression: "touch /tmp/rip-redist-ospf.$PPID" 
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no redistribute ospf \"; \
-      if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-ospf.$PPID; \
-      else \
-        if [ -n \"$VAR(./metric/@)\" ]; then \
-          COND=\"metric $VAR(./metric/@)\";
-        fi; \
-        if [ -n \"$VAR(./route-map/@)\" ]; then \
-          COND=\"$COND route-map $VAR(./route-map/@)\"; \
-        fi; \
-        vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute ospf $COND\"; \
-      fi; "
-
diff --git a/templates/protocols/rip/redistribute/ospf/route-map/node.def b/templates/protocols/rip/redistribute/ospf/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/rip/redistribute/ospf/route-map/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Route map reference
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/static/metric/node.def b/templates/protocols/rip/redistribute/static/metric/node.def
deleted file mode 100644
index 8446e404..00000000
--- a/templates/protocols/rip/redistribute/static/metric/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-val_help: u32:1-16; Redistribute route metric
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def
deleted file mode 100644
index 8ce4a0b0..00000000
--- a/templates/protocols/rip/redistribute/static/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-help: Redistribute static routes
-delete:expression: "touch /tmp/rip-redist-static.$PPID" 
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-        -c \"no redistribute static \"; \
-      if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-static.$PPID; \
-      else \
-        if [ -n \"$VAR(./metric/@)\" ]; then \
-          COND=\"metric $VAR(./metric/@)\";
-        fi; \
-        if [ -n \"$VAR(./route-map/@)\" ]; then \
-          COND=\"$COND route-map $VAR(./route-map/@)\"; \
-        fi; \
-        vtysh -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute static $COND\"; \
-      fi; "
diff --git a/templates/protocols/rip/redistribute/static/route-map/node.def b/templates/protocols/rip/redistribute/static/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/rip/redistribute/static/route-map/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Route map reference
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
deleted file mode 100644
index cd43d891..00000000
--- a/templates/protocols/rip/route/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-multi:
-type: ipv4net
-help: RIP static route
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-         -c \"route $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
-         -c \"no route $VAR(@)\" "
-
diff --git a/templates/protocols/rip/timers/garbage-collection/node.def b/templates/protocols/rip/timers/garbage-collection/node.def
deleted file mode 100644
index a88d2324..00000000
--- a/templates/protocols/rip/timers/garbage-collection/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-default: 120
-help: Garbage collection timer
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
-       "Garbage collection timer must be between 5 and 2147483647"
-val_help: u32:5-2147483647; Garbage colletion time (default 120)
diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def
deleted file mode 100644
index c8132c64..00000000
--- a/templates/protocols/rip/timers/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: RIP timer values
-
-delete: touch /tmp/rip-timers.$PPID
-
-end: vtysh -c "configure terminal" -c "router rip" -c "no timers basic"
-    if [ -f "/tmp/rip-timers.$PPID" ]; then
-       rm -rf /tmp/rip-timers.$PPID
-    else
-       vtysh -c "configure terminal" -c "router rip"  \
-             -c "timers basic $VAR(./update/@) $VAR(./timeout/@) $VAR(./garbage-collection/@)"
-    fi
diff --git a/templates/protocols/rip/timers/timeout/node.def b/templates/protocols/rip/timers/timeout/node.def
deleted file mode 100644
index 391807a9..00000000
--- a/templates/protocols/rip/timers/timeout/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-default: 180
-help: Routing information timeout timer
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
-       "Timeout timer must be between 5 and 2147483647"
-val_help: u32:5-2147483647; Routing information timeout timer (default 180)
diff --git a/templates/protocols/rip/timers/update/node.def b/templates/protocols/rip/timers/update/node.def
deleted file mode 100644
index 88795cc4..00000000
--- a/templates/protocols/rip/timers/update/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-default: 30
-help: Routing table update timer
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
-       "Update timer must be between 5 and 2147483647"
-val_help: u32:5-2147483647; Routing table update timer in seconds (default 30)