Convert VRRP to new CLI help style

Use val_help: for help strings

34 files changed, 59 insertions, 87 deletions

diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
index 75c5447e..f392d78a 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
@@ -1,8 +1,8 @@
 tag:
 type: u32
+help: VRRP group number
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+val_help: u32:1-255; VRRP group number
+
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: 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/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index fa2dbced..b9c113cc 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,5 @@
 type: u32
 default: 1
 help: 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)
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255"
+val_help: u32:1-255; Advertise interval (default 1)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 9a671375..07a4efbd 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -5,5 +5,4 @@ syntax:expression: exec "                              \
           echo Password must be 8 characters or less ; \
           exit 1 ;                                     \
         fi ; "
-comp_help: possible completions:
- <text>             Password (8 characters or less)
+val_help: Password (8 characters or less)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index f099153f..a33aefb0 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -2,6 +2,5 @@ type: txt
 help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
-comp_help: possible completions:
-  plaintext-password            Set plain text password mode
-  ah                            Set IP Authentication Header mode
+val_help: plaintext-password; Plain text password mode
+val_help: ah; IP Authentication Header mode
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index 9e062980..d8077a51 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -2,5 +2,4 @@ type: ipv4
 
 help: Hello source address
 
-comp_help: possible completions:
-  <x.x.x.x>     Set source address for vrrp hello packets (optional)
+val_help: Source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 98cd916f..72f4c33d 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Preempt-delay
-comp_help: possible completions:
-  <0-1000>            Set Preempt Delay in seconds
+help: Preempt delay
+val_help: u32:0-1000; Preempt Delay in seconds
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 504eebc4..920c59d1 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,4 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
 help: Priority
-comp_help: possible completions:
- <1-255>            Set Priority
+val_help: u32:1-255; Priority
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
index 90f54c0e..6d195d07 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
@@ -1,2 +1,2 @@
-help: Scripts to run on VRRP state-transitions
+help: scripts to run on VRRP state-transitions
 
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index ab3d6290..28f085e5 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Virtual address
+help: Virtual address [REQUIRED]
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl        \
                            --vrrp-action='check-vip' --vip='$VAR(@)' "\
@@ -17,6 +17,5 @@ syntax:expression: exec "
     fi
   fi"
 
-comp_help: possible completions:
- <x.x.x.x>          Virtual IP address (up to 20 per group)
- <x.x.x.x/x>        Virtual IP address with prefix (up to 20 per group)
+val_help: ipv4; Virtual IP address (up to 20 per group)
+val_help: ipv4net; Virtual IP address with prefix (up to 20 per group)
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
index c0efa6f4..9c6a8b17 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
@@ -1,8 +1,8 @@
 tag:
 type: u32
+help: VRRP group number
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+val_help: u32:1-255; VRRP group number
+
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: 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/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index fa2dbced..b9c113cc 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,5 @@
 type: u32
 default: 1
 help: 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)
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255"
+val_help: u32:1-255; Advertise interval (default 1)
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 9a671375..07a4efbd 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -5,5 +5,4 @@ syntax:expression: exec "                              \
           echo Password must be 8 characters or less ; \
           exit 1 ;                                     \
         fi ; "
-comp_help: possible completions:
- <text>             Password (8 characters or less)
+val_help: Password (8 characters or less)
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 21e2e165..a33aefb0 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -2,6 +2,5 @@ type: txt
 help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
-comp_help: possible completions:
-  plaintext-password          Set plain text password mode
-  ah                          Set IP Authentication Header mode
+val_help: plaintext-password; Plain text password mode
+val_help: ah; IP Authentication Header mode
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
index a0e0c576..93e4cc3e 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
@@ -1 +1 @@
-help: Disable VRRP group
+help: VRRP group disabled
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index 9e062980..d8077a51 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -2,5 +2,4 @@ type: ipv4
 
 help: Hello source address
 
-comp_help: possible completions:
-  <x.x.x.x>     Set source address for vrrp hello packets (optional)
+val_help: Source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 98cd916f..72f4c33d 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Preempt-delay
-comp_help: possible completions:
-  <0-1000>            Set Preempt Delay in seconds
+help: Preempt delay
+val_help: u32:0-1000; Preempt Delay in seconds
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 504eebc4..920c59d1 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,4 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
 help: Priority
-comp_help: possible completions:
- <1-255>            Set Priority
+val_help: u32:1-255; Priority
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index ab3d6290..28f085e5 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Virtual address
+help: Virtual address [REQUIRED]
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl        \
                            --vrrp-action='check-vip' --vip='$VAR(@)' "\
@@ -17,6 +17,5 @@ syntax:expression: exec "
     fi
   fi"
 
