diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2008-02-02 15:55:30 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2008-02-02 15:55:30 -0800 |
| commit | 53057a160296792e2c0f1151f42aac5fcba0c760 (patch) | |
| tree | 9156db61077e524e1c4dad41aae0c65f623f194a /templates/protocols | |
| parent | cd50a751d1480424cdf103fd748b514330029c24 (diff) | |
| download | vyatta-cfg-quagga-53057a160296792e2c0f1151f42aac5fcba0c760.tar.gz vyatta-cfg-quagga-53057a160296792e2c0f1151f42aac5fcba0c760.zip | |
Add some comp_help strings to ospf cli
Diffstat (limited to 'templates/protocols')
66 files changed, 483 insertions, 310 deletions
diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def index 7da8f765..53fc6067 100644 --- a/templates/protocols/ospf/area/node.def +++ b/templates/protocols/ospf/area/node.def @@ -2,3 +2,6 @@ tag: type: txt help: OSPF Area syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"; "Invalid OSFP 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 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 d5cceedb..fba5775d 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/node.def @@ -1 +1,5 @@ help: Area type +comp_help: possible completions: + normal Set normal area type + nssa Set not so stubby area type + stub Set stub Area type diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def index a55cfe79..8bf65c54 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def @@ -1,8 +1,9 @@ help: Normal OSPF area syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first" syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first" -create:expression: "if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \ - fi; " - +create:expression: " \ + if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \ + fi; " 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 6446515b..95f73f69 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,7 +1,11 @@ type: u32 help: Set the summary-default cost of nssa area syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../@) default-cost $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../../@) default-cost $VAR(@)\"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) default-cost $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -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/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def index 9bbd739f..fa1f76e4 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def @@ -1,5 +1,7 @@ help: Do not inject inter-area routes into stub -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../@) nssa no-summary \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../../@) nssa no-summary \"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) nssa no-summary \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../../@) nssa no-summary \"; " diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def index 6501dc8c..9ac0569f 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def @@ -2,7 +2,7 @@ help: nssa OSPF area syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be NSSA" syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first" syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"area $VAR(../../@) nssa\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no area $VAR(../../@) nssa\"; " - - +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" -c \"area $VAR(../../@) nssa\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" -c \"no area $VAR(../../@) nssa\"; " 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 86616a8f..045c6bec 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 @@ -1,7 +1,14 @@ type: txt +help: Configure NSSA-ABR default: "candidate" syntax:expression: $VAR(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../@) nssa translate-$VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../../@) nssa translate-$VAR(@) \"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) nssa translate-$VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../../@) nssa translate-$VAR(@) \"; " +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 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 bd29d813..cc7d96fa 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,7 +1,11 @@ type: u32 help: Set the summary-default cost of stub area syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../@) default-cost $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../../@) default-cost $VAR(@)\"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) default-cost $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -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/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def index 30cc830f..5420dba5 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def @@ -1,5 +1,7 @@ help: Do not inject inter-area routes into stub -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../@) stub no-summary \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../../@) stub no-summary \"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) stub no-summary \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../../@) stub no-summary \"; " diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def index e39f36bc..cfaa9b87 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def @@ -2,7 +2,9 @@ help: Stub OSPF area syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be stub" syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first" syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../@) stub\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) stub\"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) stub\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../@) stub\"; " diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def index 2581eee1..b5d7bbac 100644 --- a/templates/protocols/ospf/area/node.tag/authentication/node.def +++ b/templates/protocols/ospf/area/node.tag/authentication/node.def @@ -1,17 +1,20 @@ type: txt help: Configure OSPF area authentication type syntax:expression: $VAR(@) in "simple", "md5"; "Must be either simple or md5" -update:expression: "if [ x$VAR(@) == xsimple ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf \" \ - -c \"no area $VAR(../@) authentication \" \ - -c \"area $VAR(../@) authentication \" ; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf \" \ - -c \"no area $VAR(../@) authentication \" \ - -c \"area $VAR(../@) authentication message-digest\" ; \ +update:expression: "if [ x$VAR(@) == xsimple ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf \" \ + -c \"no area $VAR(../@) authentication \" \ + -c \"area $VAR(../@) authentication \" ; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf \" \ + -c \"no area $VAR(../@) authentication \" \ + -c \"area $VAR(../@) authentication message-digest\" ; \ fi; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf \" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf \" \ -c \"no area $VAR(../@) authentication \" " +comp_help: possible completions: + simple Use simple plain-text authentication + md5 Use md5 authentication diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def index 36aecb09..6b743ede 100644 --- a/templates/protocols/ospf/area/node.tag/network/node.def +++ b/templates/protocols/ospf/area/node.tag/network/node.def @@ -2,7 +2,9 @@ multi: type: ipv4net help: OSPF network syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)" -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"network $VAR(@) area $VAR(../@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no network $VAR(@) area $VAR(../@)\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"network $VAR(@) area $VAR(../@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no network $VAR(@) area $VAR(../@)\"; " diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def index 92d5512a..63147ac6 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.def @@ -2,7 +2,9 @@ tag: type: ipv4net help: Summarize routes matching prefix (border routers only) syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)" -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../@) range $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../@) range $VAR(@)\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../@) range $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../@) range $VAR(@)\"; " 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 8716bd4b..11b744db 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,7 +1,11 @@ type: u32 help: Metric for this range syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; " +comp_help: possible completions: + <0-16777215> Set metric for this range diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/node.def deleted file mode 100644 index f4440010..00000000 --- a/templates/protocols/ospf/area/node.tag/range/node.tag/node.def +++ /dev/null @@ -1 +0,0 @@ -help: what should I put here diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def index 748e264d..22a10e0c 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def @@ -1,5 +1,7 @@ help: Do NOT advertise this range -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; " diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def index d4276cfc..dba70a07 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def @@ -1,7 +1,9 @@ type: ipv4net help: Announce area range as another prefix syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; " diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def index b41d7195..ed6fd7de 100644 --- a/templates/protocols/ospf/area/node.tag/shortcut/node.def +++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def @@ -1,7 +1,13 @@ type: txt help: Configure area's shortcutting mode syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"area $VAR(../@) shortcut $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -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.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def index ba21aa64..572e161b 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def @@ -2,7 +2,9 @@ tag: type: ipv4 help: Configure a virtual link syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)" -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../@) virtual-link $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../@) virtual-link $VAR(@)\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../@) virtual-link $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../@) virtual-link $VAR(@)\"; " 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 eff0d6be..d73b4404 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 @@ -4,16 +4,18 @@ 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 \"router ospf\" \ - -c \"no area $VAR(../../../../@) virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \ - rm /tmp/ospf-md5.$PPID; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ +end:expression: "\ + if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../../../@) \ + virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \ + rm /tmp/ospf-md5.$PPID; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -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/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def index 7fd09ba1..d7760159 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def @@ -1,6 +1,11 @@ help: Configure MD5 key id -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../../@) virtual-link $VAR(../../@) authentication-key\" \ - -c \"area $VAR(../../../@) virtual-link $VAR(../../@) authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../../@) virtual-link $VAR(../../@) authentication null\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../../@) virtual-link $VAR(../../@) \ + authentication-key\" \ + -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \ + authentication message-digest\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \ + authentication null\"; " 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 179800a2..4a765bf1 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,8 +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 \"router ospf\" \ - -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; " -comp_help: <1-65535> Seconds +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -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 29ee19e0..0cab5c07 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,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 \"router ospf\" \ - -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; " -comp_help: <1-65535> Seconds +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -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 5e227a08..014a44ba 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,8 +1,13 @@ type: u32 help: Interval between retransmitting lost link state advertisements syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $VAR(../../@) virtual-link $VAR(../@) retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) virtual-link $VAR(../@) retransmit-interval \"; " -comp_help: <1-65535> Seconds +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) virtual-link $VAR(../@) \ + retransmit-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -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 c829dc4d..e2cf5896 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,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 \"router ospf\" \ - -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; " -comp_help: <1-65535> Seconds +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; " +comp_help: possible completions: + <1-65535> Seconds diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def index 3b87c973..ed0efbd4 100644 --- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def +++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def @@ -1,5 +1,9 @@ type: u32 help: Use reference bandwidth method to assign OSPF cost in Mbits/sec syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; "Must be between 1-4294967" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"auto-cost reference-bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no auto-cost reference-bandwidth \"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" -c \"auto-cost reference-bandwidth $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" -c \"no auto-cost reference-bandwidth \"; " +comp_help: possible completions: + <1-4294967> Set reference bandwidth cost in Mbits/sec diff --git a/templates/protocols/ospf/capability/opaque/node.def b/templates/protocols/ospf/capability/opaque/node.def index d4ffb775..da95642a 100644 --- a/templates/protocols/ospf/capability/opaque/node.def +++ b/templates/protocols/ospf/capability/opaque/node.def @@ -1,3 +1,5 @@ help: Opaque LSA -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"capability opaque\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no capability opaque\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" -c \"capability opaque\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" -c \"no capability opaque\"; " diff --git a/templates/protocols/ospf/compatible/rfc1583/node.def b/templates/protocols/ospf/compatible/rfc1583/node.def index 1d12f741..e8145fb2 100644 --- a/templates/protocols/ospf/compatible/rfc1583/node.def +++ b/templates/protocols/ospf/compatible/rfc1583/node.def @@ -1,5 +1,7 @@ help: compatible with RFC 1583 -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"compatible rfc1583\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no compatible rfc1583\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"compatible rfc1583\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no compatible rfc1583\"; " diff --git a/templates/protocols/ospf/default-information/originate/metric-type/node.def b/templates/protocols/ospf/default-information/originate/metric-type/node.def index 81ed06c4..d041ddef 100644 --- a/templates/protocols/ospf/default-information/originate/metric-type/node.def +++ b/templates/protocols/ospf/default-information/originate/metric-type/node.def @@ -1,4 +1,6 @@ -type: txt +type: u32 help: OSPF metric type for default routes -default: "2" +default: 2 syntax:expression: $VAR(@) in "1", "2"; "Must be either 1 or 2" +comp_help: possible completions: + <1-2> Set metric type for default routes diff --git a/templates/protocols/ospf/default-information/originate/metric/node.def b/templates/protocols/ospf/default-information/originate/metric/node.def index cd51e49f..80609683 100644 --- a/templates/protocols/ospf/default-information/originate/metric/node.def +++ b/templates/protocols/ospf/default-information/originate/metric/node.def @@ -1,3 +1,5 @@ type: u32 help: OSPF default metric syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "must be between 0-16777214" +comp_help: possible completions: + <0-16777214> Set default metric diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def index d0ecb7b2..540b39bd 100644 --- a/templates/protocols/ospf/default-information/originate/node.def +++ b/templates/protocols/ospf/default-information/originate/node.def @@ -1,21 +1,24 @@ help: Distribute a default route delete:expression: "touch /tmp/ospf-default-info.$PPID" -end:expression: "if [ -f \"/tmp/ospf-default-info.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no default-information originate \"; \ - else \ - if [ -n \"$VAR(./always/@)\" ]; then \ - PARM=\"always\"; \ - fi; \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - PARM=\"$PARM metric $VAR(./metric/@)\"; \ - fi; \ - if [ -n \"$VAR(./metric-type/@)\" ]; then \ - PARM=\"$PARM metric-type $VAR(./metric-type/@)\"; \ - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - PARM=\"$PARM route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"default-information originate $PARM\"; \ +end:expression: "\ + if [ -f \"/tmp/ospf-default-info.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no default-information originate \"; \ + else \ + if [ -n \"$VAR(./always/@)\" ]; then \ + PARM=\"always\"; \ + fi; \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + PARM=\"$PARM metric $VAR(./metric/@)\"; \ + fi; \ + if [ -n \"$VAR(./metric-type/@)\" ]; then \ + PARM=\"$PARM metric-type $VAR(./metric-type/@)\"; \ + fi; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + PARM=\"$PARM route-map $VAR(./route-map/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"default-information originate $PARM\"; \ fi; " diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def index 8549f529..f6ea1542 100644 --- a/templates/protocols/ospf/default-metric/node.def +++ b/templates/protocols/ospf/default-metric/node.def @@ -1,7 +1,11 @@ type: u32 help: Set metric of redistributed routes syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"default-metric $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no default-metric $VAR(@) \"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"default-metric $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no default-metric $VAR(@) \"; " +comp_help: possible completions: + <0-16777214> Set metric of redistributed routes diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def index 3a86f3de..7b8a45b9 100644 --- a/templates/protocols/ospf/distance/global/node.def +++ b/templates/protocols/ospf/distance/global/node.def @@ -1,9 +1,11 @@ type: u32 help: OSPF administrative distance syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"distance $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no distance $VAR(@) \"; " - - +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"distance $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no distance $VAR(@) \"; " +comp_help: possible completions: + <1-255> Set administrative distance" diff --git a/templates/protocols/ospf/distance/ospf/external/node.def b/templates/protocols/ospf/distance/ospf/external/node.def index 19f3be51..2b827181 100644 --- a/templates/protocols/ospf/distance/ospf/external/node.def +++ b/templates/protocols/ospf/distance/ospf/external/node.def @@ -1,4 +1,5 @@ type: u32 help: Define a distance for external routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" - +comp_help: possible completions: + <1-255> Set distance for external routes diff --git a/templates/protocols/ospf/distance/ospf/inter-area/node.def b/templates/protocols/ospf/distance/ospf/inter-area/node.def index 54902c54..0ac254e6 100644 --- a/templates/protocols/ospf/distance/ospf/inter-area/node.def +++ b/templates/protocols/ospf/distance/ospf/inter-area/node.def @@ -1,4 +1,5 @@ type: u32 help: Define a distance for inter-area routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" - +comp_help: possible completions: + <1-255> Set distance for inter-area routes diff --git a/templates/protocols/ospf/distance/ospf/intra-area/node.def b/templates/protocols/ospf/distance/ospf/intra-area/node.def index e4f4b5c2..665bf139 100644 --- a/templates/protocols/ospf/distance/ospf/intra-area/node.def +++ b/templates/protocols/ospf/distance/ospf/intra-area/node.def @@ -1,4 +1,5 @@ type: u32 help: Define a distance for intra-area routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" - +comp_help: possible completions: + <1-255> Set distance for intra-area routes diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def index f003de8a..f1a7884c 100644 --- a/templates/protocols/ospf/distance/ospf/node.def +++ b/templates/protocols/ospf/distance/ospf/node.def @@ -1,19 +1,22 @@ help: OSPF administrative distance delete:expression: "touch /tmp/ospf-distance.$PPID" -end:expression: "if [ -f \"/tmp/ospf-distance.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no distance ospf\"; \ - rm /tmp/ospf-distance.$PPID; \ - else \ - if [ -n \"$VAR(./intra-area/@)\" ]; then \ - PARM=\"intra-area $VAR(./intra-area/@)\"; \ - fi; \ - if [ -n \"$VAR(./inter-area/@)\" ]; then \ - PARM=\"$PARM inter-area $VAR(./inter-area/@)\"; \ - fi; \ - if [ -n \"$VAR(./external/@)\" ]; then \ - PARM=\"$PARM external $VAR(./external/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no distance ospf\" -c \"distance ospf $PARM\"; \ +end:expression: "\ + if [ -f \"/tmp/ospf-distance.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no distance ospf\"; \ + rm /tmp/ospf-distance.$PPID; \ + else \ + if [ -n \"$VAR(./intra-area/@)\" ]; then \ + PARM=\"intra-area $VAR(./intra-area/@)\"; \ + fi; \ + if [ -n \"$VAR(./inter-area/@)\" ]; then \ + PARM=\"$PARM inter-area $VAR(./inter-area/@)\"; \ + fi; \ + if [ -n \"$VAR(./external/@)\" ]; then \ + PARM=\"$PARM external $VAR(./external/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no distance ospf\" -c \"distance ospf $PARM\"; \ fi; " diff --git a/templates/protocols/ospf/distribute-list/node.tag/out/node.def b/templates/protocols/ospf/distribute-list/node.tag/out/node.def index 819ff774..98e6e169 100644 --- a/templates/protocols/ospf/distribute-list/node.tag/out/node.def +++ b/templates/protocols/ospf/distribute-list/node.tag/out/node.def @@ -1,8 +1,17 @@ multi: type: txt help: Filter outgoing routing updates -syntax:expression: $VAR(@) in "bgp", "connected", "isis", "kernel", "rip", "static"; "Must be (bgp, connected, isis, kernel, rip, or static" -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +syntax:expression: $VAR(@) in "bgp", "connected", "isis", "kernel", "rip", "static"; "Must be (bgp, connected, isis, kernel, rip, or static)" +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"distribute-list $VAR(../@) out $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no distribute-list $VAR(../@) out $VAR(@) \"; " +comp_help: possible completions: + bgp Filter bgp routes + connected Filter connected routes + isis Filter isis routes + kernel Filter kernel routes + rip Filter rip routes + static Filter static routes diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def index 9897c04e..3bf908f2 100644 --- a/templates/protocols/ospf/log-adjacency-changes/node.def +++ b/templates/protocols/ospf/log-adjacency-changes/node.def @@ -1,5 +1,7 @@ help: Log changes in adjacency state -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"log-adjacency-changes\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no log-adjacency-changes\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"log-adjacency-changes\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no log-adjacency-changes\"; " diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def index 1ad32f4c..5d1cfcaf 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def @@ -1,7 +1,7 @@ help: Administratively applied, for an indefinite period -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"max-metric router-lsa administrative\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no max-metric router-lsa administrative \"; " - - +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"max-metric router-lsa administrative\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no max-metric router-lsa administrative \"; " diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def index d69a33dc..da7c0da1 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def @@ -1,8 +1,11 @@ type: u32 help: Advertise stub-router prior to full shutdown of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"max-metric router-lsa on-shutdown $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no max-metric router-lsa on-shutdown \"; " -comp_help: Time (seconds) to advertise self as stub-router" +comp_help: possible completions: + <5-86400> Time (seconds) to advertise self as stub-router diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def index 492f7334..99480c03 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def @@ -1,9 +1,11 @@ type: u32 help: Automatically advertise stub Router-LSA on startup of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"max-metric router-lsa on-startup $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no max-metric router-lsa on-startup \"; " -comp_help: Time (seconds) to advertise self as stub-router" - +comp_help: possible completions: + <5-86400> Time (seconds) to advertise self as stub-router diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def index c502bee8..2ab09a62 100644 --- a/templates/protocols/ospf/mpls-te/enable/node.def +++ b/templates/protocols/ospf/mpls-te/enable/node.def @@ -1,5 +1,7 @@ help: Enable the MPLS-TE functionality -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"mpls-te on\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no mpls-te\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"mpls-te on\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no mpls-te\"; " diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def index b2ee1b8b..9c70bd29 100644 --- a/templates/protocols/ospf/mpls-te/router-address/node.def +++ b/templates/protocols/ospf/mpls-te/router-address/node.def @@ -1,6 +1,8 @@ type: ipv4 help: Stable IP address of the advertising router -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"mpls-te router-address $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no mpls-te\"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"mpls-te router-address $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no mpls-te\"; " diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def index c07df296..2d690ce7 100644 --- a/templates/protocols/ospf/neighbor/node.def +++ b/templates/protocols/ospf/neighbor/node.def @@ -1,7 +1,9 @@ tag: type: ipv4 help: Neighbor IP address -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"neighbor $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no neighbor $VAR(@)\"; " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"neighbor $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no neighbor $VAR(@)\"; " diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def index 25cd1662..de508545 100644 --- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def +++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def @@ -1,7 +1,11 @@ type: u32 help: Dead neighbor polling interval syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"neighbor $VAR(../@) poll-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no neighbor $VAR(../@) poll-interval $VAR(@)\"; " +comp_help: possible completions: + <1-65535> Seconds between dead neighbor polling interval diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def index 3f5730de..167dec0f 100644 --- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def +++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def @@ -1,7 +1,11 @@ type: u32 help: Neighbor priority in seconds syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"neighbor $VAR(../@) priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no neighbor $VAR(../@) priority $VAR(@)\"; " +comp_help: possible completions: + <0-255> Set neighbor priority diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def index e652deaa..def04c81 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -1,3 +1,5 @@ help: Configure OSPF for IPv4 -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router ospf\" " +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"no router ospf\" " diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def index f61fbbc9..b81d798e 100644 --- a/templates/protocols/ospf/parameters/abr-type/node.def +++ b/templates/protocols/ospf/parameters/abr-type/node.def @@ -2,7 +2,14 @@ type: txt help: Set OSPF ABR type default: "cisco" syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"ospf abr-type $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no ospf abr-type $VAR(@)\"; " +comp_help: possible completions: + cisco Set cisco ABR type (default) + ibm Set ibm ABR type + shortcut Set shortcut ABR type + standard Set standard ABR type diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def index 77ceeaa3..a2036004 100644 --- a/templates/protocols/ospf/parameters/router-id/node.def +++ b/templates/protocols/ospf/parameters/router-id/node.def @@ -1,6 +1,8 @@ type: ipv4 help: Override the default router identifier -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"ospf router-id $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ -c \"no ospf router-id \" " diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index d0834c65..5b9cf721 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -1,26 +1,31 @@ multi: type: txt help: Suppress routing updates on an interface -syntax:expression: exec " \ - if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \ - echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \ - exit 1 ; \ - fi ; " -update:expression: "if [ x$VAR(x) == xdefault ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"passive-interface default\"; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"passive-interface $VAR(@)\"; \ - fi; " -delete:expression: "if [ x$VAR(x) == xdefault ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no passive-interface default\"; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no passive-interface $VAR(@)\"; \ - fi; " +syntax:expression: exec " \ + if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \ + echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \ + exit 1 ; \ + fi ; " +update:expression: " \ + if [ x$VAR(x) == xdefault ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"passive-interface default\"; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"passive-interface $VAR(@)\"; \ + fi; " +delete:expression: " \ + if [ x$VAR(x) == xdefault ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no passive-interface default\"; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no passive-interface $VAR(@)\"; \ + fi; " allowed: local -a array; array=( /sys/class/net/{eth,vmnet}* ) ; echo -n ${array[@]##*/} - diff --git a/templates/protocols/ospf/redistribute/bgp/metric/node.def b/templates/protocols/ospf/redistribute/bgp/metric/node.def index 549cfdf1..114173dc 100644 --- a/templates/protocols/ospf/redistribute/bgp/metric/node.def +++ b/templates/protocols/ospf/redistribute/bgp/metric/node.def @@ -1,3 +1,5 @@ type: u32 help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" +comp_help: possible completions: + <1-16> Set metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def index 98856c8a..6f377318 100644 --- a/templates/protocols/ospf/redistribute/bgp/node.def +++ b/templates/protocols/ospf/redistribute/bgp/node.def @@ -1,16 +1,18 @@ help: Redistribute BGP routes delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" -end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no redistribute bgp \"; \ - if [ -f \"/tmp/ospf-redist-bgp.$PPID\" ]; then \ - rm -rf /tmp/ospf-redist-bgp.$PPID; \ - else \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - COND=\"metric $VAR(./metric/@)\"; - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - COND=\"$COND route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"redistribute bgp $COND\"; \ +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no redistribute bgp \"; \ + if [ -f \"/tmp/ospf-redist-bgp.$PPID\" ]; then \ + rm -f /tmp/ospf-redist-bgp.$PPID; \ + else \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; \ + fi; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"redistribute bgp $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/connected/metric/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def index 8234167e..114173dc 100644 --- a/templates/protocols/ospf/redistribute/connected/metric/node.def +++ b/templates/protocols/ospf/redistribute/connected/metric/node.def @@ -1,6 +1,5 @@ type: u32 help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" - - - +comp_help: possible completions: + <1-16> Set metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def index 02fc58de..892aab54 100644 --- a/templates/protocols/ospf/redistribute/connected/node.def +++ b/templates/protocols/ospf/redistribute/connected/node.def @@ -1,16 +1,18 @@ help: Redistribute connected routes delete:expression: "touch /tmp/ospf-redist-connected.$PPID" -end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no redistribute connected \"; \ - if [ -f \"/tmp/ospf-redist-connected.$PPID\" ]; then \ - rm -rf /tmp/ospf-redist-connected.$PPID; \ - else \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - COND=\"metric $VAR(./metric/@)\"; - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - COND=\"$COND route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"redistribute connected $COND\"; \ +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no redistribute connected \"; \ + if [ -f \"/tmp/ospf-redist-connected.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-connected.$PPID; \ + else \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; \ + fi; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"redistribute connected $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/kernel/metric/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def index 549cfdf1..114173dc 100644 --- a/templates/protocols/ospf/redistribute/kernel/metric/node.def +++ b/templates/protocols/ospf/redistribute/kernel/metric/node.def @@ -1,3 +1,5 @@ type: u32 help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" +comp_help: possible completions: + <1-16> Set metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def index d0fd8b97..fc47efc6 100644 --- a/templates/protocols/ospf/redistribute/kernel/node.def +++ b/templates/protocols/ospf/redistribute/kernel/node.def @@ -1,16 +1,18 @@ help: Redistribute kernel routes delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" -end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no redistribute kernel \"; \ - if [ -f \"/tmp/ospf-redist-kernel.$PPID\" ]; then \ - rm -rf /tmp/ospf-redist-kernel.$PPID; \ - else \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - COND=\"metric $VAR(./metric/@)\"; - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - COND=\"$COND route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"redistribute kernel $COND\"; \ +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no redistribute kernel \"; \ + if [ -f \"/tmp/ospf-redist-kernel.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-kernel.$PPID; \ + else \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; \ + fi; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"redistribute kernel $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def index 80d13b5e..114173dc 100644 --- a/templates/protocols/ospf/redistribute/rip/metric/node.def +++ b/templates/protocols/ospf/redistribute/rip/metric/node.def @@ -1,4 +1,5 @@ type: u32 help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" - +comp_help: possible completions: + <1-16> Set metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def index d78ad9e8..0f090921 100644 --- a/templates/protocols/ospf/redistribute/rip/node.def +++ b/templates/protocols/ospf/redistribute/rip/node.def @@ -1,17 +1,18 @@ help: Redistribute RIP routes delete:expression: "touch /tmp/ospf-redist-rip.$PPID" -end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no redistribute rip \"; \ - if [ -f \"/tmp/ospf-redist-rip.$PPID\" ]; then \ - rm -rf /tmp/ospf-redist-rip.$PPID; \ - else \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - COND=\"metric $VAR(./metric/@)\"; - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - COND=\"$COND route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"redistribute rip $COND\"; \ +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no redistribute rip \"; \ + if [ -f \"/tmp/ospf-redist-rip.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-rip.$PPID; \ + else \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; \ + fi; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"redistribute rip $COND\"; \ fi; " - diff --git a/templates/protocols/ospf/redistribute/static/metric/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def index 549cfdf1..114173dc 100644 --- a/templates/protocols/ospf/redistribute/static/metric/node.def +++ b/templates/protocols/ospf/redistribute/static/metric/node.def @@ -1,3 +1,5 @@ type: u32 help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" +comp_help: possible completions: + <1-16> Set metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def index 318c0fed..81117107 100644 --- a/templates/protocols/ospf/redistribute/static/node.def +++ b/templates/protocols/ospf/redistribute/static/node.def @@ -1,16 +1,18 @@ help: Redistribute static routes delete:expression: "touch /tmp/ospf-redist-static.$PPID" -end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no redistribute static \"; \ - if [ -f \"/tmp/ospf-redist-static.$PPID\" ]; then \ - rm -rf /tmp/ospf-redist-static.$PPID; \ - else \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - COND=\"metric $VAR(./metric/@)\"; - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - COND=\"$COND route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"redistribute static $COND\"; \ +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no redistribute static \"; \ + if [ -f \"/tmp/ospf-redist-static.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-static.$PPID; \ + else \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; \ + fi; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ + fi; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"redistribute static $COND\"; \ fi; " diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def index 309ad572..83334d11 100644 --- a/templates/protocols/ospf/refresh/timers/node.def +++ b/templates/protocols/ospf/refresh/timers/node.def @@ -1,8 +1,11 @@ type: u32 help: Set refresh timer syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no refresh timer\" -c \"refresh timer $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no refresh timer $VAR(@)\"; " -comp_help: <10-1800> Timer value in seconds +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" / + -c \"router ospf\" \ + -c \"no refresh timer\" -c \"refresh timer $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" / + -c \"router ospf\" \ + -c \"no refresh timer $VAR(@)\"; " +comp_help: possible completions: + <10-1800> Timer value in seconds diff --git a/templates/protocols/ospf/timers/throttle/spf/delay/node.def b/templates/protocols/ospf/timers/throttle/spf/delay/node.def index cd7f8e1e..68bb270f 100644 --- a/templates/protocols/ospf/timers/throttle/spf/delay/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/delay/node.def @@ -2,3 +2,5 @@ type: u32 help: Delay (msec) from first change received till SPF calculation default: 200 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" +comp_help: possible competions: + <0-600000> Set delay in msec (default 200) diff --git a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def index 63ce7d98..5054c9bd 100644 --- a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def @@ -2,3 +2,5 @@ type: u32 help: Initial hold time(msec) between consecutive SPF calculations default: 1000 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" +comp_help: possible completions: + <0-600000> Initial hold time in msec (default 1000) diff --git a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def index 0577b425..b9eb7748 100644 --- a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def @@ -2,3 +2,5 @@ type: u32 help: Maximum hold time (msec) default: 10000 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" +comp_help: possible completions: + <0-600000> Max hold time in msec (default 10000) diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def index 86bb51b6..d94698ea 100644 --- a/templates/protocols/ospf/timers/throttle/spf/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/node.def @@ -1,10 +1,14 @@ help: OSPF SPF timers delete:expression: "touch /tmp/ospf-timer.$PPID" -end:expression: "if [ -f \"/tmp/ospf-timer.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no timers throttle spf\"; \ - rm /tmp/ospf-timer.$PPID; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)\"; \ +end:expression: "\ + if [ -f \"/tmp/ospf-timer.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"no timers throttle spf\"; \ + rm /tmp/ospf-timer.$PPID; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"timers throttle spf $VAR(delay/@) \ + $VAR(initial-holdtime/@) $VAR(max-holdtime/@)\"; \ fi; " |