convert templates to new syntax

15 files changed, 47 insertions, 47 deletions

diff --git a/templates/policy/access-list/node.def b/templates/policy/access-list/node.def
index 41327e16..a6f1b05a 100644
--- a/templates/policy/access-list/node.def
+++ b/templates/policy/access-list/node.def
@@ -1,14 +1,14 @@
 tag:
 type: u32
-help: "Access list number must be \n \
-  <1-99>       IP standard access list \n \
-  <100-199>    IP extended access list \n \
-  <1300-1999>  IP standard access list (expanded range) \n \
-  <2000-2699>  IP extended access list (expanded range) \n "
-syntax: ($(@) >= 1 && $(@) <= 199) || ($(@) >= 1300 && $(@) <= 2699); \
+help: Access list number must be
+  <1-99>       IP standard access list
+  <100-199>    IP extended access list
+  <1300-1999>  IP standard access list (expanded range)
+  <2000-2699>  IP extended access list (expanded range)
+syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 199) || ($VAR(@) >= 1300 && $VAR(@) <= 2699); \
 "Access list number must be \n \
   <1-99>       IP standard access list \n \
   <100-199>    IP extended access list \n \
   <1300-1999>  IP standard access list (expanded range) \n \
   <2000-2699>  IP extended access list (expanded range) \n "
-end: "/opt/vyatta/sbin/vyatta-policy.pl --update-access-list $(@)"
+end:expression: "/opt/vyatta/sbin/vyatta-policy.pl --update-access-list $VAR(@)"
diff --git a/templates/policy/access-list/node.tag/description/node.def b/templates/policy/access-list/node.tag/description/node.def
index 7b754982..1f2b8525 100644
--- a/templates/policy/access-list/node.tag/description/node.def
+++ b/templates/policy/access-list/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Access list description"
+help: Access list description
diff --git a/templates/policy/access-list/node.tag/rule/node.def b/templates/policy/access-list/node.tag/rule/node.def
index fb9ca24a..b33229bb 100644
--- a/templates/policy/access-list/node.tag/rule/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.def
@@ -1,4 +1,4 @@
 tag:
 type: u32
-help: "Specify access-list rule number"
-syntax: $(@) >= 1 && $(@) <= 65535; "rule number must be between 1 and 65535"
+help: Specify access-list rule number
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/action/node.def b/templates/policy/access-list/node.tag/rule/node.tag/action/node.def
index 418a9fa7..735e0a77 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/action/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/action/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Action to take on packets matching this rule"
-syntax: $(@) in "permit", "deny"; "must be permit or deny"
+help: Action to take on packets matching this rule
+syntax:expression: $VAR(@) in "permit", "deny"; "must be permit or deny"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/description/node.def b/templates/policy/access-list/node.tag/rule/node.tag/description/node.def
index 00fed102..b8e3095b 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/description/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Description for this rule"
+help: Description for this rule
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def
index 96ab32c9..d00ecfc3 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def
@@ -1,7 +1,7 @@
-help: "Filter any IP address"
-syntax: ($(../../../@) >= 100 && $(../../../@) <= 199) || ($(../../../@) >= 2000 && $(../../../@) <= 2699); " \
+help: Filter any IP address
+syntax:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); " \
 To set destination filter parameters, the access-list number must be \n \
   <100-199>    IP extended access list \n \
   <2000-2699>  IP extended access list (expanded range) \n"
