summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorRobert Bays <rbays@moresby.(none)>2007-11-07 22:46:55 -0800
committerRobert Bays <rbays@moresby.(none)>2007-11-07 22:46:55 -0800
commite8b2cd03166a150c8326ab3c6585e9552d797cfe (patch)
treeab324992e547486f3eb2a0b27ac0387c98f88abc /templates
parent0584c5da0f995e0bbbaac1e80f1dc39c108c965a (diff)
downloadvyatta-cfg-quagga-e8b2cd03166a150c8326ab3c6585e9552d797cfe.tar.gz
vyatta-cfg-quagga-e8b2cd03166a150c8326ab3c6585e9552d797cfe.zip
fix route-maps
remove old create statements
Diffstat (limited to 'templates')
-rw-r--r--templates/policy/route-map/node.def1
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/action/node.def1
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/call/node.def6
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def5
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def4
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def2
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def1
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def3
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def3
-rw-r--r--templates/protocols/bgp/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/cluster-id/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/network/import-check/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/router-id/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/bgp/scan-time/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG#2
53 files changed, 28 insertions, 101 deletions
diff --git a/templates/policy/route-map/node.def b/templates/policy/route-map/node.def
index 24c12467..95dc9d53 100644
--- a/templates/policy/route-map/node.def
+++ b/templates/policy/route-map/node.def
@@ -3,4 +3,3 @@ type: txt
help: "Create route-map or enter route-map command mode"
syntax: pattern $(@) "^[-a-zA-Z0-9.]+$" ; "route-map $(@): name must be alpha-numeric"
delete: "/usr/bin/vtysh -c\"configure terminal\" -c\"no route-map $(@)\" "
-
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def
index 21804042..9445ecff 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def
@@ -1,6 +1,5 @@
type: txt
help: "Action to take on prefixes matching this rule"
syntax: $(@) in "permit", "deny"; "route-map $(../../@) $(@) $(../@) action: must be permit or deny"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(@) $(../@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(@) $(../@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"no route-map $(../../@) $(@) $(../@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def
index 6ef93c25..1a7915d6 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def
@@ -1,9 +1,7 @@
type: txt
help: "Target route-map name"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\"; "route-map $(@) doesn't exist"
-commit: $(../action/@); "must define an action for route-map $(../../@) rule $(../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \
- -c \"call $(@)\" "
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" "; "route-map $(@) doesn't exist"
+commit: $(../action/@) != ""; "must define an action for route-map $(../../@) rule $(../@)"
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \
-c \"call $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
index 9b6fa886..5d438adc 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
@@ -1,10 +1,7 @@
type: txt
help: "Match BGP AS path list"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\"; "AS path list $(@) doesn't exist"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match as-path $(@)\" "
+commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\" "; "AS path list $(@) doesn't exist"
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"match as-path $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def
index 6e6687fe..d539fdd7 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def
@@ -1,3 +1,3 @@
type: txt
help: "Match community list"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy community-list $(@)\"; "community-list $(@) doesn't exist"
+commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy community-list $(@)\" "; "community-list $(@) doesn't exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def
index 15a2be66..df9de17d 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def
@@ -11,9 +11,9 @@ end: "if [ -z \"$(./community-list/)\" ]; then \
rm -rf /tmp/policy-route-map-$(../../../@)-$(../../action/@)-$(../../@)-match-community.\\$PPID; \
else \
if [ -n \"$(./exact-match/)\" ]; then \
- COND=\"exact-match \"; \
+ cond=\"exact-match \"; \
fi ; \
/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match community $(./community-list/@) \\$COND\" ; \
+ -c \"match community $(./community-list/@) \\$cond\" ; \
fi; "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def
index 232e39eb..1d1b41d2 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def
@@ -7,9 +7,6 @@ syntax: exec " \
echo $(@) doesn\\'t exist on this system ; \
exit 1 ; \
fi ; "
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match interface $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"match interface $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
index fae2c56c..fad1c33f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
@@ -1,4 +1,4 @@
type: u32
help: "IP access-list number"
syntax: $(../prefix-list/@) == ""; "You can only specify a prefix-list or access-list"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\"; "access-list $(@) does not exist"
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
index 1cf23475..a192a5f0 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
@@ -1,4 +1,4 @@
type: u32
help: "IP access-list number"
syntax: $(../access-list/@) == ""; "You can only specify a prefix-list or access-list"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\"; "prefix-list $(@) does not exist"
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def
index fae2c56c..fad1c33f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def
@@ -1,4 +1,4 @@
type: u32
help: "IP access-list number"
syntax: $(../prefix-list/@) == ""; "You can only specify a prefix-list or access-list"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\"; "access-list $(@) does not exist"
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def
index 1cf23475..a192a5f0 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def
@@ -1,4 +1,4 @@
type: u32
help: "IP access-list number"
syntax: $(../access-list/@) == ""; "You can only specify a prefix-list or access-list"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\"; "prefix-list $(@) does not exist"
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def
index fae2c56c..fad1c33f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def
@@ -1,4 +1,4 @@
type: u32
help: "IP access-list number"
syntax: $(../prefix-list/@) == ""; "You can only specify a prefix-list or access-list"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\"; "access-list $(@) does not exist"
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def
index 1cf23475..a192a5f0 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def
@@ -1,4 +1,4 @@
type: u32
help: "IP access-list number"
syntax: $(../access-list/@) == ""; "You can only specify a prefix-list or access-list"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\"; "prefix-list $(@) does not exist"
+syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
index db104da3..b2bdf20a 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
@@ -1,9 +1,6 @@
type: u32
help: "Match metric of route"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match metric $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"match metric $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def
index e04d5a77..cbecdd01 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def
@@ -2,9 +2,6 @@ type: txt
help: "BGP origin code"
syntax: $(@) in "egp", "igp", "incomplete"; "origin must be egp, igp, or incomplete"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match origin $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"match origin $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def
index 177545eb..3e704263 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def
@@ -2,9 +2,6 @@ type: txt
help: "Match peer address"
syntax: exec "/opt/vyatta/sbin/vyatta-policy.pl --check-peer-syntax $(@)"; "peer must be either an IP or local"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match peer $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"match peer $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
index 8cd5d642..8529d589 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
@@ -2,9 +2,6 @@ type: u32
help: "Match tag of route"
syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535"
commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"match tag $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"match tag $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def
index 22c1d123..19ccbcfc 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def
@@ -3,9 +3,6 @@ help: "Goto sequence number"
syntax: $(../next/@) != ""; "you can set only goto or next"
syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535"
commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"on-match goto $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"on-match goto $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def
index d270b863..8c980e47 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def
@@ -1,9 +1,6 @@
help: "Goto next sequence number"
syntax: $(../goto/@) != ""; "you can set only goto or next"
commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"on-match next \" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"on-match next \" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def
index 22ea4938..496da614 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def
@@ -1,2 +1 @@
help: "Exit policy on matches"
-
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
index 9691282e..27b9eaf9 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
@@ -1,9 +1,6 @@
type: txt
help: "Prepend string for a BGP AS-path attribute"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set as-path prepend $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set as-path prepend $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def
index 9b32cbec..e33ed27f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def
@@ -1,8 +1,5 @@
help: "BGP atomic aggregate attribute"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set atomic-aggregate\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set atomic-aggregate\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def
index ada7fd99..c3c52863 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def
@@ -2,9 +2,6 @@ type: txt
help: "Community number in aa:nn format or local-AS|no-advertise|no-export|internet|additive or none"
# TODO: check syntax
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set community $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set community $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def
index 4d5efb2c..87bfd358 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def
@@ -2,9 +2,6 @@ type: ipv4
help: "Next hop IP address"
# TODO: can also set to peer for BGP
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set ip next-hop $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set ip next-hop $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def
index e54fd2c6..766ae851 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def
@@ -1,9 +1,6 @@
type: u32
help: "BGP local preference path attribute"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set local-preference $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set local-preference $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def
index 3a580a77..a101660a 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def
@@ -2,9 +2,6 @@ type: txt
help: "Metric value for destination routing protocol"
syntax: exec "if [ -n `echo $(@) | sed 's/[+0123456789]*-*//g'` ]; then exit 1; fi; "; "metric must be an integer with an optional +/- prepend"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set metric $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set metric $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def
index 10a9de68..45b176d5 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def
@@ -2,9 +2,6 @@ type: txt
help: "BGP origin code"
syntax: $(@) in "igp", "egp", "incomplete"; "origin must be one of igp, egp, or incomplete"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set origin $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set origin $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def
index 05dec8a3..4828e266 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def
@@ -1,9 +1,6 @@
type: ipv4
help: "BGP originator ID attribute"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set originator-id $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set originator-id $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def
index d694df35..36063d46 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def
@@ -2,9 +2,6 @@ type: u32
help: "Tag value for routing protocol"
syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set tag $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set tag $(@)\" "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def
index b899a45b..538063d1 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def
@@ -1,9 +1,6 @@
type: u32
help: "BGP weight for routing table"
commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
- -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
- -c \"set weight $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" \
-c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
-c \"set weight $(@)\" "
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index d36b505d..1a1e429a 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -3,5 +3,5 @@ type: u32
help: "Configure a BGP Autonomous System on this router"
# TODO: non-multinode parent
syntax: $(@) >= 1 && $(@) <= 65535; "AS number must be between 1 and 65535"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(@)\" "
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"no router bgp $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def b/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def
index 12bb0626..59cf867e 100644
--- a/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def
@@ -1,5 +1,5 @@
help: "Allow comparing MED from different neighbors"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp always-compare-med\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no bgp always-compare-med\" "
diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def
index fe3378e1..03adee5e 100644
--- a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def
@@ -1,5 +1,5 @@
help: "Compare path lengths including confederation sets & sequences in selecting a route"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"bgp bestpath as-path confed \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"no bgp bestpath as-path confed \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def
index 7acd88b6..dd346995 100644
--- a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def
@@ -1,5 +1,5 @@
help: "Ignore as-path length in selecting a route"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"bgp bestpath as-path ignore \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"no bgp bestpath as-path ignore \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def
index e698b9ff..8c8f598c 100644
--- a/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def
@@ -1,5 +1,5 @@
help: "Compare router-id for identical EBGP paths"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp bestpath compare-routerid \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"no bgp bestpath compare-routerid \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def
index 0b787b53..219d73d7 100644
--- a/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def
@@ -1,5 +1,5 @@
help: "Compare MED among confederation paths"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"bgp bestpath med confed \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"no bgp bestpath med confed \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def
index 274cc138..0f9316be 100644
--- a/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def
@@ -1,5 +1,5 @@
help: "Treat missing MED as the least preferred one"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"bgp bestpath med missing-as-worst \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
-c \"no bgp bestpath med missing-as-worst \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def
index 8722f7b5..1f56d8ff 100644
--- a/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def
@@ -1,6 +1,6 @@
help: "Configure client to client route reflection"
# TODO: not showing up in vyatta. Probably needs another setting to be applied.
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp client-to-client reflection \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no bgp client-to-client reflection \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def b/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def
index 624b9ad1..492a8e83 100644
--- a/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def
@@ -1,7 +1,5 @@
type: ipv4
help: "Configure route-reflector cluster-id\n"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
- -c \"bgp cluster-id $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp cluster-id $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def
index 5e73a0b6..826d32c5 100644
--- a/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def
@@ -1,8 +1,6 @@
type: u32
help: "Configure confederation AS id"
syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
- -c \"bgp confederation identifier $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp confederation identifier $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def b/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def
index e82b3239..38042e17 100644
--- a/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def
@@ -2,8 +2,6 @@ multi:
type: u32
help: "Peer ASs in BGP confederation"
syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
- -c \"bgp confederation peers $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp confederation peers $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def b/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def
index 82d8e95d..c8c5bb44 100644
--- a/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def
@@ -1,7 +1,5 @@
type: u32
help: "Local preference (higher=more preferred)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
- -c \"bgp default local-preference $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp default local-preference $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def
index 901ed69d..66f77ded 100644
--- a/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def
@@ -1,5 +1,5 @@
help: "Deactivate IPv4 unicast for a peer by default"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"no bgp default ipv4-unicast\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp default ipv4-unicast\" "
diff --git a/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def b/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def
index 647bf6ab..2f816856 100644
--- a/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def
@@ -1,5 +1,5 @@
help: "Pick the best-MED path among paths advertised from the neighboring AS"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp deterministic-med \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no bgp deterministic-med \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def
index eefdd8c4..9263395a 100644
--- a/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def
@@ -1,5 +1,5 @@
help: "Enforce the first AS for EBGP routes"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp enforce-first-as \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no bgp enforce-first-as \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def
index c7ddd5ae..8c28175e 100644
--- a/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def
@@ -1,8 +1,6 @@
type: u32
help: "Set the max time in seconds to hold onto restarting peer's stale paths"
syntax: $(@) >= 1 && $(@) <= 3600; "stalepath-time must be between 1 and 3600"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
- -c \"bgp graceful-restart stalepath-time $(@) \" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp graceful-restart stalepath-time $(@) \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def
index b8c53306..d4a64a82 100644
--- a/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def
@@ -1,5 +1,5 @@
help: "Log neighbor up/down and reset reason"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp log-neighbor-changes \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no bgp log-neighbor-changes \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def b/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def
index 0a8ab6c9..0c6ced5d 100644
--- a/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def
@@ -1,5 +1,5 @@
help: "Check BGP network route exists in IGP"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"bgp network import-check \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-c \"no bgp network import-check \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def
index 8bd23728..a53214e0 100644
--- a/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def
@@ -1,5 +1,5 @@
help: "Immediately reset session if a link to a directly connected external peer goes down"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no bgp fast-external-failover \" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp fast-external-failover \" "
diff --git a/templates/protocols/bgp/node.tag/bgp/router-id/node.def b/templates/protocols/bgp/node.tag/bgp/router-id/node.def
index accb7677..645ecb6f 100644
--- a/templates/protocols/bgp/node.tag/bgp/router-id/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/router-id/node.def
@@ -1,7 +1,5 @@
type: ipv4
help: "Override configured router identifier"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
- -c \"bgp router-id $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp router-id $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/scan-time/node.def b/templates/protocols/bgp/node.tag/bgp/scan-time/node.def
index 45637e06..f98dd34a 100644
--- a/templates/protocols/bgp/node.tag/bgp/scan-time/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/scan-time/node.def
@@ -1,8 +1,6 @@
type: u32
syntax: $(@) >= 5 && $(@) <= 60; "scan-time must be between 5 and 60 seconds"
help: "Configure background scanner interval"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
- -c \"bgp scan-time $(@)\" "
update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"bgp scan-time $(@)\" "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index 52c1f96a..b3f2eb82 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -3,7 +3,7 @@ type: txt
help: "Specify neighbor router"
syntax: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-name $(@)"
# if this neighbor has a text name it is a peer group. setup the peer-group option
-create: "if [ -n \"`echo $(@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}//'`\" ]; then \
+update: "if [ -n \"`echo $(@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}//'`\" ]; then \
/usr/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"neighbor $(@) peer-group\" ; \
fi ; "
delete: "/usr/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"no neighbor $(@) \" "
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG# b/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG#
index 3b6ef106..8105d9c7 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG#
+++ b/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG#
@@ -3,7 +3,7 @@ type: bool
help: "Specify a BGP backdoor route"
default: false
# TODO: back referencing doesn't remove the %2F
-create: "sh -c \" \
+update: "sh -c \" \
PREF=`echo $(../@) | sed 's!%2F!/!'`; \
/opt/quagga/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
-c \\\"network \\\\$PREF backdoor\\\" \