T3236: migrate ospf to vyos-1x

95 files changed, 0 insertions, 943 deletions

diff --git a/templates/protocols/ospf/access-list/node.def b/templates/protocols/ospf/access-list/node.def
deleted file mode 100644
index cbb773f3..00000000
--- a/templates/protocols/ospf/access-list/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: u32
-commit:expression: $VAR(./export/) != ""; "must add protocol to filter"
-help: Access list to filter networks in routing updates
diff --git a/templates/protocols/ospf/access-list/node.tag/export/node.def b/templates/protocols/ospf/access-list/node.tag/export/node.def
deleted file mode 100644
index 50d2db49..00000000
--- a/templates/protocols/ospf/access-list/node.tag/export/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-multi:
-type: txt
-help: Filter for outgoing routing updates [REQUIRED]
-syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)"
-
-val_help: bgp                Filter bgp routes; 
-val_help: connected          Filter connected routes; 
-val_help: kernel             Filter kernel routes; 
-val_help: rip                Filter rip routes; 
-val_help: static             Filter static routes; 
-
-create: vtysh -c "configure terminal" \
-            -c "router ospf"                                      \
-            -c "distribute-list $VAR(../@) out $VAR(@)"; 
-
-delete: vtysh -c "configure terminal" \
-            -c "router ospf"                                      \
-            -c "no distribute-list $VAR(../@) out $VAR(@)";
-
diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def
deleted file mode 100644
index fc90826b..00000000
--- a/templates/protocols/ospf/area/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-tag:
-type: txt
-help: OSPF Area
-syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"
-val_help: u32; OSPF area in decimal notation
-val_help: ipv4; OSPF area in dotted decimal notation
diff --git a/templates/protocols/ospf/area/node.tag/area-type/node.def b/templates/protocols/ospf/area/node.tag/area-type/node.def
deleted file mode 100644
index e3ab801c..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Area type
-val_help: normal; Normal area type
-val_help: nssa; Not so stubby area type 
-val_help: stub; Stub Area type 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
deleted file mode 100644
index 80639130..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Normal OSPF area
-syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
-syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
-create:expression: "                                                            \
-      if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then       \
-         vtysh -c \"configure terminal\"            \
-           -c \"router ospf\"                                                   \
-           -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \
-      fi; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
deleted file mode 100644
index a4745bce..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Summary-default cost of nssa area
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
-val_help: u32:0-16777215; Summary default cost
-
-create: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "area $VAR(../../../@) nssa"                         \
-          -c "area $VAR(../../../@) default-cost $VAR(@)";
-
-update: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "area $VAR(../../../@) default-cost $VAR(@)"; 
-
-delete: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no area $VAR(../../../@) default-cost $VAR(@)";
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
deleted file mode 100644
index 4999ff7a..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Do not inject inter-area routes into stub
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
deleted file mode 100644
index bed9a704..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
+++ /dev/null
@@ -1,28 +0,0 @@
-help: Nssa OSPF area
-syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be NSSA"
-syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
-syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
-
-delete: touch /tmp/ospf-area-nssa.$PPID
-end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then
-        vtysh -c "configure terminal" \
-          -c "router ospf" -c "no area $VAR(../../@) nssa";
-	rm /tmp/ospf-area-nssa.$PPID;
-     else
-        if [ -n "$VAR(translate/@)" ]; then
-           PARM="translate-$VAR(translate/@)";
-        fi;
-        # using workaround pending bug 2525
-        #
-        # if [ -n "$VAR(no-summary/)" ]; then
-        #   PARM="$PARM no-summary";
-        # fi;
-	${vyatta_sbindir}/vyatta-check-typeless-node.pl           \
-          "protocols ospf area $VAR(../../@) area-type nssa no-summary";
-        if [ $? -eq 0 ] ; then
-           PARM2="no-summary";
-        fi;
-        vtysh -c "configure terminal" \
-          -c "router ospf" -c "area $VAR(../../@) nssa $PARM2" -c "area $VAR(../../@) nssa $PARM"; \
-     fi;
-
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
deleted file mode 100644
index 803f29ab..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Nssa-abr
-default: "candidate"
-syntax:expression: $VAR(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)"
-
-val_help: always; NSSA-ABR to always translate
-val_help: candidate; NSSA-ABR for translate election (default)
-val_help: never; NSSA-ABR to never translate
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
deleted file mode 100644
index 3f192213..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Summary-default cost of stub area
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
-val_help: u32:0-16777215; Summary default cost of stub area
-
-create: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "area $VAR(../../../@) stub"                         \
-          -c "area $VAR(../../../@) default-cost $VAR(@)";
-
-update: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "area $VAR(../../../@) default-cost $VAR(@)";
-
-delete: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no area $VAR(../../../@) default-cost $VAR(@)";
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
deleted file mode 100644
index d831fac5..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Do not inject inter-area routes into stub
-
-create:
-	vtysh -c "configure terminal" \
-	    -c "router ospf" \
-	    -c "area $VAR(../../../@) stub no-summary "
-
-delete:
-	vtysh -c "configure terminal" \
-            -c "router ospf" \
-            -c "no area $VAR(../../../@) stub no-summary "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
deleted file mode 100644
index d4c2eb99..00000000
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-help: Stub OSPF area
-
-syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be stub"
-
-syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
-
-syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
-
-create:
-	vtysh -c "configure terminal" \
-	    -c "router ospf" \
-	    -c "area $VAR(../../@) stub"
-
-delete:
-	vtysh -c "configure terminal" \
-	    -c "router ospf" \
-	    -c "no area $VAR(../../@) stub"
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
deleted file mode 100644
index 5cb9839d..00000000
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ /dev/null
@@ -1,26 +0,0 @@
-type: txt
-help: OSPF area authentication type
-allowed: echo "plaintext-password md5"
-syntax:expression: $VAR(@) in "plaintext-password", "md5"; \
-       "Must be either plaintext-password or md5"
-val_help: plaintext-password; Use plain-text authentication
-val_help: md5; Use md5 authentication
-
-update:expression: "\
-        if [ x$VAR(@) == xplaintext-password ]; then               \
-           vtysh                       \
-            -c \"configure terminal\"                              \
-            -c \"router ospf \"                                    \
-            -c \"no area $VAR(../@) authentication \"              \
-            -c \"area $VAR(../@) authentication \" ;               \
-         else                                                      \
-           vtysh                       \
-            -c \"configure terminal\"                              \
-            -c \"router ospf \"                                    \
-            -c \"no area $VAR(../@) authentication \"              \
-            -c \"area $VAR(../@) authentication message-digest\" ; \
-         fi; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-            -c \"router ospf \"                                                 \
-            -c \"no area $VAR(../@) authentication \" "
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
deleted file mode 100644
index ebf346db..00000000
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-multi:
-type: ipv4net
-help: OSPF network [REQUIRED]
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-create:vtysh -c "configure terminal" \
-       -c "router ospf" -c "network $VAR(@) area $VAR(../@)"
-delete:vtysh -c "configure terminal" \
-       -c "router ospf" -c "no network $VAR(@) area $VAR(../@)"
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
deleted file mode 100644
index d29b775f..00000000
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ /dev/null
@@ -1,45 +0,0 @@
-tag:
-type: ipv4net
-help: Summarize routes matching prefix (border routers only)
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-
-delete: touch /tmp/ospf-range.$PPID
-
-end: if [ -f /tmp/ospf-range.$PPID ]; then
-        vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no area $VAR(../@) range $VAR(@)";
-        rm /tmp/ospf-range.$PPID;
-     else
-        ${vyatta_sbindir}/vyatta-check-typeless-node.pl           \
-          "protocols ospf area $VAR(../@) range $VAR(@) not-advertise";
-        if [ $? -eq 0 ] ; then
-           if [ -n "$VAR(cost/@)" ] || [ -n "$VAR(substitute/@)" ]; then
-              echo "Remove 'not-advertise' before setting cost or substitue";
-	      exit 1;
-           fi;
-           vtysh --noerror -c "configure terminal" \
-             -c "router ospf"                                               \
-             -c "no area $VAR(../@) range $VAR(@)";
-           vtysh -c "configure terminal" \
-             -c "router ospf"                                        \
-             -c "area $VAR(../@) range $VAR(@) not-advertise";
-        else
-           vtysh --noerror -c "configure terminal" \
-             -c "router ospf"                                               \
-             -c "no area $VAR(../@) range $VAR(@)";
-           vtysh -c "configure terminal" \
-             -c "router ospf"                                        \
-             -c "area $VAR(../@) range $VAR(@)";
-           if [ -n "$VAR(cost/@)" ]; then
-              vtysh -c "configure terminal" \
-                -c "router ospf"                                        \
-                -c "area $VAR(../@) range $VAR(@) cost $VAR(cost/@)";
-           fi;
-           if [ -n "$VAR(substitute/@)" ]; then
-              vtysh -c "configure terminal" \
-                -c "router ospf"                                        \
-                -c "area $VAR(../@) range $VAR(@) substitute $VAR(substitute/@)";
-           fi;
-        fi;
-     fi;
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
deleted file mode 100644
index 8bad1734..00000000
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Metric for this range
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215"
-val_help: u32: 0-16777215; Metric for this range
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
deleted file mode 100644
index dd6453ce..00000000
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Do not advertise this range
-create:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
deleted file mode 100644
index b5ebba1d..00000000
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: ipv4net
-help: Announce area range as another prefix
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
deleted file mode 100644
index 2e42ddaa..00000000
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: txt
-help: Area's shortcut mode
-allowed: echo "default disable enable"
-syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
-val_help: default; Set default; 
-val_help: disable; Disable shortcutting mode; 
-val_help: enable; Enable  shortcutting mode; 
-
-update:expression: "vtysh -c \"configure terminal\" \
-          -c \"router ospf\" \
-          -c \"area $VAR(../@) shortcut $VAR(@)\"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-          -c \"router ospf\" \
-          -c \"no area $VAR(../@) shortcut $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
deleted file mode 100644
index 7843530f..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-tag:
-type: ipv4
-help: Virtual link
-syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)"
-create:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"area $VAR(../@) virtual-link $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no area $VAR(../@) virtual-link $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
deleted file mode 100644
index afaad490..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,24 +0,0 @@
-tag:
-type: u32
-help: MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-val_help: u32:1-255; MD5 key id
-
-commit:expression: $VAR(md5-key/) != ""; "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
-      if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                          \
-         vtysh -c \"configure terminal\"   \
-           -c \"router ospf\"                                          \
-           -c \"no area $VAR(../../../../@)                            \
-           virtual-link $VAR(../../../@) message-digest-key $VAR(@)    \
-           md5 _\";                                                    \
-         rm /tmp/ospf-md5.$PPID;                                       \
-      else                                                             \
-         vtysh -c \"configure terminal\"   \
-           -c \"router ospf\"                                          \
-           -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \
-           message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";           \
-      fi; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index 34572058..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: MD5 key
-val_help: MD5 Key (16 characters or less)
-
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
deleted file mode 100644
index e04a2036..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-help: MD5 key id
-commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password already set"
-
-create: vtysh -c "configure terminal"                              \
-          -c "router ospf"                                         \
-          -c "no area $VAR(../../../@) virtual-link $VAR(../../@)  \
-            authentication-key _"                                  \
-          -c "area $VAR(../../../@) virtual-link $VAR(../../@)     \
-            authentication message-digest";
-
-delete: vtysh -c "configure terminal"                              \
-          -c "router ospf"                                         \
-          -c "area $VAR(../../../@) virtual-link $VAR(../../@)     \
-            authentication null";
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def
deleted file mode 100644
index 180851c4..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Authentication
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
deleted file mode 100644
index bf6d0051..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: txt
-help: Plain text password
-val_help: Plain text password (8 characters or less)
-
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then   \
-          echo Password must be 8 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-
-update: vtysh -c "configure terminal" -c "router ospf"         \
-          -c "area $VAR(../../../@) virtual-link $VAR(../../@) \
-            authentication authentication-key $VAR(@) "
-
-delete: vtysh  -c "configure terminal" -c "router ospf"           \
-          -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
-            authentication authentication-key";
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
deleted file mode 100644
index e4f67e87..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Interval after which a neighbor is declared dead
-val_help: u32:1-65535; Neighbor dead interval (seconds)
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
deleted file mode 100644
index a9fc9be1..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Interval between hello packets
-val_help: u32:1-65535; Hello interval (seconds)
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vtysh -c \"configure terminal\" \
-      -c \"router ospf\" \
-      -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-      -c \"router ospf\" \
-      -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
deleted file mode 100644
index f3724090..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: u32
-help: Interval between retransmitting lost link state advertisements
-val_help: u32:1-65535; Retransmit interval (seconds)
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"area $VAR(../../@) virtual-link $VAR(../@) \
-       retransmit-interval $VAR(@)\"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no area $VAR(../../@) virtual-link $VAR(../@) \
-       retransmit-interval \"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
deleted file mode 100644
index bf7b1440..00000000
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Link state transmit delay
-val_help: u32:1-65535; Link state transmit delay (seconds)
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vtysh -c \"configure terminal\" \
-      -c \"router ospf\" \
-      -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-      -c \"router ospf\" \
-      -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
diff --git a/templates/protocols/ospf/auto-cost/node.def b/templates/protocols/ospf/auto-cost/node.def
deleted file mode 100644
index 5ea6ce6f..00000000
--- a/templates/protocols/ospf/auto-cost/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Calculate OSPF interface cost according to bandwidth
diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
deleted file mode 100644
index 110d3fc0..00000000
--- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: u32
-help: Reference bandwidth method to assign OSPF cost
-default: 100
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \
-       "Must be between 1-4294967"
-val_help: u32:1-4294967; Reference bandwidth cost in Mbits/sec (default 100)
-
-update:expression: "vtysh --noerror \
-       -c \"configure terminal\"                       \
-       -c \"router ospf\"                              \
-       -c \"auto-cost reference-bandwidth $VAR(@) \";  \
-       echo 'OSPF: Reference bandwidth is changed.';   \
-       echo '      Please ensure reference bandwidth is consistent across all routers'; "
-
-delete:expression: "vtysh --noerror \
-       -c \"configure terminal\"                       \
-       -c \"router ospf\"                              \
-       -c \"no auto-cost reference-bandwidth \";       \
-       echo 'OSPF: Reference bandwidth is changed.';   \
-       echo '      Please ensure reference bandwidth is consistent across all routers'; "
diff --git a/templates/protocols/ospf/default-information/node.def b/templates/protocols/ospf/default-information/node.def
deleted file mode 100644
index 7cd4ddbc..00000000
--- a/templates/protocols/ospf/default-information/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Control distribution of default information
diff --git a/templates/protocols/ospf/default-information/originate/always/node.def b/templates/protocols/ospf/default-information/originate/always/node.def
deleted file mode 100644
index 31ce00db..00000000
--- a/templates/protocols/ospf/default-information/originate/always/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Always advertise default route
diff --git a/templates/protocols/ospf/default-information/originate/metric-type/node.def b/templates/protocols/ospf/default-information/originate/metric-type/node.def
deleted file mode 100644
index a5924566..00000000
--- a/templates/protocols/ospf/default-information/originate/metric-type/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: OSPF metric type for default routes
-default: 2
-syntax:expression: $VAR(@) in 1, 2 ; "metric must be either 1 or 2"
-val_help: u32:1-2; Metric type for default routes (default 2)
diff --git a/templates/protocols/ospf/default-information/originate/metric/node.def b/templates/protocols/ospf/default-information/originate/metric/node.def
deleted file mode 100644
index 99a755cb..00000000
--- a/templates/protocols/ospf/default-information/originate/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: OSPF default metric
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "must be between 0-16777214"
-val_help: u32:0-16777214; Default metric
diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def
deleted file mode 100644
index f5d50e06..00000000
--- a/templates/protocols/ospf/default-information/originate/node.def
+++ /dev/null
@@ -1,30 +0,0 @@
-help: Distribute a default route
-delete: touch /tmp/ospf-default-info.$PPID
-end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then
-        vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no default-information originate";
-     else
-        # uncomment and remove script pending bug 2525
-        #
-        # if [ -n "$VAR(./always/)" ]; then                       
-        #  PARM="always";                                          
-        # fi;                                                         
-        ${vyatta_sbindir}/vyatta-check-typeless-node.pl           \
-          "protocols ospf default-information originate always";
-        if [ $? -eq 0 ] ; then
-           PARM="always";  
-        fi;
-        if [ -n "$VAR(./metric/@)" ]; then
-           PARM="$PARM metric $VAR(./metric/@)";
-        fi;
-        if [ -n "$VAR(./metric-type/@)" ]; then
-           PARM="$PARM metric-type $VAR(./metric-type/@)";
-        fi;
-        if [ -n "$VAR(./route-map/@)" ]; then
-           PARM="$PARM route-map $VAR(./route-map/@)";
-        fi;
-        vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "default-information originate $PARM";
-     fi;
diff --git a/templates/protocols/ospf/default-information/originate/route-map/node.def b/templates/protocols/ospf/default-information/originate/route-map/node.def
deleted file mode 100644
index c7943078..00000000
--- a/templates/protocols/ospf/default-information/originate/route-map/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Route map reference
diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def
deleted file mode 100644
index 926fed1f..00000000
--- a/templates/protocols/ospf/default-metric/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Metric of redistributed routes
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214"
-val_help: u32:0-16777214; Metric of redistributed routes
-
-update:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"default-metric $VAR(@) \"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no default-metric $VAR(@) \"; "
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def
deleted file mode 100644
index b54f9881..00000000
--- a/templates/protocols/ospf/distance/global/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: OSPF administrative distance
-val_help: u32:1-255; Administrative distance
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-
-update:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"distance $VAR(@) \"; "
-
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no distance $VAR(@) \"; "
diff --git a/templates/protocols/ospf/distance/node.def b/templates/protocols/ospf/distance/node.def
deleted file mode 100644
index 97a8c1c4..00000000
--- a/templates/protocols/ospf/distance/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Administrative distance
diff --git a/templates/protocols/ospf/distance/ospf/external/node.def b/templates/protocols/ospf/distance/ospf/external/node.def
deleted file mode 100644
index 32ba607e..00000000
--- a/templates/protocols/ospf/distance/ospf/external/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Distance for external routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-val_help: u32: 1-255; Distance for external routes
diff --git a/templates/protocols/ospf/distance/ospf/inter-area/node.def b/templates/protocols/ospf/distance/ospf/inter-area/node.def
deleted file mode 100644
index 496a4cf6..00000000
--- a/templates/protocols/ospf/distance/ospf/inter-area/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Distance for inter-area routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-val_help: u32:1-255; Distance for inter-area routes
diff --git a/templates/protocols/ospf/distance/ospf/intra-area/node.def b/templates/protocols/ospf/distance/ospf/intra-area/node.def
deleted file mode 100644
index 7db14c3b..00000000
--- a/templates/protocols/ospf/distance/ospf/intra-area/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Distance for intra-area routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-val_help: u32:1-255; Distance for intra-area routes
diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def
deleted file mode 100644
index b9527712..00000000
--- a/templates/protocols/ospf/distance/ospf/node.def
+++ /dev/null
@@ -1,22 +0,0 @@
-help: OSPF administrative distance
-delete:expression: "touch /tmp/ospf-distance.$PPID"
-end:expression: "\
-      if [ -f \"/tmp/ospf-distance.$PPID\" ]; then                   \
-         vtysh -c \"configure terminal\" \
-           -c \"router ospf\"                                        \
-           -c \"no distance ospf\";                                  \
-	 rm /tmp/ospf-distance.$PPID;                                \
-      else                                                           \
-         if [ -n \"$VAR(./intra-area/@)\" ]; then                    \
-           PARM=\"intra-area $VAR(./intra-area/@)\";                 \
-         fi;                                                         \
-         if [ -n \"$VAR(./inter-area/@)\" ]; then                    \
-           PARM=\"$PARM inter-area $VAR(./inter-area/@)\";           \
-         fi;                                                         \
-         if [ -n \"$VAR(./external/@)\" ]; then                      \
-           PARM=\"$PARM external $VAR(./external/@)\";               \
-         fi;                                                         \
-         vtysh -c \"configure terminal\" \
-           -c \"router ospf\"                                        \
-           -c \"no distance ospf\" -c \"distance ospf $PARM\";       \
-      fi; "
diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
deleted file mode 100644
index e82c03ff..00000000
--- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Log all state changes
-create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
-         -c \"log-adjacency-changes detail\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
-         -c \"no log-adjacency-changes detail\"; "
-
diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def
deleted file mode 100644
index e919f971..00000000
--- a/templates/protocols/ospf/log-adjacency-changes/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Log changes in adjacency state
-create:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"log-adjacency-changes\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no log-adjacency-changes\"; "
diff --git a/templates/protocols/ospf/max-metric/node.def b/templates/protocols/ospf/max-metric/node.def
deleted file mode 100644
index aafed348..00000000
--- a/templates/protocols/ospf/max-metric/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: OSPF maximum/infinite-distance metric
diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
deleted file mode 100644
index d0ec588a..00000000
--- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Administratively apply, for an indefinite period
-create:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"max-metric router-lsa administrative\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no max-metric router-lsa administrative \"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/node.def b/templates/protocols/ospf/max-metric/router-lsa/node.def
deleted file mode 100644
index 7371f9a9..00000000
--- a/templates/protocols/ospf/max-metric/router-lsa/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise own Router-LSA with infinite distance (stub router)
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
deleted file mode 100644
index 9911dd16..00000000
--- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: u32
-help: Advertise stub-router prior to full shutdown of OSPF
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
-val_help: u32:5-86400; Time (seconds) to advertise self as stub-router
-
-update:
-    METRIC=$VAR(@)
-    if [ $METRIC -gt 100 ]; then
-        echo "Warning: $METRIC is not a supported value for OSPF max-metric, reducing to 100";
-        METRIC=100;
-    fi
-    vtysh -c "configure terminal" \
-          -c "router ospf" \
-          -c "max-metric router-lsa on-shutdown $METRIC"
-
-delete:expression: "vtysh -c \"configure terminal\" \
-        -c \"router ospf\" \
-        -c \"no max-metric router-lsa on-shutdown \"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
deleted file mode 100644
index 2992ed48..00000000
--- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: u32
-help: Automatically advertise stub Router-LSA on startup of OSPF
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
-val_help: u32:5-86400; Time (seconds) to advertise self as stub-router
-
-update:
-    METRIC=$VAR(@)
-    if [ $METRIC -gt 100 ]; then
-        echo "Warning: $METRIC is not a supported value for OSPF max-metric, reducing to 100";
-        METRIC=100;
-    fi
-    vtysh -c "configure terminal" \
-          -c "router ospf"  \
-          -c "max-metric router-lsa on-startup $METRIC"
-
-delete:expression: "vtysh -c \"configure terminal\" \
-        -c \"router ospf\" \
-        -c \"no max-metric router-lsa on-startup \"; "
-
diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def
deleted file mode 100644
index 4a24bf6e..00000000
--- a/templates/protocols/ospf/mpls-te/enable/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Enable MPLS-TE functionality
-create:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"mpls-te on\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/mpls-te/node.def b/templates/protocols/ospf/mpls-te/node.def
deleted file mode 100644
index 19886f3b..00000000
--- a/templates/protocols/ospf/mpls-te/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: MultiProtocol Label Switching-Traffic Engineering (MPLS-TE) parameters
diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def
deleted file mode 100644
index 1e69402d..00000000
--- a/templates/protocols/ospf/mpls-te/router-address/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: ipv4
-help: Stable IP address of the advertising router
-update:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"mpls-te router-address $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def
deleted file mode 100644
index 7db35e22..00000000
--- a/templates/protocols/ospf/neighbor/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-tag:
-type: ipv4
-help: Neighbor IP address
-create:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"neighbor $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
-       -c \"router ospf\" \
-       -c \"no neighbor $VAR(@)\"; "
diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
deleted file mode 100644
index adabde15..00000000
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: u32
-help: Dead neighbor polling interval
-default: 60
-val_help: u32:1-65535; Seconds between dead neighbor polling interval (default 60)
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds"
-
-update: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "neighbor $VAR(../@) poll-interval $VAR(@)";
-
-delete: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "neighbor $VAR(../@) poll-interval 60";
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
deleted file mode 100644
index d9b61457..00000000
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Neighbor priority in seconds
-default: 0
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255"
-val_help: u32:0-255; Neighbor priority (default 0)
-
-update: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "neighbor $VAR(../@) priority $VAR(@)"; 
-
-delete: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "neighbor $VAR(../@) priority 0";
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
deleted file mode 100644
index 613aee78..00000000
--- a/templates/protocols/ospf/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-priority: 620
-help: Open Shortest Path First protocol (OSPF) parameters
-begin: if [ "$COMMIT_ACTION" != DELETE ]; then
-         if [ -n "$VAR(parameters/router-id/@)" ]; then
-           vtysh -c "configure terminal" -c "router ospf" \
-                 -c "ospf router-id $VAR(parameters/router-id/@)"
-         else
-           vtysh -c "configure terminal" -c "router ospf" \
-                 -c "no ospf router-id"
-         fi
-       fi
-end: if [ "$COMMIT_ACTION" == DELETE ]; then
-       vtysh -c "configure terminal" -c "router ospf" -c "no ospf router-id"
-       vtysh -c "configure terminal" -c "no router ospf"
-       rm -f /opt/vyatta/etc/quagga/ospfd.conf
-     else
-       vtysh -d ospfd -c 'sh run' > /opt/vyatta/etc/quagga/ospfd.conf
-     fi
diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def
deleted file mode 100644
index 328574e5..00000000
--- a/templates/protocols/ospf/parameters/abr-type/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: OSPF ABR type
-default: "cisco"
-syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)"
-val_help: cisco; Cisco ABR type (default)
-val_help: ibm; Ibm ABR type
-val_help: shortcut; Shortcut ABR type
-val_help: standard; Standard ABR type
-
-update: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "ospf abr-type $VAR(@)";
-
-delete: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "ospf abr-type cisco"; 
-
diff --git a/templates/protocols/ospf/parameters/node.def b/templates/protocols/ospf/parameters/node.def
deleted file mode 100644
index c8d4482b..00000000
--- a/templates/protocols/ospf/parameters/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: OSPF specific parameters
diff --git a/templates/protocols/ospf/parameters/opaque-lsa/node.def b/templates/protocols/ospf/parameters/opaque-lsa/node.def
deleted file mode 100644
index be999e27..00000000
--- a/templates/protocols/ospf/parameters/opaque-lsa/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Enable the Opaque-LSA capability (rfc2370)
-create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
-          -c \"ospf opaque-lsa \"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
-          -c \"no ospf opaque-lsa \"; "
-
diff --git a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
deleted file mode 100644
index 9de29ecf..00000000
--- a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Enable rfc1583 criteria for handling AS external routes
-create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
-          -c \"ospf rfc1583compatibility \"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
-          -c \"no ospf rfc1583compatibility \"; "
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
deleted file mode 100644
index 5f7966e6..00000000
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4
-help: Override the default router identifier
diff --git a/templates/protocols/ospf/passive-interface-exclude/node.def b/templates/protocols/ospf/passive-interface-exclude/node.def
deleted file mode 100644
index e11b8143..00000000
--- a/templates/protocols/ospf/passive-interface-exclude/node.def
+++ /dev/null
@@ -1,22 +0,0 @@
-multi:
-type: txt
-help: Interface to exclude when using 'passive-interface default'
-val_help:<interface>; Interface to exclude from 'passive-interface default'
-
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all 
-
-syntax:expression: $VAR(../passive-interface/@) == "default"; \
-  "passive-interface-excluded can only be used with 'passive-interface default'"
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn"
-
-create: if [ -z $VAR(@) ] ; then
-          echo "Error: must include interface";
-          exit 1;
-     	else  
-          vtysh -c "configure terminal" -c "router ospf" \
-             -c "no passive-interface $VAR(@)"
-	fi;
-
-delete: vtysh -c "configure terminal" -c "router ospf" \
-          -c "passive-interface $VAR(@)";
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
deleted file mode 100644
index ed5d17cb..00000000
--- a/templates/protocols/ospf/passive-interface/node.def
+++ /dev/null
@@ -1,40 +0,0 @@
-multi:
-type: txt
-help: Suppress routing updates on an interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default
-val_help:<interface>; Interface to be passive (i.e. suppress routing updates)
-val_help:default; Default to suppress routing updates on all interfaces
-
-create: sudo /opt/vyatta/sbin/vyatta_quagga_utils.pl \
-           --check-ospf-passive="$VAR(@)"
-        if [ $? != 0 ] ; then
-           exit 1;
-        fi
-        if [ -z $VAR(@) ] || [ "$VAR(@)" == "default" ] ; then
-           vtysh -c "configure terminal" \
-                 -c "router ospf"        \
-                 -c "passive-interface default";
-        else
-           vtysh -c "configure terminal" \
-                 -c "router ospf"        \
-                 -c "passive-interface $VAR(@)"
-        fi
-
-delete: if [ -z $VAR(@) ]
-	then 
-           vtysh -c "configure terminal" \
-                 -c "router ospf"        \
-                 -c "no passive-interface default"
-	else 
-           if [ "$VAR(@)" == "default" ]
-           then
-              if [ ! -z "$VAR(../passive-interface-exclude/@)" ]
-              then
-                 echo "Error: delete passive-interface-exclude before deleting passive-interface default";
-                 exit 1;
-              fi
-           fi
-           vtysh -c "configure terminal" \
-                 -c "router ospf"        \
-                 -c "no passive-interface $VAR(@)"
- 	fi
diff --git a/templates/protocols/ospf/redistribute/bgp/metric-type/node.def b/templates/protocols/ospf/redistribute/bgp/metric-type/node.def
deleted file mode 100644
index e49f528c..00000000
--- a/templates/protocols/ospf/redistribute/bgp/metric-type/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: OSPF metric type
-default: 2
-syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/bgp/metric/node.def b/templates/protocols/ospf/redistribute/bgp/metric/node.def
deleted file mode 100644
index 58fd80d7..00000000
--- a/templates/protocols/ospf/redistribute/bgp/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "metric must be between 0 and 16777214"
-val_help: u32:0-16777214; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def
deleted file mode 100644
index 3630705c..00000000
--- a/templates/protocols/ospf/redistribute/bgp/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-help: Redistribute BGP routes
-delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" 
-end: vtysh -c "configure terminal"      \
-        -c "router ospf"                                             \
-        -c "no redistribute bgp";
-     if [ -f "/tmp/ospf-redist-bgp.$PPID" ]; then
-        rm -f /tmp/ospf-redist-bgp.$PPID;
-     else
-        if [ -n "$VAR(./metric/@)" ]; then
-           COND="metric $VAR(./metric/@)";
-        fi;
-	if [ -n "$VAR(./metric-type/@)" ]; then
-	   COND="$COND metric-type $VAR(./metric-type/@)";
-        fi;
-        if [ -n "$VAR(./route-map/@)" ]; then
-           COND="$COND route-map $VAR(./route-map/@)";
-        fi;
-        vtysh -c "configure terminal" \
-           -c "router ospf"                                       \
-           -c "redistribute bgp $COND";
-     fi; 
diff --git a/templates/protocols/ospf/redistribute/bgp/route-map/node.def b/templates/protocols/ospf/redistribute/bgp/route-map/node.def
deleted file mode 100644
index a56f5668..00000000
--- a/templates/protocols/ospf/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/ospf/redistribute/connected/metric-type/node.def b/templates/protocols/ospf/redistribute/connected/metric-type/node.def
deleted file mode 100644
index e49f528c..00000000
--- a/templates/protocols/ospf/redistribute/connected/metric-type/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: OSPF metric type
-default: 2
-syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/connected/metric/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def
deleted file mode 100644
index 58fd80d7..00000000
--- a/templates/protocols/ospf/redistribute/connected/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "metric must be between 0 and 16777214"
-val_help: u32:0-16777214; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def
deleted file mode 100644
index 49944a71..00000000
--- a/templates/protocols/ospf/redistribute/connected/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-help: Redistribute connected routes
-delete:expression: "touch /tmp/ospf-redist-connected.$PPID" 
-end: vtysh -c "configure terminal"    \
-        -c "router ospf"                                          \
-        -c "no redistribute connected";
-     if [ -f "/tmp/ospf-redist-connected.$PPID" ]; then
-        rm -f /tmp/ospf-redist-connected.$PPID;
-     else
-        if [ -n "$VAR(./metric/@)" ]; then
-           COND="metric $VAR(./metric/@)";
-        fi;
-	if [ -n "$VAR(./metric-type/@)" ]; then
-	   COND="$COND metric-type $VAR(./metric-type/@)";
-        fi;
-        if [ -n "$VAR(./route-map/@)" ]; then
-           COND="$COND route-map $VAR(./route-map/@)";
-        fi;
-        vtysh -c "configure terminal" \
-           -c "router ospf"                                       \
-           -c "redistribute connected $COND";
-     fi;
diff --git a/templates/protocols/ospf/redistribute/connected/route-map/node.def b/templates/protocols/ospf/redistribute/connected/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/ospf/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/ospf/redistribute/kernel/metric-type/node.def b/templates/protocols/ospf/redistribute/kernel/metric-type/node.def
deleted file mode 100644
index e49f528c..00000000
--- a/templates/protocols/ospf/redistribute/kernel/metric-type/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: OSPF metric type
-default: 2
-syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/kernel/metric/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def
deleted file mode 100644
index 58fd80d7..00000000
--- a/templates/protocols/ospf/redistribute/kernel/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "metric must be between 0 and 16777214"
-val_help: u32:0-16777214; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def
deleted file mode 100644
index 0ad09cf5..00000000
--- a/templates/protocols/ospf/redistribute/kernel/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-help: Redistribute kernel routes
-delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" 
-end: vtysh -c "configure terminal" \
-                  -c "router ospf"        \
-                  -c "no redistribute kernel";
-     if [ -f "/tmp/ospf-redist-kernel.$PPID" ]; then
-        rm -f /tmp/ospf-redist-kernel.$PPID;
-     else
-        if [ -n "$VAR(./metric/@)" ]; then
-           COND="metric $VAR(./metric/@)";
-        fi;
-        if [ -n "$VAR(./metric-type/@)" ]; then
-	   COND="$COND metric-type $VAR(./metric-type/@)";
-        fi;
-        if [ -n "$VAR(./route-map/@)" ]; then
-           COND="$COND route-map $VAR(./route-map/@)";
-        fi;
-        vtysh -c "configure terminal" \
-                     -c "router ospf"        \
-                     -c "redistribute kernel $COND";
-     fi;
diff --git a/templates/protocols/ospf/redistribute/kernel/route-map/node.def b/templates/protocols/ospf/redistribute/kernel/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/ospf/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/ospf/redistribute/node.def b/templates/protocols/ospf/redistribute/node.def
deleted file mode 100644
index 00eefa88..00000000
--- a/templates/protocols/ospf/redistribute/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute information from another routing protocol
diff --git a/templates/protocols/ospf/redistribute/rip/metric-type/node.def b/templates/protocols/ospf/redistribute/rip/metric-type/node.def
deleted file mode 100644
index e49f528c..00000000
--- a/templates/protocols/ospf/redistribute/rip/metric-type/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: OSPF metric type
-default: 2
-syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def
deleted file mode 100644
index 58fd80d7..00000000
--- a/templates/protocols/ospf/redistribute/rip/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "metric must be between 0 and 16777214"
-val_help: u32:0-16777214; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def
deleted file mode 100644
index 0dee3c0b..00000000
--- a/templates/protocols/ospf/redistribute/rip/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-help: Redistribute RIP routes
-delete:expression: "touch /tmp/ospf-redist-rip.$PPID" 
-end: vtysh -c "configure terminal"    \
-        -c "router ospf"                                          \
-        -c "no redistribute rip";
-     if [ -f "/tmp/ospf-redist-rip.$PPID" ]; then
-        rm -f /tmp/ospf-redist-rip.$PPID;
-     else
-        if [ -n "$VAR(./metric/@)" ]; then
-           COND="metric $VAR(./metric/@)";
-        fi;
-	if [ -n "$VAR(./metric-type/@)" ]; then
-	   COND="$COND metric-type $VAR(./metric-type/@)";
-        fi;
-        if [ -n "$VAR(./route-map/@)" ]; then
-           COND="$COND route-map $VAR(./route-map/@)";
-        fi;
-        vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "redistribute rip $COND";
-     fi;
diff --git a/templates/protocols/ospf/redistribute/rip/route-map/node.def b/templates/protocols/ospf/redistribute/rip/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/ospf/redistribute/rip/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/ospf/redistribute/static/metric-type/node.def b/templates/protocols/ospf/redistribute/static/metric-type/node.def
deleted file mode 100644
index e49f528c..00000000
--- a/templates/protocols/ospf/redistribute/static/metric-type/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: OSPF metric type
-default: 2
-syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/static/metric/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def
deleted file mode 100644
index 58fd80d7..00000000
--- a/templates/protocols/ospf/redistribute/static/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "metric must be between 0 and 16777214"
-val_help: u32:0-16777214; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def
deleted file mode 100644
index 4f1cfda6..00000000
--- a/templates/protocols/ospf/redistribute/static/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-help: Redistribute static routes
-delete:expression: "touch /tmp/ospf-redist-static.$PPID" 
-end: vtysh -c "configure terminal"    \
-        -c "router ospf"                                          \
-        -c "no redistribute static";
-     if [ -f "/tmp/ospf-redist-static.$PPID" ]; then
-        rm -f /tmp/ospf-redist-static.$PPID;
-     else
-        if [ -n "$VAR(./metric/@)" ]; then
-           COND="metric $VAR(./metric/@)";
-        fi;
-	if [ -n "$VAR(./metric-type/@)" ]; then
-	   COND="$COND metric-type $VAR(./metric-type/@)";
-         fi;
-        if [ -n "$VAR(./route-map/@)" ]; then
-           COND="$COND route-map $VAR(./route-map/@)";
-        fi;
-        vtysh -c "configure terminal" \
-           -c "router ospf"                                       \
-           -c "redistribute static $COND";
-     fi;
diff --git a/templates/protocols/ospf/redistribute/static/route-map/node.def b/templates/protocols/ospf/redistribute/static/route-map/node.def
deleted file mode 100644
index f2c6f7c2..00000000
--- a/templates/protocols/ospf/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/ospf/refresh/node.def b/templates/protocols/ospf/refresh/node.def
deleted file mode 100644
index bfa1dca4..00000000
--- a/templates/protocols/ospf/refresh/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Adjust refresh parameters
diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def
deleted file mode 100644
index 3f094b4f..00000000
--- a/templates/protocols/ospf/refresh/timers/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Refresh timer
-syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800"
-val_help: u32:10-1800; Timer value in seconds
-
-update: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no refresh timer" -c "refresh timer $VAR(@)"; 
-
-delete: vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no refresh timer $VAR(@)";
diff --git a/templates/protocols/ospf/route-map/node.def b/templates/protocols/ospf/route-map/node.def
deleted file mode 100644
index dfe28c05..00000000
--- a/templates/protocols/ospf/route-map/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Filter routes installed in local route map
-allowed: local -a params
-        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
-        echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
-create:expression: "vtysh -c \"configure terminal\" -c \"ip protocol ospf route-map $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"no ip protocol ospf\" "
diff --git a/templates/protocols/ospf/timers/node.def b/templates/protocols/ospf/timers/node.def
deleted file mode 100644
index 8c4873b2..00000000
--- a/templates/protocols/ospf/timers/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Adjust routing timers
diff --git a/templates/protocols/ospf/timers/throttle/node.def b/templates/protocols/ospf/timers/throttle/node.def
deleted file mode 100644
index 0854aae8..00000000
--- a/templates/protocols/ospf/timers/throttle/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Throttling adaptive timers
diff --git a/templates/protocols/ospf/timers/throttle/spf/delay/node.def b/templates/protocols/ospf/timers/throttle/spf/delay/node.def
deleted file mode 100644
index 14189c16..00000000
--- a/templates/protocols/ospf/timers/throttle/spf/delay/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Delay (msec) from first change received till SPF calculation
-default: 200
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
-val_help: u32:0-600000; Delay in msec (default 200)
diff --git a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
deleted file mode 100644
index 1f095b95..00000000
--- a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Initial hold time(msec) between consecutive SPF calculations
-default: 1000
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
-val_help: u32:0-600000; Initial hold time in msec (default 1000)
diff --git a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
deleted file mode 100644
index fd26a404..00000000
--- a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Maximum hold time (msec)
-default: 10000
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
-val_help: u32:0-600000; Max hold time in msec (default 10000)
diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def
deleted file mode 100644
index a80e7bcc..00000000
--- a/templates/protocols/ospf/timers/throttle/spf/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-help: OSPF SPF timers
-delete: touch /tmp/ospf-timer.$PPID
-end: if [ -f "/tmp/ospf-timer.$PPID" ]; then
-        vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "no timers throttle spf";
-        rm /tmp/ospf-timer.$PPID;
-     else
-        vtysh -c "configure terminal" \
-          -c "router ospf"                                        \
-          -c "timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)";
-     fi;