-comp_help: possible completions:
- <x.x.x.x>          Virtual IP address (up to 20 per group)
- <x.x.x.x/x>        Virtual IP address with prefix (up to 20 per group)
+val_help: ipv4; Virtual IP address (up to 20 per group)
+val_help: ipv4net; Virtual IP address with prefix (up to 20 per group)
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 75c5447e..f392d78a 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
+help: VRRP group number
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+val_help: u32:1-255; VRRP group number
+
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: 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 fa2dbced..b9c113cc 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,5 @@
 type: u32
 default: 1
 help: 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)
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255"
+val_help: u32:1-255; Advertise interval (default 1)
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 9a671375..07a4efbd 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
@@ -5,5 +5,4 @@ syntax:expression: exec "                              \
           echo Password must be 8 characters or less ; \
           exit 1 ;                                     \
         fi ; "
-comp_help: possible completions:
- <text>             Password (8 characters or less)
+val_help: Password (8 characters or less)
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 f099153f..a33aefb0 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
@@ -2,6 +2,5 @@ type: txt
 help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
-comp_help: possible completions:
-  plaintext-password            Set plain text password mode
-  ah                            Set IP Authentication Header mode
+val_help: plaintext-password; Plain text password mode
+val_help: ah; IP Authentication Header mode
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index 9e062980..d8077a51 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -2,5 +2,4 @@ type: ipv4
 
 help: Hello source address
 
-comp_help: possible completions:
-  <x.x.x.x>     Set source address for vrrp hello packets (optional)
+val_help: Source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 98cd916f..72f4c33d 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Preempt-delay
-comp_help: possible completions:
-  <0-1000>            Set Preempt Delay in seconds
+help: Preempt delay
+val_help: u32:0-1000; Preempt Delay in seconds
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 504eebc4..920c59d1 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,4 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
 help: Priority
-comp_help: possible completions:
- <1-255>            Set Priority
+val_help: u32:1-255; Priority
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 617ed1f6..28f085e5 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
@@ -17,6 +17,5 @@ syntax:expression: exec "
     fi
   fi"
 
-comp_help: possible completions:
- <x.x.x.x>          Virtual IP address (up to 20 per group)
- <x.x.x.x/x>        Virtual IP address with prefix (up to 20 per group)
+val_help: ipv4; Virtual IP address (up to 20 per group)
+val_help: ipv4net; Virtual IP address with prefix (up to 20 per group)
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 c0efa6f4..9c6a8b17 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
+help: VRRP group number
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+val_help: u32:1-255; VRRP group number
+
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: 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 fa2dbced..b9c113cc 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,5 @@
 type: u32
 default: 1
 help: 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)
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255"
+val_help: u32:1-255; Advertise interval (default 1)
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 9a671375..07a4efbd 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
@@ -5,5 +5,4 @@ syntax:expression: exec "                              \
           echo Password must be 8 characters or less ; \
           exit 1 ;                                     \
         fi ; "
-comp_help: possible completions:
- <text>             Password (8 characters or less)
+val_help: Password (8 characters or less)
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 21e2e165..a33aefb0 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
@@ -2,6 +2,5 @@ type: txt
 help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
-comp_help: possible completions:
-  plaintext-password          Set plain text password mode
-  ah                          Set IP Authentication Header mode
+val_help: plaintext-password; Plain text password mode
+val_help: ah; IP Authentication Header mode
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index 9e062980..d8077a51 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -2,5 +2,4 @@ type: ipv4
 
 help: Hello source address
 
-comp_help: possible completions:
-  <x.x.x.x>     Set source address for vrrp hello packets (optional)
+val_help: Source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 2018ff44..72f4c33d 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -2,5 +2,4 @@ type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
 help: Preempt delay
-comp_help: possible completions:
-  <0-1000>            Set Preempt Delay in seconds
+val_help: u32:0-1000; Preempt Delay in seconds
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 504eebc4..920c59d1 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,4 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
 help: Priority
-comp_help: possible completions:
- <1-255>            Set Priority
+val_help: u32:1-255; Priority
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 617ed1f6..28f085e5 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
@@ -17,6 +17,5 @@ syntax:expression: exec "
     fi
   fi"
 
-comp_help: possible completions:
- <x.x.x.x>          Virtual IP address (up to 20 per group)
- <x.x.x.x/x>        Virtual IP address with prefix (up to 20 per group)
+val_help: ipv4; Virtual IP address (up to 20 per group)
+val_help: ipv4net; Virtual IP address with prefix (up to 20 per group)