From 00250bfa344edfe41904dfa1b2aa16019401e694 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Tue, 8 Apr 2008 15:17:43 -0700
Subject: Make sure OSPF area-type is set before default-cost.

---
 .../node.tag/area-type/nssa/default-cost/node.def  | 22 +++++++++++++++-------
 .../node.tag/area-type/stub/default-cost/node.def  | 20 ++++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

(limited to 'templates/protocols/ospf/area')

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 95f73f69..21a486a7 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,11 +1,19 @@
 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(@)\"; "
+
+create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "area $VAR(../../../@) nssa"                         \
+          -c "area $VAR(../../../@) default-cost $VAR(@)";
+
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "area $VAR(../../../@) default-cost $VAR(@)"; 
+
+delete: ${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
+  <0-16777215>       Set summary default cost
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 cc7d96fa..78c28760 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,11 +1,19 @@
 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(@)\"; "
+
+create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "area $VAR(../../../@) stub"                         \
+          -c "area $VAR(../../../@) default-cost $VAR(@)";
+
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "area $VAR(../../../@) default-cost $VAR(@)";
+
+delete: ${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
-- 
cgit v1.2.3