summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-02 17:12:23 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-07-09 16:50:06 -0700
commit85f38872d097ac5162dea2e8e75abbeceb76534b (patch)
treefeea3cc2e0ae65a57294e0c63484635267c86634
parent69db53b3ad7495759ef94066f94c6dff8b628a95 (diff)
downloadvyatta-cfg-quagga-85f38872d097ac5162dea2e8e75abbeceb76534b.tar.gz
vyatta-cfg-quagga-85f38872d097ac5162dea2e8e75abbeceb76534b.zip
Replace update tag on multi-nodes
Multiple value nodes are never updated, only created or deleted. (cherry picked from commit 909452cdb631577aed7b9a7aed6613c2756f4e33)
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/network/node.def2
-rw-r--r--templates/protocols/ospf/passive-interface/node.def2
-rw-r--r--templates/protocols/rip/passive-interface/node.def2
-rw-r--r--templates/protocols/ripng/passive-interface/node.def2
6 files changed, 5 insertions, 6 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
index 0381d22b..3813e3c8 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
@@ -1,5 +1,4 @@
type: u32
-priority: 1
help: Set neighbor BGP AS number
comp_help:
<1-4294967294> AS number
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
index 1f043d41..2a763ae2 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
@@ -3,7 +3,7 @@ type: u32
help: Set the peer ASs in the BGP confederation
comp_help: \1 <1-4294967294>\tpeer AS number numbers (ex: "435 234")
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
-update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+create: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp confederation peers $VAR(@)"
delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp confederation peers $VAR(@)"
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 6f8e69d6..99e6cf7e 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -2,7 +2,7 @@ multi:
type: ipv4net
help: Set OSPF network
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-update:vyatta-vtysh -c "configure terminal" \
+create:vyatta-vtysh -c "configure terminal" \
-c "router ospf" -c "network $VAR(@) area $VAR(../@)"
delete:vyatta-vtysh -c "configure terminal" \
-c "router ospf" -c "no network $VAR(@) area $VAR(../@)"
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index b469f1c7..09321d9f 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -2,7 +2,7 @@ multi:
type: txt
help: Set to suppress routing updates on an interface
allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default
-update: if [ -z $VAR(@) ]
+create: if [ -z $VAR(@) ]
then vyatta-vtysh -c "configure terminal" -c "router ospf" \
-c "passive-interface default";
else vyatta-vtysh -c "configure terminal" -c "router ospf" \
diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def
index 09039331..b3674afe 100644
--- a/templates/protocols/rip/passive-interface/node.def
+++ b/templates/protocols/rip/passive-interface/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec " \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
exit 1 ; \
fi ; "
-update: if [ x$VAR(x) == xdefault ]
+create: if [ x$VAR(x) == xdefault ]
then vyatta-vtysh -c "configure terminal" -c "router rip" \
-c "passive-interface default"
else vyatta-vtysh -c "configure terminal" -c "router rip" \
diff --git a/templates/protocols/ripng/passive-interface/node.def b/templates/protocols/ripng/passive-interface/node.def
index 4fe2e16b..c3b1feed 100644
--- a/templates/protocols/ripng/passive-interface/node.def
+++ b/templates/protocols/ripng/passive-interface/node.def
@@ -8,7 +8,7 @@ syntax:expression: exec " \
exit 1; \
fi ; "
-update: if [ x$VAR(x) == xdefault ]; then
+create: if [ x$VAR(x) == xdefault ]; then
vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "passive-interface default";