remove low-level config dir usage

4 files changed, 4 insertions, 12 deletions

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 1ba1af4f..6a1455cb 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
@@ -5,9 +5,7 @@ val_help: u32:100-199; IP extended access list number
 val_help: u32:1300-1999; IP standard access list number (expanded range)
 val_help: u32:2000-2699; IP extended access list number (expanded range)
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/access-list/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy access-list
 
 commit:expression: $VAR(../prefix-list/) == ""; "you may only specify a prefix-list or access-list"
 
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 c0da0baf..535c9cdd 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
@@ -2,9 +2,7 @@ type: txt
 help: IP prefix-list to match
 val_help: Prefix list name
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy prefix-list
 
 commit:expression: $VAR(../access-list/) == ""; "you may only specify a prefix-list or access-list"
 
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 27bf95ce..64dfe74b 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
@@ -2,9 +2,7 @@ type: txt
 help: IPv6 access-list6 to match
 val_help: IPV6 access list name
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/access-list6/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy access-list6
 
 commit:expression: $VAR(../prefix-list/) == ""; "you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) does not exist"
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 ef841e89..28d2e977 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
@@ -2,9 +2,7 @@ type: txt
 help: IPv6 prefix-list to match
 val_help: IPv6 prefix list name
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list6/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy prefix-list6
 
 commit:expression: $VAR(../access-list/) == ""; "you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; "prefix-list6 $VAR(@) does not exist"