convert templates to new syntax

15 files changed, 58 insertions, 58 deletions

diff --git a/templates/protocols/static/interface-route/node.def b/templates/protocols/static/interface-route/node.def
index 035417e3..56992140 100644
--- a/templates/protocols/static/interface-route/node.def
+++ b/templates/protocols/static/interface-route/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv4net
-help: "Configure an interface-based static route"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
+help: Configure an interface-based static route
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
index 938aea1a..ac8083af 100644
--- a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
+++ b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
+help: Distance value for this route
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
+comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
index 5bfab1a8..d8e65ef4 100644
--- a/templates/protocols/static/interface-route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
@@ -1,11 +1,11 @@
-help: "Silently discard pkts when matched"
-delete: "touch /tmp/static.\\$PPID"
-end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $(../@) null0\" ; \
-         rm /tmp/static.\\$PPID; \
+help: Silently discard pkts when matched
+delete:expression: "touch /tmp/static.$PPID"
+end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) null0\" ; \
+         rm /tmp/static.$PPID; \
       else \
-         if [ -n \"$(./distance/@)\" ]; then \
-	    DIST=\"$(./distance/@)\"; \
+         if [ -n \"$VAR(./distance/@)\" ]; then \
+	    DIST=\"$VAR(./distance/@)\"; \
          fi; \	       
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $(../@) null0 \\$DIST \" ; \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $VAR(../@) null0 $DIST \" ; \
       fi; "
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index f39457b7..6f3b606a 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -1,19 +1,19 @@
 tag:
 type: txt
-help: "Configure the next-hop interface"
-syntax: exec " \
-        if [ -z \"`ip addr | grep $(@) `\" ]; then \
-          echo ethernet interface $(@) doesn\\'t exist on this system ; \
+help: Configure the next-hop interface
+syntax:expression: exec " \
+        if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
+          echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-delete: "touch /tmp/static.\\$PPID"
-end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $(../@) $(@)\" ; \
-         rm /tmp/static.\\$PPID; \
+delete:expression: "touch /tmp/static.$PPID"
+end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) $VAR(@)\" ; \
+         rm /tmp/static.$PPID; \
       else \
-         if [ -n \"$(./distance/@)\" ]; then \
-	    DIST=\"$(./distance/@)\"; \
+         if [ -n \"$VAR(./distance/@)\" ]; then \
+	    DIST=\"$VAR(./distance/@)\"; \
          fi; \	       
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $(../@) $(@) \\$DIST \" ; \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $VAR(../@) $VAR(@) $DIST \" ; \
       fi; "
 
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
index 938aea1a..ac8083af 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
+help: Distance value for this route
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
+comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def
index f02c8e46..0422e89c 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def
@@ -1 +1 @@
-help: "Enter next-hop interface"
+help: Enter next-hop interface
diff --git a/templates/protocols/static/interface-route/node.tag/node.def b/templates/protocols/static/interface-route/node.tag/node.def
index 40651f1a..e6893719 100644
--- a/templates/protocols/static/interface-route/node.tag/node.def
+++ b/templates/protocols/static/interface-route/node.tag/node.def
@@ -1,2 +1,2 @@
-help: "IP network"
-commit: $(./next-hop-interface/) != "" || $(./blackhole/) != ""; "Must add either a next-hop-interface or blackhole for route $(@)"
+help: IP network
+commit:expression: $VAR(./next-hop-interface/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop-interface or blackhole for route $VAR(@)"
diff --git a/templates/protocols/static/node.def b/templates/protocols/static/node.def
index 6c673799..0cb6cd0c 100644
--- a/templates/protocols/static/node.def
+++ b/templates/protocols/static/node.def
@@ -1,3 +1,3 @@
-help: "Static route configuration"
+help: Static route configuration
 
 
diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def
index 63e2c6c7..be26c621 100644
--- a/templates/protocols/static/route/node.def
+++ b/templates/protocols/static/route/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv4net
-help: "Configure a static route"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
+help: Configure a static route
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
diff --git a/templates/protocols/static/route/node.tag/blackhole/distance/node.def b/templates/protocols/static/route/node.tag/blackhole/distance/node.def
index 938aea1a..ac8083af 100644
--- a/templates/protocols/static/route/node.tag/blackhole/distance/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/distance/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
+help: Distance value for this route
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
+comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index 5bfab1a8..d8e65ef4 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -1,11 +1,11 @@
-help: "Silently discard pkts when matched"
-delete: "touch /tmp/static.\\$PPID"
-end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $(../@) null0\" ; \
-         rm /tmp/static.\\$PPID; \
+help: Silently discard pkts when matched
+delete:expression: "touch /tmp/static.$PPID"
+end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) null0\" ; \
+         rm /tmp/static.$PPID; \
       else \
-         if [ -n \"$(./distance/@)\" ]; then \
-	    DIST=\"$(./distance/@)\"; \
+         if [ -n \"$VAR(./distance/@)\" ]; then \
+	    DIST=\"$VAR(./distance/@)\"; \
          fi; \	       
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $(../@) null0 \\$DIST \" ; \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $VAR(../@) null0 $DIST \" ; \
       fi; "
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index 7d02f9d6..1540a0b4 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -1,13 +1,13 @@
 tag:
 type: ipv4
-help: "Configure the next-hop router"
-delete: "touch /tmp/static.\\$PPID"
-end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $(../@) $(@)\" ; \
-         rm /tmp/static.\\$PPID; \
+help: Configure the next-hop router
+delete:expression: "touch /tmp/static.$PPID"
+end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) $VAR(@)\" ; \
+         rm /tmp/static.$PPID; \
       else \
-         if [ -n \"$(./distance/@)\" ]; then \
-	    DIST=\"$(./distance/@)\"; \
+         if [ -n \"$VAR(./distance/@)\" ]; then \
+	    DIST=\"$VAR(./distance/@)\"; \
          fi; \	       
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $(../@) $(@) \\$DIST \" ; \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $VAR(../@) $VAR(@) $DIST \" ; \
       fi; "
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def b/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
index 938aea1a..ac8083af 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
+help: Distance value for this route
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
+comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def b/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def
index 45bb111e..7a5e624b 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def
@@ -1,2 +1,2 @@
-help: "Enter next-hop router"
+help: Enter next-hop router
 
diff --git a/templates/protocols/static/route/node.tag/node.def b/templates/protocols/static/route/node.tag/node.def
index 56b1f7c8..ce1324d8 100644
--- a/templates/protocols/static/route/node.tag/node.def
+++ b/templates/protocols/static/route/node.tag/node.def
@@ -1,3 +1,3 @@
-help: "IP network"
-commit: $(./next-hop/) != "" || $(./blackhole/) != ""; "Must add either a next-hop or blackhole for route $(@)"
+help: IP network
+commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop or blackhole for route $VAR(@)"