From 941971e33ef6e74c4304416ccc8cc95fb74fa20f Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Tue, 6 Jul 2010 15:53:10 -0700 Subject: fix for bug 5780 --- .../address-family/ipv6-unicast/distribute-list/export/node.def | 4 +--- .../address-family/ipv6-unicast/distribute-list/import/node.def | 4 +--- .../bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def | 4 +--- .../bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def index d24af594..d0986f30 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def @@ -1,11 +1,9 @@ type: txt help: Set an access-list to filter outgoing route updates to this neighbor comp_help: possible completions: - <1-65535> access-list number access-list6 name allowed: local -a params - params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list; - /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) + params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; \ "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) export: access-list $VAR(@) doesn't exist" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def index dccb1b14..d1d43187 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def @@ -1,11 +1,9 @@ type: txt help: Set an access-list to filter incoming route updates from this neighbor comp_help: possible completions: - <1-65535> access-list number access-list6 name allowed: local -a params - params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list; - /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) + params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";\ "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) import: access-list $VAR(@) doesn't exist" 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 bd51c71d..14b77ddd 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 @@ -2,10 +2,8 @@ type: txt help: Set an access-list to filter outgoing route updates to this neighbor comp_help: possible completions: <1-65535> access-list number - access-list6 name allowed: local -a params - params=( /opt/vyatta/config/active/policy/access-list/* - /opt/vyatta/config/active/policy/access-list6/* ) + params=( /opt/vyatta/config/active/policy/access-list/* ) echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; \ "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) export: access-list $VAR(@) doesn't exist" 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 9c88fd5e..9841ca6c 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 @@ -2,10 +2,8 @@ type: txt help: Set an access-list to filter incoming route updates from this neighbor comp_help: possible completions: <1-65535> access-list number - access-list6 name allowed: local -a params - params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list; - /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) + params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list ) echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";\ "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) import: access-list $VAR(@) doesn't exist" -- cgit v1.2.3