diff options
| author | Robert Bays <rbays@moresby.(none)> | 2007-11-07 22:46:55 -0800 |
|---|---|---|
| committer | Robert Bays <rbays@moresby.(none)> | 2007-11-07 22:46:55 -0800 |
| commit | e8b2cd03166a150c8326ab3c6585e9552d797cfe (patch) | |
| tree | ab324992e547486f3eb2a0b27ac0387c98f88abc /templates/protocols/bgp | |
| parent | 0584c5da0f995e0bbbaac1e80f1dc39c108c965a (diff) | |
| download | vyatta-cfg-quagga-e8b2cd03166a150c8326ab3c6585e9552d797cfe.tar.gz vyatta-cfg-quagga-e8b2cd03166a150c8326ab3c6585e9552d797cfe.zip | |
fix route-maps
remove old create statements
Diffstat (limited to 'templates/protocols/bgp')
23 files changed, 16 insertions, 30 deletions
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\\\" \ |