summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def16
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/node.def19
2 files changed, 23 insertions, 12 deletions
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 dfcbfdf7..da351ee5 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,7 +1,11 @@
help: Set to not inject inter-area routes into stub
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"area $VAR(../../../@) stub no-summary \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"no area $VAR(../../../@) stub no-summary \"; "
+
+create:
+ vyatta-vtysh -c "configure terminal" \
+ -c "router ospf" \
+ -c "area $VAR(../../../@) stub no-summary "
+
+delete:
+ vyatta-vtysh -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 b9d2066c..ecdc091a 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,10 +1,17 @@
help: Set 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-vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"area $VAR(../../@) stub\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"no area $VAR(../../@) stub\"; "
+
+create:
+ vyatta-vtysh -c "configure terminal" \
+ -c "router ospf" \
+ -c "area $VAR(../../@) stub"
+
+delete:
+ vyatta-vtysh -c "configure terminal" \
+ -c "router ospf" \
+ -c "no area $VAR(../../@) stub"