-commit: $(../../action/) != ""; "You must specify an action before committing"
-commit: ($(../host/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
+commit:expression: ($VAR(../host/) == "") && ($VAR(../network/) == ""); "You may only define one filter type. (host|network|any)"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def
index c4fad7cf..e89026c7 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def
@@ -1,8 +1,8 @@
 type: ipv4
-help: "Filter a host IP address"
-syntax: ($(../../../@) >= 100 && $(../../../@) <= 199) || ($(../../../@) >= 2000 && $(../../../@) <= 2699); " \
+help: Filter a host IP address
+syntax:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
   <100-199>    IP extended access list \n \
   <2000-2699>  IP extended access list (expanded range) \n" 
-commit: ($(../any/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)"
-commit: $(../../action/) != ""; "You must specify an action before committing"
+commit:expression: ($VAR(../any/) == "") && ($VAR(../network/) == ""); "You may only define one filter type. (host|network|any)"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def
index 004d7283..7dea1a34 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def
@@ -1,9 +1,9 @@
 type: ipv4
-help: "Filter a network IP netmask"
-syntax: ($(../../../@) >= 100 && $(../../../@) <= 199) || ($(../../../@) >= 2000 && $(../../../@) <= 2699); " \
+help: Filter a network IP netmask
+syntax:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
   <100-199>    IP extended access list \n \
   <2000-2699>  IP extended access list (expanded range) \n"
-commit: $(../network/) != ""; "You must specify a network before committing"
-commit: $(../../action/) != ""; "You must specify an action before committing"
-commit: ($(../any/) == "") && ($(../host/) == ""); "You may only define one filter type. (host|network|any)"
+commit:expression: $VAR(../network/) != ""; "You must specify a network before committing"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
+commit:expression: ($VAR(../any/) == "") && ($VAR(../host/) == ""); "You may only define one filter type. (host|network|any)"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
index 8c6be0ef..9be5cd97 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
@@ -1,9 +1,9 @@
 type: ipv4
-help: "Filter a network IP address"
-syntax: ($(../../../@) >= 100 && $(../../../@) <= 199) || ($(../../../@) >= 2000 && $(../../../@) <= 2699); " \
+help: Filter a network IP address
+syntax:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
   <100-199>    IP extended access list \n \
   <2000-2699>  IP extended access list (expanded range) \n"
-commit: $(../inverse-mask/) != ""; "You must specify an inverse-mask before committing"
-commit: $(../../action/) != ""; "You must specify an action before committing"
-commit: ($(../host/) == "") && ($(../any/) == ""); "You may only define one filter type (host|network|any)"
+commit:expression: $VAR(../inverse-mask/) != ""; "You must specify an inverse-mask before committing"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
+commit:expression: ($VAR(../host/) == "") && ($VAR(../any/) == ""); "You may only define one filter type (host|network|any)"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def
index ef0ce540..aaf2e4b4 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def
@@ -1 +1 @@
-help: "Define a destination address or network filter"
+help: Define a destination address or network filter
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def
index 09a4a0cc..74b4a53c 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def
@@ -1,3 +1,3 @@
-help: "Filter any IP address"
-commit: ($(../host/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)"
-commit: $(../../action/) != ""; "You must specify an action before committing"
+help: Filter any IP address
+commit:expression: ($VAR(../host/) == "") && ($VAR(../network/) == ""); "You may only define one filter type. (host|network|any)"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def
index f835f45d..dcc0d026 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def
@@ -1,4 +1,4 @@
 type: ipv4
-help: "Filter a host IP address"
-commit: ($(../any/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)"
-commit: $(../../action/) != ""; "You must specify an action before committing"
+help: Filter a host IP address
+commit:expression: ($VAR(../any/) == "") && ($VAR(../network/) == ""); "You may only define one filter type. (host|network|any)"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def
index 2f068156..8002a86a 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def
@@ -1,5 +1,5 @@
 type: ipv4
-help: "Filter a network IP netmask"
-commit: ($(../any/) == "") && ($(../host/) == ""); "You may only define one filter type. (host|network|any)"
-commit: $(../network/) != ""; "You must specify a network before committing"
-commit: $(../../action/) != ""; "You must specify an action before committing"
+help: Filter a network IP netmask
+commit:expression: ($VAR(../any/) == "") && ($VAR(../host/) == ""); "You may only define one filter type. (host|network|any)"
+commit:expression: $VAR(../network/) != ""; "You must specify a network before committing"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
index 55a0a725..f5f1e3eb 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
@@ -1,5 +1,5 @@
 type: ipv4
-help: "Filter a network IP address"
-commit: ($(../host/) == "") && ($(../any/) == ""); "You may only define one filter type (host|network|any)"
-commit: $(../inverse-mask/) != ""; "You must specify an inverse-mask before committing"
-commit: $(../../action/) != ""; "You must specify an action before committing"
+help: Filter a network IP address
+commit:expression: ($VAR(../host/) == "") && ($VAR(../any/) == ""); "You may only define one filter type (host|network|any)"
+commit:expression: $VAR(../inverse-mask/) != ""; "You must specify an inverse-mask before committing"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action before committing"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/node.def
index aba17030..6c77723e 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/node.def
@@ -1 +1 @@
-help: "Define a source address or network filter"
+help: Define a source address or network filter