From 67c9ab299d135e8866e81868843197dd3aa78d02 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Tue, 8 Apr 2008 17:03:09 -0700
Subject: Fix 3129: "delete protocols ospf neighbor <> priority" should delete
 the neighbor in the config as under the routing engine

---
 .../ospf/neighbor/node.tag/poll-interval/node.def         | 15 ++++++++-------
 .../protocols/ospf/neighbor/node.tag/priority/node.def    | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

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 de508545..7c234d10 100644
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Dead neighbor polling interval
+default: 60
 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(@)\"; "
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "neighbor $VAR(../@) poll-interval $VAR(@)";
+delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "neighbor $VAR(../@) poll-interval 60";
 comp_help: possible completions:
- <1-65535>          Seconds between dead neighbor polling interval
+ <1-65535>          Seconds between dead neighbor polling interval (default 60)
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
index 167dec0f..16af4dc3 100644
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Neighbor priority in seconds
+default: 0
 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(@)\"; "
+update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "neighbor $VAR(../@) priority $VAR(@)"; 
+delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+          -c "router ospf"                                        \
+          -c "neighbor $VAR(../@) priority 0";
 comp_help: possible completions:
- <0-255>            Set neighbor priority
+ <0-255>            Set neighbor priority (default 0)
-- 
cgit v1.2.3