diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-30 15:28:35 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-30 15:28:35 -0700 |
| commit | bb626b99b59133577e333cd2b5553cdc621c4ad7 (patch) | |
| tree | 6b4417b20f57b33c3dae8495d764417c6fa55832 /templates/protocols/bgp | |
| parent | 88bcee588c999abe4eae6fb12f01a8ca2d929279 (diff) | |
| download | vyatta-cfg-quagga-bb626b99b59133577e333cd2b5553cdc621c4ad7.tar.gz vyatta-cfg-quagga-bb626b99b59133577e333cd2b5553cdc621c4ad7.zip | |
Replace calls to vyatta-vtysh perl script with vyatta-vtysh
No longer need the perl wrapper, the logging and error suppression
are now in the command itself. This helps with the speed of route
creation with lots of routes.
Diffstat (limited to 'templates/protocols/bgp')
70 files changed, 143 insertions, 143 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 9d640b1e..69c2daab 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -3,8 +3,8 @@ type: u32 help: Configure Border Gateway Protocol (BGP) parameters comp_help: \1 <1-4294967294>\tAS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "AS number must be between 1 and 4294967294" -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(@)" +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" # we need to set default parameters in BGP here since we can't do it in # startup scripts as we don't know the AS number at that point -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(@)" -c "bgp network import-check" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "no router bgp $VAR(@)" +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" -c "bgp network import-check" +delete: vyatta-vtysh -c "configure terminal" -c "no router bgp $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def index 9d834276..19eae4e3 100644 --- a/templates/protocols/bgp/node.tag/aggregate-address/node.def +++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def @@ -4,7 +4,7 @@ help: Set a BGP aggregate network comp_help: \1 <x.x.x.x/x>\taggregate network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +end: vyatta-vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../@)" \ -c "no aggregate-address $VAR(@)"; @@ -17,7 +17,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ if ${vyatta_sbindir}/vyatta_quagga_utils.pl --exists 'protocols bgp $VAR(../@) aggregate-address $VAR(@) summary-only' ; then cond="$cond summary-only"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router bgp $VAR(../@)" \ -c "aggregate-address $VAR(@) $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def index 20679a41..4e2e2793 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.def @@ -4,7 +4,7 @@ help: Set a BGP neighbor comp_help: \1 <x.x.x.x>\tBGP neighbor IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-name $VAR(@)" update: if [ -n "`echo $VAR(@) | sed 's/[0-9]\{1,3\}.[0-9]\{1,3\}.[0-9]\{1,3\}.[0-9]\{1,3\}//'`" ]; then - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../@)" -c "neighbor $VAR(@) peer-group" ; + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" -c "neighbor $VAR(@) peer-group" ; fi ; delete: /opt/vyatta/sbin/vyatta-bgp.pl --check-peer-groups --peergroup $VAR(@) --as $VAR(../@); - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../@)" -c "no neighbor $VAR(@)" + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" -c "no neighbor $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def index 104a4954..7544aeec 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def @@ -8,8 +8,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) advertisement-interval $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) advertisement-interval" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def index 47739dee..f4442693 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def @@ -1,7 +1,7 @@ help: Set to accept a route that contains the local-AS in the as-path commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)" delete: touch /tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) allowas-in "; if [ -f "/tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID" ]; then rm -rf /tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID; @@ -11,7 +11,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "route else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) allowas-in $VAR(./number/@)"; fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def index 0439166e..37cec991 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def @@ -2,7 +2,7 @@ help: Set whether BGP attributes are sent unchanged commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)" commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set attribute-unchanged for a neighbor in a peer-group" delete: touch /tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) attribute-unchanged "; if [ -f "/tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID" ]; then rm -rf /tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID; @@ -25,7 +25,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "route else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) attribute-unchanged $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def index 2fd214b9..7c41868c 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def @@ -5,9 +5,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) capability dynamic" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) capability dynamic" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def index 3d8ebb02..693b764e 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../../../../remote-as/@)" ]; then else peer="peer-group $VAR(../../../../peer-group/@)\"; \ fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \ -c "neighbor $VAR(../../../../@) $peer" \ -c "neighbor $VAR(../../../../@) capability orf prefix-list receive" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \ -c "no neighbor $VAR(../../../../@) capability orf prefix-list receive" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def index 8ffc380b..73f1768f 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def @@ -6,9 +6,9 @@ update:expression: "if [ -n \"$VAR(../../../../remote-as/@)\" ]; then \ else \ peer=\"peer-group $VAR(../../../../peer-group/@)\"; \ fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \ + vyatta-vtysh -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \ -c \"neighbor $VAR(../../../../@) $peer\" \ -c \"neighbor $VAR(../../../../@) capability orf prefix-list send\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \ +delete:expression: "vyatta-vtysh --noerror -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \ -c \"no neighbor $VAR(../../../../@) capability orf prefix-list send\" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def index b340a4ee..e318a3ae 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def @@ -2,7 +2,7 @@ help: Set to send default route to this neighbor commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)" commit:expression: $VAR(../peer-group/) == ""; "protocold bgp $VAR(../../@) neighbor $VAR(../@): you can't set default-originate for a neighbor in a peer-group" delete: touch /tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) default-originate "; if [ -f "/tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID" ]; then rm -rf /tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID; @@ -15,7 +15,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "route else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) default-originate $cond"; \ fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def index 894b0a12..c10cfbb4 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def @@ -5,9 +5,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) dont-capability-negotiate " -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) dont-capability-negotiate" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def index 86ecbe85..e3ad1593 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def @@ -5,9 +5,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) disable-connected-check" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) disable-connected-check" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def index ad46a9ba..b480dd29 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "no neighbor $VAR(../../@) send-community extended" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) send-community extended" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def index 13e28d5a..0de7a6c3 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "no neighbor $VAR(../../@) send-community standard" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) send-community standard" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def index 3ed5ac6d..35c78cb3 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def @@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) distribute-list $VAR(@) out" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) distribute-list $VAR(@) out" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def index 9a6e6b80..378ea604 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def @@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) distribute-list $VAR(@) in" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) distribute-list $VAR(@) in" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def index 0bc04757..6f3d4bf6 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def @@ -8,9 +8,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) ebgp-multihop $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) ebgp-multihop" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def index bf0e2d33..e116f9b4 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def @@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) filter-list $VAR(@) out" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) filter-list $VAR(@) out" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def index a06da057..f6ef4a99 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def @@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) filter-list $VAR(@) in" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) filter-list $VAR(@) in" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def index 3f3ee011..c70da32f 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def @@ -4,7 +4,7 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../ commit:expression: $VAR(./local-as/@) != $VAR(../../@); "protocols bgp $VAR(../../@) neighbor $VAR(../@) local-as: you can't set a different local-as for iBGP neighbors" commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) local-as: you can't set local-as for a neighbor in a peer-group" delete: touch /tmp/bgp-neighbor-$VAR(../@)-local-as.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) local-as "; if [ -f "/tmp/bgp-neighbor-$VAR(../@)-local-as.$PPID" ]; then rm -rf /tmp/bgp-neighbor-$VAR(../@)-local-as.$PPID; @@ -26,7 +26,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "route else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) local-as $VAR(./local-as/@) $cond "; fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def index 8ec44aab..2d8cd1ef 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def @@ -7,9 +7,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) maximum-prefix $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) maximum-prefix" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def index 9374186f..e1bd2ce7 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) next-hop-self" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) next-hop-self " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def index 821fefdc..12e156ac 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) override-capability" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) override-capability" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def index ad15bb5e..e50e6686 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def @@ -5,9 +5,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) passive" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) passive" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def index 7cfd25af..922ff28a 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def @@ -10,10 +10,10 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) password $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) password" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def index 4001027c..26f54db7 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def @@ -6,7 +6,7 @@ syntax:expression: exec "if [ -n \"`echo $VAR(../@) | sed 's/[0-9]\\{1,3\\}.[0-9 fi; "; "peer-group token may not be specified for a peer-group" commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --peergroup=$VAR(@) --as $VAR(../../@) --neighbor $VAR(../@)" commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) neighbor $VAR(@)\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) peer-group: peer-group $VAR(@) doesn't exist" -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) peer-group $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) peer-group $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def index d6f20b81..333f06b0 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def @@ -9,10 +9,10 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) port $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete: vyatta-vtysh --noerror \ -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) port" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def index 02699c7b..4de56dfe 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def @@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) prefix-list $VAR(@) out" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) prefix-list $VAR(@) out" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def index 8c3f1b0a..5696359c 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def @@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) prefix-list $VAR(@) in" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) prefix-list $VAR(@) in" 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 c10df2e1..10b33281 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 @@ -2,9 +2,9 @@ type: u32 help: Set neighbor BGP AS number comp_help: \1 <1-4294967294>\tAS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "remote-as must be between 1 and 4294967294" -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) remote-as $VAR(@)" # commented out because deleting anything after remote-as will cause a failure in Quagga # this is a temporary fix until node ordering is enabled -#delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +#delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ # -c "no neighbor $VAR(../@) remote-as $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def index 2fe11e46..70af0e3b 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) remove-private-AS" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) remove-private-AS" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def index 0f68abd3..75cd25dc 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def @@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) route-map $VAR(@) out" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) out" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def index 10513cf8..d6fa203e 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def @@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) route-map $VAR(@) in" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) in" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def index 88e8e48b..405b47d5 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def @@ -7,9 +7,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) route-reflector-client" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) route-reflector-client" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def index 97eaf838..46848522 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def @@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) route-server-client" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) route-server-client" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def index 0d90f0d1..817d4966 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def @@ -5,8 +5,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) shutdown" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) shutdown" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def index 493073d3..4f14a62b 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def @@ -5,8 +5,8 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then else peer="peer-group $VAR(../../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) soft-reconfiguration inbound" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) soft-reconfiguration inbound" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def index 1603de51..1ffad91e 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def @@ -6,8 +6,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) strict-capability-match" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) strict-capability-match " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def index 71a74730..b1a8eeac 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def @@ -2,9 +2,9 @@ help: Set neighbor timers commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)" commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set timers for a neighbor in a peer-group" delete: touch /tmp/bgp-neighbor-$VAR(../@)-timers.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) timers"; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) timers connect"; if [ -f "/tmp/bgp-neighbor-$VAR(../@)-timers.$PPID" ]; then rm -rf /tmp/bgp-neighbor-$VAR(../@)-timers.$PPID; @@ -15,12 +15,12 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router peer="peer-group $VAR(../peer-group/@)"; fi; if [ -n "$VAR(./connect/@)" ]; then - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) timers connect $VAR(./connect/@)"; fi; if [ -n "$VAR(./keepalive/@)" ] || [ -n "$VAR(./holdtime/@)" ]; then - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) timers $VAR(./keepalive/@) $VAR(./holdtime/@)"; fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def index 81936f0c..500e4ec4 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def @@ -9,8 +9,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) unsuppress-map $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) unsuppress-map $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def index 249429ce..e631951d 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def @@ -12,8 +12,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) update-source $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) update-source" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def index 3671473e..ce016875 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def @@ -8,8 +8,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) weight $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) weight $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def index 5a5f1164..fe253baa 100644 --- a/templates/protocols/bgp/node.tag/network/node.def +++ b/templates/protocols/bgp/node.tag/network/node.def @@ -6,7 +6,7 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); "protocols bgp $VAR(../@) network $VAR(@): May specify route-map or backdoor but not both" delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../@)" -c "no network $VAR(@)"; +end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../@)" -c "no network $VAR(@)"; if [ -f "/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID" ]; then rm -rf /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID; @@ -24,5 +24,5 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router cond="route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../@)" -c "network $VAR(@) $cond"; + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" -c "network $VAR(@) $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def index 6acaa730..1b28dbb3 100644 --- a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def +++ b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def @@ -1,5 +1,5 @@ help: Set to compare MEDs from different neighbors -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp always-compare-med" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp always-compare-med" diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def index 94d0947b..1e5eadac 100644 --- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def +++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def @@ -1,6 +1,6 @@ help: Set to compare AS-path lengths including confederation sets & sequences -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath as-path confed" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "no bgp bestpath as-path confed " diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def index 02ae5d3b..7cc281fb 100644 --- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def +++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def @@ -1,5 +1,5 @@ help: Set to ignore AS-path length in selecting a route -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath as-path ignore" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "no bgp bestpath as-path ignore" diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def index bdee3425..afd20542 100644 --- a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def +++ b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def @@ -1,6 +1,6 @@ help: Set to compare the router-id for identical EBGP paths -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp bestpath compare-routerid" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp bestpath compare-routerid" diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def index 2fe47d22..30334b86 100644 --- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def +++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def @@ -1,6 +1,6 @@ help: Set to compare MEDs among confederation paths -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath med confed" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "no bgp bestpath med confed" diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def index 48b9f4c5..28ccdbc7 100644 --- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def +++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def @@ -1,6 +1,6 @@ help: Set to treat a route missing a MED as the least preferred one -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath med missing-as-worst" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "no bgp bestpath med missing-as-worst" diff --git a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def index e898e349..fb6521fc 100644 --- a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def +++ b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def @@ -1,7 +1,7 @@ type: ipv4 help: Set the route-reflector cluster-id comp_help: \1 <x.x.x.x>\tcluster-id IP -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp cluster-id $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp cluster-id" diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def index 23ee9cea..fb4ff733 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def @@ -2,7 +2,7 @@ type: u32 help: Set confederation AS identifier comp_help: \1 <1-4294967294>\tconfederation AS id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294" -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp confederation identifier $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp confederation identifier" 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 849f2934..1f043d41 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_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp confederation peers $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp confederation peers $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/node.def index 5d71fca0..ae05b419 100644 --- a/templates/protocols/bgp/node.tag/parameters/dampening/node.def +++ b/templates/protocols/bgp/node.tag/parameters/dampening/node.def @@ -3,10 +3,10 @@ delete:expression: "touch /tmp/bgp-dampening.$PPID" # Note that there is a bug in quagga here. If bgpd gets two 'no bgp dampening' # commands in a row it will crash end: if [ -f "/tmp/bgp-dampening.$PPID" ]; then - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp dampening" ; rm -f "/tmp/bgp-dampening.$PPID" ; else - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp dampening $VAR(./half-life/@) $VAR(./re-use/@) $VAR(./start-suppress-time/@) $VAR(./max-suppress-time/@)" ; fi ; diff --git a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def index 4651cd68..1c358313 100644 --- a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def +++ b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def @@ -1,7 +1,7 @@ type: u32 help: Set the default local preference (higher=more preferred) comp_help: \1 <0-4294967295>\tlocal preference -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp default local-preference $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp default local-preference" diff --git a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def index 5747cdfa..58a884bd 100644 --- a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def +++ b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def @@ -1,5 +1,5 @@ help: Set to deactivate IPv4 unicast for a peer by default -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp default ipv4-unicast" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp default ipv4-unicast " diff --git a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def index f6a23e70..26a6f72f 100644 --- a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def +++ b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def @@ -1,5 +1,5 @@ help: Set to compare MEDs between different peers in the same AS -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp deterministic-med" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp deterministic-med" diff --git a/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def index 85bfee9a..0031aea0 100644 --- a/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def +++ b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def @@ -1,5 +1,5 @@ help: Set to disable IGP route check for network statements -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp network import-check" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp network import-check" diff --git a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def index 8ec9c0de..a527ff8b 100644 --- a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def +++ b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def @@ -1,5 +1,5 @@ help: Set to require first AS in the path to match peer's AS -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp enforce-first-as " -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp enforce-first-as " diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def index 91491cbd..2c92a0b5 100644 --- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def +++ b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def @@ -2,7 +2,7 @@ type: u32 help: Set the maximum time to hold onto restarting peer's stale paths comp_help: \1 <1-3600>\thold time in seconds syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 3600; "stalepath-time must be between 1 and 3600" -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp graceful-restart stalepath-time $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp graceful-restart stalepath-time" diff --git a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def index 11429c19..9df1f912 100644 --- a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def +++ b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def @@ -1,5 +1,5 @@ help: Set to log neighbor up/down changes and reset reason -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp log-neighbor-changes" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp log-neighbor-changes" diff --git a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def index 2d774537..15512df8 100644 --- a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def +++ b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def @@ -1,5 +1,5 @@ help: Set to disable client to client route reflection -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp client-to-client reflection" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp client-to-client reflection" diff --git a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def index 23440864..3925b270 100644 --- a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def +++ b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def @@ -1,5 +1,5 @@ help: Set to disable immediate sesison reset if peer's connected link goes down -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp fast-external-failover" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp fast-external-failover" diff --git a/templates/protocols/bgp/node.tag/parameters/router-id/node.def b/templates/protocols/bgp/node.tag/parameters/router-id/node.def index 477f900a..33741ad4 100644 --- a/templates/protocols/bgp/node.tag/parameters/router-id/node.def +++ b/templates/protocols/bgp/node.tag/parameters/router-id/node.def @@ -1,7 +1,7 @@ type: ipv4 help: Set BGP router id comp_help: \1 <x.x.x.x>\tBGP router-id IP -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp router-id $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp router-id" diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def index 8619b163..e8c4152f 100644 --- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def +++ b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def @@ -2,7 +2,7 @@ type: u32 help: Set BGP route scanner interval comp_help: \1 <5-60>\tscan interval in seconds syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds" -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp scan-time $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp scan-time" diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def index 6c44113c..5a6cf333 100644 --- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/connected/node.def @@ -1,6 +1,6 @@ help: Set to redistribute connected routes into BGP delete: touch /tmp/bgp-redist-connected.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no redistribute connected"; if [ -f "/tmp/bgp-redist-connected.$PPID" ]; then rm -rf /tmp/bgp-redist-connected.$PPID; @@ -11,6 +11,6 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $V if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "redistribute connected $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def index 0b7f0d04..6be988b3 100644 --- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def @@ -1,6 +1,6 @@ help: Set to redistribute kernel routes into BGP delete: touch /tmp/bgp-redist-kernel.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no redistribute kernel "; if [ -f "/tmp/bgp-redist-kernel.$PPID" ]; then rm -rf /tmp/bgp-redist-kernel.$PPID; @@ -11,6 +11,6 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "redistribute kernel $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def index 3eb7a3c5..3121c8dc 100644 --- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def @@ -1,6 +1,6 @@ help: Set to redistribute OSPF routes into BGP delete: touch /tmp/bgp-redist-ospf.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no redistribute ospf"; if [ -f "/tmp/bgp-redist-ospf.$PPID" ]; then rm -rf /tmp/bgp-redist-ospf.$PPID; @@ -11,6 +11,6 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "redistribute ospf $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/node.def index f66f5d74..77287058 100644 --- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/rip/node.def @@ -1,6 +1,6 @@ help: Set to redistribute RIP routes into BGP delete: touch /tmp/bgp-redist-rip.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no redistribute rip "; if [ -f "/tmp/bgp-redist-rip.$PPID" ]; then rm -rf /tmp/bgp-redist-rip.$PPID; @@ -11,6 +11,6 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "redistribute rip $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/redistribute/static/node.def index ec107483..c23a5381 100644 --- a/templates/protocols/bgp/node.tag/redistribute/static/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/static/node.def @@ -1,6 +1,6 @@ help: Set to redistribute static routes into BGP delete: touch /tmp/bgp-redist-static.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no redistribute static"; if [ -f "/tmp/bgp-redist-static.$PPID" ]; then rm -rf /tmp/bgp-redist-static.$PPID; @@ -11,6 +11,6 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "redistribute static $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/timers/node.def index ad23965b..d0586116 100644 --- a/templates/protocols/bgp/node.tag/timers/node.def +++ b/templates/protocols/bgp/node.tag/timers/node.def @@ -2,11 +2,11 @@ help: Set BGP protocol timers commit:expression: $VAR(./keepalive/) != ""; "protocols bgp $VAR(../@) timers: you must set a keepalive interval" commit:expression: $VAR(./holdtime/) != ""; "protocols bgp $VAR(../@) timers: you must set a holdtime interval" delete: touch /tmp/bgp-timers.$PPID -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../@)" \ +end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \ -c "no timers bgp"; if [ -f "/tmp/bgp-timers.$PPID" ]; then rm -rf /tmp/bgp-timers.$PPID; else - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../@)" \ + vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \ -c "timers bgp $VAR(./keepalive/@) $VAR(./holdtime/@)"; fi; |