convert templates to new syntax

14 files changed, 59 insertions, 59 deletions

diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def
index c78ad2fb..87eddf90 100644
--- a/templates/protocols/rip/distribute-list/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/in/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "access-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) in\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) in\" "
+help: access-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) in\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) in\" "
                      
diff --git a/templates/protocols/rip/distribute-list/access-list/node.def b/templates/protocols/rip/distribute-list/access-list/node.def
index a76ae356..dd7917a7 100644
--- a/templates/protocols/rip/distribute-list/access-list/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/node.def
@@ -1 +1 @@
-help: "Access-list"
+help: Access-list
diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def
index 96855ca4..4b7f6b85 100644
--- a/templates/protocols/rip/distribute-list/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/out/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "access-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) out\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) out\" "
+help: access-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) out\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) out\" "
 
diff --git a/templates/protocols/rip/distribute-list/interface/node.def b/templates/protocols/rip/distribute-list/interface/node.def
index ce00fdc9..70009e14 100644
--- a/templates/protocols/rip/distribute-list/interface/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.def
@@ -1,10 +1,10 @@
 tag:
 type: txt
-help: "Apply filtering to an interface"
-syntax: exec "if [ -z \"`ip addr | grep $(@) `\" ]; then                       \
-                 echo ethernet interface $(@) doesn\\'t exist on this system ; \
+help: Apply filtering to an interface
+syntax:expression: exec "if [ -z \"`ip addr | grep $VAR(@) `\" ]; then                       \
+                 echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
                  exit 1 ;                                                      \
               fi ; "
-#allowed: local -a array;
-# array=( /sys/class/net/{eth,vmnet}* ) ;
-# echo -n ${array[@]##*/}
+allowed: local -a array;
+ array=( /sys/class/net/{eth,vmnet}* ) ;
+ echo -n ${array[@]##*/}
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
index 4c0b0c1f..4b2bad82 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "access-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) in $(../../@)\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) in $(../../@)\" "
+help: access-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) in $VAR(../../@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) in $VAR(../../@)\" "
 
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
index a76ae356..dd7917a7 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
@@ -1 +1 @@
-help: "Access-list"
+help: Access-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
index a3d4477c..5362c410 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
@@ -1,7 +1,7 @@
 type: u32
-help: "access-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) out $(../../@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) out $(../../@) \" "
+help: access-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) out $VAR(../../@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) out $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
index ce3de387..2c02beba 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "prefix-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) in $(../../@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) in $(../../@) \" "
+help: prefix-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) in $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
index f30db7e7..2aa289c3 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
@@ -1 +1 @@
-help: "Prefix-list"
+help: Prefix-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
index 48a97014..bd441e02 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "prefix-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) out $(../../@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) out $(../../@)\" "
+help: prefix-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) out $VAR(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/node.def b/templates/protocols/rip/distribute-list/node.def
index 89d561fe..34c3cd35 100644
--- a/templates/protocols/rip/distribute-list/node.def
+++ b/templates/protocols/rip/distribute-list/node.def
@@ -1,2 +1,2 @@
-help: "Filter networks in routing updates"
+help: Filter networks in routing updates
 
diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
index 2a79d94e..c4966d6f 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
@@ -1,8 +1,8 @@
 type: txt
-help: "prefix-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) in\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) in\" "
+help: prefix-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) in\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) in\" "
                     
diff --git a/templates/protocols/rip/distribute-list/prefix-list/node.def b/templates/protocols/rip/distribute-list/prefix-list/node.def
index f30db7e7..2aa289c3 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/node.def
@@ -1 +1 @@
-help: "Prefix-list"
+help: Prefix-list
diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
index 78d3f8bd..b488ffdb 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "prefix-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) out\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) out\" "
+help: prefix-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) out\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) out\" "