diff options
Diffstat (limited to 'templates/protocols/ospf/area')
31 files changed, 157 insertions, 157 deletions
diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def index 339fa9c5..7da8f765 100644 --- a/templates/protocols/ospf/area/node.def +++ b/templates/protocols/ospf/area/node.def @@ -1,4 +1,4 @@ tag: type: txt -help: "OSPF Area" -syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $(@)"; "Invalid OSFP area \"$(@)\" " +help: OSPF Area +syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"; "Invalid OSFP area \"$VAR(@)\" " 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 19c4ff6e..d5cceedb 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 @@ -help: "Area type" +help: 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 784d2b4a..a55cfe79 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,8 @@ -help: "Normal OSPF area" -syntax: $(../stub/) == "" ; "Must delete stub area type first" -syntax: $(../nssa/) == "" ; "Must delete nssa area type first" -create: "if [ x$(../../@) != x0.0.0.0 ] && [ x$(../../@) != x0 ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) stub\" -c \"no area $(../../@) nssa\"; \ +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; " 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 f3851e46..6446515b 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,7 @@ type: u32 -help: "Set the summary-default cost of nssa area" -syntax: $(@) >= 0 && $(@) <= 16777215; "Cost must be between 0-16777215" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) default-cost $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) default-cost $(@)\"; " +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(@)\"; " 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 1b149db4..9bbd739f 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,5 @@ -help: "Do not inject inter-area routes into stub" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) nssa no-summary \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) nssa no-summary \"; " +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 \"; " 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 75cb20a8..6501dc8c 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 @@ -1,8 +1,8 @@ -help: "nssa OSPF area" -syntax: ! $(../../@) in "0", "0.0.0.0"; "Backbone can't be NSSA" -syntax: $(../normal/) == "" ; "Must delete normal area type first" -syntax: $(../stub/) == "" ; "Must delete stub area type first" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"area $(../../@) nssa\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no area $(../../@) nssa\"; " +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\"; " 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 8c4d9f81..86616a8f 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,7 @@ type: txt default: "candidate" -syntax: $(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) nssa translate-$(@) \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) nssa translate-$(@) \"; " +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(@) \"; " 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 6d82250d..bd29d813 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,7 @@ type: u32 -help: "Set the summary-default cost of stub area" -syntax: $(@) >= 0 && $(@) <= 16777215; "Cost must be between 0-16777215" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) default-cost $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) default-cost $(@)\"; " +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(@)\"; " 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 750e6311..30cc830f 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,5 @@ -help: "Do not inject inter-area routes into stub" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) stub no-summary \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) stub no-summary \"; " +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 \"; " 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 1e975ff3..e39f36bc 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 @@ -1,8 +1,8 @@ -help: "Stub OSPF area" -syntax: ! $(../../@) in "0", "0.0.0.0"; "Backbone can't be stub" -syntax: $(../nssa/) == "" ; "Must delete nssa area type first" -syntax: $(../normal/) == "" ; "Must delete normal area type first" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) stub\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) stub\"; " +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\"; " diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def index f30c1c9a..2581eee1 100644 --- a/templates/protocols/ospf/area/node.tag/authentication/node.def +++ b/templates/protocols/ospf/area/node.tag/authentication/node.def @@ -1,17 +1,17 @@ type: txt -help: "Configure OSPF area authentication type" -syntax: $(@) in "simple", "md5"; "Must be either simple or md5" -update: "if [ x$(@) == xsimple ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +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 $(../@) authentication \" \ - -c \"area $(../@) authentication \" ; \ + -c \"no area $VAR(../@) authentication \" \ + -c \"area $VAR(../@) authentication \" ; \ else \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"router ospf \" \ - -c \"no area $(../@) authentication \" \ - -c \"area $(../@) authentication message-digest\" ; \ + -c \"no area $VAR(../@) authentication \" \ + -c \"area $VAR(../@) authentication message-digest\" ; \ fi; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"router ospf \" \ - -c \"no area $(../@) authentication \" " + -c \"no area $VAR(../@) authentication \" " diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def index 9d345218..36aecb09 100644 --- a/templates/protocols/ospf/area/node.tag/network/node.def +++ b/templates/protocols/ospf/area/node.tag/network/node.def @@ -1,8 +1,8 @@ multi: type: ipv4net -help: "OSPF network" -syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"network $(@) area $(../@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no network $(@) area $(../@)\"; " +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(../@)\"; " diff --git a/templates/protocols/ospf/area/node.tag/node.def b/templates/protocols/ospf/area/node.tag/node.def index 391ddf6b..2652108b 100644 --- a/templates/protocols/ospf/area/node.tag/node.def +++ b/templates/protocols/ospf/area/node.tag/node.def @@ -1,3 +1,3 @@ -help: "IPv4 network" +help: IPv4 network diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def index b2b998e9..92d5512a 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.def @@ -1,8 +1,8 @@ tag: type: ipv4net -help: "Summarize routes matching prefix (border routers only)" -syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../@) range $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../@) range $(@)\"; " +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(@)\"; " 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 46478b26..8716bd4b 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,7 @@ type: u32 -help: "Metric for this range" -syntax: $(@) >= 0 && $(@) <= 16777215; "Metric must be between 0-16777215" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) range $(../@) cost $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) range $(../@) cost $(@)\"; " +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(@)\"; " 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 index 1a011c8c..f4440010 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.tag/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.tag/node.def @@ -1 +1 @@ -help: "what should I put here" +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 cf56efe4..748e264d 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,5 @@ -help: "Do NOT advertise this range" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) range $(../@) not-advertise\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) range $(../@) not-advertise\"; " +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\"; " 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 9b1243b4..d4276cfc 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,7 @@ type: ipv4net -help: "Announce area range as another prefix" -syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) range $(../@) substitute $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) range $(../@) substitute $(@)\"; " +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(@)\"; " diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def index 975d8563..b41d7195 100644 --- a/templates/protocols/ospf/area/node.tag/shortcut/node.def +++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def @@ -1,7 +1,7 @@ type: txt -help: "Configure area's shortcutting mode" -syntax: $(@) in "default", "disable", "enable"; "Must be (default, disable, enable)" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../@) shortcut $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../@) shortcut $(@)\"; " +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\" \ + -c \"area $VAR(../@) shortcut $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"no area $VAR(../@) shortcut $VAR(@)\"; " 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 8f305002..ba21aa64 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def @@ -1,8 +1,8 @@ tag: type: ipv4 -help: "Configure a virtual link" -syntax: ! $(../@) in "0", "0.0.0.0"; "Can't configure VL over area $(../@)" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../@) virtual-link $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../@) virtual-link $(@)\"; " +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(@)\"; " 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 5bb35317..eff0d6be 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 @@ -1,16 +1,16 @@ tag: type: u32 -help: "Configure MD5 key id" -syntax: $(@) >= 1 && $(@) <= 255; "ID must be between (1-255)" -commit: $(md5-key/) != ""; "must add the md5-key for key-id $(@)" -delete: "touch /tmp/ospf-md5.\\$PPID" -end: "if [ -f \"/tmp/ospf-md5.\\$PPID\" ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../../@) virtual-link $(../../../@) message-digest-key $(@)\"; \ - rm /tmp/ospf-md5.\\$PPID; \ +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 $(../../../../@) virtual-link $(../../../@) message-digest-key $(@) md5 $(md5-key/@)\"; \ + ${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; " 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 54bbd8f7..3efdfdd3 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,2 +1,2 @@ type: txt -help: "Configure md5 key" +help: Configure md5 key diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def index 7d644d6f..c90f5cf9 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: "Configure md5 key" +help: Configure md5 key 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 aaf79ced..7fd09ba1 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,6 @@ -help: "Configure MD5 key id" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) virtual-link $(../../@) authentication-key\" \ - -c \"area $(../../../@) virtual-link $(../../@) authentication message-digest\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) virtual-link $(../../@) authentication null\"; " +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\"; " diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def index ba787ac5..0e0aad62 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def @@ -1 +1 @@ -help: "Configure authentication" +help: Configure authentication diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def index 253572a3..36a924d2 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def @@ -1,7 +1,7 @@ type: txt -help: "Configure simple password" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../../@) virtual-link $(../../@) authentication authentication-key $(@) \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../../@) virtual-link $(../../@) authentication authentication-key \"; " +help: Configure simple password +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"area $VAR(../../../@) virtual-link $VAR(../../@) authentication authentication-key $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"no area $VAR(../../../@) virtual-link $VAR(../../@) authentication authentication-key \"; " 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 7e66e018..179800a2 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,8 @@ type: u32 -help: "Interval after which a neighbor is declared dead" -syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) virtual-link $(../@) dead-interval $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) virtual-link $(../@) dead-interval \"; " -#comp_help: <1-65535> Seconds +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 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 dc63aad8..29ee19e0 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,8 @@ type: u32 -help: "Interval between HELLO packets" -syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) virtual-link $(../@) hello-interval $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) virtual-link $(../@) hello-interval \"; " -#comp_help: <1-65535> Seconds +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 diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def index 5dbaf4af..dd576aa7 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def @@ -1 +1 @@ -help: "virtual link" +help: virtual link 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 2edda12f..5e227a08 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,8 @@ type: u32 -help: "Interval between retransmitting lost link state advertisements" -syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) virtual-link $(../@) retransmit-interval $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) virtual-link $(../@) retransmit-interval \"; " -#comp_help: <1-65535> Seconds +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 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 9dc9a8d2..c829dc4d 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,8 @@ type: u32 -help: "Link state transmit delay" -syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"area $(../../@) virtual-link $(../@) transmit-delay $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no area $(../../@) virtual-link $(../@) transmit-delay \"; " -#comp_help: <1-65535> Seconds +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 |