convert templates to new syntax

32 files changed, 104 insertions, 104 deletions

diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
index f6ca51e4..9a071930 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
@@ -1,12 +1,12 @@
 type: txt
-help: "Add this interface to a bridge-group"
-syntax: exec " \
-        if [ -z \"`sudo brctl show | grep $(@) `\" ]; then \
-          echo bridge interface $(@) doesn\\'t exist on this system ; \
+help: Add this interface to a bridge-group
+syntax:expression: exec " \
+        if [ -z \"`sudo brctl show | grep $VAR(@) `\" ]; then \
+          echo bridge interface $VAR(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-update: "sudo brctl addif $(@) $(../../@)"
-delete: "sudo brctl delif $(@) $(../../@)"
-#allowed: local -a array ;
-# array=( /sys/class/net/br* ) ;
-# echo -n ${array[@]##*/}
+update:expression: "sudo brctl addif $VAR(@) $VAR(../../@)"
+delete:expression: "sudo brctl delif $VAR(@) $VAR(../../@)"
+allowed: local -a array ;
+ array=( /sys/class/net/br* ) ;
+ echo -n ${array[@]##*/}
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
index 1c2bbde1..f3ae520f 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Set the path cost for this port"
-commit: $(../bridge/) != ""; "Must configure bridge interface"
-update: "sudo brctl setpathcost $(../../@) $(@)"
+help: Set the path cost for this port
+commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface"
+update:expression: "sudo brctl setpathcost $VAR(../../@) $VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/node.def
index b76b5d71..fd392431 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/node.def
@@ -1,2 +1,2 @@
-help: "Add this interface to a bridge group"
-commit: $(./bridge/) != ""; "Must set the bridge interface"
+help: Add this interface to a bridge group
+commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface"
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
index d254b082..12200b72 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Set the path priority for this port"
-commit: $(../bridge/) != ""; "Must configure bridge interface"
-update: "sudo brctl setportprio $(../../@) $(@)"
+help: Set the path priority for this port
+commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface"
+update:expression: "sudo brctl setportprio $VAR(../../@) $VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
index d655f6bc..fffa0eeb 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
@@ -1,12 +1,12 @@
 type: txt
-help: "Add this interface to a bridge-group"
-syntax: exec " \
-        if [ -z \"`sudo brctl show | grep $(@) `\" ]; then \
-          echo bridge interface $(@) doesn\\'t exist on this system ; \
+help: Add this interface to a bridge-group
+syntax:expression: exec " \
+        if [ -z \"`sudo brctl show | grep $VAR(@) `\" ]; then \
+          echo bridge interface $VAR(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-update: "sudo brctl addif $(@) $(../../../../@).$(../../@)"
-delete: "sudo brctl delif $(@) $(../../../../@).$(../../@)"
-#allowed: local -a array ;
-# array=( /sys/class/net/br* ) ;
-# echo -n ${array[@]##*/}
+update:expression: "sudo brctl addif $VAR(@) $VAR(../../../../@).$VAR(../../@)"
+delete:expression: "sudo brctl delif $VAR(@) $VAR(../../../../@).$VAR(../../@)"
+allowed: local -a array ;
+ array=( /sys/class/net/br* ) ;
+ echo -n ${array[@]##*/}
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
index 1c2bbde1..f3ae520f 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Set the path cost for this port"
-commit: $(../bridge/) != ""; "Must configure bridge interface"
-update: "sudo brctl setpathcost $(../../@) $(@)"
+help: Set the path cost for this port
+commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface"
+update:expression: "sudo brctl setpathcost $VAR(../../@) $VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
index b76b5d71..fd392431 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
@@ -1,2 +1,2 @@
-help: "Add this interface to a bridge group"
-commit: $(./bridge/) != ""; "Must set the bridge interface"
+help: Add this interface to a bridge group
+commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
index d254b082..12200b72 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Set the path priority for this port"
-commit: $(../bridge/) != ""; "Must configure bridge interface"
-update: "sudo brctl setportprio $(../../@) $(@)"
+help: Set the path priority for this port
+commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface"
+update:expression: "sudo brctl setportprio $VAR(../../@) $VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def
index b21963c6..e4892540 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def
@@ -1,3 +1,3 @@
-help: "Configure VRRP"
-commit: $(../address/) != ""; "Must define a primary IP address on $(../../@) vif $(../@)"
-end: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $(../../@).$(../@) "
+help: Configure VRRP
+commit:expression: $VAR(../address/) != ""; "Must define a primary IP address on $VAR(../../@) vif $VAR(../@)"
+end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../../@).$VAR(../@) "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
index e3e0b083..d59bf682 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
@@ -1,8 +1,8 @@
 tag:
 type: u32
-syntax: $(@) >= 0 && $(@) <= 255; "VRRP group must be between 1-255"
-commit: $(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $(@)"
-help: "Configure VRRP group number"
-delete: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $(../../../@).$(../../@) --group $(@) "
-#comp_help: possible completions
-# <1-255>            VRRP group number
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
+help: Configure VRRP group number
+delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) "
+comp_help: possible completions
+ <1-255>            VRRP group number
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index 12c9f0f4..f033aa5d 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 1
-help: "Configure advertise interval"
-syntax: $(@) >= 1 && $(@) <=255; "Advertise interval must be between 1-255"
-#comp_help: possible completions
-# <1-255>            Set advertise interval (default 1)
+help: Configure advertise interval
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255"
+comp_help: possible completions
+ <1-255>            Set advertise interval (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
index e3120d51..8e924a0e 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
@@ -1,3 +1,3 @@
-help: "Configure authentication"
-commit: $(./type/@) != ""; "You must set a authentication type"
-commit: $(./password/@) != ""; "You must set a authentication password"
+help: Configure authentication
+commit:expression: $VAR(./type/@) != ""; "You must set a authentication type"
+commit:expression: $VAR(./password/@) != ""; "You must set a authentication password"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 87855962..412d8274 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Password text"
+help: Password text
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 9f624356..33fbdae9 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,6 +1,6 @@
 type: txt
-help: "Authentication type"
-syntax: $(@) in "simple", "AH", "ah"; "authentication must be simple or AH"
-#comp_help: possible completions:
-# simple             Set simple password mode
-# AH                 Set IP Authentication Header mode
+help: Authentication type
+syntax:expression: $VAR(@) in "simple", "AH", "ah"; "authentication must be simple or AH"
+comp_help: possible completions:
+ simple             Set simple password mode
+ AH                 Set IP Authentication Header mode
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
index d457185a..835ad401 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Description for this interface"
+help: Description for this interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def
index a4f3c074..95761590 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def
@@ -1 +1 @@
-help: "VRRP configuration for this VRRP group"
+help: VRRP configuration for this VRRP group
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
index a0b0efa2..c3dc66cd 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "Preempt mode"
+help: Preempt mode
 default: "true"
-syntax: $(@) in "true", "false"; "preempt must be true or false"
-#comp_help: possible completions:
-# true (default)
-# false
+syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false"
+comp_help: possible completions:
+ true (default)
+ false
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 413bba15..504eebc4 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
-syntax: $(@) >= 0 &&$(@) <= 255; "priority must be between 1-255"
-help: "Priority"
-#comp_help: possible completions:
-# <1-255>            Set Priority
+syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
+help: Priority
+comp_help: possible completions:
+ <1-255>            Set Priority
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
index 5fa24b92..a7d2e1fd 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Add this vrrp group to a sync group"
+help: Add this vrrp group to a sync group
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index bcf9392f..516d6add 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,3 +1,3 @@
 multi:
 type: ipv4
-help: "Configure virtual address"
+help: Configure virtual address
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def
index 2c8cc58a..05cfb986 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/node.def
@@ -1,3 +1,3 @@
-help: "Configure VRRP"
-commit: $(../address/) != ""; "Must define a primary IP address on $(../@)"
-end: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $(../@) "
+help: Configure VRRP
+commit:expression: $VAR(../address/) != ""; "Must define a primary IP address on $VAR(../@)"
+end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) "
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def
index a61a022f..90bf0d5c 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def
@@ -1,8 +1,8 @@
 tag:
 type: u32
-syntax: $(@) >= 0 && $(@) <= 255; "VRRP group must be between 1-255"
-commit: $(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $(@)"
-help: "Configure VRRP group number"
-delete: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $(../../@) --group $(@) "
-#comp_help: possible completions
-# <1-255>            VRRP group number
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
+help: Configure VRRP group number
+delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) "
+comp_help: possible completions
+ <1-255>            VRRP group number
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index 12c9f0f4..f033aa5d 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 1
-help: "Configure advertise interval"
-syntax: $(@) >= 1 && $(@) <=255; "Advertise interval must be between 1-255"
-#comp_help: possible completions
-# <1-255>            Set advertise interval (default 1)
+help: Configure advertise interval
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255"
+comp_help: possible completions
+ <1-255>            Set advertise interval (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
index e3120d51..8e924a0e 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
@@ -1,3 +1,3 @@
-help: "Configure authentication"
-commit: $(./type/@) != ""; "You must set a authentication type"
-commit: $(./password/@) != ""; "You must set a authentication password"
+help: Configure authentication
+commit:expression: $VAR(./type/@) != ""; "You must set a authentication type"
+commit:expression: $VAR(./password/@) != ""; "You must set a authentication password"
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 87855962..412d8274 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Password text"
+help: Password text
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 9f624356..33fbdae9 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,6 +1,6 @@
 type: txt
-help: "Authentication type"
-syntax: $(@) in "simple", "AH", "ah"; "authentication must be simple or AH"
-#comp_help: possible completions:
-# simple             Set simple password mode
-# AH                 Set IP Authentication Header mode
+help: Authentication type
+syntax:expression: $VAR(@) in "simple", "AH", "ah"; "authentication must be simple or AH"
+comp_help: possible completions:
+ simple             Set simple password mode
+ AH                 Set IP Authentication Header mode
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def
index d457185a..835ad401 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Description for this interface"
+help: Description for this interface
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def
index a4f3c074..95761590 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def
@@ -1 +1 @@
-help: "VRRP configuration for this VRRP group"
+help: VRRP configuration for this VRRP group
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
index a0b0efa2..c3dc66cd 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "Preempt mode"
+help: Preempt mode
 default: "true"
-syntax: $(@) in "true", "false"; "preempt must be true or false"
-#comp_help: possible completions:
-# true (default)
-# false
+syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false"
+comp_help: possible completions:
+ true (default)
+ false
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 413bba15..504eebc4 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
-syntax: $(@) >= 0 &&$(@) <= 255; "priority must be between 1-255"
-help: "Priority"
-#comp_help: possible completions:
-# <1-255>            Set Priority
+syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
+help: Priority
+comp_help: possible completions:
+ <1-255>            Set Priority
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
index 5fa24b92..a7d2e1fd 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Add this vrrp group to a sync group"
+help: Add this vrrp group to a sync group
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index bcf9392f..516d6add 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,3 +1,3 @@
 multi:
 type: ipv4
-help: "Configure virtual address"
+help: Configure virtual address