diff options
Diffstat (limited to 'templates')
227 files changed, 532 insertions, 539 deletions
diff --git a/templates/policy/prefix-list/node.tag/rule/node.def b/templates/policy/prefix-list/node.tag/rule/node.def index 977f5300..5b97a5f0 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.def @@ -13,7 +13,7 @@ delete: touch /tmp/protocols-$VAR(../@)-$VAR(@).$PPID ; if [ -n "$VAR(./le/@)" ]; then cond="$cond le $VAR(./le/@) "; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ip prefix-list $VAR(../@) seq $VAR(@) $VAR(./action/@) $VAR(./prefix/@) $cond " end: len=`echo $VAR(./prefix/@) | awk -F/ '{ print $2 }'` ; if [ -n "$VAR(./ge/@)" ]; then @@ -33,7 +33,7 @@ end: len=`echo $VAR(./prefix/@) | awk -F/ '{ print $2 }'` ; if [ -f "/tmp/protocols-$VAR(../@)-$VAR(@).$PPID" ]; then rm -f "protocols-$VAR(../@)-$VAR(@).$PPID" ; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ip prefix-list $VAR(../@) seq $VAR(@) $VAR(./action/@) $VAR(./prefix/@) $cond " ; fi ; exit 0 ; diff --git a/templates/policy/prefix-list6/node.tag/rule/node.def b/templates/policy/prefix-list6/node.tag/rule/node.def index 644f09c1..bee35245 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.def @@ -15,7 +15,7 @@ delete: len=`echo $VAR(@) | awk -F/ '{ print $2 }'` ; if [ -n "$VAR(./le/@)" ]; then cond="$cond le $VAR(./le/@) "; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ipv6 prefix-list $VAR(../@) seq $VAR(@) $VAR(./action/@) $VAR(./prefix/@) $cond " end: len=`echo $VAR(./prefix/@) | awk -F/ '{ print $2 }'` ; @@ -35,7 +35,7 @@ end: len=`echo $VAR(./prefix/@) | awk -F/ '{ print $2 }'` ; fi; if [ ${COMMIT_ACTION} = 'SET' ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ipv6 prefix-list $VAR(../@) seq $VAR(@) $VAR(./action/@) $VAR(./prefix/@) $cond " ; fi; exit 0 ; diff --git a/templates/policy/route-map/node.tag/rule/node.def b/templates/policy/route-map/node.tag/rule/node.def index 98c179da..2322ebe9 100644 --- a/templates/policy/route-map/node.tag/rule/node.def +++ b/templates/policy/route-map/node.tag/rule/node.def @@ -4,6 +4,6 @@ help: Set a rule for this route-map comp_help: \1 <1-65535>\troute-map rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535" delete: if [ -f /tmp/route-map-$VAR(../@)-rule-$VAR(@)-action.$PPID ]; then - vyatta-vtysh -c "configure terminal" -c "no route-map $VAR(../@) $VAR(./@/action/@) $VAR(@)"; + vtysh -c "configure terminal" -c "no route-map $VAR(../@) $VAR(./@/action/@) $VAR(@)"; rm -f /tmp/route-map-$VAR(../@)-rule-$VAR(@)-action.$PPID; fi; diff --git a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def index 99ea11d7..065b2637 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def @@ -5,7 +5,7 @@ comp_help: \1 permit\tpermit matching prefixes syntax:expression: $VAR(@) in "permit", "deny"; "action must be permit or deny" update: /opt/vyatta/sbin/vyatta-policy.pl --check-routemap-action "policy route-map $VAR(../../@) rule $VAR(../@) action"; if [ $? -eq 0 ]; then - vyatta-vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(@) $VAR(../@)"; + vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(@) $VAR(../@)"; else echo "policy route-map $VAR(../../@) rule $VAR(../@): You can not change the action."; echo " To change the action you must first delete the rule "; diff --git a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def index 25f32a56..903f393f 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def @@ -3,7 +3,7 @@ help: Set to call another route-map on match comp_help: \1 <txt>\t\troute-map name commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" "; "policy route-map $VAR(../../@) rule $VAR(../@) call: called route-map $VAR(@) doesn't exist" commit:expression: $VAR(../action/) != ""; "policy route-map $VAR(../../@) rule $VAR(../@): you must define an action" -update: vyatta-vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \ +update: vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \ -c "call $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \ +delete: vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \ -c "no call " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def index fefafe2b..2e53e0e0 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def @@ -4,9 +4,9 @@ comp_help: \1 <1-65535>\trule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "continue must be between 1 and 65535" commit:expression: $VAR(@) > $VAR(../@); "you may only continue forward in the route-map" commit:expression: $VAR(../action/) != ""; "policy route-map $VAR(../../@) rule $VAR(../@): you must define an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \ -c "continue $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \ -c "no continue " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def index 42e410cc..8fcf6329 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def @@ -3,9 +3,9 @@ help: Set a BGP as-path-list to match comp_help: \1 <txt>\t\tas-path-list name commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): You must specify an action" commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" "; "policy route-map $VAR(../../../@) rule $VAR(../../@) match as-path: AS path list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "match as-path $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no match as-path $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def index dde2ffb8..357ee2c8 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def @@ -3,7 +3,7 @@ delete: echo route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@) >> / end: if [ -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID ]; then routemap=`cat /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID` rm -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID; - vyatta-vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ; + vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ; exit 0; else if [ -z "$VAR(./community-list/@)" ]; then @@ -25,6 +25,6 @@ end: if [ -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match- cond="exact-match "; fi ; - vyatta-vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ; - vyatta-vtysh -c "configure terminal" -c "$routemap " -c "match community $VAR(./community-list/@) $cond" ; + vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ; + vtysh -c "configure terminal" -c "$routemap " -c "match community $VAR(./community-list/@) $cond" ; fi diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def index 66cab1e7..794f2d4d 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def @@ -7,9 +7,9 @@ commit:expression: exec " \ echo policy route-map $VAR(../../../@) rule $VAR(../../@) match interface: interface $VAR(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "match interface $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no match interface $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def index f7a19aa4..6347b93d 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def @@ -17,10 +17,10 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ip address $VAR(@) " -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ip address $VAR(@) " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def index f305a8dd..9fc64b12 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def @@ -14,10 +14,10 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ip address prefix-list $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ip address prefix-list $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def index 884d43e5..caa58290 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def @@ -7,9 +7,9 @@ comp_help: \1 <1-99>\tIP standard access list number commit:expression: $VAR(../prefix-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop access-list: you may only specify a prefix-list or access-list" commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop access-list: access-list $VAR(@) does not exist" commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ip next-hop $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ip next-hop $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def index 3bd76736..5e13d9a5 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def @@ -4,9 +4,9 @@ comp_help: \1 <txt>\t\tprefix-list name commit:expression: $VAR(../access-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop prefix-list: you can only specify a prefix-list or access-list" commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop prefix-list: prefix-list $VAR(@) does not exist" commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ip next-hop prefix-list $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ip next-hop prefix-list $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def index dd6cd805..c77f2bb2 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def @@ -7,9 +7,9 @@ comp_help: \1 <1-99>\tIP standard access list number commit:expression: $VAR(../prefix-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source access-list: you may only specify a prefix-list or access-list" commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source access-list: access-list $VAR(@) does not exist" commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ip route-source $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ip route-source $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def index 0cad0615..9d0b9092 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def @@ -8,12 +8,12 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source prefix-list: you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) \ $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ip route-source prefix-list $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) \ $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ip route-source prefix-list $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def index a9208398..0a51fc26 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def @@ -11,11 +11,11 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ipv6 address $VAR(@) " -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ipv6 address $VAR(@) " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def index ac05daa3..b8537f61 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def @@ -11,11 +11,11 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ipv6 address prefix-list $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ipv6 address prefix-list $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def index 83e9e3dd..98410f1c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def @@ -7,11 +7,11 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ipv6 next-hop $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ipv6 next-hop $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def index d5b68037..aab547ed 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def @@ -7,11 +7,11 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "match ipv6 next-hop prefix-list $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ -c "no match ipv6 next-hop prefix-list $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def index d2202649..cf7edf51 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def @@ -3,10 +3,10 @@ help: Set metric of route to match comp_help: \1 <1-65535>\troute metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "metric must be between 1 and 65535" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "match metric $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no match metric $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def index 8b9abb5f..a43d7fb2 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def @@ -5,10 +5,10 @@ comp_help: \1 egp\t\texterior gateway protocol origin incomplete\tincomplete origin syntax:expression: $VAR(@) in "egp", "igp", "incomplete"; "origin must be egp, igp, or incomplete" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "match origin $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no match origin $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def index da49eb8f..da94b0f9 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def @@ -4,10 +4,10 @@ comp_help: \1 <x.x.x.x>\tpeer IP address local\t\tstatic or redistributed routes syntax:expression: exec "/opt/vyatta/sbin/vyatta-policy.pl --check-peer-syntax $VAR(@)"; "peer must be either an IP or local" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "match peer $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no match peer " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def index 1038d110..29b87acb 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def @@ -3,10 +3,10 @@ help: Set route tag to match comp_help: \1 <1-65535>\troute tag syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "tag must be between 1 and 65535" commit:expression: $VAR(../../action) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "match tag $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no match tag $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def index 4b9bd9aa..63164f95 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def @@ -5,9 +5,9 @@ syntax:expression: $VAR(../next/) == ""; "you may set only goto or next" syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "goto must be a rule number between 1 and 65535" commit:expression: $VAR(@) > $VAR(../../@); "policy route-map $VAR(../../../@) rule $VAR(../../@): you may only go forward in the route-map" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "on-match goto $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no on-match goto " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def index 16dad364..6e5aa703 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def @@ -1,10 +1,10 @@ help: Set next sequence number to goto on match syntax:expression: $VAR(../goto/) == ""; "you may set only goto or next" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "on-match next " -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no on-match next " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def index b64b891e..eddcf92f 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def @@ -4,13 +4,13 @@ commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) delete: echo $VAR(./as/@) $VAR(./ip/@) > /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID end: if [ -f "/tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID" ]; then as=$(cat /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID); - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set aggregator as $as" ; rm -rf /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID; else as="$VAR(./as/@) $VAR(./ip/@)"; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set aggregator as $as" ; fi ; diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def index 0db66701..2b41c884 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def @@ -3,9 +3,9 @@ help: Set prepend string for a Border Gateway Protocol (BGP) AS-path attribute comp_help: \1 <txt>\t\tBGP AS path prepend string (ex: "456 64500 45001") syntax:expression: exec "/opt/vyatta/sbin/vyatta-check-as-prepend.pl \"$VAR(@)\" "; "invalid AS path string" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set as-path prepend $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set as-path prepend " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def index bd4a4681..5a892483 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def @@ -1,8 +1,8 @@ help: Set Border Gateway Protocol (BGP) atomic aggregate attribute commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set atomic-aggregate" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set atomic-aggregate" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def index 382a37a8..3ccd9a42 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def @@ -4,7 +4,7 @@ end: if [ -z "$VAR(./comm-list/)" ]; then echo policy route-map $VAR(../../../@) rule $VAR(../../@) set comm-list: You must configure a comm-list ; exit 1 ; fi ; - vyatta-vtysh --noerror -c "configure terminal" \ + vtysh --noerror -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set comm-list " ; if [ -f "/tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-comm-list.$PPID" ]; then @@ -18,7 +18,7 @@ end: if [ -z "$VAR(./comm-list/)" ]; then if [ $? -eq 0 ]; then cond="delete "; fi ; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set comm-list $VAR(./comm-list/@) $cond" ; fi; diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def index 5d0ef00d..8ac47b4b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def @@ -14,10 +14,10 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-communi commit:expression: $VAR(../../action/) != "" \ ; "policy route-map $VAR(../../../@) rule $VAR(../../@): You must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set community $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set community " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def index a912d25d..e39866d0 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def @@ -3,9 +3,9 @@ help: Set nexthop IP address comp_help: \1 <x.x.x.x>\tIP address # TODO: can also set to peer for BGP commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set ip next-hop $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set ip next-hop " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def index fdcbedf4..b643391e 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def @@ -2,9 +2,9 @@ type: u32 help: Set Border Gateway Protocol (BGP) local preference attribute comp_help: \1 <0-4294967295>\tlocal preference value commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set local-preference $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set local-preference " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def index c2c50f5f..633ea289 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def @@ -4,9 +4,9 @@ comp_help: \1 type-1\tOSPF external type 1 metric type-2\tOSPF external type 2 metric syntax:expression: $VAR(@) in "type-1", "type-2"; "Must be (type-1, type-2)" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set metric-type $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set metric-type " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def index df3aece7..be83a312 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def @@ -4,9 +4,9 @@ comp_help: \1 <+/-metric>\tadd or subtract metric <0-4294967295>\tmetric value syntax:expression: exec "if [ -n \"$(echo $VAR(@) | sed 's/^[+-]*[0123456789]*//')\" ]; then exit 1; fi; "; "metric must be an integer with an optional +/- prepend" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set metric $VAR(@)" -delete: vyatta-vtysh --noerror -c "configure terminal" \ +delete: vtysh --noerror -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set metric " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def index 1e3dbc52..d84c002c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def @@ -5,9 +5,9 @@ comp_help: \1 igp\t\tinterior gateway protocol origin incomplete\tincomplete origin syntax:expression: $VAR(@) in "igp", "egp", "incomplete"; "origin must be one of igp, egp, or incomplete" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set origin $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set origin " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def index 65c78d4f..1f54bb5e 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def @@ -2,9 +2,9 @@ type: ipv4 help: Set Border Gateway Protocol (BGP) originator ID attribute comp_help: \1 <x.x.x.x>\toriginator IP address commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set originator-id $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set originator-id " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def index c023b899..3a30051d 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def @@ -3,9 +3,9 @@ help: Set tag value for routing protocol comp_help: \1 <1-65535>\t\ttag value syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "tag must be between 1 and 65535" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set tag $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set tag " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def index 38561d24..7f831ca7 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def @@ -2,9 +2,9 @@ type: u32 help: Set Border Gateway Protocol (BGP) weight attribute comp_help: \1 <0-4294967295>\tBGP weight commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "set weight $VAR(@) " -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ -c "no set weight " 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; diff --git a/templates/protocols/ospf/access-list/node.tag/export/node.def b/templates/protocols/ospf/access-list/node.tag/export/node.def index 31806ebb..ef7c6027 100644 --- a/templates/protocols/ospf/access-list/node.tag/export/node.def +++ b/templates/protocols/ospf/access-list/node.tag/export/node.def @@ -2,10 +2,10 @@ multi: type: txt help: Set filter for outgoing routing updates [REQUIRED] syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ospf" \ -c "distribute-list $VAR(../@) out $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no distribute-list $VAR(../@) out $VAR(@)"; comp_help: possible completions: diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def index 251c9c30..52d5c949 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def @@ -3,7 +3,7 @@ syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first" syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first" create:expression: " \ if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \ fi; " diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def index 65cff07f..ea03efdb 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def @@ -2,16 +2,16 @@ type: u32 help: Set the summary-default cost of nssa area syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../../@) nssa" \ -c "area $VAR(../../../@) default-cost $VAR(@)"; -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../../@) default-cost $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../../../@) default-cost $VAR(@)"; diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def index 6a4ad877..14c9df74 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def @@ -5,7 +5,7 @@ syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first" delete: touch /tmp/ospf-area-nssa.$PPID end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" -c "no area $VAR(../../@) nssa"; rm /tmp/ospf-area-nssa.$PPID; else @@ -22,6 +22,6 @@ end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then if [ $? -eq 0 ] ; then PARM="$PARM no-summary"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" -c "area $VAR(../../@) nssa $PARM"; fi; diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def index 1929ef18..52b73d05 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def @@ -2,16 +2,16 @@ type: u32 help: Set the summary-default cost of stub area syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../../@) stub" \ -c "area $VAR(../../../@) default-cost $VAR(@)"; -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../../@) default-cost $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../../../@) default-cost $VAR(@)"; diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def index da351ee5..fdafe0db 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def @@ -1,11 +1,11 @@ help: Set to not inject inter-area routes into stub create: - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../../@) stub no-summary " delete: - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../../../@) stub no-summary " diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def index ecdc091a..5f5bef18 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def @@ -7,11 +7,11 @@ syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first" syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first" create: - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../@) stub" delete: - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../../@) stub" diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def index 2146df7f..3c87b9db 100644 --- a/templates/protocols/ospf/area/node.tag/authentication/node.def +++ b/templates/protocols/ospf/area/node.tag/authentication/node.def @@ -5,20 +5,20 @@ syntax:expression: $VAR(@) in "plaintext-password", "md5"; \ update:expression: "\ if [ x$VAR(@) == xplaintext-password ]; then \ - vyatta-vtysh \ + vtysh \ -c \"configure terminal\" \ -c \"router ospf \" \ -c \"no area $VAR(../@) authentication \" \ -c \"area $VAR(../@) authentication \" ; \ else \ - vyatta-vtysh \ + vtysh \ -c \"configure terminal\" \ -c \"router ospf \" \ -c \"no area $VAR(../@) authentication \" \ -c \"area $VAR(../@) authentication message-digest\" ; \ fi; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf \" \ -c \"no area $VAR(../@) authentication \" " diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def index 55b2e632..990070dd 100644 --- a/templates/protocols/ospf/area/node.tag/network/node.def +++ b/templates/protocols/ospf/area/node.tag/network/node.def @@ -2,7 +2,7 @@ multi: type: ipv4net help: Set OSPF network [REQUIRED] syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create:vyatta-vtysh -c "configure terminal" \ +create:vtysh -c "configure terminal" \ -c "router ospf" -c "network $VAR(@) area $VAR(../@)" -delete:vyatta-vtysh -c "configure terminal" \ +delete:vtysh -c "configure terminal" \ -c "router ospf" -c "no network $VAR(@) area $VAR(../@)" diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def index c2c74ecb..72004a5e 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.def @@ -6,7 +6,7 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" delete: touch /tmp/ospf-range.$PPID end: if [ -f /tmp/ospf-range.$PPID ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../@) range $VAR(@)"; rm /tmp/ospf-range.$PPID; @@ -18,26 +18,26 @@ end: if [ -f /tmp/ospf-range.$PPID ]; then echo "Remove 'not-advertise' before setting cost or substitue"; exit 1; fi; - vyatta-vtysh --noerror -c "configure terminal" \ + vtysh --noerror -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../@) range $VAR(@)"; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../@) range $VAR(@) not-advertise"; else - vyatta-vtysh --noerror -c "configure terminal" \ + vtysh --noerror -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../@) range $VAR(@)"; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../@) range $VAR(@)"; if [ -n "$VAR(cost/@)" ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../@) range $VAR(@) cost $VAR(cost/@)"; fi; if [ -n "$VAR(substitute/@)" ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../@) range $VAR(@) substitute $VAR(substitute/@)"; fi; diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def index e5387351..4728b0f3 100644 --- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def +++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def @@ -1,7 +1,7 @@ help: Set to not advertise this range -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; " diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def index 15046236..85b7df93 100644 --- a/templates/protocols/ospf/area/node.tag/shortcut/node.def +++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def @@ -1,10 +1,10 @@ type: txt help: Set area's shortcut mode syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../@) shortcut $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../@) shortcut $VAR(@)\"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def index 614a50cd..4f8e71f0 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def @@ -2,9 +2,9 @@ tag: type: ipv4 help: Set a virtual link syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../@) virtual-link $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../@) virtual-link $VAR(@)\"; " diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def index 0806a5c7..f906e58f 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def @@ -6,13 +6,13 @@ commit:expression: $VAR(md5-key/) != ""; "Must add the md5-key for key-id $VAR(@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../../../@) \ virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \ message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def index dfb75d71..2fd13feb 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def @@ -1,16 +1,14 @@ help: Set MD5 key id commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password already set" -create: vyatta-vtysh \ - -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication-key" \ -c "area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication message-digest"; -delete: vyatta-vtysh \ - -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication null"; diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def index ee36125b..9a7292eb 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def @@ -8,13 +8,11 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: vyatta-vtysh \ - -c "configure terminal" -c "router ospf" \ +update: vtysh -c "configure terminal" -c "router ospf" \ -c "area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication authentication-key $VAR(@) " -delete: vyatta-vtysh \ - -c "configure terminal" -c "router ospf" \ +delete: vtysh -c "configure terminal" -c "router ospf" \ -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication authentication-key"; diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def index f61b8e2d..8ce008a3 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interval after which a neighbor is declared dead syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def index a2922c43..2d378bd7 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interval between hello packets syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def index e2c6a17f..faa4ba8d 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def @@ -1,11 +1,11 @@ type: u32 help: Set interval between retransmitting lost link state advertisements syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../../@) virtual-link $VAR(../@) \ retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../@) virtual-link $VAR(../@) \ retransmit-interval \"; " diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def index 4caab873..13a58564 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def @@ -1,10 +1,10 @@ type: u32 help: Set link state transmit delay syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def index 9d1b9b1c..0bcafe6d 100644 --- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def +++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def @@ -4,14 +4,14 @@ default: 100 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \ "Must be between 1-4294967" -update:expression: "vyatta-vtysh --noerror \ +update:expression: "vtysh --noerror \ -c \"configure terminal\" \ -c \"router ospf\" \ -c \"auto-cost reference-bandwidth $VAR(@) \"; \ echo 'OSPF: Reference bandwidth is changed.'; \ echo ' Please ensure reference bandwidth is consistent across all routers'; " -delete:expression: "vyatta-vtysh --noerror \ +delete:expression: "vtysh --noerror \ -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no auto-cost reference-bandwidth \"; \ diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def index 5e6e79cc..c1646b9d 100644 --- a/templates/protocols/ospf/default-information/originate/node.def +++ b/templates/protocols/ospf/default-information/originate/node.def @@ -1,7 +1,7 @@ help: Set to distribute a default route delete: touch /tmp/ospf-default-info.$PPID end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "no default-information originate"; else @@ -24,7 +24,7 @@ end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then if [ -n "$VAR(./route-map/@)" ]; then PARM="$PARM route-map $VAR(./route-map/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "default-information originate $PARM"; fi; diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def index c2bcef57..e6f0dd3a 100644 --- a/templates/protocols/ospf/default-metric/node.def +++ b/templates/protocols/ospf/default-metric/node.def @@ -1,10 +1,10 @@ type: u32 help: Set metric of redistributed routes syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"default-metric $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no default-metric $VAR(@) \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def index 8eb8f75a..31025a39 100644 --- a/templates/protocols/ospf/distance/global/node.def +++ b/templates/protocols/ospf/distance/global/node.def @@ -1,10 +1,10 @@ type: u32 help: Set OSPF administrative distance syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"distance $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no distance $VAR(@) \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def index 8a5bc13f..85329600 100644 --- a/templates/protocols/ospf/distance/ospf/node.def +++ b/templates/protocols/ospf/distance/ospf/node.def @@ -2,7 +2,7 @@ help: Set OSPF administrative distance delete:expression: "touch /tmp/ospf-distance.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-distance.$PPID\" ]; then \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no distance ospf\"; \ rm /tmp/ospf-distance.$PPID; \ @@ -16,7 +16,7 @@ end:expression: "\ if [ -n \"$VAR(./external/@)\" ]; then \ PARM=\"$PARM external $VAR(./external/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no distance ospf\" -c \"distance ospf $PARM\"; \ fi; " diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def index 92e992fd..49c8c0de 100644 --- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def +++ b/templates/protocols/ospf/log-adjacency-changes/detail/node.def @@ -1,6 +1,6 @@ help: Set to log all state changes -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"log-adjacency-changes detail\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"no log-adjacency-changes detail\"; " diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def index 7b56f74b..d8789d98 100644 --- a/templates/protocols/ospf/log-adjacency-changes/node.def +++ b/templates/protocols/ospf/log-adjacency-changes/node.def @@ -1,7 +1,7 @@ help: Set to log changes in adjacency state -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"log-adjacency-changes\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no log-adjacency-changes\"; " diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def index d6f7b8ac..96b17e75 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def @@ -1,7 +1,7 @@ help: Set to administratively apply, for an indefinite period -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"max-metric router-lsa administrative\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no max-metric router-lsa administrative \"; " diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def index ebd9dd25..2369b7be 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def @@ -1,10 +1,10 @@ type: u32 help: Set to advertise stub-router prior to full shutdown of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"max-metric router-lsa on-shutdown $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no max-metric router-lsa on-shutdown \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def index 514a3075..e859f0fd 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def @@ -1,10 +1,10 @@ type: u32 help: Set to automatically advertise stub Router-LSA on startup of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"max-metric router-lsa on-startup $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no max-metric router-lsa on-startup \"; " comp_help: possible completions: diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def index 188d0d04..4a24bf6e 100644 --- a/templates/protocols/ospf/mpls-te/enable/node.def +++ b/templates/protocols/ospf/mpls-te/enable/node.def @@ -1,7 +1,7 @@ help: Enable MPLS-TE functionality -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"mpls-te on\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no mpls-te\"; " diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def index fe414340..e849f8b3 100644 --- a/templates/protocols/ospf/mpls-te/router-address/node.def +++ b/templates/protocols/ospf/mpls-te/router-address/node.def @@ -1,8 +1,8 @@ type: ipv4 help: Set stable IP address of the advertising router -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"mpls-te router-address $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no mpls-te\"; " diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def index e1c9e9e9..84491993 100644 --- a/templates/protocols/ospf/neighbor/node.def +++ b/templates/protocols/ospf/neighbor/node.def @@ -1,9 +1,9 @@ tag: type: ipv4 help: Set neighbor IP address -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"neighbor $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no neighbor $VAR(@)\"; " diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def index cd8babb2..b5e39099 100644 --- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def +++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set dead neighbor polling interval default: 60 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ospf" \ -c "neighbor $VAR(../@) poll-interval $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "neighbor $VAR(../@) poll-interval 60"; comp_help: possible completions: diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def index ae89ff6f..6772e988 100644 --- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def +++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set neighbor priority in seconds default: 0 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ospf" \ -c "neighbor $VAR(../@) priority $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "neighbor $VAR(../@) priority 0"; comp_help: possible completions: diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def index a51c86d8..a2262b24 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -1,4 +1,4 @@ priority: 620 help: Configure Open Shortest Path First protocol (OSPF) parameters -create: vyatta-vtysh -c "configure terminal" -c "router ospf" -delete: vyatta-vtysh -c "configure terminal" -c "no router ospf" +create: vtysh -c "configure terminal" -c "router ospf" +delete: vtysh -c "configure terminal" -c "no router ospf" diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def index 2b80f14a..cb1b588c 100644 --- a/templates/protocols/ospf/parameters/abr-type/node.def +++ b/templates/protocols/ospf/parameters/abr-type/node.def @@ -2,10 +2,10 @@ type: txt help: Set OSPF ABR type default: "cisco" syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ospf" \ -c "ospf abr-type $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "ospf abr-type cisco"; comp_help: possible completions: diff --git a/templates/protocols/ospf/parameters/opaque-lsa/node.def b/templates/protocols/ospf/parameters/opaque-lsa/node.def index 7faf64b6..be999e27 100644 --- a/templates/protocols/ospf/parameters/opaque-lsa/node.def +++ b/templates/protocols/ospf/parameters/opaque-lsa/node.def @@ -1,6 +1,6 @@ help: Enable the Opaque-LSA capability (rfc2370) -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"ospf opaque-lsa \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"no ospf opaque-lsa \"; " diff --git a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def index dfef025d..9de29ecf 100644 --- a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def +++ b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def @@ -1,5 +1,5 @@ help: Enable rfc1583 criteria for handling AS external routes -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"ospf rfc1583compatibility \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"no ospf rfc1583compatibility \"; " diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def index 8b1011ec..abd4211d 100644 --- a/templates/protocols/ospf/parameters/router-id/node.def +++ b/templates/protocols/ospf/parameters/router-id/node.def @@ -1,8 +1,8 @@ type: ipv4 help: Set to override the default router identifier -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"ospf router-id $VAR(@)\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no ospf router-id \" " diff --git a/templates/protocols/ospf/passive-interface-exclude/node.def b/templates/protocols/ospf/passive-interface-exclude/node.def index 98820945..b69cc8b0 100644 --- a/templates/protocols/ospf/passive-interface-exclude/node.def +++ b/templates/protocols/ospf/passive-interface-exclude/node.def @@ -13,11 +13,11 @@ create: if [ -z $VAR(@) ] ; then echo "Error: must include interface"; exit 1; else - vyatta-vtysh -c "configure terminal" -c "router ospf" \ + vtysh -c "configure terminal" -c "router ospf" \ -c "no passive-interface $VAR(@)" fi; -delete: vyatta-vtysh -c "configure terminal" -c "router ospf" \ +delete: vtysh -c "configure terminal" -c "router ospf" \ -c "passive-interface $VAR(@)"; comp_help: possible completions: diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index 09321d9f..2ee24c93 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -3,15 +3,15 @@ type: txt help: Set to suppress routing updates on an interface allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default create: if [ -z $VAR(@) ] - then vyatta-vtysh -c "configure terminal" -c "router ospf" \ + then vtysh -c "configure terminal" -c "router ospf" \ -c "passive-interface default"; - else vyatta-vtysh -c "configure terminal" -c "router ospf" \ + else vtysh -c "configure terminal" -c "router ospf" \ -c "passive-interface $VAR(@)" fi delete: if [ -z $VAR(@) ] - then vyatta-vtysh -c "configure terminal" -c "router ospf" \ + then vtysh -c "configure terminal" -c "router ospf" \ -c "no passive-interface default" - else vyatta-vtysh -c "configure terminal" -c "router ospf" \ + else vtysh -c "configure terminal" -c "router ospf" \ -c "no passive-interface $VAR(@)" fi comp_help: possible completions: diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def index a3e04d6d..573b0e82 100644 --- a/templates/protocols/ospf/redistribute/bgp/node.def +++ b/templates/protocols/ospf/redistribute/bgp/node.def @@ -1,6 +1,6 @@ help: Set to redistribute BGP routes delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute bgp"; if [ -f "/tmp/ospf-redist-bgp.$PPID" ]; then @@ -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 ospf" \ -c "redistribute bgp $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def index be4f6d0e..98b864fd 100644 --- a/templates/protocols/ospf/redistribute/connected/node.def +++ b/templates/protocols/ospf/redistribute/connected/node.def @@ -1,6 +1,6 @@ help: Set to redistribute connected routes delete:expression: "touch /tmp/ospf-redist-connected.$PPID" -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute connected"; if [ -f "/tmp/ospf-redist-connected.$PPID" ]; then @@ -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 ospf" \ -c "redistribute connected $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def index 605e72a8..5e2fc586 100644 --- a/templates/protocols/ospf/redistribute/kernel/node.def +++ b/templates/protocols/ospf/redistribute/kernel/node.def @@ -1,6 +1,6 @@ help: Set to redistribute kernel routes delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute kernel"; if [ -f "/tmp/ospf-redist-kernel.$PPID" ]; then @@ -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 ospf" \ -c "redistribute kernel $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def index 6d29347b..48552329 100644 --- a/templates/protocols/ospf/redistribute/rip/node.def +++ b/templates/protocols/ospf/redistribute/rip/node.def @@ -1,6 +1,6 @@ help: Set to redistribute RIP routes delete:expression: "touch /tmp/ospf-redist-rip.$PPID" -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute rip"; if [ -f "/tmp/ospf-redist-rip.$PPID" ]; then @@ -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 ospf" \ -c "redistribute rip $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def index 4e748859..a9fc42d1 100644 --- a/templates/protocols/ospf/redistribute/static/node.def +++ b/templates/protocols/ospf/redistribute/static/node.def @@ -1,6 +1,6 @@ help: Set to redistribute static routes delete:expression: "touch /tmp/ospf-redist-static.$PPID" -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute static"; if [ -f "/tmp/ospf-redist-static.$PPID" ]; then @@ -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 ospf" \ -c "redistribute static $COND"; fi; diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def index 241ee3b6..055d9f26 100644 --- a/templates/protocols/ospf/refresh/timers/node.def +++ b/templates/protocols/ospf/refresh/timers/node.def @@ -1,10 +1,10 @@ type: u32 help: Set refresh timer syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no refresh timer" -c "refresh timer $VAR(@)"; -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ospf" \ -c "no refresh timer $VAR(@)"; comp_help: possible completions: diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def index 44d74492..1600d41c 100644 --- a/templates/protocols/ospf/timers/throttle/spf/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/node.def @@ -1,12 +1,12 @@ help: Set OSPF SPF timers delete: touch /tmp/ospf-timer.$PPID end: if [ -f "/tmp/ospf-timer.$PPID" ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "no timers throttle spf"; rm /tmp/ospf-timer.$PPID; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf" \ -c "timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)"; fi; diff --git a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def index eb63a9c2..21fd7948 100644 --- a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def +++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def @@ -2,9 +2,9 @@ tag: type: txt help: Set direction of filter (in|out) allowed: echo "in out" -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"area $VAR(../../@) filter-list $VAR(../@) $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"no area $VAR(../../@) filter-list $VAR(../@) $VAR(@) \"; " diff --git a/templates/protocols/ospfv3/area/node.tag/export-list/node.def b/templates/protocols/ospfv3/area/node.tag/export-list/node.def index ff984240..756cd44e 100644 --- a/templates/protocols/ospfv3/area/node.tag/export-list/node.def +++ b/templates/protocols/ospfv3/area/node.tag/export-list/node.def @@ -1,8 +1,8 @@ type: txt help: Set name of export-list -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"area $VAR(../@) export-list $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"no area $VAR(../@) export-list $VAR(@) \"; " diff --git a/templates/protocols/ospfv3/area/node.tag/import-list/node.def b/templates/protocols/ospfv3/area/node.tag/import-list/node.def index 9409e9d1..4a7cd641 100644 --- a/templates/protocols/ospfv3/area/node.tag/import-list/node.def +++ b/templates/protocols/ospfv3/area/node.tag/import-list/node.def @@ -1,8 +1,8 @@ type: txt help: Set name of import-list -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"area $VAR(../@) import-list $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"no area $VAR(../@) import-list $VAR(@) \"; " diff --git a/templates/protocols/ospfv3/area/node.tag/interface/node.def b/templates/protocols/ospfv3/area/node.tag/interface/node.def index 54446641..b7ce5d62 100644 --- a/templates/protocols/ospfv3/area/node.tag/interface/node.def +++ b/templates/protocols/ospfv3/area/node.tag/interface/node.def @@ -2,10 +2,10 @@ multi: type: txt help: Set OSPFv3 area interface -create: vyatta-vtysh -c "configure terminal" -c "router ospf6" \ +create: vtysh -c "configure terminal" -c "router ospf6" \ -c "interface $VAR(@) area $VAR(../@)" -delete: vyatta-vtysh -c "configure terminal" -c "router ospf6" \ +delete: vtysh -c "configure terminal" -c "router ospf6" \ -c "no interface $VAR(@) area $VAR(../@)" allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.def index 4df392fc..52fc9b50 100644 --- a/templates/protocols/ospfv3/area/node.tag/range/node.def +++ b/templates/protocols/ospfv3/area/node.tag/range/node.def @@ -6,15 +6,15 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" delete: touch /tmp/ospf6-range.$PPID end: if [ -f /tmp/ospf6-range.$PPID ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf6" \ -c "no area $VAR(../@) range $VAR(@)"; rm /tmp/ospf6-range.$PPID; else - vyatta-vtysh --noerror -c "configure terminal" \ + vtysh --noerror -c "configure terminal" \ -c "router ospf6" \ -c "no area $VAR(../@) range $VAR(@)"; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ospf6" \ -c "area $VAR(../@) range $VAR(@)"; fi; diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def index 5da43c1e..8c781f13 100644 --- a/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def +++ b/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def @@ -1,7 +1,7 @@ help: Set to advertise this range -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"area $VAR(../../@) range $VAR(../@) advertise\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"no area $VAR(../../@) range $VAR(../@) advertise\"; " diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def index 1b97f964..09b35e71 100644 --- a/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def +++ b/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def @@ -1,7 +1,7 @@ help: Set to not advertise this range -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; " diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def index fd07feab..b79d63af 100644 --- a/templates/protocols/ospfv3/node.def +++ b/templates/protocols/ospfv3/node.def @@ -1,4 +1,4 @@ priority: 640 help: Configure IPv6 Open Shortest Path First protocol (OSPFv3) parameters -create: vyatta-vtysh -c "configure terminal" -c "router ospf6" -delete: vyatta-vtysh -c "configure terminal" -c "no router ospf6" +create: vtysh -c "configure terminal" -c "router ospf6" +delete: vtysh -c "configure terminal" -c "no router ospf6" diff --git a/templates/protocols/ospfv3/parameters/router-id/node.def b/templates/protocols/ospfv3/parameters/router-id/node.def index d38713eb..bccf295e 100644 --- a/templates/protocols/ospfv3/parameters/router-id/node.def +++ b/templates/protocols/ospfv3/parameters/router-id/node.def @@ -1,5 +1,5 @@ type: ipv4 help: Set router identifier -update:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"router-id $VAR(@)\" " diff --git a/templates/protocols/ospfv3/redistribute/node.def b/templates/protocols/ospfv3/redistribute/node.def index 4d7d1bcc..c33bd557 100644 --- a/templates/protocols/ospfv3/redistribute/node.def +++ b/templates/protocols/ospfv3/redistribute/node.def @@ -2,9 +2,9 @@ multi: type: txt help: Set route type to redistribute allowed: echo "static kernel connected ripng bgp" -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"redistribute $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"no redistribute $VAR(@) \"; " diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def index 79df4021..5b7996e6 100644 --- a/templates/protocols/rip/default-distance/node.def +++ b/templates/protocols/rip/default-distance/node.def @@ -1,8 +1,8 @@ type: u32 help: Set administrative distance syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distance $VAR(@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distance $VAR(@) \" " comp_help: Enter a distance valude between 1-255 diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def index 0eeb3d30..9ecbe683 100644 --- a/templates/protocols/rip/default-information/originate/node.def +++ b/templates/protocols/rip/default-information/originate/node.def @@ -1,6 +1,6 @@ help: Set to distribute a default route -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"default-information originate\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no default-information originate\" " diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def index fb1faee8..ea1ceb77 100644 --- a/templates/protocols/rip/default-metric/node.def +++ b/templates/protocols/rip/default-metric/node.def @@ -1,8 +1,8 @@ type: u32 help: Set metric of redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"default-metric $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no default-metric $VAR(@) \"; " #comp_help <1-16> Default metric diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def index c4b42975..124705b2 100644 --- a/templates/protocols/rip/distribute-list/access-list/in/node.def +++ b/templates/protocols/rip/distribute-list/access-list/in/node.def @@ -1,8 +1,8 @@ type: u32 help: Set access-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) in\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) in\" " diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def index e6e21860..77810a46 100644 --- a/templates/protocols/rip/distribute-list/access-list/out/node.def +++ b/templates/protocols/rip/distribute-list/access-list/out/node.def @@ -1,8 +1,8 @@ type: u32 help: Set access-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) out\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) out\" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def index 6f5950fe..ac16b25f 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def @@ -1,8 +1,8 @@ type: u32 help: Set access-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) in $VAR(../../@)\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) in $VAR(../../@)\" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def index db795ea7..8f58be0f 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def @@ -1,7 +1,7 @@ type: u32 help: Set access-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) out $VAR(../../@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) out $VAR(../../@) \" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def index 73ba0933..4dbe19c4 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def @@ -1,7 +1,7 @@ type: txt help: Set prefix-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) in $VAR(../../@) \" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def index 753fda2b..51707b0f 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def @@ -1,7 +1,7 @@ type: txt help: Set prefix-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) out $VAR(../../@)\" " diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def index 31e3afad..89f95bcb 100644 --- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def +++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def @@ -1,8 +1,8 @@ type: txt help: Set prefix-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) in\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) in\" " diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def index c6278ee1..598eeaa5 100644 --- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def +++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def @@ -1,7 +1,7 @@ type: txt help: Set prefix-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) out\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) out\" " diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def index 3d939ffd..2b4c75fe 100644 --- a/templates/protocols/rip/interface/node.def +++ b/templates/protocols/rip/interface/node.def @@ -6,6 +6,6 @@ commit:expression: exec " \ echo interface $VAR(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " -create:vyatta-vtysh -c "configure terminal" -c "router rip" -c "network $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "router rip" -c "no network $VAR(@)" +create:vtysh -c "configure terminal" -c "router rip" -c "network $VAR(@)" +delete:vtysh -c "configure terminal" -c "router rip" -c "no network $VAR(@)" allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def index 43e98ba4..f9359405 100644 --- a/templates/protocols/rip/neighbor/node.def +++ b/templates/protocols/rip/neighbor/node.def @@ -1,8 +1,8 @@ multi: type: ipv4 help: Set a neighbor router -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"neighbor $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no neighbor $VAR(@)\"; " diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def index 9ec05222..74be87b8 100644 --- a/templates/protocols/rip/network-distance/node.def +++ b/templates/protocols/rip/network-distance/node.def @@ -9,10 +9,10 @@ end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \ fi; \ if [ -f \"/tmp/rip-dist.$PPID\" ]; then \ dist=$(cat /tmp/rip-network-distance.$PPID); \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distance $dist $VAR(@) $ACL \" ; rm -f \"/tmp/rip-dist.$PPID\"; else \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distance $VAR(./distance/@) $VAR(@) $ACL \" ; fi; " diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def index 483173a4..82ee17be 100644 --- a/templates/protocols/rip/network/node.def +++ b/templates/protocols/rip/network/node.def @@ -2,7 +2,7 @@ multi: type: ipv4net help: Set RIP network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"network $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no network $VAR(@)\"; " diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def index fdce5c4a..c8224308 100644 --- a/templates/protocols/rip/node.def +++ b/templates/protocols/rip/node.def @@ -1,4 +1,4 @@ priority: 650 help: Configure Routing Information Protocol (RIP) parameters -create: vyatta-vtysh -c "configure terminal" -c "router rip" -delete: vyatta-vtysh -c "configure terminal" -c "no router rip" +create: vtysh -c "configure terminal" -c "router rip" +delete: vtysh -c "configure terminal" -c "no router rip" diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def index b3674afe..a3a17f12 100644 --- a/templates/protocols/rip/passive-interface/node.def +++ b/templates/protocols/rip/passive-interface/node.def @@ -7,15 +7,15 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " create: if [ x$VAR(x) == xdefault ] - then vyatta-vtysh -c "configure terminal" -c "router rip" \ + then vtysh -c "configure terminal" -c "router rip" \ -c "passive-interface default" - else vyatta-vtysh -c "configure terminal" -c "router rip" \ + else vtysh -c "configure terminal" -c "router rip" \ -c "passive-interface $VAR(@)" fi delete: if [ x$VAR(x) == xdefault ] - then vyatta-vtysh -c "configure terminal" -c "router rip" \ + then vtysh -c "configure terminal" -c "router rip" \ -c "no passive-interface default" - else vyatta-vtysh -c "configure terminal" -c "router rip" \ + else vtysh -c "configure terminal" -c "router rip" \ -c "no passive-interface $VAR(@)" fi allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def index ac9076ab..1ac42adb 100644 --- a/templates/protocols/rip/redistribute/bgp/node.def +++ b/templates/protocols/rip/redistribute/bgp/node.def @@ -1,6 +1,6 @@ help: Set to redistribute BGP routes delete:expression: "touch /tmp/rip-redist-bgp.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute bgp \"; \ if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \ rm -rf /tmp/rip-redist-bgp.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute bgp $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def index 1ad349ac..4bd5c8c3 100644 --- a/templates/protocols/rip/redistribute/connected/node.def +++ b/templates/protocols/rip/redistribute/connected/node.def @@ -1,6 +1,6 @@ help: Set to redistribute connected routes delete:expression: "touch /tmp/rip-redist-connected.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute connected \"; \ if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \ rm -rf /tmp/rip-redist-connected.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute connected $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def index 689dcfe5..d7ef7420 100644 --- a/templates/protocols/rip/redistribute/kernel/node.def +++ b/templates/protocols/rip/redistribute/kernel/node.def @@ -1,6 +1,6 @@ help: Set to redistribute kernel routes delete:expression: "touch /tmp/rip-redist-kernel.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute kernel \"; \ if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \ rm -rf /tmp/rip-redist-kernel.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute kernel $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def index bad996cb..8c97dba9 100644 --- a/templates/protocols/rip/redistribute/ospf/node.def +++ b/templates/protocols/rip/redistribute/ospf/node.def @@ -1,6 +1,6 @@ help: Set to redistribute OSPF routes delete:expression: "touch /tmp/rip-redist-ospf.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute ospf \"; \ if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \ rm -rf /tmp/rip-redist-ospf.$PPID; \ @@ -11,7 +11,7 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute ospf $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def index 384f3735..728bf6f2 100644 --- a/templates/protocols/rip/redistribute/static/node.def +++ b/templates/protocols/rip/redistribute/static/node.def @@ -1,6 +1,6 @@ help: Set to redistribute static routes delete:expression: "touch /tmp/rip-redist-static.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute static \"; \ if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \ rm -rf /tmp/rip-redist-static.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute static $COND\"; \ fi; " diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def index 351e8fc3..81638c9a 100644 --- a/templates/protocols/rip/route/node.def +++ b/templates/protocols/rip/route/node.def @@ -2,8 +2,8 @@ multi: type: ipv4net help: Set RIP static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"route $VAR(@)\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no route $VAR(@)\" " diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def index db2562b0..51b2cf17 100644 --- a/templates/protocols/rip/timers/node.def +++ b/templates/protocols/rip/timers/node.def @@ -1,14 +1,11 @@ help: Set RIP timer values -delete:expression: "touch /tmp/rip-timers.$PPID" -end:expression: "vyatta-vtysh \ - -c \"configure terminal\" -c \"router rip\" \ - -c \"no timers basic\"; \ - if [ -f \"/tmp/rip-timers.$PPID\" ]; then \ - rm -rf /tmp/rip-timers.$PPID; \ - else \ - vyatta-vtysh \ - -c \"configure terminal\" -c \"router rip\" \ - -c \"timers basic $VAR(./update/@) \ - $VAR(./timeout/@) \ - $VAR(./garbage-collection/@)\"; \ - fi; " + +delete: touch /tmp/rip-timers.$PPID + +end: vtysh -c "configure terminal" -c "router rip" -c "no timers basic" + if [ -f "/tmp/rip-timers.$PPID" ]; then + rm -rf /tmp/rip-timers.$PPID + else + vtysh -c "configure terminal" -c "router rip" \ + -c "timers basic $VAR(./update/@) $VAR(./timeout/@) $VAR(./garbage-collection/@)" + fi diff --git a/templates/protocols/ripng/aggregate-address/node.def b/templates/protocols/ripng/aggregate-address/node.def index edd739b8..5532eb83 100644 --- a/templates/protocols/ripng/aggregate-address/node.def +++ b/templates/protocols/ripng/aggregate-address/node.def @@ -4,10 +4,10 @@ help: Set aggregate RIPng route announcement syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ripng" \ -c "aggregate-address $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no aggregate-address $VAR(@)" diff --git a/templates/protocols/ripng/default-information/originate/node.def b/templates/protocols/ripng/default-information/originate/node.def index 34d60cd7..eb392758 100644 --- a/templates/protocols/ripng/default-information/originate/node.def +++ b/templates/protocols/ripng/default-information/originate/node.def @@ -1,9 +1,9 @@ help: Set to distribute a default route -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ripng" \ -c "default-information originate" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no default-information originate" diff --git a/templates/protocols/ripng/default-metric/node.def b/templates/protocols/ripng/default-metric/node.def index 6af8bc3b..fc546c03 100644 --- a/templates/protocols/ripng/default-metric/node.def +++ b/templates/protocols/ripng/default-metric/node.def @@ -2,11 +2,11 @@ type: u32 help: Set metric of redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "default-metric $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no default-metric $VAR(@)" diff --git a/templates/protocols/ripng/distribute-list/access-list/in/node.def b/templates/protocols/ripng/distribute-list/access-list/in/node.def index b67087bc..f04150f0 100644 --- a/templates/protocols/ripng/distribute-list/access-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/access-list/in/node.def @@ -3,11 +3,11 @@ help: Set access-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list $VAR(@) in" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list $VAR(@) in" diff --git a/templates/protocols/ripng/distribute-list/access-list/out/node.def b/templates/protocols/ripng/distribute-list/access-list/out/node.def index 9345b4b8..0c086528 100644 --- a/templates/protocols/ripng/distribute-list/access-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/access-list/out/node.def @@ -3,10 +3,10 @@ help: Set access-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list $VAR(@) out" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list $VAR(@) out" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def index 2297140c..a481d8ef 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def @@ -3,10 +3,10 @@ help: Set access-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list $VAR(@) in $VAR(../../@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list $VAR(@) in $VAR(../../@)" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def index f6d3d1cc..fa0c54c4 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def @@ -3,10 +3,10 @@ help: Set access-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list $VAR(@) out $VAR(../../@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list $VAR(@) out $VAR(../../@)" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def index 3f29e1b3..cd2e4aad 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def @@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list prefix $VAR(@) in $VAR(../../@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list prefix $VAR(@) in $VAR(../../@)" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def index 1173fc2f..2c847580 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def @@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list prefix $VAR(@) out $VAR(../../@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list prefix $VAR(@) out $VAR(../../@)" diff --git a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def index dd73f83c..3897a132 100644 --- a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def @@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list prefix $VAR(@) in" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list prefix $VAR(@) in" diff --git a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def index 7d13bedb..49e38358 100644 --- a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def @@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "router ripng" \ -c "distribute-list prefix $VAR(@) out" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no distribute-list prefix $VAR(@) out" diff --git a/templates/protocols/ripng/interface/node.def b/templates/protocols/ripng/interface/node.def index e55355f4..3df2dd3e 100644 --- a/templates/protocols/ripng/interface/node.def +++ b/templates/protocols/ripng/interface/node.def @@ -8,8 +8,8 @@ commit:expression: exec " \ exit 1 ; \ fi ; " -create: vyatta-vtysh -c "configure terminal" -c "router ripng" \ +create: vtysh -c "configure terminal" -c "router ripng" \ -c "network $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "router ripng" \ +delete: vtysh -c "configure terminal" -c "router ripng" \ -c "no network $VAR(@)" diff --git a/templates/protocols/ripng/network/node.def b/templates/protocols/ripng/network/node.def index 2bbab1be..163ba2cc 100644 --- a/templates/protocols/ripng/network/node.def +++ b/templates/protocols/ripng/network/node.def @@ -4,10 +4,10 @@ help: Set RIPng network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ripng" \ -c "network $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no network $VAR(@)" diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def index 0fdd26cc..d679d6c2 100644 --- a/templates/protocols/ripng/node.def +++ b/templates/protocols/ripng/node.def @@ -1,4 +1,4 @@ priority: 660 help: Configure Routing Information Protocol (RIPng) parameters -create: vyatta-vtysh -c "configure terminal" -c "router ripng" -delete: vyatta-vtysh -c "configure terminal" -c "no router ripng" +create: vtysh -c "configure terminal" -c "router ripng" +delete: vtysh -c "configure terminal" -c "no router ripng" diff --git a/templates/protocols/ripng/passive-interface/node.def b/templates/protocols/ripng/passive-interface/node.def index c3b1feed..ecbcf546 100644 --- a/templates/protocols/ripng/passive-interface/node.def +++ b/templates/protocols/ripng/passive-interface/node.def @@ -9,20 +9,20 @@ syntax:expression: exec " \ fi ; " create: if [ x$VAR(x) == xdefault ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ripng" \ -c "passive-interface default"; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ripng" \ -c "passive-interface $VAR(@)"; fi; delete: if [ x$VAR(x) == xdefault ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ripng" \ -c "no passive-interface default" else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ripng" \ -c "no passive-interface $VAR(@)"; fi; diff --git a/templates/protocols/ripng/redistribute/bgp/node.def b/templates/protocols/ripng/redistribute/bgp/node.def index 92d01db4..4c44cbf6 100644 --- a/templates/protocols/ripng/redistribute/bgp/node.def +++ b/templates/protocols/ripng/redistribute/bgp/node.def @@ -2,7 +2,7 @@ help: Set to redistribute BGP routes delete: touch /tmp/rip-redist-bgp.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no redistribute bgp" if [ -f "/tmp/rip-redist-bgp.$PPID" ]; then @@ -14,7 +14,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 ripng" \ -c "redistribute bgp $COND"; fi diff --git a/templates/protocols/ripng/redistribute/connected/node.def b/templates/protocols/ripng/redistribute/connected/node.def index b2c82096..dfce0b34 100644 --- a/templates/protocols/ripng/redistribute/connected/node.def +++ b/templates/protocols/ripng/redistribute/connected/node.def @@ -2,7 +2,7 @@ help: Set to redistribute connected routes delete: touch /tmp/rip-redist-connected.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no redistribute connected" if [ -f "/tmp/rip-redist-connected.$PPID" ]; then @@ -14,7 +14,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 ripng" \ -c "redistribute connected $COND"; fi; diff --git a/templates/protocols/ripng/redistribute/kernel/node.def b/templates/protocols/ripng/redistribute/kernel/node.def index 3023733a..fa21a2fc 100644 --- a/templates/protocols/ripng/redistribute/kernel/node.def +++ b/templates/protocols/ripng/redistribute/kernel/node.def @@ -2,7 +2,7 @@ help: Set to redistribute kernel routes delete: touch /tmp/rip-redist-kernel.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no redistribute kernel"; if [ -f "/tmp/rip-redist-kernel.$PPID" ]; then @@ -14,7 +14,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 ripng" \ -c "redistribute kernel $COND"; fi; diff --git a/templates/protocols/ripng/redistribute/ospfv3/node.def b/templates/protocols/ripng/redistribute/ospfv3/node.def index cf4e37ae..1df11812 100644 --- a/templates/protocols/ripng/redistribute/ospfv3/node.def +++ b/templates/protocols/ripng/redistribute/ospfv3/node.def @@ -2,7 +2,7 @@ help: Set to redistribute OSPFv3 routes delete: touch /tmp/rip-redist-ospf6.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no redistribute ospf6"; if [ -f "/tmp/rip-redist-ospf6.$PPID" ]; then @@ -14,7 +14,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 ripng" \ -c "redistribute ospf6 $COND"; fi; diff --git a/templates/protocols/ripng/redistribute/static/node.def b/templates/protocols/ripng/redistribute/static/node.def index 2d142f2b..a47d20a5 100644 --- a/templates/protocols/ripng/redistribute/static/node.def +++ b/templates/protocols/ripng/redistribute/static/node.def @@ -2,7 +2,7 @@ help: Set to redistribute static routes delete: touch /tmp/rip-redist-static.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no redistribute static"; if [ -f "/tmp/rip-redist-static.$PPID" ]; then @@ -14,7 +14,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 ripng" \ -c "redistribute static $COND"; fi; diff --git a/templates/protocols/ripng/route/node.def b/templates/protocols/ripng/route/node.def index bed064e4..e0e05796 100644 --- a/templates/protocols/ripng/route/node.def +++ b/templates/protocols/ripng/route/node.def @@ -4,11 +4,11 @@ help: Set RIPng static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create: vyatta-vtysh -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "router ripng" \ -c "route $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no route $VAR(@)" diff --git a/templates/protocols/ripng/timers/node.def b/templates/protocols/ripng/timers/node.def index a0117092..b82d4c16 100644 --- a/templates/protocols/ripng/timers/node.def +++ b/templates/protocols/ripng/timers/node.def @@ -2,13 +2,13 @@ help: Set RIPng timer values delete: touch /tmp/ripng-timers.$PPID -end: vyatta-vtysh -c "configure terminal" \ +end: vtysh -c "configure terminal" \ -c "router ripng" \ -c "no timers basic"; \ if [ -f "/tmp/ripng-timers.$PPID" ]; then rm -rf /tmp/ripng-timers.$PPID; else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "router ripng" \ -c "timers basic $VAR(./update/@) \ $VAR(./timeout/@) \ diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def index 386874ec..7c0a0299 100644 --- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def +++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def @@ -11,17 +11,17 @@ end: then if [[ ${COMMIT_ACTION} = 'DELETE' ]] then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) $VAR(@)" else if [[ -n "$VAR(./distance/@)" ]] then DIST="$VAR(./distance/@)" fi - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ip route $VAR(../@) $VAR(@) $DIST"; fi else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) $VAR(@)" fi diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def index 4f23fc35..666abca0 100644 --- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def +++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def @@ -10,17 +10,17 @@ end: then if [[ ${COMMIT_ACTION} = 'DELETE' ]] then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) $VAR(@)" else if [[ -n "$VAR(./distance/@)" ]] then DIST="$VAR(./distance/@)" fi - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ipv6 route $VAR(../@) $VAR(@) $DIST"; fi else - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) $VAR(@)" fi diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def index 14375e0e..b2272e68 100644 --- a/templates/protocols/static/route/node.tag/blackhole/node.def +++ b/templates/protocols/static/route/node.tag/blackhole/node.def @@ -1,12 +1,12 @@ help: Set to silently discard pkts when matched end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) null0"; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ip route $VAR(../@) null0 $DIST"; fi; diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def index f3119da1..e0cb6862 100644 --- a/templates/protocols/static/route/node.tag/next-hop/node.def +++ b/templates/protocols/static/route/node.tag/next-hop/node.def @@ -9,7 +9,7 @@ end: if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ "$VAR(../@)" "$VAR(@)" then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) $VAR(@)" fi else @@ -17,14 +17,14 @@ end: then DIST="$VAR(./distance/@)" fi - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ip route $VAR(../@) $VAR(@) $DIST"; fi else if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ "$VAR(../@)" "$VAR(@)" then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ip route $VAR(../@) $VAR(@)" fi fi diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def index a4066ee6..24b15560 100644 --- a/templates/protocols/static/route6/node.tag/blackhole/node.def +++ b/templates/protocols/static/route6/node.tag/blackhole/node.def @@ -1,12 +1,12 @@ help: Set to silently discard pkts when matched end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) null0"; else if [ -n "$VAR(./distance/@)" ]; then DIST="$VAR(./distance/@)"; fi; - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ipv6 route $VAR(../@) null0 $DIST"; fi; diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def index 3f90e757..4d123637 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.def @@ -9,7 +9,7 @@ end: if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ "$VAR(../@)" "$VAR(@)" then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) $VAR(@)" fi else @@ -23,14 +23,14 @@ end: INTERFACE="$VAR(./interface/@)" fi - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "ipv6 route $VAR(../@) $VAR(@) $INTERFACE $DIST"; fi else if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ "$VAR(../@)" "$VAR(@)" then - vyatta-vtysh -c "configure terminal" \ + vtysh -c "configure terminal" \ -c "no ipv6 route $VAR(../@) $VAR(@)" fi fi diff --git a/templates/system/gateway-address/node.def b/templates/system/gateway-address/node.def index 6c2c61d2..c8772881 100644 --- a/templates/system/gateway-address/node.def +++ b/templates/system/gateway-address/node.def @@ -1,13 +1,13 @@ priority: 400 type: ipv4 help: Set default gateway -create: vyatta-vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)" +create: vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)" update: oldgw=`/opt/vyatta/sbin/vyatta-cli-expand-var.pl \\$VAR\(/system/gateway-address/@\)` if [ -n "$oldgw" ]; then - vyatta-vtysh --noerror -c "configure terminal" \ + vtysh --noerror -c "configure terminal" \ -c "no ip route 0.0.0.0/0 $oldgw" fi - vyatta-vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)" + vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)" delete: if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(@)" - then vyatta-vtysh -c "configure terminal" -c "no ip route 0.0.0.0/0 $VAR(@)" + then vtysh -c "configure terminal" -c "no ip route 0.0.0.0/0 $VAR(@)" fi |