diff options
Diffstat (limited to 'templates/protocols/bgp')
77 files changed, 206 insertions, 206 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 718bdd67..6ceb8c63 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -5,7 +5,7 @@ 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" -create: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "no router bgp $VAR(@)" +create: vtysh -c "configure terminal" -c "router bgp $VAR(@)" +delete: 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 19eae4e3..1fa743c4 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-vtysh --noerror \ +end: vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../@)" \ -c "no aggregate-address $VAR(@)"; @@ -17,7 +17,7 @@ end: vyatta-vtysh --noerror \ if ${vyatta_sbindir}/vyatta_quagga_utils.pl --exists 'protocols bgp $VAR(../@) aggregate-address $VAR(@) summary-only' ; then cond="$cond summary-only"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../@)" \ -c "aggregate-address $VAR(@) $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def b/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def index cb260727..37b76fe8 100644 --- a/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def @@ -8,7 +8,7 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID -end: vyatta-vtysh -n -c "configure terminal" \ +end: vtysh -n -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no ipv6 bgp aggregate-address $VAR(@)"; if [ -f "/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID" ]; then @@ -17,7 +17,7 @@ end: vyatta-vtysh -n -c "configure terminal" \ if [ -n "$VAR(./summary-only)" ]; then cond="$cond summary-only"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "ipv6 bgp aggregate-address $VAR(@) $cond"; fi; diff --git a/templates/protocols/bgp/node.tag/ipv6/network/node.def b/templates/protocols/bgp/node.tag/ipv6/network/node.def index cfe2d8a7..81052ea2 100644 --- a/templates/protocols/bgp/node.tag/ipv6/network/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/network/node.def @@ -6,10 +6,10 @@ comp_help: syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "ipv6 bgp network $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no ipv6 bgp network $VAR(@)"; diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def index 34ef9014..2af59605 100644 --- a/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def @@ -2,7 +2,7 @@ help: Set to redistribute connected routes into BGP delete: touch /tmp/bgp-redist-connected.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no redistribute connected"; @@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "redistribute connected $cond"; diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def index a3915423..0b83aee9 100644 --- a/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def @@ -2,7 +2,7 @@ help: Set to redistribute kernel routes into BGP delete: touch /tmp/bgp-redist-kernel.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no redistribute kernel "; @@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "redistribute kernel $cond"; diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def index ae44b906..d9a08db7 100644 --- a/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def @@ -2,7 +2,7 @@ help: Set to redistribute OSPFv3 routes into BGP delete: touch /tmp/bgp-redist-ospf.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no redistribute ospf6"; @@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "redistribute ospf6 $cond"; diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def index 4ba7c3a1..dd24ef27 100644 --- a/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def @@ -2,7 +2,7 @@ help: Set to redistribute RIPng routes into BGP delete: touch /tmp/bgp-redist-rip.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no redistribute ripng"; @@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "redistribute ripng $cond"; diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def index 23f40710..b59edfc4 100644 --- a/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def +++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def @@ -2,7 +2,7 @@ help: Set to redistribute static routes into BGP delete: touch /tmp/bgp-redist-static.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no redistribute static"; @@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "redistribute static $cond"; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def index 765c2fdc..333ee1a0 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.def @@ -12,13 +12,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \ create: if /opt/vyatta/sbin/vyatta-bgp.pl --check-if-peer-group \ --peergroup $VAR(@); then - vyatta-vtysh -c "configure terminal" \ + 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(../@) || exit 1 - vyatta-vtysh -c "configure terminal" \ + 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 e64ab3d6..90432838 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 @@ -14,12 +14,12 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) advertisement-interval $VAR(@)" -delete: vyatta-vtysh --noerror \ +delete: 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 4ee7ebac..70c98e74 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 @@ -3,13 +3,13 @@ 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(../@)" end: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) allowas-in "; else - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) allowas-in "; @@ -22,12 +22,12 @@ end: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then peer="peer-group $VAR(../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) allowas-in $VAR(./number/@)"; else - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 a04fa398..e9f02cc6 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 @@ -5,14 +5,14 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../ commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set attribute-unchanged for a neighbor in a peer-group" end: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) activate" \ -c "no neighbor $VAR(../@) attribute-unchanged "; else - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) attribute-unchanged "; @@ -38,13 +38,13 @@ end: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) attribute-unchanged $cond"; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) attribute-unchanged $cond"; 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 4ec98ef6..64848769 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 @@ -11,13 +11,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) capability dynamic" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) capability dynamic" @@ -25,13 +25,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) capability dynamic" else - vyatta-vtysh --noerror \ + 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 9e28247b..33067593 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 @@ -11,13 +11,13 @@ update: if [ -n "$VAR(../../../../remote-as/@)" ]; then fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../../../@)" \ -c "neighbor $VAR(../../../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../../../@) capability orf prefix-list receive" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../../../@)" \ -c "neighbor $VAR(../../../../@) $peer" \ -c "neighbor $VAR(../../../../@) capability orf prefix-list receive" @@ -25,13 +25,13 @@ update: if [ -n "$VAR(../../../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../../../@) capability orf prefix-list receive" else - vyatta-vtysh --noerror \ + 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 f0cc7193..a3334d78 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 @@ -13,13 +13,13 @@ update: if [ -n "$VAR(../../../../remote-as/@)" ] if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../../../@)" \ -c "neighbor $VAR(../../../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../../../@) capability orf prefix-list send" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../../../@)" \ -c "neighbor $VAR(../../../../@) $peer" \ -c "neighbor $VAR(../../../../@) capability orf prefix-list send" @@ -27,13 +27,13 @@ update: if [ -n "$VAR(../../../../remote-as/@)" ] delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../../../@) capability orf prefix-list send" else - vyatta-vtysh --noerror \ + 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 e17f499c..26c28b52 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 @@ -5,13 +5,13 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../ commit:expression: $VAR(../peer-group/) == ""; "protocold bgp $VAR(../../@) neighbor $VAR(../@): you can't set default-originate for a neighbor in a peer-group" end: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) default-originate "; else - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) default-originate "; @@ -27,14 +27,14 @@ end: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then peer="peer-group $VAR(../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) default-originate $cond"; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) default-originate $cond"; 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 c10cfbb4..a15d36ea 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) dont-capability-negotiate " -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 e3ad1593..bf96e198 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) disable-connected-check" -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 20897c0d..71083ca8 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 @@ -12,13 +12,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) send-community extended" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "no neighbor $VAR(../../@) send-community extended" @@ -27,13 +27,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) send-community extended" else - vyatta-vtysh --noerror \ + 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 4ed4be3c..d6cc6e17 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 @@ -12,13 +12,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) send-community standard" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "no neighbor $VAR(../../@) send-community standard" @@ -26,13 +26,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) send-community standard" else - vyatta-vtysh --noerror \ + 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 61fbd023..af7f92c8 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 @@ -27,14 +27,14 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) activate" \ -c "neighbor $VAR(../../@) distribute-list $VAR(@) out" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) distribute-list $VAR(@) out" @@ -42,13 +42,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) distribute-list $VAR(@) out" else - vyatta-vtysh --noerror \ + 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 76858faa..4db868fe 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 @@ -22,13 +22,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) distribute-list $VAR(@) in" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) distribute-list $VAR(@) in" @@ -36,13 +36,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) distribute-list $VAR(@) in" else - vyatta-vtysh --noerror \ + 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 8658b0c5..4186dfbd 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 @@ -14,12 +14,12 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) ebgp-multihop $VAR(@)" -delete: vyatta-vtysh --noerror \ +delete: 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 48e397db..d5567d22 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 @@ -20,28 +20,28 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then peer="peer-group $VAR(../../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) filter-list $VAR(@) out" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) filter-list $VAR(@) out" fi; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "address-family ipv6" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) filter-list $VAR(@) out" else - vyatta-vtysh --noerror \ + 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 91b8814c..daee397b 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 @@ -20,28 +20,28 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then peer="peer-group $VAR(../../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) filter-list $VAR(@) in" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) filter-list $VAR(@) in" fi; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "address-family ipv6" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) filter-list $VAR(@) in" else - vyatta-vtysh --noerror \ + 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 27882373..1334cd2c 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 @@ -8,7 +8,7 @@ commit:expression: $VAR(./local-as/@) != $VAR(../../@); "protocols bgp $VAR(../. 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" -end: vyatta-vtysh --noerror \ +end: vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) local-as "; @@ -33,7 +33,7 @@ end: vyatta-vtysh --noerror \ peer="peer-group $VAR(../peer-group/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) local-as $VAR(./local-as/@) $cond "; 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 ab31b9e4..344504fb 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 @@ -15,13 +15,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) maximum-prefix $VAR(@)" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) maximum-prefix $VAR(@)" @@ -29,13 +29,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) maximum-prefix" else - vyatta-vtysh --noerror \ + 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 bd4e8b3c..f7ec8e1f 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 @@ -12,13 +12,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) next-hop-self" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) next-hop-self" @@ -26,13 +26,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) next-hop-self " else - vyatta-vtysh --noerror \ + 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 12e156ac..b403b38b 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) override-capability" -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 e50e6686..812def6a 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) passive" -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 fc7b2110..04a34027 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-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c 'neighbor $VAR(../@) password $VAR(@)' -delete: vyatta-vtysh \ +delete: 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 26f54db7..66d80b69 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) peer-group $VAR(@)" -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 333f06b0..edf597a0 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-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) port $VAR(@)" -delete: vyatta-vtysh --noerror \ +delete: 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 eb8c252c..fde7d4f9 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 @@ -24,28 +24,28 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then peer="peer-group $VAR(../../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) prefix-list $VAR(@) out" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) prefix-list $VAR(@) out" fi; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "address-family ipv6" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) prefix-list $VAR(@) out" else - vyatta-vtysh --noerror \ + 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 849a871d..f27abd95 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 @@ -24,28 +24,28 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then peer="peer-group $VAR(../../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) prefix-list $VAR(@) in" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) prefix-list $VAR(@) in" fi; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "address-family ipv6" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) prefix-list $VAR(@) in" else - vyatta-vtysh --noerror \ + 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 2bc7382b..ed00b1f5 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 @@ -8,24 +8,24 @@ syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \ "remote-as must be between 1 and 4294967294" # Create action so this leaf is done before others -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) remote-as $VAR(@)" || exit 1; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) activate" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) activate"; fi -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) remote-as $VAR(@)" || exit 1; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) activate" \ -c "address-family ipv6" \ @@ -33,12 +33,12 @@ update: vyatta-vtysh -c "configure terminal" \ fi #remote-as needs to be set 1st & deleted last - comment out for now -#delete: vyatta-vtysh -c "configure terminal" \ +#delete: vtysh -c "configure terminal" \ # -c "router bgp $VAR(../../@)" \ # -c "no neighbor $VAR(../@) remote-as $VAR(@)"; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) activate" \ -c "address-family ipv6" \ 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 8ea74210..a2b7b553 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 @@ -12,13 +12,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) remove-private-AS" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) remove-private-AS" @@ -26,13 +26,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) remove-private-AS" else - vyatta-vtysh --noerror \ + 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 20fe9b2b..c73162c6 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 @@ -18,14 +18,14 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) activate" \ -c "neighbor $VAR(../../@) route-map $VAR(@) out" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) route-map $VAR(@) out" @@ -33,12 +33,12 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) out" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) out" fi 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 10157986..86d50f79 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 @@ -20,14 +20,14 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) activate" \ -c "neighbor $VAR(../../@) route-map $VAR(@) in" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) route-map $VAR(@) in" @@ -35,12 +35,12 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) in" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) in" fi; 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 42167786..1ea47938 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 @@ -14,13 +14,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) route-reflector-client" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) route-reflector-client" @@ -28,13 +28,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) route-reflector-client" else - vyatta-vtysh --noerror \ + 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 40102885..913fe3b1 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 @@ -12,13 +12,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) route-server-client" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) route-server-client" @@ -26,13 +26,13 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) route-server-client" else - vyatta-vtysh --noerror \ + 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 38898848..4ea19509 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 @@ -6,8 +6,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) shutdown" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 a86dca62..ff70de01 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 @@ -9,13 +9,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../../@) soft-reconfiguration inbound"; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) soft-reconfiguration inbound"; @@ -23,12 +23,12 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -n -c "configure terminal" \ + vtysh -n -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../../@) soft-reconfiguration inbound"; else - vyatta-vtysh -n -c "configure terminal" \ + vtysh -n -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) soft-reconfiguration inbound"; fi; 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 1ffad91e..45aab6e8 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) strict-capability-match" -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 b1a8eeac..2b8d75e8 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-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) timers"; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@) peer="peer-group $VAR(../peer-group/@)"; fi; if [ -n "$VAR(./connect/@)" ]; then - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 e3582280..3bc83999 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 @@ -22,28 +22,28 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then peer="peer-group $VAR(../peer-group/@)"; fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) $peer" \ -c "address-family ipv6" \ -c "neighbor $VAR(../@) unsuppress-map $VAR(@)" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) unsuppress-map $VAR(@)" fi; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then - vyatta-vtysh --noerror \ + vtysh --noerror \ -c "configure terminal" \ -c "address-family ipv6" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) unsuppress-map $VAR(@)" else - vyatta-vtysh --noerror \ + 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 833174d8..28239414 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 @@ -10,9 +10,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then else peer="peer-group $VAR(../peer-group/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) update-source $VAR(@)" -delete: vyatta-vtysh --noerror -c "configure terminal" \ +delete: 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 ce016875..75ac0190 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) $peer" \ -c "neighbor $VAR(../@) weight $VAR(@)" -delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 e263d4e3..e8262d1b 100644 --- a/templates/protocols/bgp/node.tag/network/node.def +++ b/templates/protocols/bgp/node.tag/network/node.def @@ -10,7 +10,7 @@ commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID -end: vyatta-vtysh -n -c "configure terminal" \ +end: vtysh -n -c "configure terminal" \ -c "router bgp $VAR(../@)" \ -c "no network $VAR(@)"; if [ -f "/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID" ]; then @@ -22,7 +22,7 @@ end: vyatta-vtysh -n -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then cond="route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + 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 1b28dbb3..f91e5743 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp always-compare-med" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 1e5eadac..c5cf317b 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath as-path confed" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: 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 7cc281fb..bc364db1 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath as-path ignore" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: 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 afd20542..cd6da257 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp bestpath compare-routerid" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: 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 30334b86..a2e56c64 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath med confed" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: 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 28ccdbc7..89ffa368 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ -c "bgp bestpath med missing-as-worst" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \ +delete: 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 fb6521fc..7a413785 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp cluster-id $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 21abcb83..1cc994b9 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 [REQUIRED] 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp confederation identifier $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: 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 2a763ae2..899d696d 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" -create: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +create: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp confederation peers $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: 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 ae05b419..e9513221 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp dampening" ; rm -f "/tmp/bgp-dampening.$PPID" ; else - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 1c358313..7915bf52 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp default local-preference $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: 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 58a884bd..b65bacf3 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "no bgp default ipv4-unicast" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: 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 26a6f72f..d15fc5ba 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp deterministic-med" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 0031aea0..62adaf91 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp network import-check" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 a527ff8b..269ec92f 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp enforce-first-as " -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 2c92a0b5..73cc18c5 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp graceful-restart stalepath-time $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \ +delete: 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 9df1f912..b27054f2 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp log-neighbor-changes" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 15512df8..a0dd5246 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp client-to-client reflection" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 3925b270..3c0a8254 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "no bgp fast-external-failover" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 33741ad4..e80d5f19 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp router-id $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 e8c4152f..057832f7 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "bgp scan-time $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +delete: 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 5a6cf333..a85348f9 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 6be988b3..3f2d4147 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 3121c8dc..8570d8d3 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 77287058..2695f58e 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 c23a5381..c2517d07 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ +end: 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-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ if [ -n "$VAR(./route-map/@)" ]; then cond="$cond route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \ + 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 d0586116..97e3a31f 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-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \ +end: 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-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \ + vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \ -c "timers bgp $VAR(./keepalive/@) $VAR(./holdtime/@)"; fi; |