summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2011-05-04 17:20:24 +0800
committerAn-Cheng Huang <ancheng@vyatta.com>2011-05-04 17:20:24 +0800
commit946db1f1c6c664191b21f98a825c4a4f095bcb03 (patch)
tree9bc3513280a84714f8dc87a2ec39da8a3cb344c4 /templates
parent7aba91c07c113619ad003e5d5886e10ca7f43626 (diff)
downloadvyatta-cfg-quagga-946db1f1c6c664191b21f98a825c4a4f095bcb03.tar.gz
vyatta-cfg-quagga-946db1f1c6c664191b21f98a825c4a4f095bcb03.zip
changes for new commitnapa-dev
Diffstat (limited to 'templates')
-rw-r--r--templates/protocols/node.def1
-rw-r--r--templates/protocols/ospf/node.def15
-rw-r--r--templates/protocols/ospf/parameters/node.def1
-rw-r--r--templates/protocols/ospf/parameters/router-id/node.def6
-rw-r--r--templates/protocols/ospfv3/node.def15
-rw-r--r--templates/protocols/ospfv3/parameters/node.def1
-rw-r--r--templates/protocols/ospfv3/parameters/router-id/node.def3
7 files changed, 26 insertions, 16 deletions
diff --git a/templates/protocols/node.def b/templates/protocols/node.def
index 601ea951..2f7eead5 100644
--- a/templates/protocols/node.def
+++ b/templates/protocols/node.def
@@ -1,2 +1 @@
-priority: 900
help: Routing protocol parameters
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index cf71ff05..be8a8111 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,4 +1,15 @@
priority: 620
help: Open Shortest Path First protocol (OSPF) parameters
-create: vtysh -c "configure terminal" -c "router ospf"
-delete: vtysh -c "configure terminal" -c "no router ospf"
+begin: if [ "$COMMIT_ACTION" != DELETE ]; then
+ if [ -n "$VAR(parameters/router-id/@)" ]; then
+ vtysh -c "configure terminal" -c "router ospf" \
+ -c "ospf router-id $VAR(parameters/router-id/@)"
+ else
+ vtysh -c "configure terminal" -c "router ospf" \
+ -c "no ospf router-id"
+ fi
+ fi
+end: if [ "$COMMIT_ACTION" == DELETE ]; then
+ vtysh -c "configure terminal" -c "router ospf" -c "no ospf router-id"
+ vtysh -c "configure terminal" -c "no router ospf"
+ fi
diff --git a/templates/protocols/ospf/parameters/node.def b/templates/protocols/ospf/parameters/node.def
index 0864bb0b..c8d4482b 100644
--- a/templates/protocols/ospf/parameters/node.def
+++ b/templates/protocols/ospf/parameters/node.def
@@ -1,2 +1 @@
-priority: 610
help: OSPF specific parameters
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
index e1b073fe..5f7966e6 100644
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ b/templates/protocols/ospf/parameters/router-id/node.def
@@ -1,8 +1,2 @@
type: ipv4
help: Override the default router identifier
-update:expression: "vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"ospf router-id $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"no ospf router-id \" "
diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def
index 72e1886f..56655199 100644
--- a/templates/protocols/ospfv3/node.def
+++ b/templates/protocols/ospfv3/node.def
@@ -1,4 +1,15 @@
priority: 640
help: IPv6 Open Shortest Path First protocol (OSPFv3) parameters
-create: vtysh -c "configure terminal" -c "router ospf6"
-delete: vtysh -c "configure terminal" -c "no router ospf6"
+begin: if [ "$COMMIT_ACTION" != DELETE ]; then
+ if [ -n "$VAR(parameters/router-id/@)" ]; then
+ vtysh -c "configure terminal" -c "router ospf6" \
+ -c "router-id $VAR(parameters/router-id/@)"
+ else
+ vtysh -c "configure terminal" -c "router ospf6" \
+ -c "no router-id"
+ fi
+ fi
+end: if [ "$COMMIT_ACTION" == DELETE ]; then
+ vtysh -c "configure terminal" -c "router ospf6" -c "no router-id"
+ vtysh -c "configure terminal" -c "no router ospf6"
+ fi
diff --git a/templates/protocols/ospfv3/parameters/node.def b/templates/protocols/ospfv3/parameters/node.def
index 8f16d09d..11fda8f8 100644
--- a/templates/protocols/ospfv3/parameters/node.def
+++ b/templates/protocols/ospfv3/parameters/node.def
@@ -1,2 +1 @@
-priority: 630
help: OSPFv3 specific parameters
diff --git a/templates/protocols/ospfv3/parameters/router-id/node.def b/templates/protocols/ospfv3/parameters/router-id/node.def
index f0a02436..659cccf1 100644
--- a/templates/protocols/ospfv3/parameters/router-id/node.def
+++ b/templates/protocols/ospfv3/parameters/router-id/node.def
@@ -1,5 +1,2 @@
type: ipv4
help: Router identifier
-update:expression: "vtysh -c \"configure terminal\" \
- -c \"router ospf6\" \
- -c \"router-id $VAR(@)\" "