convert templates to new syntax

16 files changed, 76 insertions, 76 deletions

diff --git a/templates/protocols/ospf/redistribute/bgp/metric/node.def b/templates/protocols/ospf/redistribute/bgp/metric/node.def
index 270a810e..549cfdf1 100644
--- a/templates/protocols/ospf/redistribute/bgp/metric/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/metric/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def
index f09214b7..98856c8a 100644
--- a/templates/protocols/ospf/redistribute/bgp/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute BGP routes"
-delete: "touch /tmp/ospf-redist-bgp.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+help: Redistribute BGP routes
+delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute bgp \"; \
-      if [ -f \"/tmp/ospf-redist-bgp.\\$PPID\" ]; then \
-        rm -rf /tmp/ospf-redist-bgp.\\$PPID; \
+      if [ -f \"/tmp/ospf-redist-bgp.$PPID\" ]; then \
+        rm -rf /tmp/ospf-redist-bgp.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
-          -c \"redistribute bgp \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -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
index f6e81288..a56f5668 100644
--- a/templates/protocols/ospf/redistribute/bgp/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/route-map/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+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/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def
index d7ca3c34..8234167e 100644
--- a/templates/protocols/ospf/redistribute/connected/metric/node.def
+++ b/templates/protocols/ospf/redistribute/connected/metric/node.def
@@ -1,6 +1,6 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
 
 
 
diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def
index 77d286dd..02fc58de 100644
--- a/templates/protocols/ospf/redistribute/connected/node.def
+++ b/templates/protocols/ospf/redistribute/connected/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute connected routes"
-delete: "touch /tmp/ospf-redist-connected.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+help: Redistribute connected routes
+delete:expression: "touch /tmp/ospf-redist-connected.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute connected \"; \
-      if [ -f \"/tmp/ospf-redist-connected.\\$PPID\" ]; then \
-        rm -rf /tmp/ospf-redist-connected.\\$PPID; \
+      if [ -f \"/tmp/ospf-redist-connected.$PPID\" ]; then \
+        rm -rf /tmp/ospf-redist-connected.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
-          -c \"redistribute connected \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -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
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/ospf/redistribute/connected/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/connected/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+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/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def
index 270a810e..549cfdf1 100644
--- a/templates/protocols/ospf/redistribute/kernel/metric/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/metric/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def
index f8ab05e6..d0fd8b97 100644
--- a/templates/protocols/ospf/redistribute/kernel/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute kernel routes"
-delete: "touch /tmp/ospf-redist-kernel.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+help: Redistribute kernel routes
+delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute kernel \"; \
-      if [ -f \"/tmp/ospf-redist-kernel.\\$PPID\" ]; then \
-        rm -rf /tmp/ospf-redist-kernel.\\$PPID; \
+      if [ -f \"/tmp/ospf-redist-kernel.$PPID\" ]; then \
+        rm -rf /tmp/ospf-redist-kernel.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
-          -c \"redistribute kernel \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -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
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/ospf/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+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
index e46c9122..00eefa88 100644
--- a/templates/protocols/ospf/redistribute/node.def
+++ b/templates/protocols/ospf/redistribute/node.def
@@ -1 +1 @@
-help: "Redistribute information from another routing protocol"
+help: Redistribute information from another routing protocol
diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def
index 01a2dda7..80d13b5e 100644
--- a/templates/protocols/ospf/redistribute/rip/metric/node.def
+++ b/templates/protocols/ospf/redistribute/rip/metric/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
 
diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def
index fdf4ea4a..d78ad9e8 100644
--- a/templates/protocols/ospf/redistribute/rip/node.def
+++ b/templates/protocols/ospf/redistribute/rip/node.def
@@ -1,17 +1,17 @@
-help: "Redistribute RIP routes"
-delete: "touch /tmp/ospf-redist-rip.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+help: Redistribute RIP routes
+delete:expression: "touch /tmp/ospf-redist-rip.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute rip \"; \
-      if [ -f \"/tmp/ospf-redist-rip.\\$PPID\" ]; then \
-        rm -rf /tmp/ospf-redist-rip.\\$PPID; \
+      if [ -f \"/tmp/ospf-redist-rip.$PPID\" ]; then \
+        rm -rf /tmp/ospf-redist-rip.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
-          -c \"redistribute rip \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -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
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/ospf/redistribute/rip/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/rip/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+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/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def
index 270a810e..549cfdf1 100644
--- a/templates/protocols/ospf/redistribute/static/metric/node.def
+++ b/templates/protocols/ospf/redistribute/static/metric/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def
index ee9f387b..318c0fed 100644
--- a/templates/protocols/ospf/redistribute/static/node.def
+++ b/templates/protocols/ospf/redistribute/static/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute static routes"
-delete: "touch /tmp/ospf-redist-static.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+help: Redistribute static routes
+delete:expression: "touch /tmp/ospf-redist-static.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute static \"; \
-      if [ -f \"/tmp/ospf-redist-static.\\$PPID\" ]; then \
-        rm -rf /tmp/ospf-redist-static.\\$PPID; \
+      if [ -f \"/tmp/ospf-redist-static.$PPID\" ]; then \
+        rm -rf /tmp/ospf-redist-static.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
-          -c \"redistribute static \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -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
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/ospf/redistribute/static/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/static/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+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"