summaryrefslogtreecommitdiff
path: root/templates/interfaces/tunnel
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-19 12:22:23 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-19 12:22:23 -0700
commitbf7375668f33050a9b642e54a0266982ef579137 (patch)
tree22fc28c11f252c8c278c5f1e5675f07c2c974f85 /templates/interfaces/tunnel
parentc7779f898380ed23f839ebad6ac79edba4d46b35 (diff)
downloadvyatta-cfg-quagga-bf7375668f33050a9b642e54a0266982ef579137.tar.gz
vyatta-cfg-quagga-bf7375668f33050a9b642e54a0266982ef579137.zip
Use val_help: features to format better
Previous change did not format val-help tag correctly
Diffstat (limited to 'templates/interfaces/tunnel')
-rw-r--r--templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/encapsulation/node.def8
-rw-r--r--templates/interfaces/tunnel/node.tag/key/node.def4
-rw-r--r--templates/interfaces/tunnel/node.tag/mtu/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/multicast/node.def4
-rw-r--r--templates/interfaces/tunnel/node.tag/tos/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/ttl/node.def2
8 files changed, 13 insertions, 13 deletions
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
index f25a36ac..243747b9 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
type: u32
help: Path cost for this port
syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help:<1-65535>; Path cost value for Spanning Tree Protocol
+val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
index 38c11131..abda5971 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
type: u32
help: Port priority for this port
syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
-val_help:<1-255>; Bridge port priority
+val_help: u32:1-255; Bridge port priority
diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
index 79c57310..edbc3ae1 100644
--- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def
+++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
@@ -7,8 +7,8 @@ create:expression: "true"
update:expression: "false" ; \
"Encapsulation can only be set at tunnel creation for $VAR(../@)"
-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
+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 e873765f..3f4cea4e 100644
--- a/templates/interfaces/tunnel/node.tag/key/node.def
+++ b/templates/interfaces/tunnel/node.tag/key/node.def
@@ -2,6 +2,8 @@ type: u32
help: Tunnel key
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 999999; \
"Must be between 0-999999 for $VAR(../@)"
+val_help: u32:0-999999; Tunnel key
+
syntax:expression: exec " \
if [ -n \"`ip tunnel show $VAR(../@) | grep $VAR(../@) `\" ]; then \
echo Key can only be set at tunnel creation for $VAR(../@); \
@@ -14,5 +16,3 @@ commit:expression: $VAR(../encapsulation/@) in "gre" ; \
create:expression: "true"
update:expression: "false" ; \
"Key can only be set at tunnel creation for $VAR(../@)"
-
-val_help:<0-999999>:Tunnel key
diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def
index 1fcd3467..67594bc3 100644
--- a/templates/interfaces/tunnel/node.tag/mtu/node.def
+++ b/templates/interfaces/tunnel/node.tag/mtu/node.def
@@ -1,7 +1,7 @@
type: u32
help: Maximum Transmission Unit (MTU)
syntax:expression: $VAR(@) >= 64 && $VAR(@) <= 8024; "Must be between 64-8024"
-val_help:<64-8024>:Maximum Transmission Unit (MTU)
+val_help: u32:64-8024; Maximum Transmission Unit (MTU)
update: ip link set $VAR(../@) mtu $VAR(@)
delete: ip link set $VAR(../@) mtu 1476
diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def
index 8fd45da6..911a4e88 100644
--- a/templates/interfaces/tunnel/node.tag/multicast/node.def
+++ b/templates/interfaces/tunnel/node.tag/multicast/node.def
@@ -1,8 +1,8 @@
type: txt
help: Multicast operation over tunnel
default: "disable"
-val_help:enable:Enable Multicast
-val_help:disable:Disable Multicast (default)
+val_help: enable; Enable Multicast
+val_help: disable; Disable Multicast (default)
syntax:expression: $VAR(@) in "enable", "disable"; \
"Must be 'disable' or 'enable'"
diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def
index 8a78875c..7a7817fc 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)
+val_help: u32:0-99; Type Of Service (TOS)
update: ip tunnel change $VAR(../@) tos $VAR(@)
delete: ip tunnel change $VAR(../@) tos inherit
diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def
index bad9e027..fba20795 100644
--- a/templates/interfaces/tunnel/node.tag/ttl/node.def
+++ b/templates/interfaces/tunnel/node.tag/ttl/node.def
@@ -1,7 +1,7 @@
type: u32
default: 255
help: Time to live field
-val_help:<0-255>:Time to live (default 255)
+val_help: u32: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;