Convert tunnel parameters to new help format

6 files changed, 12 insertions, 19 deletions

diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def
index 747347b3..f9c5bd74 100644
--- a/templates/interfaces/tunnel/node.tag/address/node.def
+++ b/templates/interfaces/tunnel/node.tag/address/node.def
@@ -1,5 +1,5 @@
 multi:
-type: txt
+type: ipv4net,ipv6net
 help: IP address
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
@@ -8,6 +8,3 @@ create:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update
 
 delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)"
 
-comp_help:Possible completions:
-  <x.x.x.x/x>           Set the IP address and prefix length
-  <h:h:h:h:h:h:h:h/x>   Set the IPv6 address and prefix length
diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
index 50480b93..79c57310 100644
--- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def
+++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
@@ -7,9 +7,8 @@ create:expression: "true"
 update:expression: "false" ; \
                "Encapsulation can only be set at tunnel creation for $VAR(../@)"
 
-comp_help: possible completions:
- gre                 Set Generic Routing Encapsulation
- gre-bridge          Set Generic Routing Encapsulation bridge interface
- ipip                Set IP in IP encapsulation
- sit                 Set Simple Internet Transition encapsulation
+val_help:gre:Generic Routing Encapsulation
+val_help:gre-bridge:Generic Routing Encapsulation bridge interface
+val_help:ipip:IP in IP encapsulation
+val_help:sit:Simple Internet Transition encapsulation
 
diff --git a/templates/interfaces/tunnel/node.tag/key/node.def b/templates/interfaces/tunnel/node.tag/key/node.def
index 2362423f..e873765f 100644
--- a/templates/interfaces/tunnel/node.tag/key/node.def
+++ b/templates/interfaces/tunnel/node.tag/key/node.def
@@ -15,5 +15,4 @@ create:expression: "true"
 update:expression: "false" ; \
                    "Key can only be set at tunnel creation for $VAR(../@)"
 
-comp_help: possible completions
- <0-999999>         Set a tunnel key
+val_help:<0-999999>:Tunnel key
diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def
index dbe117de..8fd45da6 100644
--- a/templates/interfaces/tunnel/node.tag/multicast/node.def
+++ b/templates/interfaces/tunnel/node.tag/multicast/node.def
@@ -1,6 +1,8 @@
 type: txt
 help: Multicast operation over tunnel
 default: "disable"
+val_help:enable:Enable Multicast
+val_help:disable:Disable Multicast (default)
 
 syntax:expression: $VAR(@) in "enable", "disable"; \
                    "Must be 'disable' or 'enable'"
@@ -8,7 +10,3 @@ syntax:expression: $VAR(@) in "enable", "disable"; \
 create:expression: "true"
 update:expression: "false" ; \
                    "Multicast should be set at tunnel creation for $VAR(../@)"
-
-comp_help: "possible completions:
-  enable            Enable Multicast
-  disable           Disable Multicast (default)
diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def
index d276319b..8a78875c 100644
--- a/templates/interfaces/tunnel/node.tag/tos/node.def
+++ b/templates/interfaces/tunnel/node.tag/tos/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: Type of Service (TOS)
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99"
+val_help:<0-99>:Type Of Service (TOS)
+
 update: ip tunnel change $VAR(../@) tos $VAR(@)
 delete: ip tunnel change $VAR(../@) tos inherit
-comp_help: possible completions
- <0-99>             Set type of service
diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def
index 6e5f5f4f..bad9e027 100644
--- a/templates/interfaces/tunnel/node.tag/ttl/node.def
+++ b/templates/interfaces/tunnel/node.tag/ttl/node.def
@@ -1,8 +1,8 @@
 type: u32
 default: 255
 help: Time to live field
-comp_help: possible completions:
- <0-255>            Set time to live (default 255)
+val_help:<0-255>:Time to live (default 255)
+
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
 update:if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then sudo ip tunnel change $VAR(../@) ttl $VAR(@); fi;
 delete:if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then sudo ip tunnel change $VAR(../@) ttl inherit; fi;