summaryrefslogtreecommitdiff
path: root/templates/protocols/ospf/area
diff options
context:
space:
mode:
Diffstat (limited to 'templates/protocols/ospf/area')
-rw-r--r--templates/protocols/ospf/area/node.def3
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/normal/node.def11
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def12
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/node.def8
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def15
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def12
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/authentication/node.def27
-rw-r--r--templates/protocols/ospf/area/node.tag/network/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def12
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/node.def1
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/shortcut/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def26
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def15
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def13
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def13
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def15
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def13
25 files changed, 181 insertions, 109 deletions
diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def
index 7da8f765..53fc6067 100644
--- a/templates/protocols/ospf/area/node.def
+++ b/templates/protocols/ospf/area/node.def
@@ -2,3 +2,6 @@ tag:
type: txt
help: OSPF Area
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"; "Invalid OSFP area \"$VAR(@)\" "
+comp_help: possible completions:
+ <0-4294967295> Set OSPF area in decimal notation
+ <x.x.x.x> Set OSPF area in dotted decimal notation
diff --git a/templates/protocols/ospf/area/node.tag/area-type/node.def b/templates/protocols/ospf/area/node.tag/area-type/node.def
index d5cceedb..fba5775d 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/node.def
@@ -1 +1,5 @@
help: Area type
+comp_help: possible completions:
+ normal Set normal area type
+ nssa Set not so stubby area type
+ stub Set stub Area type
diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
index a55cfe79..8bf65c54 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
@@ -1,8 +1,9 @@
help: Normal OSPF area
syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
-create:expression: "if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \
- fi; "
-
+create:expression: " \
+ if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then \
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \
+ fi; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
index 6446515b..95f73f69 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
@@ -1,7 +1,11 @@
type: u32
help: Set the summary-default cost of nssa area
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../@) default-cost $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../@) default-cost $VAR(@)\"; "
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../@) default-cost $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../@) default-cost $VAR(@)\"; "
+comp_help: possible completions:
+ <0-16777215> Set summary default cost
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
index 9bbd739f..fa1f76e4 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
@@ -1,5 +1,7 @@
help: Do not inject inter-area routes into stub
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../@) nssa no-summary \"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../@) nssa no-summary \"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../@) nssa no-summary \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../@) nssa no-summary \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
index 6501dc8c..9ac0569f 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
@@ -2,7 +2,7 @@ help: nssa OSPF area
syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be NSSA"
syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"area $VAR(../../@) nssa\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no area $VAR(../../@) nssa\"; "
-
-
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" -c \"area $VAR(../../@) nssa\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" -c \"no area $VAR(../../@) nssa\"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
index 86616a8f..045c6bec 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
@@ -1,7 +1,14 @@
type: txt
+help: Configure NSSA-ABR
default: "candidate"
syntax:expression: $VAR(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../@) nssa translate-$VAR(@) \"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../@) nssa translate-$VAR(@) \"; "
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../@) nssa translate-$VAR(@) \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../@) nssa translate-$VAR(@) \"; "
+comp_help: possible completions:
+ always Configure NSSA-ABR to always translate
+ candidate Configure NSSA-ABR for translate election (default)
+ never Configure NSSA-ABR to never translate
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
index bd29d813..cc7d96fa 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
@@ -1,7 +1,11 @@
type: u32
help: Set the summary-default cost of stub area
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../@) default-cost $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../@) default-cost $VAR(@)\"; "
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../@) default-cost $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../@) default-cost $VAR(@)\"; "
+comp_help: possible completions:
+ <0-16777215> Set summary default cost of stub area
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
index 30cc830f..5420dba5 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
@@ -1,5 +1,7 @@
help: Do not inject inter-area routes into stub
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../@) stub no-summary \"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../@) stub no-summary \"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../@) stub no-summary \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../@) stub no-summary \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
index e39f36bc..cfaa9b87 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
@@ -2,7 +2,9 @@ help: Stub OSPF area
syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be stub"
syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) stub\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) stub\"; "
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) stub\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) stub\"; "
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 2581eee1..b5d7bbac 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -1,17 +1,20 @@
type: txt
help: Configure OSPF area authentication type
syntax:expression: $VAR(@) in "simple", "md5"; "Must be either simple or md5"
-update:expression: "if [ x$VAR(@) == xsimple ]; then \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
- -c \"router ospf \" \
- -c \"no area $VAR(../@) authentication \" \
- -c \"area $VAR(../@) authentication \" ; \
- else \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
- -c \"router ospf \" \
- -c \"no area $VAR(../@) authentication \" \
- -c \"area $VAR(../@) authentication message-digest\" ; \
+update:expression: "if [ x$VAR(@) == xsimple ]; then \
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf \" \
+ -c \"no area $VAR(../@) authentication \" \
+ -c \"area $VAR(../@) authentication \" ; \
+ else \
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf \" \
+ -c \"no area $VAR(../@) authentication \" \
+ -c \"area $VAR(../@) authentication message-digest\" ; \
fi; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
- -c \"router ospf \" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf \" \
-c \"no area $VAR(../@) authentication \" "
+comp_help: possible completions:
+ simple Use simple plain-text authentication
+ md5 Use md5 authentication
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 36aecb09..6b743ede 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -2,7 +2,9 @@ multi:
type: ipv4net
help: OSPF network
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"network $VAR(@) area $VAR(../@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no network $VAR(@) area $VAR(../@)\"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"network $VAR(@) area $VAR(../@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no network $VAR(@) area $VAR(../@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index 92d5512a..63147ac6 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -2,7 +2,9 @@ tag:
type: ipv4net
help: Summarize routes matching prefix (border routers only)
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../@) range $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../@) range $VAR(@)\"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../@) range $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../@) range $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
index 8716bd4b..11b744db 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
@@ -1,7 +1,11 @@
type: u32
help: Metric for this range
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; "
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) range $VAR(../@) cost $VAR(@)\"; "
+comp_help: possible completions:
+ <0-16777215> Set metric for this range
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/node.def
deleted file mode 100644
index f4440010..00000000
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: what should I put here
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
index 748e264d..22a10e0c 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
@@ -1,5 +1,7 @@
help: Do NOT advertise this range
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
index d4276cfc..dba70a07 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
@@ -1,7 +1,9 @@
type: ipv4net
help: Announce area range as another prefix
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; "
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) range $VAR(../@) substitute $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index b41d7195..ed6fd7de 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,7 +1,13 @@
type: txt
help: Configure area's shortcutting mode
syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
-c \"area $VAR(../@) shortcut $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
-c \"no area $VAR(../@) shortcut $VAR(@)\"; "
+comp_help: possible completions:
+ default Set default
+ disable Disable shortcutting mode
+ enable Enable shortcutting mode
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
index ba21aa64..572e161b 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
@@ -2,7 +2,9 @@ tag:
type: ipv4
help: Configure a virtual link
syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)"
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../@) virtual-link $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../@) virtual-link $VAR(@)\"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../@) virtual-link $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../@) virtual-link $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index eff0d6be..d73b4404 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -4,16 +4,18 @@ help: Configure MD5 key id
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
commit:expression: $VAR(md5-key/) != ""; "must add the md5-key for key-id $VAR(@)"
delete:expression: "touch /tmp/ospf-md5.$PPID"
-end:expression: "if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../../@) virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
+end:expression: "\
+ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../../@) \
+ virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \
+ rm /tmp/ospf-md5.$PPID; \
+ else \
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \
+ message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
fi; "
-
-
-
-
-
+comp_help: possible completions:
+ <1-255> Set the key id
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index 7fd09ba1..d7760159 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -1,6 +1,11 @@
help: Configure MD5 key id
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../../@) virtual-link $VAR(../../@) authentication-key\" \
- -c \"area $VAR(../../../@) virtual-link $VAR(../../@) authentication message-digest\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../../@) virtual-link $VAR(../../@) authentication null\"; "
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../../@) virtual-link $VAR(../../@) \
+ authentication-key\" \
+ -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \
+ authentication message-digest\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \
+ authentication null\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
index 179800a2..4a765bf1 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
@@ -1,8 +1,11 @@
type: u32
help: Interval after which a neighbor is declared dead
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
-comp_help: <1-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
+comp_help: possible completions:
+ <1-65535> Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
index 29ee19e0..0cab5c07 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
@@ -1,8 +1,11 @@
type: u32
help: Interval between HELLO packets
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
-comp_help: <1-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
+comp_help: possible completions:
+ <1-65535> Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
index 5e227a08..014a44ba 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
@@ -1,8 +1,13 @@
type: u32
help: Interval between retransmitting lost link state advertisements
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) virtual-link $VAR(../@) retransmit-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) virtual-link $VAR(../@) retransmit-interval \"; "
-comp_help: <1-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) virtual-link $VAR(../@) \
+ retransmit-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) virtual-link $VAR(../@) \
+ retransmit-interval \"; "
+comp_help: possible completions:
+ <1-65535> Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
index c829dc4d..e2cf5896 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
@@ -1,8 +1,11 @@
type: u32
help: Link state transmit delay
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
- -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
-comp_help: <1-65535> Seconds
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"router ospf\" \
+ -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
+comp_help: possible completions:
+ <1-65535> Seconds