Add some comp_help strings to ospf cli

9 files changed, 74 insertions, 53 deletions

diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 9e196ef7..273a974a 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -4,19 +4,16 @@ help: Configure MD5 key id
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
 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                    \
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
-          -c \"interface $VAR(../../../../../@) \"                    \
-          -c \"no ip ospf message-digest-key $VAR(@)\";               \
-         rm /tmp/ospf-md5.$PPID;                                 \
-      else                                                         \
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
-          -c \"interface $VAR(../../../../../@) \"                    \
+end:expression: "\
+      if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                            \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"     \
+          -c \"interface $VAR(../../../../../@) \"                       \
+          -c \"no ip ospf message-digest-key $VAR(@)\";                  \
+         rm /tmp/ospf-md5.$PPID;                                         \
+      else                                                               \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"     \
+          -c \"interface $VAR(../../../../../@) \"                       \
           -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
       fi; "
-
-
-
-
-
-
+comp_help: possible completions:
+ <1-255>            Set the key id
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
index cbe96ee1..1ef9665e 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
@@ -1,9 +1,11 @@
 type: u32
 help: Interface cost
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
         -c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+        -c \"interface $VAR(../../../@)\" \
         -c \"no ip ospf cost \"; "
-comp_help: <1-65535> Cost
-
+comp_help: possible completions:
+ <1-65535>          Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
index 93bc5a1b..3b940cf3 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
@@ -1,9 +1,11 @@
 type: u32
 help: Interval after which a neighbor is declared dead
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"no ip ospf dead-interval \"; "
-comp_help: <1-65535> Seconds
-
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"ip ospf dead-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"no ip ospf dead-interval \"; "
+comp_help: possible completions:
+ <1-65535>          Seconds
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
index dd3dd2cc..e3676ffa 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
@@ -1,8 +1,11 @@
 type: u32
 help: Interval between HELLO packets
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
-          -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
-          -c \"no ip ospf hello-interval \"; "
-comp_help: <1-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@) \" \
+       -c \"ip ospf hello-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@) \" \
+       -c \"no ip ospf hello-interval \"; "
+comp_help: possible completions:
+ <1-65535>          Seconds
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
index 9f6643e5..f2cc5a80 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,5 +1,7 @@
 help: Disable mtu mismatch detection
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"ip ospf mtu-ignore\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"no ip ospf mtu-ignore\"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"ip ospf mtu-ignore\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
index 4b31e756..dc99a4b9 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
@@ -1,8 +1,14 @@
 type: txt
 help: Network type
 syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"ip ospf network $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"no ip ospf network \"; "
-comp_help: Enter the network type (broadcast|non-broadcast|point-to-multipoint|point-to-point)
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"ip ospf network $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"no ip ospf network \"; "
+comp_help: possible completions:
+ broadcast              Set broadcast network type
+ non-broadcast          Set non-broadcast network type
+ point-to-multipoint    Set point-to-multipoint network type
+ point-to-point         Set point-to-point network type
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
index cfb73389..94e4522b 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
@@ -1,8 +1,11 @@
 type: u32
 help: Router priority
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"no ip ospf priority \"; "
-comp_help: <0-255> Priority
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"ip ospf priority $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"no ip ospf priority \"; "
+comp_help: possible completions:
+ <0-255>            Priority
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
index 06a5d5e7..56e8a243 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
@@ -1,8 +1,11 @@
 type: u32
 help: Interval between retransmitting lost link state advertisements
 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"no ip ospf retransmit-interval \"; "
-comp_help: <3-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"ip ospf retransmit-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"no ip ospf retransmit-interval \"; "
+comp_help: possible completions:
+ <3-65535>          Seconds
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
index a9128624..c53c775d 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
@@ -1,8 +1,11 @@
 type: u32
 help: Link state transmit delay
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-          -c \"no ip ospf transmit-delay \"; "
-comp_help: <1-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"ip ospf transmit-delay $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+       -c \"interface $VAR(../../../@)\" \
+       -c \"no ip ospf transmit-delay \"; "
+comp_help: possible completions:
+ <1-65535>          Seconds