diff options
Diffstat (limited to 'templates/protocols/ospf')
96 files changed, 413 insertions, 413 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 diff --git a/templates/protocols/ospf/auto-cost/node.def b/templates/protocols/ospf/auto-cost/node.def index 54a3e80c..5ea6ce6f 100644 --- a/templates/protocols/ospf/auto-cost/node.def +++ b/templates/protocols/ospf/auto-cost/node.def @@ -1 +1 @@ -help: "Calculate OSPF interface cost according to bandwidth" +help: Calculate OSPF interface cost according to bandwidth diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def index b5a97e7b..3b87c973 100644 --- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def +++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: "Use reference bandwidth method to assign OSPF cost in Mbits/sec" -syntax: $(@) >= 1 && $(@) <= 4294967; "Must be between 1-4294967" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"auto-cost reference-bandwidth $(@) \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no auto-cost reference-bandwidth \"; " +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 \"; " diff --git a/templates/protocols/ospf/capability/node.def b/templates/protocols/ospf/capability/node.def index 18402df4..089d322e 100644 --- a/templates/protocols/ospf/capability/node.def +++ b/templates/protocols/ospf/capability/node.def @@ -1 +1 @@ -help: "Enable specific OSPF feature" +help: Enable specific OSPF feature diff --git a/templates/protocols/ospf/capability/opaque/node.def b/templates/protocols/ospf/capability/opaque/node.def index 5dfed2af..d4ffb775 100644 --- a/templates/protocols/ospf/capability/opaque/node.def +++ b/templates/protocols/ospf/capability/opaque/node.def @@ -1,3 +1,3 @@ -help: "Opaque LSA" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"capability opaque\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no capability opaque\"; " +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\"; " diff --git a/templates/protocols/ospf/compatible/node.def b/templates/protocols/ospf/compatible/node.def index d398cf75..a92c9f0e 100644 --- a/templates/protocols/ospf/compatible/node.def +++ b/templates/protocols/ospf/compatible/node.def @@ -1 +1 @@ -help: "OSPF compatibility list" +help: OSPF compatibility list diff --git a/templates/protocols/ospf/compatible/rfc1583/node.def b/templates/protocols/ospf/compatible/rfc1583/node.def index e896c274..1d12f741 100644 --- a/templates/protocols/ospf/compatible/rfc1583/node.def +++ b/templates/protocols/ospf/compatible/rfc1583/node.def @@ -1,5 +1,5 @@ -help: "compatible with RFC 1583" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: compatible with RFC 1583 +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"compatible rfc1583\"; " -delete: "\\${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 compatible rfc1583\"; " diff --git a/templates/protocols/ospf/default-information/node.def b/templates/protocols/ospf/default-information/node.def index f50bef38..7cd4ddbc 100644 --- a/templates/protocols/ospf/default-information/node.def +++ b/templates/protocols/ospf/default-information/node.def @@ -1 +1 @@ -help: "Control distribution of default information" +help: Control distribution of default information diff --git a/templates/protocols/ospf/default-information/originate/always/node.def b/templates/protocols/ospf/default-information/originate/always/node.def index e2a93034..31ce00db 100644 --- a/templates/protocols/ospf/default-information/originate/always/node.def +++ b/templates/protocols/ospf/default-information/originate/always/node.def @@ -1 +1 @@ -help: "Always advertise default route" +help: Always advertise default route 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 6e7f91b5..81ed06c4 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,4 @@ type: txt -help: "OSPF metric type for default routes" +help: OSPF metric type for default routes default: "2" -syntax: $(@) in "1", "2"; "Must be either 1 or 2" +syntax:expression: $VAR(@) in "1", "2"; "Must be either 1 or 2" diff --git a/templates/protocols/ospf/default-information/originate/metric/node.def b/templates/protocols/ospf/default-information/originate/metric/node.def index bef11e38..cd51e49f 100644 --- a/templates/protocols/ospf/default-information/originate/metric/node.def +++ b/templates/protocols/ospf/default-information/originate/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "OSPF default metric" -syntax: $(@) >= 0 && $(@) <= 16777214; "must be between 0-16777214" +help: OSPF default metric +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "must be between 0-16777214" diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def index 5772bdcb..d0ecb7b2 100644 --- a/templates/protocols/ospf/default-information/originate/node.def +++ b/templates/protocols/ospf/default-information/originate/node.def @@ -1,21 +1,21 @@ -help: "Distribute a default route" -delete: "touch /tmp/ospf-default-info.\\$PPID" -end: "if [ -f \"/tmp/ospf-default-info.\\$PPID\" ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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 \"$(./always/@)\" ]; then \ - PARM=\"always\"; \ + if [ -n \"$VAR(./always/@)\" ]; then \ + PARM=\"always\"; \ fi; \ - if [ -n \"$(./metric/@)\" ]; then \ - PARM=\"\\$PARM metric $(./metric/@)\"; \ + if [ -n \"$VAR(./metric/@)\" ]; then \ + PARM=\"$PARM metric $VAR(./metric/@)\"; \ fi; \ - if [ -n \"$(./metric-type/@)\" ]; then \ - PARM=\"\\$PARM metric-type $(./metric-type/@)\"; \ + if [ -n \"$VAR(./metric-type/@)\" ]; then \ + PARM=\"$PARM metric-type $VAR(./metric-type/@)\"; \ fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - PARM=\"\\$PARM route-map $(./route-map/@)\"; \ + 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\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"default-information originate $PARM\"; \ fi; " diff --git a/templates/protocols/ospf/default-information/originate/route-map/node.def b/templates/protocols/ospf/default-information/originate/route-map/node.def index 5b4f587e..c7943078 100644 --- a/templates/protocols/ospf/default-information/originate/route-map/node.def +++ b/templates/protocols/ospf/default-information/originate/route-map/node.def @@ -1,2 +1,2 @@ type: txt -help: "Route map reference" +help: Route map reference diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def index f147d611..8549f529 100644 --- a/templates/protocols/ospf/default-metric/node.def +++ b/templates/protocols/ospf/default-metric/node.def @@ -1,7 +1,7 @@ type: u32 -help: "Set metric of redistributed routes" -syntax: $(@) >= 0 && $(@) <= 16777214; "Must be between 0-16777214" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"default-metric $(@) \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no default-metric $(@) \"; " +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(@) \"; " diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def index d88a761b..3a86f3de 100644 --- a/templates/protocols/ospf/distance/global/node.def +++ b/templates/protocols/ospf/distance/global/node.def @@ -1,9 +1,9 @@ type: u32 -help: "OSPF administrative distance" -syntax: $(@) >= 1 && $(@) <= 255; "Must be between 1-255" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"distance $(@) \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no distance $(@) \"; " +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(@) \"; " diff --git a/templates/protocols/ospf/distance/node.def b/templates/protocols/ospf/distance/node.def index fdc52f32..f86a74d1 100644 --- a/templates/protocols/ospf/distance/node.def +++ b/templates/protocols/ospf/distance/node.def @@ -1 +1 @@ -help: "Define an administrative distance" +help: Define an administrative distance diff --git a/templates/protocols/ospf/distance/ospf/external/node.def b/templates/protocols/ospf/distance/ospf/external/node.def index 696e14b7..19f3be51 100644 --- a/templates/protocols/ospf/distance/ospf/external/node.def +++ b/templates/protocols/ospf/distance/ospf/external/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Define a distance for external routes" -syntax: $(@) >= 1 && $(@) <= 255; "Must be between 1-255" +help: Define a distance for external routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/ospf/distance/ospf/inter-area/node.def b/templates/protocols/ospf/distance/ospf/inter-area/node.def index 1e2fa5ba..54902c54 100644 --- a/templates/protocols/ospf/distance/ospf/inter-area/node.def +++ b/templates/protocols/ospf/distance/ospf/inter-area/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Define a distance for inter-area routes" -syntax: $(@) >= 1 && $(@) <= 255; "Must be between 1-255" +help: Define a distance for inter-area routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/ospf/distance/ospf/intra-area/node.def b/templates/protocols/ospf/distance/ospf/intra-area/node.def index cae2bf0f..e4f4b5c2 100644 --- a/templates/protocols/ospf/distance/ospf/intra-area/node.def +++ b/templates/protocols/ospf/distance/ospf/intra-area/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Define a distance for intra-area routes" -syntax: $(@) >= 1 && $(@) <= 255; "Must be between 1-255" +help: Define a distance for intra-area routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def index fa49eaa1..f003de8a 100644 --- a/templates/protocols/ospf/distance/ospf/node.def +++ b/templates/protocols/ospf/distance/ospf/node.def @@ -1,19 +1,19 @@ -help: "OSPF administrative distance" -delete: "touch /tmp/ospf-distance.\\$PPID" -end: "if [ -f \"/tmp/ospf-distance.\\$PPID\" ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + rm /tmp/ospf-distance.$PPID; \ else \ - if [ -n \"$(./intra-area/@)\" ]; then \ - PARM=\"intra-area $(./intra-area/@)\"; \ + if [ -n \"$VAR(./intra-area/@)\" ]; then \ + PARM=\"intra-area $VAR(./intra-area/@)\"; \ fi; \ - if [ -n \"$(./inter-area/@)\" ]; then \ - PARM=\"\\$PARM inter-area $(./inter-area/@)\"; \ + if [ -n \"$VAR(./inter-area/@)\" ]; then \ + PARM=\"$PARM inter-area $VAR(./inter-area/@)\"; \ fi; \ - if [ -n \"$(./external/@)\" ]; then \ - PARM=\"\\$PARM external $(./external/@)\"; \ + 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\"; \ + ${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.def b/templates/protocols/ospf/distribute-list/node.def index bd170cd6..9f4a8f06 100644 --- a/templates/protocols/ospf/distribute-list/node.def +++ b/templates/protocols/ospf/distribute-list/node.def @@ -1,4 +1,4 @@ tag: type: txt -commit: $(./out/) != ""; "must add protocol to filter" -help: "access-list to filter networks in routing updates" +commit:expression: $VAR(./out/) != ""; "must add protocol to filter" +help: access-list to filter networks in routing updates 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 cd2f1200..819ff774 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,8 @@ multi: type: txt -help: "Filter outgoing routing updates" -syntax: $(@) in "bgp", "connected", "isis", "kernel", "rip", "static"; "Must be (bgp, connected, isis, kernel, rip, or static" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"distribute-list $(../@) out $(@) \"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no distribute-list $(../@) out $(@) \"; " +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\" \ + -c \"distribute-list $VAR(../@) out $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"no distribute-list $VAR(../@) out $VAR(@) \"; " diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def index cffc4455..89c2bb75 100644 --- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def +++ b/templates/protocols/ospf/log-adjacency-changes/detail/node.def @@ -1,6 +1,6 @@ -help: "Log all state changes" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: Log all state changes +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"log-adjacency-changes detail\"; " -delete: "\\${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 log-adjacency-changes detail\"; " diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def index 0c07be4a..9897c04e 100644 --- a/templates/protocols/ospf/log-adjacency-changes/node.def +++ b/templates/protocols/ospf/log-adjacency-changes/node.def @@ -1,5 +1,5 @@ -help: "Log changes in adjacency state" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: Log changes in adjacency state +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"log-adjacency-changes\"; " -delete: "\\${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 log-adjacency-changes\"; " diff --git a/templates/protocols/ospf/max-metric/node.def b/templates/protocols/ospf/max-metric/node.def index 1295623c..812172f8 100644 --- a/templates/protocols/ospf/max-metric/node.def +++ b/templates/protocols/ospf/max-metric/node.def @@ -1 +1 @@ -help: "OSPF maximum / infinite-distance metric" +help: OSPF maximum / infinite-distance metric 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 0f7c2ba6..1ad32f4c 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: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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: "\\${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 administrative \"; " diff --git a/templates/protocols/ospf/max-metric/router-lsa/node.def b/templates/protocols/ospf/max-metric/router-lsa/node.def index 61c4d253..7371f9a9 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/node.def @@ -1 +1 @@ -help: "Advertise own Router-LSA with infinite distance (stub router)" +help: Advertise own Router-LSA with infinite distance (stub router) 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 55a08828..d69a33dc 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,8 @@ type: u32 -help: "Advertise stub-router prior to full shutdown of OSPF" -syntax: $(@) >= 5 && $(@) <= 86400; "must be between 5-86400 seconds" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"max-metric router-lsa on-shutdown $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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\" \ + -c \"max-metric router-lsa on-shutdown $VAR(@)\"; " +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: 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 f9c9432d..492f7334 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,9 @@ type: u32 -help: "Automatically advertise stub Router-LSA on startup of OSPF" -syntax: $(@) >= 5 && $(@) <= 86400; "must be between 5-86400 seconds" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"max-metric router-lsa on-startup $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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\" \ + -c \"max-metric router-lsa on-startup $VAR(@)\"; " +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: 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 22804817..c502bee8 100644 --- a/templates/protocols/ospf/mpls-te/enable/node.def +++ b/templates/protocols/ospf/mpls-te/enable/node.def @@ -1,5 +1,5 @@ -help: "Enable the MPLS-TE functionality" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: Enable the MPLS-TE functionality +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"mpls-te on\"; " -delete: "\\${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 mpls-te\"; " diff --git a/templates/protocols/ospf/mpls-te/node.def b/templates/protocols/ospf/mpls-te/node.def index 997d3406..691c56d6 100644 --- a/templates/protocols/ospf/mpls-te/node.def +++ b/templates/protocols/ospf/mpls-te/node.def @@ -1 +1 @@ -help: "Configure MPLS-TE parameters" +help: Configure MPLS-TE parameters diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def index 6a0fdfee..b2ee1b8b 100644 --- a/templates/protocols/ospf/mpls-te/router-address/node.def +++ b/templates/protocols/ospf/mpls-te/router-address/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: "Stable IP address of the advertising router" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"mpls-te router-address $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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\"; " diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def index baa994d8..c07df296 100644 --- a/templates/protocols/ospf/neighbor/node.def +++ b/templates/protocols/ospf/neighbor/node.def @@ -1,7 +1,7 @@ tag: type: ipv4 -help: "Neighbor IP address" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"neighbor $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no neighbor $(@)\"; " +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(@)\"; " 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 9bd63ae0..25cd1662 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,7 @@ type: u32 -help: "Dead neighbor polling interval" -syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535 seconds" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"neighbor $(../@) poll-interval $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no neighbor $(../@) poll-interval $(@)\"; " +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\" \ + -c \"neighbor $VAR(../@) poll-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"no neighbor $VAR(../@) poll-interval $VAR(@)\"; " diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def index 7d50ed8b..3f5730de 100644 --- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def +++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def @@ -1,7 +1,7 @@ type: u32 -help: "Neighbor priority in seconds" -syntax: $(@) >= 0 && $(@) <= 255; "Priority must be between 0-255" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"neighbor $(../@) priority $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no neighbor $(../@) priority $(@)\"; " +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\" \ + -c \"neighbor $VAR(../@) priority $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"no neighbor $VAR(../@) priority $VAR(@)\"; " diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def index 24cb31e8..e652deaa 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -1,3 +1,3 @@ -help: "Configure OSPF for IPv4" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router ospf\" " +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\" " diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def index 9bd50e8a..f61fbbc9 100644 --- a/templates/protocols/ospf/parameters/abr-type/node.def +++ b/templates/protocols/ospf/parameters/abr-type/node.def @@ -1,8 +1,8 @@ type: txt -help: "Set OSPF ABR type" +help: Set OSPF ABR type default: "cisco" -syntax: $(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"ospf abr-type $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no ospf abr-type $(@)\"; " +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\" \ + -c \"ospf abr-type $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"no ospf abr-type $VAR(@)\"; " diff --git a/templates/protocols/ospf/parameters/node.def b/templates/protocols/ospf/parameters/node.def index 95934f6e..050f78ae 100644 --- a/templates/protocols/ospf/parameters/node.def +++ b/templates/protocols/ospf/parameters/node.def @@ -1 +1 @@ -help: "OSPF specific commands" +help: OSPF specific commands diff --git a/templates/protocols/ospf/parameters/opaque-lsa/node.def b/templates/protocols/ospf/parameters/opaque-lsa/node.def index 9e1e5b14..194a8499 100644 --- a/templates/protocols/ospf/parameters/opaque-lsa/node.def +++ b/templates/protocols/ospf/parameters/opaque-lsa/node.def @@ -1,6 +1,6 @@ -help: "Enable the Opaque-LSA capability (rfc2370)" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: Enable the Opaque-LSA capability (rfc2370) +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"ospf opaque-lsa \"; " -delete: "\\${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 opaque-lsa \"; " diff --git a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def index f689edb9..29b95c40 100644 --- a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def +++ b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def @@ -1,5 +1,5 @@ -help: "Enable rfc1583 criteria for handling AS external routes" -create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: Enable rfc1583 criteria for handling AS external routes +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"ospf rfc1583compatibility \"; " -delete: "\\${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 rfc1583compatibility \"; " diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def index b1902d49..77ceeaa3 100644 --- a/templates/protocols/ospf/parameters/router-id/node.def +++ b/templates/protocols/ospf/parameters/router-id/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: "Override the default router identifier" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"ospf router-id $(@)\" " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +help: Override the default router identifier +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\" \ -c \"no ospf router-id \" " diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index f2b3267d..d0834c65 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -1,26 +1,26 @@ multi: type: txt -help: "Suppress routing updates on an interface" -syntax: exec " \ - if [ -z \"`ip addr | grep $(@) `\" ] && [ x$(@) != xdefault ]; then \ - echo ethernet interface $(@) doesn\\'t exist on this system ; \ +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: "if [ x$(x) == xdefault ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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 $(@)\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"passive-interface $VAR(@)\"; \ fi; " -delete: "if [ x$(x) == xdefault ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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 $(@)\"; \ + ${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[@]##*/} +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 270a810e..549cfdf1 100644 --- a/templates/protocols/ospf/redistribute/bgp/metric/node.def +++ b/templates/protocols/ospf/redistribute/bgp/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def index f09214b7..98856c8a 100644 --- a/templates/protocols/ospf/redistribute/bgp/node.def +++ b/templates/protocols/ospf/redistribute/bgp/node.def @@ -1,16 +1,16 @@ -help: "Redistribute BGP routes" -delete: "touch /tmp/ospf-redist-bgp.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + if [ -f \"/tmp/ospf-redist-bgp.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-bgp.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + 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\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"redistribute bgp $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/bgp/route-map/node.def b/templates/protocols/ospf/redistribute/bgp/route-map/node.def index f6e81288..a56f5668 100644 --- a/templates/protocols/ospf/redistribute/bgp/route-map/node.def +++ b/templates/protocols/ospf/redistribute/bgp/route-map/node.def @@ -1,4 +1,4 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/ospf/redistribute/connected/metric/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def index d7ca3c34..8234167e 100644 --- a/templates/protocols/ospf/redistribute/connected/metric/node.def +++ b/templates/protocols/ospf/redistribute/connected/metric/node.def @@ -1,6 +1,6 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def index 77d286dd..02fc58de 100644 --- a/templates/protocols/ospf/redistribute/connected/node.def +++ b/templates/protocols/ospf/redistribute/connected/node.def @@ -1,16 +1,16 @@ -help: "Redistribute connected routes" -delete: "touch /tmp/ospf-redist-connected.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + if [ -f \"/tmp/ospf-redist-connected.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-connected.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + 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\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"redistribute connected $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/connected/route-map/node.def b/templates/protocols/ospf/redistribute/connected/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/ospf/redistribute/connected/route-map/node.def +++ b/templates/protocols/ospf/redistribute/connected/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/ospf/redistribute/kernel/metric/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def index 270a810e..549cfdf1 100644 --- a/templates/protocols/ospf/redistribute/kernel/metric/node.def +++ b/templates/protocols/ospf/redistribute/kernel/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def index f8ab05e6..d0fd8b97 100644 --- a/templates/protocols/ospf/redistribute/kernel/node.def +++ b/templates/protocols/ospf/redistribute/kernel/node.def @@ -1,16 +1,16 @@ -help: "Redistribute kernel routes" -delete: "touch /tmp/ospf-redist-kernel.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + if [ -f \"/tmp/ospf-redist-kernel.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-kernel.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + 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\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"redistribute kernel $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/kernel/route-map/node.def b/templates/protocols/ospf/redistribute/kernel/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/ospf/redistribute/kernel/route-map/node.def +++ b/templates/protocols/ospf/redistribute/kernel/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/ospf/redistribute/node.def b/templates/protocols/ospf/redistribute/node.def index e46c9122..00eefa88 100644 --- a/templates/protocols/ospf/redistribute/node.def +++ b/templates/protocols/ospf/redistribute/node.def @@ -1 +1 @@ -help: "Redistribute information from another routing protocol" +help: Redistribute information from another routing protocol diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def index 01a2dda7..80d13b5e 100644 --- a/templates/protocols/ospf/redistribute/rip/metric/node.def +++ b/templates/protocols/ospf/redistribute/rip/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def index fdf4ea4a..d78ad9e8 100644 --- a/templates/protocols/ospf/redistribute/rip/node.def +++ b/templates/protocols/ospf/redistribute/rip/node.def @@ -1,17 +1,17 @@ -help: "Redistribute RIP routes" -delete: "touch /tmp/ospf-redist-rip.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + if [ -f \"/tmp/ospf-redist-rip.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-rip.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + 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\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"redistribute rip $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/rip/route-map/node.def b/templates/protocols/ospf/redistribute/rip/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/ospf/redistribute/rip/route-map/node.def +++ b/templates/protocols/ospf/redistribute/rip/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/ospf/redistribute/static/metric/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def index 270a810e..549cfdf1 100644 --- a/templates/protocols/ospf/redistribute/static/metric/node.def +++ b/templates/protocols/ospf/redistribute/static/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def index ee9f387b..318c0fed 100644 --- a/templates/protocols/ospf/redistribute/static/node.def +++ b/templates/protocols/ospf/redistribute/static/node.def @@ -1,16 +1,16 @@ -help: "Redistribute static routes" -delete: "touch /tmp/ospf-redist-static.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + if [ -f \"/tmp/ospf-redist-static.$PPID\" ]; then \ + rm -rf /tmp/ospf-redist-static.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + 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\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"redistribute static $COND\"; \ fi; " diff --git a/templates/protocols/ospf/redistribute/static/route-map/node.def b/templates/protocols/ospf/redistribute/static/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/ospf/redistribute/static/route-map/node.def +++ b/templates/protocols/ospf/redistribute/static/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/ospf/refresh/node.def b/templates/protocols/ospf/refresh/node.def index 0885963f..bfa1dca4 100644 --- a/templates/protocols/ospf/refresh/node.def +++ b/templates/protocols/ospf/refresh/node.def @@ -1 +1 @@ -help: "Adjust refresh parameters" +help: Adjust refresh parameters diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def index fe181359..309ad572 100644 --- a/templates/protocols/ospf/refresh/timers/node.def +++ b/templates/protocols/ospf/refresh/timers/node.def @@ -1,8 +1,8 @@ type: u32 -help: "Set refresh timer" -syntax: $(@) >= 10 && $(@) <= 1800; "must be between 10-1800" -update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no refresh timer\" -c \"refresh timer $(@)\"; " -delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"no refresh timer $(@)\"; " -#comp_help: <10-1800> Timer value in seconds +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 diff --git a/templates/protocols/ospf/timers/node.def b/templates/protocols/ospf/timers/node.def index d81f1b41..8c4873b2 100644 --- a/templates/protocols/ospf/timers/node.def +++ b/templates/protocols/ospf/timers/node.def @@ -1 +1 @@ -help: "Adjust routing timers" +help: Adjust routing timers diff --git a/templates/protocols/ospf/timers/throttle/node.def b/templates/protocols/ospf/timers/throttle/node.def index adac0fcb..0854aae8 100644 --- a/templates/protocols/ospf/timers/throttle/node.def +++ b/templates/protocols/ospf/timers/throttle/node.def @@ -1 +1 @@ -help: "Throttling adaptive timers" +help: Throttling adaptive timers diff --git a/templates/protocols/ospf/timers/throttle/spf/delay/node.def b/templates/protocols/ospf/timers/throttle/spf/delay/node.def index 28d24cee..cd7f8e1e 100644 --- a/templates/protocols/ospf/timers/throttle/spf/delay/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/delay/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Delay (msec) from first change received till SPF calculation" +help: Delay (msec) from first change received till SPF calculation default: 200 -syntax: $(@) >= 0 && $(@) <= 600000; "must be between 0-600000" +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" 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 a52b9b09..63ce7d98 100644 --- a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Initial hold time(msec) between consecutive SPF calculations" +help: Initial hold time(msec) between consecutive SPF calculations default: 1000 -syntax: $(@) >= 0 && $(@) <= 600000; "must be between 0-600000" +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" 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 fd5d6332..0577b425 100644 --- a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Maximum hold time (msec)" +help: Maximum hold time (msec) default: 10000 -syntax: $(@) >= 0 && $(@) <= 600000; "must be between 0-600000" +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def index 8478376a..86bb51b6 100644 --- a/templates/protocols/ospf/timers/throttle/spf/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/node.def @@ -1,10 +1,10 @@ -help: "OSPF SPF timers" -delete: "touch /tmp/ospf-timer.\\$PPID" -end: "if [ -f \"/tmp/ospf-timer.\\$PPID\" ]; then \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ +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; \ + rm /tmp/ospf-timer.$PPID; \ else \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ - -c \"timers throttle spf $(delay/@) $(initial-holdtime/@) $(max-holdtime/@)\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ + -c \"timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)\"; \ fi; " |