Convert Quagga templates to use val_help:

15 files changed, 44 insertions, 43 deletions

diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def
index ef26aafb..0aaa7524 100644
--- a/templates/protocols/ospf/area/node.def
+++ b/templates/protocols/ospf/area/node.def
@@ -2,6 +2,5 @@ tag:
 type: txt
 help: Set OSPF Area
 syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"
-comp_help: possible completions:
- <0-4294967295>     Set OSPF area in decimal notation
- <x.x.x.x>          Set OSPF area in dotted decimal notation
+val_help: u32; OSPF area in decimal notation
+val_help: ipv4; OSPF area in dotted decimal notation
diff --git a/templates/protocols/ospf/area/node.tag/area-type/node.def b/templates/protocols/ospf/area/node.tag/area-type/node.def
index 76724122..5f90efcc 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/node.def
@@ -1,5 +1,4 @@
 help: Set area type
-comp_help: possible completions:
- normal             Set normal area type
- nssa               Set not so stubby area type 
- stub               Set stub Area type 
+val_help: normal; Normal area type
+val_help: nssa; Not so stubby area type 
+val_help: stub; Stub Area type 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
index ea03efdb..f6b5c409 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
@@ -1,6 +1,7 @@
 type: u32
 help: Set the summary-default cost of nssa area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
+val_help: u32:0-16777215; Summary default cost
 
 create: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
@@ -14,6 +15,3 @@ update: vtysh -c "configure terminal" \
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
-
-comp_help: possible completions:
-  <0-16777215>       Set summary default cost
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
index bb1269df..07d0607b 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
@@ -3,7 +3,6 @@ help: Set nssa-abr
 default: "candidate"
 syntax:expression: $VAR(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)"
 
-comp_help: possible completions:
- always             Configure NSSA-ABR to always translate
- candidate          Configure NSSA-ABR for translate election (default)
- never              Configure NSSA-ABR to never translate
+val_help: always; NSSA-ABR to always translate
+val_help: candidate; NSSA-ABR for translate election (default)
+val_help: never; NSSA-ABR to never translate
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
index 52b73d05..25320ad5 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
@@ -1,6 +1,7 @@
 type: u32
 help: Set the summary-default cost of stub area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
+val_help: u32:0-16777215; Summary default cost of stub area
 
 create: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
@@ -14,6 +15,3 @@ update: vtysh -c "configure terminal" \
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
-
-comp_help: possible completions:
- <0-16777215>       Set summary default cost of stub area
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 3c87b9db..9616e27c 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -1,7 +1,10 @@
 type: txt
 help: Set OSPF area authentication type
+allowed: echo "plaintext-password md5"
 syntax:expression: $VAR(@) in "plaintext-password", "md5"; \
        "Must be either plaintext-password or md5"
+val_help: plaintext-password; Use plain-text authentication
+val_help: md5; Use md5 authentication
 
 update:expression: "\
         if [ x$VAR(@) == xplaintext-password ]; then               \
@@ -21,7 +24,3 @@ update:expression: "\
 delete:expression: "vtysh -c \"configure terminal\" \
             -c \"router ospf \"                                                 \
             -c \"no area $VAR(../@) authentication \" "
-
-comp_help: possible completions:
- plaintex-password    Use plain-text authentication
- md5                  Use md5 authentication
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
index 22665949..cbdd1aa7 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
@@ -1,6 +1,4 @@
 type: u32
 help: Set metric for this range
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215"
-
-comp_help: possible completions:
-  <0-16777215>       Set metric for this range
+val_help: u32: 0-16777215; Metric for this range
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index 85b7df93..6749ac11 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,13 +1,15 @@
 type: txt
 help: Set area's shortcut mode
+allowed: echo "default disable enable"
 syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
+val_help: default; Set default; 
+val_help: disable; Disable shortcutting mode; 
+val_help: enable; Enable  shortcutting mode; 
+
 update:expression: "vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"area $VAR(../@) shortcut $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"no area $VAR(../@) shortcut $VAR(@)\"; "
-comp_help: possible completions:
- default            Set default
- disable            Disable shortcutting mode
- enable             Enable  shortcutting mode
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index f906e58f..da1451a4 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -2,8 +2,12 @@ tag:
 type: u32
 help: Set MD5 key id
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
+val_help: u32:1-255; MD5 key id
+
 commit:expression: $VAR(md5-key/) != ""; "Must add the md5-key for key-id $VAR(@)"
+
 delete:expression: "touch /tmp/ospf-md5.$PPID"
+
 end:expression: "\
       if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                          \
          vtysh -c \"configure terminal\"   \
@@ -17,5 +21,3 @@ end:expression: "\
            -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \
            message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";           \
       fi; "
-comp_help: possible completions:
- <1-255>            Set the key id
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
index c985099d..29200bd1 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
@@ -1,9 +1,9 @@
 type: txt
 help: Set MD5 key
+val_help: MD5 Key (16 characters or less)
+
 syntax:expression: exec "                              \
         if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
           echo MD5 key must be 16 characters or less ; \
           exit 1 ;                                     \
         fi ; "
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
index 9a7292eb..16d2fde0 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
@@ -1,5 +1,7 @@
 type: txt
 help: Set plain text password
+val_help: Plain text password (8 characters or less)
+
 syntax:expression: exec "                              \
         if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
@@ -15,6 +17,3 @@ update: vtysh -c "configure terminal" -c "router ospf"         \
 delete: vtysh  -c "configure terminal" -c "router ospf"           \
           -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
             authentication authentication-key";
-
-comp_help: possible completions:
-  <text>             Plain text password (8 characters or less)
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
index 8ce008a3..1b8d0ea1 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set interval after which a neighbor is declared dead
+val_help: u32:1-65535; Neighbor dead interval (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
-comp_help: possible completions:
- <1-65535>           Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
index 2d378bd7..8fed1181 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set interval between hello packets
+val_help: u32:1-65535; Hello interval (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
-comp_help: possible completions:
- <1-65535>          Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
index faa4ba8d..62f02f2c 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
@@ -1,13 +1,15 @@
 type: u32
 help: Set interval between retransmitting lost link state advertisements
+val_help: u32:1-65535; Retransmit interval (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval \"; "
-comp_help: possible completions:
- <1-65535>          Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
index 13a58564..9c2f9e10 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set link state transmit delay
+val_help: u32:1-65535; Link state transmit delay (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
-comp_help: possible completions:
- <1-65535>          Seconds