fix direct active dir access in node.defs

63 files changed, 962 insertions, 967 deletions

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index c5e1054a..0e6f6f85 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -38,1039 +38,1041 @@ use Vyatta::Config;
 use Vyatta::Quagga::Config;
 use Vyatta::Misc;
 
-my %qcom = ( 
-  "protocols" => {
-       set => undef, 
-       del => undef,
+my %qcom = (
+  'protocols' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var" => {
-       set => "router bgp #3", 
-       del => "no router bgp #3", 
+  'protocols bgp var' => {
+      set => 'router bgp #3',
+      del => 'no router bgp #3',
   },
-  "protocols bgp var address-family" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var address-family' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var address-family ipv6-unicast" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var address-family ipv6-unicast' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var address-family ipv6-unicast aggregate-address" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var address-family ipv6-unicast aggregate-address' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var address-family ipv6-unicast aggregate-address var" => {
-       set => "router bgp #3 ; no ipv6 bgp aggregate-address #7 ; ipv6 bgp aggregate-address #7 ?summary-only", 
-       del => "router bgp #3 ; no ipv6 bgp aggregate-address #7", 
+  'protocols bgp var address-family ipv6-unicast aggregate-address var' => {
+      set => 'router bgp #3 ; no ipv6 bgp aggregate-address #7 ; ipv6 bgp aggregate-address #7 ?summary-only',
+      del => 'router bgp #3 ; no ipv6 bgp aggregate-address #7',
   },
-  "protocols bgp var address-family ipv6-unicast network" => {
-       set => "router bgp #3 ; no ipv6 bgp network #7 ; ipv6 bgp network #7", 
-       del => "router bgp #3 ; no ipv6 bgp network #7 ; no ipv6 bgp network #7", 
+  'protocols bgp var address-family ipv6-unicast network' => {
+      set => 'router bgp #3 ; no ipv6 bgp network #7 ; ipv6 bgp network #7',
+      del => 'router bgp #3 ; no ipv6 bgp network #7 ; no ipv6 bgp network #7',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var address-family ipv6-unicast redistribute' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute connected" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute connected", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute connected", 
+  'protocols bgp var address-family ipv6-unicast redistribute connected' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute connected',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute connected metric" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute connected metric #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute connected metric #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute connected metric' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute connected metric #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected metric #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute connected route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute connected route-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute connected route-map #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute connected route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute connected route-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected route-map #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute kernel" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute kernel", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute kernel", 
+  'protocols bgp var address-family ipv6-unicast redistribute kernel' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute kernel',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute kernel metric" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute kernel metric #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute kernel metric #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute kernel metric' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute kernel metric #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel metric #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute kernel route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute kernel route-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute kernel route-map #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute kernel route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute kernel route-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel route-map #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute ospfv3", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute ospfv3", 
+  'protocols bgp var address-family ipv6-unicast redistribute ospfv3' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute ospfv3',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute ospfv3',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3 metric" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute ospfv3 metric #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 metric #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute ospfv3 metric' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute ospfv3 metric #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 metric #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3 route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute ospfv3 route-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 route-map #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute ospfv3 route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute ospfv3 route-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 route-map #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute ripng" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute ripng", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute ripng", 
+  'protocols bgp var address-family ipv6-unicast redistribute ripng' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute ripng',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute ripng',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute ripng metric" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute ripng metric #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute ripng metric #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute ripng metric' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute ripng metric #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute ripng metric #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute ripng route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute ripng route-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute ripng route-map #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute ripng route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute ripng route-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute ripng route-map #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute static" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute static", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute static", 
+  'protocols bgp var address-family ipv6-unicast redistribute static' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute static',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute static',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute static metric" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute static metric #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute static metric #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute static metric' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute static metric #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute static metric #9',
   },
-  "protocols bgp var address-family ipv6-unicast redistribute static route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; redistribute static route-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no redistribute static route-map #9", 
+  'protocols bgp var address-family ipv6-unicast redistribute static route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; redistribute static route-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no redistribute static route-map #9',
   },
-  "protocols bgp var aggregate-address" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var aggregate-address' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var aggregate-address var" => {
-       set => "router bgp #3 ; no aggregate-address #5 ; aggregate-address #5 ?as-set ?summary-only", 
-       del => "router bgp #3 ; no aggregate-address #5 ?as-set ?summary-only", 
+  'protocols bgp var aggregate-address var' => {
+      set => 'router bgp #3 ; no aggregate-address #5 ; aggregate-address #5 ?as-set ?summary-only',
+      del => 'router bgp #3 ; no aggregate-address #5 ?as-set ?summary-only',
   },
-  "protocols bgp var neighbor" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var" => {
-       set => undef, 
-       del => "router bgp #3 ; no neighbor #5", 
+  'protocols bgp var neighbor var' => {
+      set => 'undef',
+      del => 'router bgp #3 ; no neighbor #5',
   },
-  "protocols bgp var neighbor var address-family" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 activate", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 activate", 
+  'protocols bgp var neighbor var address-family ipv6-unicast' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 activate',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 activate',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast allowas-in" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in", 
+  'protocols bgp var neighbor var address-family ipv6-unicast allowas-in' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast allowas-in number" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in #10",
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in",
+  'protocols bgp var neighbor var address-family ipv6-unicast allowas-in number' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in #10',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast attribute-unchanged" => {
-       set => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged", 
+  'protocols bgp var neighbor var address-family ipv6-unicast attribute-unchanged' => {
+      set => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast capability" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast capability' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast capability dynamic" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability dynamic", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability dynamic", 
+  'protocols bgp var neighbor var address-family ipv6-unicast capability dynamic' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 capability dynamic',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 capability dynamic',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast capability orf' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list receive" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list receive", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list receive", 
+  'protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list receive' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list receive',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list receive',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list send" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list send", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list send", 
+  'protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list send' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list send',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list send',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast default-originate" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate", 
+  'protocols bgp var neighbor var address-family ipv6-unicast default-originate' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast default-originate route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate route-map #10", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate route-map #10", 
+  'protocols bgp var neighbor var address-family ipv6-unicast default-originate route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate route-map #10',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate route-map #10',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast disable-send-community' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community extended" => {
-       set => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community extended", 
-       del => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community extended", 
+  'protocols bgp var neighbor var address-family ipv6-unicast disable-send-community extended' => {
+      set => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community extended',
+      del => 'router bgp #3 ; address-family ipv6 ; neighbor #5 send-community extended',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community standard" => {
-       set => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community standard", 
-       del => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community standard", 
+  'protocols bgp var neighbor var address-family ipv6-unicast disable-send-community standard' => {
+      set => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community standard',
+      del => 'router bgp #3 ; address-family ipv6 ; neighbor #5 send-community standard',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast distribute-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 out", 
+  'protocols bgp var neighbor var address-family ipv6-unicast distribute-list export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 out',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 in", 
+  'protocols bgp var neighbor var address-family ipv6-unicast distribute-list import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 in',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast filter-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 out", 
+  'protocols bgp var neighbor var address-family ipv6-unicast filter-list export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 out',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 in", 
+  'protocols bgp var neighbor var address-family ipv6-unicast filter-list import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 in',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast maximum-prefix" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 maximum-prefix #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 maximum-prefix #9", 
+  'protocols bgp var neighbor var address-family ipv6-unicast maximum-prefix' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 maximum-prefix #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 maximum-prefix #9',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-local" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 nexthop-local unchanged", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 nexthop-local unchanged", 
+  'protocols bgp var neighbor var address-family ipv6-unicast nexthop-local' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 nexthop-local unchanged',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 nexthop-local unchanged',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-self" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 next-hop-self", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 next-hop-self", 
+  'protocols bgp var neighbor var address-family ipv6-unicast nexthop-self' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 next-hop-self',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 next-hop-self',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 out", 
+  'protocols bgp var neighbor var address-family ipv6-unicast prefix-list export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 out',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 in", 
+  'protocols bgp var neighbor var address-family ipv6-unicast prefix-list import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 in',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast remove-private-as" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 remove-private-AS", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 remove-private-AS", 
+  'protocols bgp var neighbor var address-family ipv6-unicast remove-private-as' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 remove-private-AS',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 remove-private-AS',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast route-map' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 out", 
+  'protocols bgp var neighbor var address-family ipv6-unicast route-map export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 out',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 in", 
+  'protocols bgp var neighbor var address-family ipv6-unicast route-map import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 in',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast route-reflector-client" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-reflector-client", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-reflector-client", 
+  'protocols bgp var neighbor var address-family ipv6-unicast route-reflector-client' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-reflector-client',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-reflector-client',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast route-server-client" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-server-client", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-server-client", 
+  'protocols bgp var neighbor var address-family ipv6-unicast route-server-client' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-server-client',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-server-client',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration inbound" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 soft-reconfiguration inbound", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 soft-reconfiguration inbound", 
+  'protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration inbound' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 soft-reconfiguration inbound',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 soft-reconfiguration inbound',
   },
-  "protocols bgp var neighbor var address-family ipv6-unicast unsuppress-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 unsuppress-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 unsuppress-map #9", 
+  'protocols bgp var neighbor var address-family ipv6-unicast unsuppress-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 unsuppress-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 unsuppress-map #9',
   },
-  "protocols bgp var neighbor var advertisement-interval" => {
-       set => "router bgp #3 ; neighbor #5 advertisement-interval #7", 
-       del => "router bgp #3 ; no neighbor #5 advertisement-interval", 
+  'protocols bgp var neighbor var advertisement-interval' => {
+      set => 'router bgp #3 ; neighbor #5 advertisement-interval #7',
+      del => 'router bgp #3 ; no neighbor #5 advertisement-interval',
   },
-  "protocols bgp var neighbor var allowas-in" => {
-       set => "router bgp #3 ; neighbor #5 allowas-in", 
-       del => "router bgp #3 ; no neighbor #5 allowas-in", 
+  'protocols bgp var neighbor var allowas-in' => {
+      set => 'router bgp #3 ; neighbor #5 allowas-in',
+      del => 'router bgp #3 ; no neighbor #5 allowas-in',
   },
-  "protocols bgp var neighbor var allowas-in number" => {
-       set => "router bgp #3 ; neighbor #5 allowas-in #8", 
-       del => "router bgp #3 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in", 
+  'protocols bgp var neighbor var allowas-in number' => {
+      set => 'router bgp #3 ; neighbor #5 allowas-in #8',
+      del => 'router bgp #3 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in',
   },
-  "protocols bgp var neighbor var attribute-unchanged" => {
-       set => "router bgp #3 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop", 
-       del => "router bgp #3 ; no neighbor #5 attribute-unchanged ?as-path ?med ?next-hop", 
+  'protocols bgp var neighbor var attribute-unchanged' => {
+      set => 'router bgp #3 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop',
+      del => 'router bgp #3 ; no neighbor #5 attribute-unchanged ?as-path ?med ?next-hop',
   },
-  "protocols bgp var neighbor var capability" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var capability' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var capability dynamic" => {
-       set => "router bgp #3 ; neighbor #5 capability dynamic", 
-       del => "router bgp #3 ; no neighbor #5 capability dynamic", 
+  'protocols bgp var neighbor var capability dynamic' => {
+      set => 'router bgp #3 ; neighbor #5 capability dynamic',
+      del => 'router bgp #3 ; no neighbor #5 capability dynamic',
   },
-  "protocols bgp var neighbor var capability orf" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var capability orf' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var capability orf prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var capability orf prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var capability orf prefix-list receive" => {
-       set => "router bgp #3 ; neighbor #5 capability orf prefix-list receive", 
-       del => "router bgp #3 ; no neighbor #5 capability orf prefix-list receive", 
+  'protocols bgp var neighbor var capability orf prefix-list receive' => {
+      set => 'router bgp #3 ; neighbor #5 capability orf prefix-list receive',
+      del => 'router bgp #3 ; no neighbor #5 capability orf prefix-list receive',
   },
-  "protocols bgp var neighbor var capability orf prefix-list send" => {
-       set => "router bgp #3 ; neighbor #5 capability orf prefix-list send", 
-       del => "router bgp #3 ; no neighbor #5 capability orf prefix-list send", 
+  'protocols bgp var neighbor var capability orf prefix-list send' => {
+      set => 'router bgp #3 ; neighbor #5 capability orf prefix-list send',
+      del => 'router bgp #3 ; no neighbor #5 capability orf prefix-list send',
   },
-  "protocols bgp var neighbor var default-originate" => {
-       set => "router bgp #3 ; neighbor #5 default-originate", 
-       del => "router bgp #3 ; no neighbor #5 default-originate", 
+  'protocols bgp var neighbor var default-originate' => {
+      set => 'router bgp #3 ; neighbor #5 default-originate',
+      del => 'router bgp #3 ; no neighbor #5 default-originate',
   },
-  "protocols bgp var neighbor var default-originate route-map" => {
-       set => "router bgp #3 ; neighbor #5 default-originate route-map #8", 
-       del => "router bgp #3 ; no neighbor #5 default-originate route-map #8", 
+  'protocols bgp var neighbor var default-originate route-map' => {
+      set => 'router bgp #3 ; neighbor #5 default-originate route-map #8',
+      del => 'router bgp #3 ; no neighbor #5 default-originate route-map #8',
   },
-  "protocols bgp var neighbor var disable-capability-negotiation" => {
-       set => "router bgp #3 ; neighbor #5 dont-capability-negotiate", 
-       del => "router bgp #3 ; no neighbor #5 dont-capability-negotiate", 
+  'protocols bgp var neighbor var disable-capability-negotiation' => {
+      set => 'router bgp #3 ; neighbor #5 dont-capability-negotiate',
+      del => 'router bgp #3 ; no neighbor #5 dont-capability-negotiate',
   },
-  "protocols bgp var neighbor var disable-connected-check" => {
-       set => "router bgp #3 ; neighbor #5 disable-connected-check", 
-       del => "router bgp #3 ; no neighbor #5 disable-connected-check", 
+  'protocols bgp var neighbor var disable-connected-check' => {
+      set => 'router bgp #3 ; neighbor #5 disable-connected-check',
+      del => 'router bgp #3 ; no neighbor #5 disable-connected-check',
   },
-  "protocols bgp var neighbor var disable-send-community" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var disable-send-community' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var disable-send-community extended" => {
-       set => "router bgp #3 ; no neighbor #5 send-community extended", 
-       del => "router bgp #3 ; neighbor #5 send-community extended", 
+  'protocols bgp var neighbor var disable-send-community extended' => {
+      set => 'router bgp #3 ; no neighbor #5 send-community extended',
+      del => 'router bgp #3 ; neighbor #5 send-community extended',
   },
-  "protocols bgp var neighbor var disable-send-community standard" => {
-       set => "router bgp #3 ; no neighbor #5 send-community standard", 
-       del => "router bgp #3 ; neighbor #5 send-community standard", 
+  'protocols bgp var neighbor var disable-send-community standard' => {
+      set => 'router bgp #3 ; no neighbor #5 send-community standard',
+      del => 'router bgp #3 ; neighbor #5 send-community standard',
   },
-  "protocols bgp var neighbor var distribute-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var distribute-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var distribute-list export" => {
-       set => "router bgp #3 ; neighbor #5 distribute-list #8 out", 
-       del => "router bgp #3 ; no neighbor #5 distribute-list #8 out", 
+  'protocols bgp var neighbor var distribute-list export' => {
+      set => 'router bgp #3 ; neighbor #5 distribute-list #8 out',
+      del => 'router bgp #3 ; no neighbor #5 distribute-list #8 out',
   },
-  "protocols bgp var neighbor var distribute-list import" => {
-       set => "router bgp #3 ; neighbor #5 distribute-list #8 in", 
-       del => "router bgp #3 ; no neighbor #5 distribute-list #8 in", 
+  'protocols bgp var neighbor var distribute-list import' => {
+      set => 'router bgp #3 ; neighbor #5 distribute-list #8 in',
+      del => 'router bgp #3 ; no neighbor #5 distribute-list #8 in',
   },
-  "protocols bgp var neighbor var ebgp-multihop" => {
-       set => "router bgp #3 ; neighbor #5 ebgp-multihop #7", 
-       del => "router bgp #3 ; no neighbor #5 ebgp-multihop", 
+  'protocols bgp var neighbor var ebgp-multihop' => {
+      set => 'router bgp #3 ; neighbor #5 ebgp-multihop #7',
+      del => 'router bgp #3 ; no neighbor #5 ebgp-multihop',
   },
-  "protocols bgp var neighbor var filter-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var filter-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var filter-list export" => {
-       set => "router bgp #3 ; neighbor #5 filter-list #8 out", 
-       del => "router bgp #3 ; no neighbor #5 filter-list #8 out", 
+  'protocols bgp var neighbor var filter-list export' => {
+      set => 'router bgp #3 ; neighbor #5 filter-list #8 out',
+      del => 'router bgp #3 ; no neighbor #5 filter-list #8 out',
   },
-  "protocols bgp var neighbor var filter-list import" => {
-       set => "router bgp #3 ; neighbor #5 filter-list #8 in", 
-       del => "router bgp #3 ; no neighbor #5 filter-list #8 in", 
+  'protocols bgp var neighbor var filter-list import' => {
+      set => 'router bgp #3 ; neighbor #5 filter-list #8 in',
+      del => 'router bgp #3 ; no neighbor #5 filter-list #8 in',
   },
-  "protocols bgp var neighbor var local-as" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var local-as' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var local-as var" => {
-       set => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7", 
-       del => "router bgp #3 ; no neighbor #5 local-as", 
+  'protocols bgp var neighbor var local-as var' => {
+      set => 'router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7',
+      del => 'router bgp #3 ; no neighbor #5 local-as',
   },
-  "protocols bgp var neighbor var local-as var no-prepend" => {
-       set => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7 no-prepend", 
-       del => "router bgp #3 ; no neighbor #5 local-as #7 no-prepend; neighbor #5 local-as #7", 
+  'protocols bgp var neighbor var local-as var no-prepend' => {
+      set => 'router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7 no-prepend',
+      del => 'router bgp #3 ; no neighbor #5 local-as #7 no-prepend; neighbor #5 local-as #7',
   },
-  "protocols bgp var neighbor var maximum-prefix" => {
-       set => "router bgp #3 ; neighbor #5 maximum-prefix #7", 
-       del => "router bgp #3 ; no neighbor #5 maximum-prefix", 
+  'protocols bgp var neighbor var maximum-prefix' => {
+      set => 'router bgp #3 ; neighbor #5 maximum-prefix #7',
+      del => 'router bgp #3 ; no neighbor #5 maximum-prefix',
   },
-  "protocols bgp var neighbor var nexthop-self" => {
-       set => "router bgp #3 ; neighbor #5 next-hop-self", 
-       del => "router bgp #3 ; no neighbor #5 next-hop-self", 
+  'protocols bgp var neighbor var nexthop-self' => {
+      set => 'router bgp #3 ; neighbor #5 next-hop-self',
+      del => 'router bgp #3 ; no neighbor #5 next-hop-self',
   },
-  "protocols bgp var neighbor var override-capability" => {
-       set => "router bgp #3 ; neighbor #5 override-capability", 
-       del => "router bgp #3 ; no neighbor #5 override-capability", 
+  'protocols bgp var neighbor var override-capability' => {
+      set => 'router bgp #3 ; neighbor #5 override-capability',
+      del => 'router bgp #3 ; no neighbor #5 override-capability',
   },
-  "protocols bgp var neighbor var passive" => {
-       set => "router bgp #3 ; neighbor #5 passive", 
-       del => "router bgp #3 ; no neighbor #5 passive", 
+  'protocols bgp var neighbor var passive' => {
+      set => 'router bgp #3 ; neighbor #5 passive',
+      del => 'router bgp #3 ; no neighbor #5 passive',
   },
-  "protocols bgp var neighbor var password" => {
-       set => "router bgp #3 ; neighbor #5 password #7", 
-       del => "router bgp #3 ; no neighbor #5 password", 
+  'protocols bgp var neighbor var password' => {
+      set => 'router bgp #3 ; neighbor #5 password #7',
+      del => 'router bgp #3 ; no neighbor #5 password',
   },
-  "protocols bgp var neighbor var peer-group" => {
-       set => "router bgp #3 ; neighbor #5 peer-group #7", 
-       del => "router bgp #3 ; no neighbor #5 peer-group #7", 
+  'protocols bgp var neighbor var peer-group' => {
+      set => 'router bgp #3 ; neighbor #5 peer-group #7',
+      del => 'router bgp #3 ; no neighbor #5 peer-group #7',
   },
-  "protocols bgp var neighbor var port" => {
-       set => "router bgp #3 ; neighbor #5 port #7", 
-       del => "router bgp #3 ; no neighbor #5 port", 
+  'protocols bgp var neighbor var port' => {
+      set => 'router bgp #3 ; neighbor #5 port #7',
+      del => 'router bgp #3 ; no neighbor #5 port',
   },
-  "protocols bgp var neighbor var prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var prefix-list export" => {
-       set => "router bgp #3 ; neighbor #5 prefix-list #8 out", 
-       del => "router bgp #3 ; no neighbor #5 prefix-list #8 out", 
+  'protocols bgp var neighbor var prefix-list export' => {
+      set => 'router bgp #3 ; neighbor #5 prefix-list #8 out',
+      del => 'router bgp #3 ; no neighbor #5 prefix-list #8 out',
   },
-  "protocols bgp var neighbor var prefix-list import" => {
-       set => "router bgp #3 ; neighbor #5 prefix-list #8 in", 
-       del => "router bgp #3 ; no neighbor #5 prefix-list #8 in", 
+  'protocols bgp var neighbor var prefix-list import' => {
+      set => 'router bgp #3 ; neighbor #5 prefix-list #8 in',
+      del => 'router bgp #3 ; no neighbor #5 prefix-list #8 in',
   },
-  "protocols bgp var neighbor var remote-as" => {
-       set => "router bgp #3 ; neighbor #5 remote-as #7", 
-       del => "router bgp #3 ; no neighbor #5 remote-as #7", 
+  'protocols bgp var neighbor var remote-as' => {
+      set => 'router bgp #3 ; neighbor #5 remote-as #7',
+      del => 'router bgp #3 ; no neighbor #5 remote-as #7',
   },
-  "protocols bgp var neighbor var remove-private-as" => {
-       set => "router bgp #3 ; neighbor #5 remove-private-AS", 
-       del => "router bgp #3 ; no neighbor #5 remove-private-AS", 
+  'protocols bgp var neighbor var remove-private-as' => {
+      set => 'router bgp #3 ; neighbor #5 remove-private-AS',
+      del => 'router bgp #3 ; no neighbor #5 remove-private-AS',
   },
-  "protocols bgp var neighbor var route-map" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var route-map' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var route-map export" => {
-       set => "router bgp #3 ; neighbor #5 route-map #8 out", 
-       del => "router bgp #3 ; no neighbor #5 route-map #8 out", 
+  'protocols bgp var neighbor var route-map export' => {
+      set => 'router bgp #3 ; neighbor #5 route-map #8 out',
+      del => 'router bgp #3 ; no neighbor #5 route-map #8 out',
   },
-  "protocols bgp var neighbor var route-map import" => {
-       set => "router bgp #3 ; neighbor #5 route-map #8 in", 
-       del => "router bgp #3 ; no neighbor #5 route-map #8 in", 
+  'protocols bgp var neighbor var route-map import' => {
+      set => 'router bgp #3 ; neighbor #5 route-map #8 in',
+      del => 'router bgp #3 ; no neighbor #5 route-map #8 in',
   },
-  "protocols bgp var neighbor var route-reflector-client" => {
-       set => "router bgp #3 ; neighbor #5 route-reflector-client", 
-       del => "router bgp #3 ; no neighbor #5 route-reflector-client", 
+  'protocols bgp var neighbor var route-reflector-client' => {
+      set => 'router bgp #3 ; neighbor #5 route-reflector-client',
+      del => 'router bgp #3 ; no neighbor #5 route-reflector-client',
   },
-  "protocols bgp var neighbor var route-server-client" => {
-       set => "router bgp #3 ; neighbor #5 route-server-client", 
-       del => "router bgp #3 ; no neighbor #5 route-server-client", 
+  'protocols bgp var neighbor var route-server-client' => {
+      set => 'router bgp #3 ; neighbor #5 route-server-client',
+      del => 'router bgp #3 ; no neighbor #5 route-server-client',
   },
-  "protocols bgp var neighbor var shutdown" => {
-       set => "router bgp #3 ; neighbor #5 shutdown", 
-       del => "router bgp #3 ; no neighbor #5 shutdown", 
+  'protocols bgp var neighbor var shutdown' => {
+      set => 'router bgp #3 ; neighbor #5 shutdown',
+      del => 'router bgp #3 ; no neighbor #5 shutdown',
   },
-  "protocols bgp var neighbor var soft-reconfiguration" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var soft-reconfiguration' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var soft-reconfiguration inbound" => {
-       set => "router bgp #3 ; neighbor #5 soft-reconfiguration inbound", 
-       del => "router bgp #3 ; no neighbor #5 soft-reconfiguration inbound", 
+  'protocols bgp var neighbor var soft-reconfiguration inbound' => {
+      set => 'router bgp #3 ; neighbor #5 soft-reconfiguration inbound',
+      del => 'router bgp #3 ; no neighbor #5 soft-reconfiguration inbound',
   },
-  "protocols bgp var neighbor var strict-capability-match" => {
-       set => "router bgp #3 ; neighbor #5 strict-capability-match", 
-       del => "router bgp #3 ; no neighbor #5 strict-capability-match", 
+  'protocols bgp var neighbor var strict-capability-match' => {
+      set => 'router bgp #3 ; neighbor #5 strict-capability-match',
+      del => 'router bgp #3 ; no neighbor #5 strict-capability-match',
   },
-  "protocols bgp var neighbor var timers" => {
-       set => 'router bgp #3 ; neighbor #5 timers @keepalive @holdtime', 
-       del => 'router bgp #3 ; no neighbor #5 timers', 
+  'protocols bgp var neighbor var timers' => {
+      set => 'router bgp #3 ; neighbor #5 timers @keepalive @holdtime',
+      del => 'router bgp #3 ; no neighbor #5 timers',
   },
-  "protocols bgp var neighbor var timers connect" => {
-       set => "router bgp #3 ; neighbor #5 timers connect #8", 
-       del => "router bgp #3 ; no neighbor #5 timers connect", 
+  'protocols bgp var neighbor var timers connect' => {
+      set => 'router bgp #3 ; neighbor #5 timers connect #8',
+      del => 'router bgp #3 ; no neighbor #5 timers connect',
   },
-  "protocols bgp var neighbor var ttl-security" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var neighbor var ttl-security' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var neighbor var ttl-security hops" => {
-       set => "router bgp #3 ; neighbor #5 ttl-security hops #8", 
-       del => "router bgp #3 ; no neighbor #5 ttl-security hops", 
+  'protocols bgp var neighbor var ttl-security hops' => {
+      set => 'router bgp #3 ; neighbor #5 ttl-security hops #8',
+      del => 'router bgp #3 ; no neighbor #5 ttl-security hops #8',
   },
-  "protocols bgp var neighbor var unsuppress-map" => {
-       set => "router bgp #3 ; neighbor #5 unsuppress-map #7", 
-       del => "router bgp #3 ; no neighbor #5 unsuppress-map #7", 
+  'protocols bgp var neighbor var unsuppress-map' => {
+      set => 'router bgp #3 ; neighbor #5 unsuppress-map #7',
+      del => 'router bgp #3 ; no neighbor #5 unsuppress-map #7',
   },
-  "protocols bgp var neighbor var update-source" => {
-       set => "router bgp #3 ; neighbor #5 update-source #7", 
-       del => "router bgp #3 ; no neighbor #5 update-source", 
+  'protocols bgp var neighbor var update-source' => {
+      set => 'router bgp #3 ; neighbor #5 update-source #7',
+      del => 'router bgp #3 ; no neighbor #5 update-source',
   },
-  "protocols bgp var neighbor var weight" => {
-       set => "router bgp #3 ; neighbor #5 weight #7", 
-       del => "router bgp #3 ; no neighbor #5 weight", 
+  'protocols bgp var neighbor var weight' => {
+      set => 'router bgp #3 ; neighbor #5 weight #7',
+      del => 'router bgp #3 ; no neighbor #5 weight',
   },
-  "protocols bgp var network" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var network' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var network var" => {
-       set => "router bgp #3 ; network #5 ?backdoor", 
-       del => "router bgp #3 ; no network #5", 
+  'protocols bgp var network var' => {
+      set => 'router bgp #3 ; network #5 ?backdoor',
+      del => 'router bgp #3 ; no network #5',
   },
-  "protocols bgp var network var route-map" => {
-       set => "router bgp #3 ; network #5 route-map #7", 
-       del => "router bgp #3 ; no network #5 route-map #7", 
+  'protocols bgp var network var route-map' => {
+      set => 'router bgp #3 ; network #5 route-map #7',
+      del => 'router bgp #3 ; no network #5 route-map #7',
   },
-  "protocols bgp var parameters" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters always-compare-med" => {
-       set => "router bgp #3 ; bgp always-compare-med", 
-       del => "router bgp #3 ; no bgp always-compare-med", 
+  'protocols bgp var parameters always-compare-med' => {
+      set => 'router bgp #3 ; bgp always-compare-med',
+      del => 'router bgp #3 ; no bgp always-compare-med',
   },
-  "protocols bgp var parameters bestpath" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters bestpath' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters bestpath as-path" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters bestpath as-path' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters bestpath as-path confed" => {
-       set => "router bgp #3 ; bgp bestpath as-path confed", 
-       del => "router bgp #3 ; no bgp bestpath as-path confed", 
+  'protocols bgp var parameters bestpath as-path confed' => {
+      set => 'router bgp #3 ; bgp bestpath as-path confed',
+      del => 'router bgp #3 ; no bgp bestpath as-path confed',
   },
-  "protocols bgp var parameters bestpath as-path ignore" => {
-       set => "router bgp #3 ; bgp bestpath as-path ignore", 
-       del => "router bgp #3 ; no bgp bestpath as-path ignore", 
+  'protocols bgp var parameters bestpath as-path ignore' => {
+      set => 'router bgp #3 ; bgp bestpath as-path ignore',
+      del => 'router bgp #3 ; no bgp bestpath as-path ignore',
   },
-  "protocols bgp var parameters bestpath compare-routerid" => {
-       set => "router bgp #3 ; bgp bestpath compare-routerid", 
-       del => "router bgp #3 ; no bgp bestpath compare-routerid", 
+  'protocols bgp var parameters bestpath compare-routerid' => {
+      set => 'router bgp #3 ; bgp bestpath compare-routerid',
+      del => 'router bgp #3 ; no bgp bestpath compare-routerid',
   },
-  "protocols bgp var parameters bestpath med" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters bestpath med' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters bestpath med confed" => {
-       set => "router bgp #3 ; bgp bestpath med confed", 
-       del => "router bgp #3 ; no bgp bestpath med confed", 
+  'protocols bgp var parameters bestpath med confed' => {
+      set => 'router bgp #3 ; bgp bestpath med confed',
+      del => 'router bgp #3 ; no bgp bestpath med confed',
   },
-  "protocols bgp var parameters bestpath med missing-as-worst" => {
-       set => "router bgp #3 ; bgp bestpath med missing-as-worst", 
-       del => "router bgp #3 ; no bgp bestpath med missing-as-worst", 
+  'protocols bgp var parameters bestpath med missing-as-worst' => {
+      set => 'router bgp #3 ; bgp bestpath med missing-as-worst',
+      del => 'router bgp #3 ; no bgp bestpath med missing-as-worst',
   },
-  "protocols bgp var parameters cluster-id" => {
-       set => "router bgp #3 ; bgp cluster-id #6", 
-       del => "router bgp #3 ; no bgp cluster-id #6", 
+  'protocols bgp var parameters cluster-id' => {
+      set => 'router bgp #3 ; bgp cluster-id #6',
+      del => 'router bgp #3 ; no bgp cluster-id #6',
   },
-  "protocols bgp var parameters confederation" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters confederation' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters confederation identifier" => {
-       set => "router bgp #3 ; bgp confederation identifier #7", 
-       del => "router bgp #3 ; no bgp confederation identifier #7", 
+  'protocols bgp var parameters confederation identifier' => {
+      set => 'router bgp #3 ; bgp confederation identifier #7',
+      del => 'router bgp #3 ; no bgp confederation identifier #7',
   },
-  "protocols bgp var parameters confederation peers" => {
-       set => "router bgp #3 ; bgp confederation peers #7", 
-       del => "router bgp #3 ; no bgp confederation peers #7", 
+  'protocols bgp var parameters confederation peers' => {
+      set => 'router bgp #3 ; bgp confederation peers #7',
+      del => 'router bgp #3 ; no bgp confederation peers #7',
   },
-  "protocols bgp var parameters dampening" => {
-       set => 'router bgp #3 ; no bgp dampening ; bgp dampening @half-life @re-use @start-suppress-time @max-suppress-time', 
-       del => "router bgp #3 ; no bgp dampening", 
+  'protocols bgp var parameters dampening' => {
+      set => 'router bgp #3 ; no bgp dampening ; bgp dampening @half-life @re-use @start-suppress-time @max-suppress-time',
+      del => 'router bgp #3 ; no bgp dampening',
   },
-  "protocols bgp var parameters default" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters default' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters default local-pref" => {
-       set => "router bgp #3 ; bgp default local-preference #7", 
-       del => "router bgp #3 ; no bgp default local-preference #7", 
+  'protocols bgp var parameters default local-pref' => {
+      set => 'router bgp #3 ; bgp default local-preference #7',
+      del => 'router bgp #3 ; no bgp default local-preference #7',
   },
-  "protocols bgp var parameters default no-ipv4-unicast" => {
-       set => "router bgp #3 ; no bgp default ipv4-unicast", 
-       del => "router bgp #3 ; bgp default ipv4-unicast", 
+  'protocols bgp var parameters default no-ipv4-unicast' => {
+      set => 'router bgp #3 ; no bgp default ipv4-unicast',
+      del => 'router bgp #3 ; bgp default ipv4-unicast',
   },
-  "protocols bgp var parameters deterministic-med" => {
-       set => "router bgp #3 ; bgp deterministic-med", 
-       del => "router bgp #3 ; no bgp deterministic-med", 
+  'protocols bgp var parameters deterministic-med' => {
+      set => 'router bgp #3 ; bgp deterministic-med',
+      del => 'router bgp #3 ; no bgp deterministic-med',
   },
-  "protocols bgp var parameters disable-network-import-check" => {
-       set => "router bgp #3 ; no bgp network import-check", 
-       del => "router bgp #3 ; bgp network import-check", 
+  'protocols bgp var parameters disable-network-import-check' => {
+      set => 'router bgp #3 ; no bgp network import-check',
+      del => 'router bgp #3 ; bgp network import-check',
   },
-  "protocols bgp var parameters enforce-first-as" => {
-       set => "router bgp #3 ; bgp enforce-first-as", 
-       del => "router bgp #3 ; no bgp enforce-first-as", 
+  'protocols bgp var parameters enforce-first-as' => {
+      set => 'router bgp #3 ; bgp enforce-first-as',
+      del => 'router bgp #3 ; no bgp enforce-first-as',
   },
-  "protocols bgp var parameters graceful-restart" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var parameters graceful-restart' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var parameters graceful-restart stalepath-time" => {
-       set => "router bgp #3 ; bgp graceful-restart stalepath-time #7", 
-       del => "router bgp #3 ; no bgp graceful-restart stalepath-time #7", 
+  'protocols bgp var parameters graceful-restart stalepath-time' => {
+      set => 'router bgp #3 ; bgp graceful-restart stalepath-time #7',
+      del => 'router bgp #3 ; no bgp graceful-restart stalepath-time #7',
   },
-  "protocols bgp var parameters log-neighbor-changes" => {
-       set => "router bgp #3 ; bgp log-neighbor-changes", 
-       del => "router bgp #3 ; no bgp log-neighbor-changes", 
+  'protocols bgp var parameters log-neighbor-changes' => {
+      set => 'router bgp #3 ; bgp log-neighbor-changes',
+      del => 'router bgp #3 ; no bgp log-neighbor-changes',
   },
-  "protocols bgp var parameters no-client-to-client-reflection" => {
-       set => "router bgp #3 ; no bgp client-to-client reflection", 
-       del => "router bgp #3 ; bgp client-to-client reflection", 
+  'protocols bgp var parameters no-client-to-client-reflection' => {
+      set => 'router bgp #3 ; no bgp client-to-client reflection',
+      del => 'router bgp #3 ; bgp client-to-client reflection',
   },
-  "protocols bgp var parameters no-fast-external-failover" => {
-       set => "router bgp #3 ; no bgp fast-external-failover", 
-       del => "router bgp #3 ; bgp fast-external-failover", 
+  'protocols bgp var parameters no-fast-external-failover' => {
+      set => 'router bgp #3 ; no bgp fast-external-failover',
+      del => 'router bgp #3 ; bgp fast-external-failover',
   },
-  "protocols bgp var parameters router-id" => {
-       set => "router bgp #3 ; bgp router-id #6", 
-       del => "router bgp #3 ; no bgp router-id #6", 
+  'protocols bgp var parameters router-id' => {
+      set => 'router bgp #3 ; bgp router-id #6',
+      del => 'router bgp #3 ; no bgp router-id #6',
   },
-  "protocols bgp var parameters scan-time" => {
-       set => "router bgp #3 ; bgp scan-time #6", 
-       del => "router bgp #3 ; no bgp scan-time #6", 
+  'protocols bgp var parameters scan-time' => {
+      set => 'router bgp #3 ; bgp scan-time #6',
+      del => 'router bgp #3 ; no bgp scan-time #6',
   },
-  "protocols bgp var peer-group" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var" => {
-       set => "router bgp #3 ; neighbor #5 peer-group", 
-       del => "router bgp #3 ; no neighbor #5 peer-group", 
+  'protocols bgp var peer-group var' => {
+      set => 'router bgp #3 ; neighbor #5 peer-group',
+      del => 'router bgp #3 ; no neighbor #5 peer-group',
+      noerr => 'set',
   },
-  "protocols bgp var peer-group var address-family" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 activate", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 activate", 
+  'protocols bgp var peer-group var address-family ipv6-unicast' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 activate',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 activate',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast allowas-in" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in", 
+  'protocols bgp var peer-group var address-family ipv6-unicast allowas-in' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast allowas-in number" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in #10",
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in",
+  'protocols bgp var peer-group var address-family ipv6-unicast allowas-in number' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in #10',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast attribute-unchanged" => {
-       set => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged", 
+  'protocols bgp var peer-group var address-family ipv6-unicast attribute-unchanged' => {
+      set => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast capability" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast capability' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast capability dynamic" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability dynamic", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability dynamic", 
+  'protocols bgp var peer-group var address-family ipv6-unicast capability dynamic' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 capability dynamic',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 capability dynamic',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast capability orf' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list receive" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list receive", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list receive", 
+  'protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list receive' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list receive',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list receive',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list send" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list send", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list send", 
+  'protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list send' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list send',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 capability orf prefix-list send',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast default-originate" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate", 
+  'protocols bgp var peer-group var address-family ipv6-unicast default-originate' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast default-originate route-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate route-map #10", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate route-map #10", 
+  'protocols bgp var peer-group var address-family ipv6-unicast default-originate route-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate route-map #10',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate route-map #10',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast disable-send-community' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community extended" => {
-       set => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community extended", 
-       del => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community extended", 
+  'protocols bgp var peer-group var address-family ipv6-unicast disable-send-community extended' => {
+      set => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community extended',
+      del => 'router bgp #3 ; address-family ipv6 ; neighbor #5 send-community extended',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community standard" => {
-       set => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community standard", 
-       del => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community standard", 
+  'protocols bgp var peer-group var address-family ipv6-unicast disable-send-community standard' => {
+      set => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community standard',
+      del => 'router bgp #3 ; address-family ipv6 ; neighbor #5 send-community standard',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast distribute-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 out", 
+  'protocols bgp var peer-group var address-family ipv6-unicast distribute-list export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 out',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 in", 
+  'protocols bgp var peer-group var address-family ipv6-unicast distribute-list import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 in',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast filter-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 out", 
+  'protocols bgp var peer-group var address-family ipv6-unicast filter-list export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 out',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 in", 
+  'protocols bgp var peer-group var address-family ipv6-unicast filter-list import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 in',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast maximum-prefix" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 maximum-prefix #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 maximum-prefix #9", 
+  'protocols bgp var peer-group var address-family ipv6-unicast maximum-prefix' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 maximum-prefix #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 maximum-prefix #9',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-local" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 nexthop-local unchanged", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 nexthop-local unchanged", 
+  'protocols bgp var peer-group var address-family ipv6-unicast nexthop-local' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 nexthop-local unchanged',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 nexthop-local unchanged',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-self" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 next-hop-self", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 next-hop-self", 
+  'protocols bgp var peer-group var address-family ipv6-unicast nexthop-self' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 next-hop-self',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 next-hop-self',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 out", 
+  'protocols bgp var peer-group var address-family ipv6-unicast prefix-list export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 out',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 in", 
+  'protocols bgp var peer-group var address-family ipv6-unicast prefix-list import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 prefix-list #10 in',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast remove-private-as" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 remove-private-AS", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 remove-private-AS", 
+  'protocols bgp var peer-group var address-family ipv6-unicast remove-private-as' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 remove-private-AS',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 remove-private-AS',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast route-map' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map export" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 out", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 out", 
+  'protocols bgp var peer-group var address-family ipv6-unicast route-map export' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 out',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 out',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map import" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 in", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 in", 
+  'protocols bgp var peer-group var address-family ipv6-unicast route-map import' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 in',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-map #10 in',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast route-reflector-client" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-reflector-client", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-reflector-client", 
+  'protocols bgp var peer-group var address-family ipv6-unicast route-reflector-client' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-reflector-client',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-reflector-client',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast route-server-client" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-server-client", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-server-client", 
+  'protocols bgp var peer-group var address-family ipv6-unicast route-server-client' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 route-server-client',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 route-server-client',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration inbound" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 soft-reconfiguration inbound", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 soft-reconfiguration inbound", 
+  'protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration inbound' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 soft-reconfiguration inbound',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 soft-reconfiguration inbound',
   },
-  "protocols bgp var peer-group var address-family ipv6-unicast unsuppress-map" => {
-       set => "router bgp #3 ; address-family ipv6 ; neighbor #5 unsuppress-map #9", 
-       del => "router bgp #3 ; address-family ipv6 ; no neighbor #5 unsuppress-map #9", 
+  'protocols bgp var peer-group var address-family ipv6-unicast unsuppress-map' => {
+      set => 'router bgp #3 ; address-family ipv6 ; neighbor #5 unsuppress-map #9',
+      del => 'router bgp #3 ; address-family ipv6 ; no neighbor #5 unsuppress-map #9',
   },
-  "protocols bgp var peer-group var allowas-in" => {
-       set => "router bgp #3 ; neighbor #5 allowas-in", 
-       del => "router bgp #3 ; no neighbor #5 allowas-in", 
+  'protocols bgp var peer-group var allowas-in' => {
+      set => 'router bgp #3 ; neighbor #5 allowas-in',
+      del => 'router bgp #3 ; no neighbor #5 allowas-in',
   },
-  "protocols bgp var peer-group var allowas-in number" => {
-       set => "router bgp #3 ; neighbor #5 allowas-in #8", 
-       del => "router bgp #3 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in", 
+  'protocols bgp var peer-group var allowas-in number' => {
+      set => 'router bgp #3 ; neighbor #5 allowas-in #8',
+      del => 'router bgp #3 ; no neighbor #5 allowas-in ; neighbor #5 allowas-in',
   },
-  "protocols bgp var peer-group var attribute-unchanged" => {
-       set => "router bgp #3 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop", 
-       del => "router bgp #3 ; no neighbor #5 attribute-unchanged ?as-path ?med ?next-hop", 
+  'protocols bgp var peer-group var attribute-unchanged' => {
+      set => 'router bgp #3 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop',
+      del => 'router bgp #3 ; no neighbor #5 attribute-unchanged ?as-path ?med ?next-hop',
   },
-  "protocols bgp var peer-group var capability" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var capability' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var capability dynamic" => {
-       set => "router bgp #3 ; neighbor #5 capability dynamic", 
-       del => "router bgp #3 ; no neighbor #5 capability dynamic", 
+  'protocols bgp var peer-group var capability dynamic' => {
+      set => 'router bgp #3 ; neighbor #5 capability dynamic',
+      del => 'router bgp #3 ; no neighbor #5 capability dynamic',
   },
-  "protocols bgp var peer-group var capability orf" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var capability orf' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var capability orf prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var capability orf prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var capability orf prefix-list receive" => {
-       set => "router bgp #3 ; neighbor #5 capability orf prefix-list receive", 
-       del => "router bgp #3 ; no neighbor #5 capability orf prefix-list receive", 
+  'protocols bgp var peer-group var capability orf prefix-list receive' => {
+      set => 'router bgp #3 ; neighbor #5 capability orf prefix-list receive',
+      del => 'router bgp #3 ; no neighbor #5 capability orf prefix-list receive',
   },
-  "protocols bgp var peer-group var capability orf prefix-list send" => {
-       set => "router bgp #3 ; neighbor #5 capability orf prefix-list send", 
-       del => "router bgp #3 ; no neighbor #5 capability orf prefix-list send", 
+  'protocols bgp var peer-group var capability orf prefix-list send' => {
+      set => 'router bgp #3 ; neighbor #5 capability orf prefix-list send',
+      del => 'router bgp #3 ; no neighbor #5 capability orf prefix-list send',
   },
-  "protocols bgp var peer-group var default-originate" => {
-       set => "router bgp #3 ; neighbor #5 default-originate", 
-       del => "router bgp #3 ; no neighbor #5 default-originate", 
+  'protocols bgp var peer-group var default-originate' => {
+      set => 'router bgp #3 ; neighbor #5 default-originate',
+      del => 'router bgp #3 ; no neighbor #5 default-originate',
   },
-  "protocols bgp var peer-group var default-originate route-map" => {
-       set => "router bgp #3 ; neighbor #5 default-originate route-map #8", 
-       del => "router bgp #3 ; no neighbor #5 default-originate route-map #8", 
+  'protocols bgp var peer-group var default-originate route-map' => {
+      set => 'router bgp #3 ; neighbor #5 default-originate route-map #8',
+      del => 'router bgp #3 ; no neighbor #5 default-originate route-map #8',
   },
-  "protocols bgp var peer-group var disable-capability-negotiation" => {
-       set => "router bgp #3 ; neighbor #5 dont-capability-negotiate", 
-       del => "router bgp #3 ; no neighbor #5 dont-capability-negotiate", 
+  'protocols bgp var peer-group var disable-capability-negotiation' => {
+      set => 'router bgp #3 ; neighbor #5 dont-capability-negotiate',
+      del => 'router bgp #3 ; no neighbor #5 dont-capability-negotiate',
   },
-  "protocols bgp var peer-group var disable-connected-check" => {
-       set => "router bgp #3 ; neighbor #5 disable-connected-check", 
-       del => "router bgp #3 ; no neighbor #5 disable-connected-check", 
+  'protocols bgp var peer-group var disable-connected-check' => {
+      set => 'router bgp #3 ; neighbor #5 disable-connected-check',
+      del => 'router bgp #3 ; no neighbor #5 disable-connected-check',
   },
-  "protocols bgp var peer-group var disable-send-community" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var disable-send-community' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var disable-send-community extended" => {
-       set => "router bgp #3 ; no neighbor #5 send-community extended", 
-       del => "router bgp #3 ; neighbor #5 send-community extended", 
+  'protocols bgp var peer-group var disable-send-community extended' => {
+      set => 'router bgp #3 ; no neighbor #5 send-community extended',
+      del => 'router bgp #3 ; neighbor #5 send-community extended',
   },
-  "protocols bgp var peer-group var disable-send-community standard" => {
-       set => "router bgp #3 ; no neighbor #5 send-community standard", 
-       del => "router bgp #3 ; neighbor #5 send-community standard", 
+  'protocols bgp var peer-group var disable-send-community standard' => {
+      set => 'router bgp #3 ; no neighbor #5 send-community standard',
+      del => 'router bgp #3 ; neighbor #5 send-community standard',
   },
-  "protocols bgp var peer-group var distribute-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var distribute-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var distribute-list export" => {
-       set => "router bgp #3 ; neighbor #5 distribute-list #8 out", 
-       del => "router bgp #3 ; no neighbor #5 distribute-list #8 out", 
+  'protocols bgp var peer-group var distribute-list export' => {
+      set => 'router bgp #3 ; neighbor #5 distribute-list #8 out',
+      del => 'router bgp #3 ; no neighbor #5 distribute-list #8 out',
   },
-  "protocols bgp var peer-group var distribute-list import" => {
-       set => "router bgp #3 ; neighbor #5 distribute-list #8 in", 
-       del => "router bgp #3 ; no neighbor #5 distribute-list #8 in", 
+  'protocols bgp var peer-group var distribute-list import' => {
+      set => 'router bgp #3 ; neighbor #5 distribute-list #8 in',
+      del => 'router bgp #3 ; no neighbor #5 distribute-list #8 in',
   },
-  "protocols bgp var peer-group var ebgp-multihop" => {
-       set => "router bgp #3 ; neighbor #5 ebgp-multihop #7", 
-       del => "router bgp #3 ; no neighbor #5 ebgp-multihop #7", 
+  'protocols bgp var peer-group var ebgp-multihop' => {
+      set => 'router bgp #3 ; neighbor #5 ebgp-multihop #7',
+      del => 'router bgp #3 ; no neighbor #5 ebgp-multihop #7',
   },
-  "protocols bgp var peer-group var filter-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var filter-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var filter-list export" => {
-       set => "router bgp #3 ; neighbor #5 filter-list #8 out", 
-       del => "router bgp #3 ; no neighbor #5 filter-list #8 out", 
+  'protocols bgp var peer-group var filter-list export' => {
+      set => 'router bgp #3 ; neighbor #5 filter-list #8 out',
+      del => 'router bgp #3 ; no neighbor #5 filter-list #8 out',
   },
-  "protocols bgp var peer-group var filter-list import" => {
-       set => "router bgp #3 ; neighbor #5 filter-list #8 in", 
-       del => "router bgp #3 ; no neighbor #5 filter-list #8 in", 
+  'protocols bgp var peer-group var filter-list import' => {
+      set => 'router bgp #3 ; neighbor #5 filter-list #8 in',
+      del => 'router bgp #3 ; no neighbor #5 filter-list #8 in',
   },
-  "protocols bgp var peer-group var local-as" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var local-as' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var local-as var" => {
-       set => "router bgp #3 ; no neighbor #5 local-as ; neighbor #5 local-as #7", 
-       del => "router bgp #3 ; no neighbor #5 local-as #7", 
+  'protocols bgp var peer-group var local-as var' => {
+      set => 'router bgp #3 ; no neighbor #5 local-as ; neighbor #5 local-as #7',
+      del => 'router bgp #3 ; no neighbor #5 local-as #7',
   },
-  "protocols bgp var peer-group var local-as var no-prepend" => {
-       set => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7i no-prepend", 
-       del => "router bgp #3 ; no neighbor #5 local-as #7 no-prepend ; neighbor #5 local-as #7", 
+  'protocols bgp var peer-group var local-as var no-prepend' => {
+      set => 'router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7i no-prepend',
+      del => 'router bgp #3 ; no neighbor #5 local-as #7 no-prepend ; neighbor #5 local-as #7',
   },
-  "protocols bgp var peer-group var maximum-prefix" => {
-       set => "router bgp #3 ; neighbor #5 maximum-prefix #7", 
-       del => "router bgp #3 ; no neighbor #5 maximum-prefix #7", 
+  'protocols bgp var peer-group var maximum-prefix' => {
+      set => 'router bgp #3 ; neighbor #5 maximum-prefix #7',
+      del => 'router bgp #3 ; no neighbor #5 maximum-prefix #7',
   },
-  "protocols bgp var peer-group var nexthop-self" => {
-       set => "router bgp #3 ; neighbor #5 next-hop-self", 
-       del => "router bgp #3 ; no neighbor #5 next-hop-self", 
+  'protocols bgp var peer-group var nexthop-self' => {
+      set => 'router bgp #3 ; neighbor #5 next-hop-self',
+      del => 'router bgp #3 ; no neighbor #5 next-hop-self',
   },
-  "protocols bgp var peer-group var override-capability" => {
-       set => "router bgp #3 ; neighbor #5 override-capability", 
-       del => "router bgp #3 ; no neighbor #5 override-capability", 
+  'protocols bgp var peer-group var override-capability' => {
+      set => 'router bgp #3 ; neighbor #5 override-capability',
+      del => 'router bgp #3 ; no neighbor #5 override-capability',
   },
-  "protocols bgp var peer-group var passive" => {
-       set => "router bgp #3 ; neighbor #5 passive", 
-       del => "router bgp #3 ; no neighbor #5 passive", 
+  'protocols bgp var peer-group var passive' => {
+      set => 'router bgp #3 ; neighbor #5 passive',
+      del => 'router bgp #3 ; no neighbor #5 passive',
   },
-  "protocols bgp var peer-group var password" => {
-       set => "router bgp #3 ; neighbor #5 password #7", 
-       del => "router bgp #3 ; no neighbor #5 password #7", 
+  'protocols bgp var peer-group var password' => {
+      set => 'router bgp #3 ; neighbor #5 password #7',
+      del => 'router bgp #3 ; no neighbor #5 password #7',
   },
-  "protocols bgp var peer-group var port" => {
-       set => "router bgp #3 ; neighbor #5 port #7", 
-       del => "router bgp #3 ; no neighbor #5 port #7", 
+  'protocols bgp var peer-group var port' => {
+      set => 'router bgp #3 ; neighbor #5 port #7',
+      del => 'router bgp #3 ; no neighbor #5 port #7',
   },
-  "protocols bgp var peer-group var prefix-list" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var prefix-list' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var prefix-list export" => {
-       set => "router bgp #3 ; neighbor #5 prefix-list #8 out", 
-       del => "router bgp #3 ; no neighbor #5 prefix-list #8 out", 
+  'protocols bgp var peer-group var prefix-list export' => {
+      set => 'router bgp #3 ; neighbor #5 prefix-list #8 out',
+      del => 'router bgp #3 ; no neighbor #5 prefix-list #8 out',
   },
-  "protocols bgp var peer-group var prefix-list import" => {
-       set => "router bgp #3 ; neighbor #5 prefix-list #8 in", 
-       del => "router bgp #3 ; no neighbor #5 prefix-list #8 in", 
+  'protocols bgp var peer-group var prefix-list import' => {
+      set => 'router bgp #3 ; neighbor #5 prefix-list #8 in',
+      del => 'router bgp #3 ; no neighbor #5 prefix-list #8 in',
   },
-  "protocols bgp var peer-group var remote-as" => {
-       set => "router bgp #3 ; neighbor #5 peer-group ; neighbor #5 remote-as #7", 
-       del => "router bgp #3 ; no neighbor #5", 
+  'protocols bgp var peer-group var remote-as' => {
+      set => 'router bgp #3 ; neighbor #5 peer-group ; neighbor #5 remote-as #7',
+      del => 'router bgp #3 ; no neighbor #5 remote-as #7',
+      noerr => 'set',
   },
-  "protocols bgp var peer-group var remove-private-as" => {
-       set => "router bgp #3 ; neighbor #5 remove-private-AS", 
-       del => "router bgp #3 ; no neighbor #5 remove-private-AS", 
+  'protocols bgp var peer-group var remove-private-as' => {
+      set => 'router bgp #3 ; neighbor #5 remove-private-AS',
+      del => 'router bgp #3 ; no neighbor #5 remove-private-AS',
   },
-  "protocols bgp var peer-group var route-map" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var route-map' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var route-map export" => {
-       set => "router bgp #3 ; neighbor #5 route-map #8 out", 
-       del => "router bgp #3 ; no neighbor #5 route-map #8 out", 
+  'protocols bgp var peer-group var route-map export' => {
+      set => 'router bgp #3 ; neighbor #5 route-map #8 out',
+      del => 'router bgp #3 ; no neighbor #5 route-map #8 out',
   },
-  "protocols bgp var peer-group var route-map import" => {
-       set => "router bgp #3 ; neighbor #5 route-map #8 in", 
-       del => "router bgp #3 ; no neighbor #5 route-map #8 in", 
+  'protocols bgp var peer-group var route-map import' => {
+      set => 'router bgp #3 ; neighbor #5 route-map #8 in',
+      del => 'router bgp #3 ; no neighbor #5 route-map #8 in',
   },
-  "protocols bgp var peer-group var route-reflector-client" => {
-       set => "router bgp #3 ; neighbor #5 route-reflector-client", 
-       del => "router bgp #3 ; no neighbor #5 route-reflector-client", 
+  'protocols bgp var peer-group var route-reflector-client' => {
+      set => 'router bgp #3 ; neighbor #5 route-reflector-client',
+      del => 'router bgp #3 ; no neighbor #5 route-reflector-client',
   },
-  "protocols bgp var peer-group var route-server-client" => {
-       set => "router bgp #3 ; neighbor #5 route-server-client", 
-       del => "router bgp #3 ; no neighbor #5 route-server-client", 
+  'protocols bgp var peer-group var route-server-client' => {
+      set => 'router bgp #3 ; neighbor #5 route-server-client',
+      del => 'router bgp #3 ; no neighbor #5 route-server-client',
   },
-  "protocols bgp var peer-group var shutdown" => {
-       set => "router bgp #3 ; neighbor #5 shutdown", 
-       del => "router bgp #3 ; no neighbor #5 shutdown", 
+  'protocols bgp var peer-group var shutdown' => {
+      set => 'router bgp #3 ; neighbor #5 shutdown',
+      del => 'router bgp #3 ; no neighbor #5 shutdown',
   },
-  "protocols bgp var peer-group var soft-reconfiguration" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var peer-group var soft-reconfiguration' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var peer-group var soft-reconfiguration inbound" => {
-       set => "router bgp #3 ; neighbor #5 soft-reconfiguration inbound", 
-       del => "router bgp #3 ; no neighbor #5 soft-reconfiguration inbound", 
+  'protocols bgp var peer-group var soft-reconfiguration inbound' => {
+      set => 'router bgp #3 ; neighbor #5 soft-reconfiguration inbound',
+      del => 'router bgp #3 ; no neighbor #5 soft-reconfiguration inbound',
   },
-  "protocols bgp var peer-group var timers" => {
-       set => 'router bgp #3 ; neighbor #5 timers @keepalive @holdtime', 
-       del => "router bgp #3 ; no neighbor #5", 
+  'protocols bgp var peer-group var timers' => {
+      set => 'router bgp #3 ; neighbor #5 timers @keepalive @holdtime',
+      del => 'router bgp #3 ; no neighbor #5',
   },
-  "protocols bgp var peer-group var timers connect" => {
-       set => "router bgp #3 ; neighbor #5 timers connect #8", 
-       del => "router bgp #3 ; no neighbor #5 timers connect #8", 
+  'protocols bgp var peer-group var timers connect' => {
+      set => 'router bgp #3 ; neighbor #5 timers connect #8',
+      del => 'router bgp #3 ; no neighbor #5 timers connect #8',
   },
-  "protocols bgp var peer-group var unsuppress-map" => {
-       set => "router bgp #3 ; neighbor #5 unsuppress-map #7", 
-       del => "router bgp #3 ; no neighbor #5 unsuppress-map #7", 
+  'protocols bgp var peer-group var unsuppress-map' => {
+      set => 'router bgp #3 ; neighbor #5 unsuppress-map #7',
+      del => 'router bgp #3 ; no neighbor #5 unsuppress-map #7',
   },
-  "protocols bgp var peer-group var update-source" => {
-       set => "router bgp #3 ; neighbor #5 update-source #7", 
-       del => "router bgp #3 ; no neighbor #5 update-source #7", 
+  'protocols bgp var peer-group var update-source' => {
+      set => 'router bgp #3 ; neighbor #5 update-source #7',
+      del => 'router bgp #3 ; no neighbor #5 update-source #7',
   },
-  "protocols bgp var peer-group var weight" => {
-       set => "router bgp #3 ; neighbor #5 weight #7", 
-       del => "router bgp #3 ; no neighbor #5 weight #7", 
+  'protocols bgp var peer-group var weight' => {
+      set => 'router bgp #3 ; neighbor #5 weight #7',
+      del => 'router bgp #3 ; no neighbor #5 weight #7',
   },
-  "protocols bgp var redistribute" => {
-       set => undef, 
-       del => undef,
+  'protocols bgp var redistribute' => {
+      set => 'undef',
+      del => 'undef',
   },
-  "protocols bgp var redistribute connected" => {
-       set => "router bgp #3 ; redistribute connected", 
-       del => "router bgp #3 ; no redistribute connected", 
+  'protocols bgp var redistribute connected' => {
+      set => 'router bgp #3 ; redistribute connected',
+      del => 'router bgp #3 ; no redistribute connected',
   },
-  "protocols bgp var redistribute connected metric" => {
-       set => "router bgp #3 ; redistribute connected metric #7", 
-       del => "router bgp #3 ; no redistribute connected metric #7", 
+  'protocols bgp var redistribute connected metric' => {
+      set => 'router bgp #3 ; redistribute connected metric #7',
+      del => 'router bgp #3 ; no redistribute connected metric #7',
   },
-  "protocols bgp var redistribute connected route-map" => {
-       set => "router bgp #3 ; redistribute connected route-map #7", 
-       del => "router bgp #3 ; no redistribute connected route-map #7", 
+  'protocols bgp var redistribute connected route-map' => {
+      set => 'router bgp #3 ; redistribute connected route-map #7',
+      del => 'router bgp #3 ; no redistribute connected route-map #7',
   },
-  "protocols bgp var redistribute kernel" => {
-       set => "router bgp #3 ; redistribute kernel", 
-       del => "router bgp #3 ; no redistribute kernel", 
+  'protocols bgp var redistribute kernel' => {
+      set => 'router bgp #3 ; redistribute kernel',
+      del => 'router bgp #3 ; no redistribute kernel',
   },
-  "protocols bgp var redistribute kernel metric" => {
-       set => "router bgp #3 ; redistribute kernel metric #7", 
-       del => "router bgp #3 ; no redistribute kernel metric #7", 
+  'protocols bgp var redistribute kernel metric' => {
+      set => 'router bgp #3 ; redistribute kernel metric #7',
+      del => 'router bgp #3 ; no redistribute kernel metric #7',
   },
-  "protocols bgp var redistribute kernel route-map" => {
-       set => "router bgp #3 ; redistribute kernel route-map #7", 
-       del => "router bgp #3 ; no redistribute kernel route-map #7", 
+  'protocols bgp var redistribute kernel route-map' => {
+      set => 'router bgp #3 ; redistribute kernel route-map #7',
+      del => 'router bgp #3 ; no redistribute kernel route-map #7',
   },
-  "protocols bgp var redistribute ospf" => {
-       set => "router bgp #3 ; redistribute ospf", 
-       del => "router bgp #3 ; no redistribute ospf", 
+  'protocols bgp var redistribute ospf' => {
+      set => 'router bgp #3 ; redistribute ospf',
+      del => 'router bgp #3 ; no redistribute ospf',
   },
-  "protocols bgp var redistribute ospf metric" => {
-       set => "router bgp #3 ; redistribute ospf metric #7", 
-       del => "router bgp #3 ; no redistribute ospf metric #7", 
+  'protocols bgp var redistribute ospf metric' => {
+      set => 'router bgp #3 ; redistribute ospf metric #7',
+      del => 'router bgp #3 ; no redistribute ospf metric #7',
   },
-  "protocols bgp var redistribute ospf route-map" => {
-       set => "router bgp #3 ; redistribute ospf route-map #7", 
-       del => "router bgp #3 ; no redistribute ospf route-map #7", 
+  'protocols bgp var redistribute ospf route-map' => {
+      set => 'router bgp #3 ; redistribute ospf route-map #7',
+      del => 'router bgp #3 ; no redistribute ospf route-map #7',
   },
-  "protocols bgp var redistribute rip" => {
-       set => "router bgp #3 ; redistribute rip", 
-       del => "router bgp #3 ; no redistribute rip", 
+  'protocols bgp var redistribute rip' => {
+      set => 'router bgp #3 ; redistribute rip',
+      del => 'router bgp #3 ; no redistribute rip',
   },
-  "protocols bgp var redistribute rip metric" => {
-       set => "router bgp #3 ; redistribute rip metric #7", 
-       del => "router bgp #3 ; no redistribute rip metric #7", 
+  'protocols bgp var redistribute rip metric' => {
+      set => 'router bgp #3 ; redistribute rip metric #7',
+      del => 'router bgp #3 ; no redistribute rip metric #7',
   },
-  "protocols bgp var redistribute rip route-map" => {
-       set => "router bgp #3 ; redistribute rip route-map #7", 
-       del => "router bgp #3 ; no redistribute rip route-map #7", 
+  'protocols bgp var redistribute rip route-map' => {
+      set => 'router bgp #3 ; redistribute rip route-map #7',
+      del => 'router bgp #3 ; no redistribute rip route-map #7',
   },
-  "protocols bgp var redistribute static" => {
-       set => "router bgp #3 ; redistribute static", 
-       del => "router bgp #3 ; no redistribute static", 
+  'protocols bgp var redistribute static' => {
+      set => 'router bgp #3 ; redistribute static',
+      del => 'router bgp #3 ; no redistribute static',
   },
-  "protocols bgp var redistribute static metric" => {
-       set => "router bgp #3 ; redistribute static metric #7", 
-       del => "router bgp #3 ; no redistribute static metric #7", 
+  'protocols bgp var redistribute static metric' => {
+      set => 'router bgp #3 ; redistribute static metric #7',
+      del => 'router bgp #3 ; no redistribute static metric #7',
   },
-  "protocols bgp var redistribute static route-map" => {
-       set => "router bgp #3 ; redistribute static route-map #7", 
-       del => "router bgp #3 ; no redistribute static route-map #7", 
+  'protocols bgp var redistribute static route-map' => {
+      set => 'router bgp #3 ; redistribute static route-map #7',
+      del => 'router bgp #3 ; no redistribute static route-map #7',
   },
-  "protocols bgp var timers" => {
-       set => 'router bgp #3 ; timers bgp @keepalive @holdtime', 
-       del => "router bgp #3 ; no timers bgp", 
+  'protocols bgp var timers' => {
+      set => 'router bgp #3 ; timers bgp @keepalive @holdtime',
+      del => 'router bgp #3 ; no timers bgp',
   },
 );
 
 my ( $pg, $as, $neighbor );
-my ( $main, $checkas, $peername, $isneighbor, $checkpeergroups, $checksource );
+my ( $main, $peername, $isneighbor, $checkpeergroups, $checksource );
 
 GetOptions(
     "peergroup=s"             => \$pg,
@@ -1078,7 +1080,6 @@ GetOptions(
     "neighbor=s"              => \$neighbor,
     "check-peergroup-name=s"  => \$peername,
     "check-neighbor-ip"       => \$isneighbor,
-    "check-as"                => \$checkas,
     "check-peer-groups"       => \$checkpeergroups,
     "check-source=s"	      => \$checksource,
     "main"                    => \$main,
@@ -1088,7 +1089,6 @@ main()					if ($main);
 check_peergroup_name($peername)	  	if ($peername);
 check_neighbor_ip($neighbor)            if ($isneighbor);
 check_for_peer_groups( $pg, $as )	if ($checkpeergroups);
-check_neighbor_as( $neighbor, $as) 	if ($checkas);
 check_source($checksource)	        if ($checksource);
 
 exit 0;
@@ -1148,40 +1148,6 @@ sub check_for_peer_groups {
     }
 }
 
-# make sure nodes are either in a peer group or have
-# a remote AS assigned to them.
-sub check_neighbor_as {
-    my ($neighbor, $as) = @_;
-
-    die "neighbor not defined\n" unless $neighbor;
-    die "AS not defined\n" unless $as;
-
-    my $config = new Vyatta::Config;
-    $config->setLevel("protocols bgp $as neighbor $neighbor");
-    my $remoteas = $config->returnValue("remote-as");
-    my $ttlsecurity = $config->returnValue("ttl-security hops");
-
-    if ($remoteas) {
-	my $ebgp = $config->returnValue("ebgp-multihops");
-	die "protocols bgp $as neighbor $neighbor: cannot configure both ttl-security hops and ebgp-multihop\n"
-	    if (defined($ttlsecurity) && defined($ebgp));
-	return;
-    }
-
-    my $peergroup   = $config->returnValue("peer-group");
-    die "protocols bgp $as neighbor $neighbor: must define a remote-as or peer-group\n"
-      unless $peergroup;
-
-    my $peergroupas = $config->returnValue(" .. .. peer-group $peergroup remote-as");
-    die "protocols bgp $as neighbor $neighbor: must define a remote-as in neighbor or peer-group $peergroup\n"
-      unless $peergroupas;
-    
-    my $peerebgp = $config->returnValue(".. .. peer-group $peergroup ebgp-multihop");
-
-    die "protocols bgp $as neighbor $neighbor: cannot configure both ttl-security hops and ebgp-multihop (peer $peergroup)\n"
-	if (defined($ttlsecurity) && defined($peerebgp))
-}
-
 # check that changed neighbors have a remote-as or peer-group defined
 sub check_remote_as {
     my $config = new Vyatta::Config;
@@ -1227,6 +1193,7 @@ sub main {
    # initialize the Quagga Config object with data from Vyatta config tree
    my $qconfig = new Vyatta::Quagga::Config('protocols', \%qcom);
 
+   # debug routines
    #$qconfig->setDebugLevel('3');
    #$qconfig->_reInitialize();
 
@@ -1243,6 +1210,11 @@ sub main {
    $qconfig->deleteConfigTreeRecursive('protocols bgp var neighbor var ', @skip_array) || die "exiting $?\n";
    # now finish off neighbor
    $qconfig->deleteConfigTreeRecursive('protocols bgp var neighbor var') || die "exiting $?\n";
+   # now delete everything in peer-group except remote-as
+   @skip_array = ('remote-as');
+   $qconfig->deleteConfigTreeRecursive('protocols bgp var peer-group var ', @skip_array) || die "exiting $?\n";
+   # now finish off peer-group
+   $qconfig->deleteConfigTreeRecursive('protocols bgp var peer-group var ') || die "exiting $?\n";
    # now delete everything else in the tree
    $qconfig->deleteConfigTreeRecursive('protocols bgp') || die "exiting $?\n";
 
@@ -1271,4 +1243,3 @@ sub main {
    #720 protocols bgp var neighbhor
    #730 protocols bgp var
 }
-
diff --git a/scripts/policy/vyatta-policy.pl b/scripts/policy/vyatta-policy.pl
index 08dc3b93..b4439bec 100755
--- a/scripts/policy/vyatta-policy.pl
+++ b/scripts/policy/vyatta-policy.pl
@@ -8,7 +8,7 @@ use Getopt::Long;
 my $VTYSH = '/usr/bin/vtysh';
 
 my ( $accesslist, $accesslist6, $aspathlist, $communitylist, $peer );
-my ( $routemap, $deleteroutemap );
+my ( $routemap, $deleteroutemap, $listpolicy );
 
 GetOptions(
     "update-access-list=s"           => \$accesslist,
@@ -18,6 +18,7 @@ GetOptions(
     "check-peer-syntax=s"            => \$peer,
     "check-routemap-action=s"        => \$routemap,
     "check-delete-routemap-action=s" => \$deleteroutemap,
+    "list-policy=s"		     => \$listpolicy,
 ) or exit 1;
 
 update_access_list($accesslist)               if ($accesslist);
@@ -27,6 +28,7 @@ update_community_list($communitylist)         if ($communitylist);
 check_peer_syntax($peer)                      if ($peer);
 check_routemap_action($routemap)              if ($routemap);
 check_delete_routemap_action($deleteroutemap) if ($deleteroutemap);
+list_policy($listpolicy)	    	      if ($listpolicy);
 
 exit 0;
 
@@ -309,3 +311,14 @@ sub check_delete_routemap_action {
 
     exit(@nodes) ? 1 : 0;
 }
+
+## list available policies
+sub list_policy {
+   my $policy = shift;
+   my $config = new Vyatta::Config;
+
+   $config->setLevel("policy $policy");
+   my @nodes = $config->listNodes();
+   foreach my $node (@nodes) { print "$node "; }
+   return;
+}
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
index 594d8782..cac0be3e 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
@@ -3,5 +3,4 @@ type: ipv6net
 help: Set a BGP IPv6 aggregate network
 comp_help:
   <h:h:h:h:h:h:h:h/x>     IPv6 aggregate network
-
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
index 14034a79..bd7e5909 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
@@ -3,5 +3,4 @@ type: ipv6net
 help: Set a BGP IPv6 network
 comp_help: 
   <h:h:h:h:h:h:h:h/x>    IPv6 network
-
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def
index 94f0b513..f122376d 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) ipv6 redistribute connected: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def
index 9e8181d8..e9099fe7 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) ipv6 redistribute kernel: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def
index a2cd8040..c822e491 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) ipv6 redistribute ospfv3: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def
index 97a43975..40876949 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) ipv6 redistribute ripng: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def
index 67b64a9b..6af666d7 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) ipv6 redistribute static: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
index 035d6c4a..bd0e0235 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
@@ -1,7 +1,9 @@
 type: txt
 help: Set the route-map to specify criteria of the default
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) default-originate: route-map $VAR(@) doesn't exist"
 commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set default-originate route-map for a neighbor in a peer-group"
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 905f22ad..d24af594 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
@@ -4,10 +4,9 @@ comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        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/sbin/vyatta-policy.pl --list-policy access-list;
+                  /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"
 commit:expression: $VAR(../../prefix-list/export/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) distribute-list export: you can't set both a prefix-list and a distribute list"
-commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set distribute-list export for a neighbor in a peer-group"
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 d47b2cea..dccb1b14 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
@@ -3,7 +3,10 @@ help: Set an access-list to filter incoming route updates from this neighbor
 comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        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 )
+        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"
 commit:expression: $VAR(../../prefix-list/import/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) distribute-list import: you can't set both a prefix-list and a distribute list"
-commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set distribute-list import for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
index f08bfeae..523a6153 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
@@ -1,9 +1,8 @@
 type: txt
 help: Set an as-path-list to filter outgoing route updates to this neighbor
+comp_help: possible completions:
+  <txt>     as-path-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
         echo -n ${params[@]##*/}
-comp_help: possible completions:
-  <txt>    as-path-list name
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) filter-list export: as-path-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set filter-list export for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
index ee23e655..b2b88266 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
@@ -1,9 +1,8 @@
 type: txt
 help: Set an as-path-list to filter incoming route updates from this neighbor
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
-        echo -n ${params[@]##*/}
 comp_help: possible completions:
   <txt>     as-path-list name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) filter-list import: as-path-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set filter-list import for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
index 0ec58eef..241363e1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
@@ -1,16 +1,10 @@
 type: txt
-
 help: Set a prefix-list to filter outgoing route updates to this neighbor
-
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list6/*)
-        echo -n ${params[@]##*/}
-
 comp_help: possible completions:
   <txt>     prefix-list name
-
-
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; \
 "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) address-family ipv6-unicast prefix-list export: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/export/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) prefix-list export: you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
index 55c1492f..26664bb8 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
@@ -1,17 +1,11 @@
 type: txt
-
 help: Set a prefix-list to filter incoming route updates from this neighbor
-
+comp_help: possible completions:
+  <txt>     prefix-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list6/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
         echo -n ${params[@]##*/}
-
-comp_help: possible completions:
-  <txt>    prefix-list name
-
-
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; \
 "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) address-family ipv6-unicast prefix-list import: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/import/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) address-family ipv6-unicast prefix-list import: you can't set both a prefix-list and a distribute list"
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def
index b8cf146e..cd6423b1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter outgoing route updates to this neighbor
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) export: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def
index c3326556..02c348e2 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter incoming route updates from this neighbor
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@) import: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
index c8726635..e3174775 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
@@ -1,2 +1 @@
 help: Set inbound soft reconfiguration for this neighbor [REQUIRED]
-                           --as $VAR(../../../../../@) --neighbor $VAR(../../../../@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
index 523eaff2..aea9c773 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
@@ -3,7 +3,7 @@ help: Set a route-map to selectively unsuppress suppressed routes
 comp_help: possible completions:
   <txt>  route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): route-map $VAR(@) doesn't exist"
 commit:expression: $VAR(../../../peer-group/) == ""; "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set unsuppress-map for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
index f2209d3f..09d7a25c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
@@ -1,7 +1,9 @@
 type: txt
 help: Set the route-map to specify criteria of the default
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) default-originate: route-map $VAR(@) doesn't exist"
 commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set default-originate for a neighbor in a peer-group"
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 80a6930c..9c88fd5e 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
@@ -3,6 +3,10 @@ help: Set an access-list to filter incoming route updates from this neighbor
 comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        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 )
+        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"
 commit:expression: $VAR(../../prefix-list/import/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) distribute-list import: you can't set both a prefix-list and a distribute list"
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 8a89fc4c..2cfa6fe6 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
@@ -3,3 +3,4 @@ help: Allow this EBGP neighbor to not be on a directly connected network
 comp_help: possible completions:
   <1-255>    number of hops 
 syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop: you can't set both ebgp-multihop and ttl-security"
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 75a564f4..c482a8a0 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
@@ -1,8 +1,8 @@
 type: txt
 help: Set an as-path-list to filter outgoing route updates to this neighbor
+comp_help: possible completions:
+  <txt>     as-path-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
         echo -n ${params[@]##*/}
-comp_help: possible completions:
-  <txt>    as-path-list name
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../@) neighbor $VAR(../../@) filter-list export: as-path-list $VAR(@) doesn't exist"
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 5539df9f..270cbc83 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
@@ -1,8 +1,8 @@
 type: txt
 help: Set an as-path-list to filter incoming route updates from this neighbor
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
-        echo -n ${params[@]##*/}
 comp_help: possible completions:
   <txt>     as-path-list name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../@) neighbor $VAR(../../@) filter-list import: as-path-list $VAR(@) doesn't exist"
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 3dc923c8..be2e5b69 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
@@ -1,16 +1,10 @@
 type: txt
-
 help: Set a prefix-list to filter outgoing route updates to this neighbor
-
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* )
-        echo -n ${params[@]##*/}
-
 comp_help: possible completions:
   <txt>     prefix-list name
-
-
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; \
 "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) prefix-list export: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/export/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) prefix-list export: you can't set both a prefix-list and a distribute list"
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 cf23040c..12e0eb8e 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
@@ -1,17 +1,11 @@
 type: txt
-
 help: Set a prefix-list to filter incoming route updates from this neighbor
-
+comp_help: possible completions:
+  <txt>     prefix-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
         echo -n ${params[@]##*/}
-
-comp_help: possible completions:
-  <txt>    prefix-list name
-
-
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; \
 "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) prefix-list import: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/import/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) prefix-list import: you can't set both a prefix-list and a distribute list"
 
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 d07edf89..5e99b260 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
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter outgoing route updates to this neighbor
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) neighbor $VAR(../../@) export: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
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 6960329b..ac3bc025 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
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter incoming route updates from this neighbor
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) neighbor $VAR(../../@) import: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
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 25e6f8eb..e3174775 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
@@ -1,2 +1 @@
 help: Set inbound soft reconfiguration for this neighbor [REQUIRED]
-                           --as $VAR(../../../@) --neighbor $VAR(../../@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
index de03530d..05be9f5b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
@@ -1 +1,2 @@
 help: Set ttl security mechanism for this BGP peer
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security"
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 9e3a1b19..65e37dd5 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
@@ -3,7 +3,7 @@ help: Set a route-map to selectively unsuppress suppressed routes
 comp_help: possible completions:
   <txt>  route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set unsuppress-map for a neighbor in a peer-group"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../@) neighbor $VAR(../@): route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
index 97091ab3..740bf97b 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route-map to modify route attributes
-comp_help: \1  <text>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../@) network $VAR(../@): route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/peer-group/node.def
index c773f6f0..74a0e5eb 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.def
@@ -3,9 +3,7 @@ type: txt
 help: Set a BGP peer-group 
 comp_help: 
   <name>	BGP peer-group name
-
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
                            --check-peergroup-name $VAR(@)"
-commit:expression: $VAR(./remote-as/) != ""; "protocols bgp $VAR(../@) peer-group $VAR(@): you must define a remote-as"
 delete:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
                            --check-peer-groups --peergroup $VAR(@) --as $VAR(../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
index a32301eb..5dd8e8dc 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
@@ -1,6 +1,8 @@
 type: txt
 help: Set the route-map to specify criteria of the default
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) default-originate: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
index d715f586..8cd7aeee 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
@@ -4,8 +4,8 @@ comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        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/sbin/vyatta-policy.pl --list-policy access-list;
+                  /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(../../../../../@) peer-group $VAR(../../../../@) export: access-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
index 1e6d77d4..ed8084d0 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
@@ -3,6 +3,10 @@ help: Set an access-list to filter incoming route updates from this peer-group
 comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        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 )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";\
 "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) import: access-list $VAR(@) doesn't exist"
 commit:expression: $VAR(../../prefix-list/import/) == ""; "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) distribute-list import: you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
index 6f919399..f98bb5b9 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set an as-path-list to filter outgoing route updates to this peer-group
+comp_help: possible completions:
+  <txt>     as-path-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
         echo -n ${params[@]##*/}
-comp_help: possible completions:
-  <txt>    as-path-list name
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) filter-list export: as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
index a3e230d3..f74b3d40 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set an as-path-list to filter incoming route updates from this peer-group
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
-        echo -n ${params[@]##*/}
 comp_help: possible completions:
   <txt>     as-path-list name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) filter-list import: as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
index 373acef3..a379cbc6 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
@@ -1,16 +1,10 @@
 type: txt
-
 help: Set a prefix-list to filter outgoing route updates to this peer-group
-
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list6/*)
-        echo -n ${params[@]##*/}
-
 comp_help: possible completions:
   <txt>     prefix-list name
-
-
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; \
 "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) address-family ipv6-unicast prefix-list export: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/export/) == ""; "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) address-family ipv6-unicast prefix-list export: you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
index fe2c4d68..9ef4f0db 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
@@ -1,17 +1,11 @@
 type: txt
-
 help: Set a prefix-list to filter incoming route updates from this peer-group
-
+comp_help: possible completions:
+  <txt>     prefix-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list6/*)
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
         echo -n ${params[@]##*/}
-
-comp_help: possible completions:
-  <txt>    prefix-list name
-
-
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; \
 "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) address-family ipv6-unicast prefix-list import: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/import/) == ""; "protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) address-family ipv6-unicast prefix-list import: you can't set both a prefix-list and a distribute list"
 
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def
index cf6db489..6e7a49db 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter outgoing route updates to this peer-group
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) export: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def
index d30e9975..0646123f 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter incoming route updates from this peer-group
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../../@) peer-group $VAR(../../../../@) import: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
index ca04ea35..f3a5369b 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
@@ -1,2 +1 @@
 help: Set inbound soft reconfiguration for this peer-group [REQUIRED]
-                           --as $VAR(../../../../../@) --neighbor $VAR(../../../../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
index 20a39f5c..a57c9e07 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
@@ -3,6 +3,6 @@ help: Set a route-map to selectively unsuppress suppressed routes
 comp_help: possible completions:
   <txt>  route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../../@) peer-group $VAR(../../../@): route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def
index ed32ce80..719c0fd8 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def
@@ -1,2 +1 @@
 help: Set whether BGP attributes are sent unchanged 
-commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) peer-group $VAR(../@): you can't set attribute-unchanged for a peer-group in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def
index 4945d684..e1825d4d 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def
@@ -1,6 +1,8 @@
 type: txt
 help: Set the route-map to specify criteria of the default
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) default-originate: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def
index cb4a1b99..8aa19846 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def
@@ -4,7 +4,7 @@ comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        access-list6 name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/access-list/* 
+        params=( /opt/vyatta/config/active/policy/access-list/*
                  /opt/vyatta/config/active/policy/access-list6/* )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; \
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def
index a79b1726..6b809d4a 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def
@@ -3,6 +3,10 @@ help: Set an access-list to filter incoming route updates from this peer-group
 comp_help: possible completions:
   <1-65535>    access-list number
   <txt>        access-list6 name
+allowed: local -a params
+        params=( /opt/vyatta/config/active/policy/access-list/*
+                 /opt/vyatta/config/active/policy/access-list6/* )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";\
 "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) import: access-list $VAR(@) doesn't exist"
 commit:expression: $VAR(../../prefix-list/import/) == ""; "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) distribute-list import: you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
index a6984981..f3606389 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
@@ -3,3 +3,4 @@ help: Allow this EBGP peer-group to not be on a directly connected network
 comp_help: possible completions:
   <1-255>    number of hops 
 syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop: you can't set both ebgp-multihop and ttl-security"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def
index 5f7599bf..7463045d 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set an as-path-list to filter outgoing route updates to this peer-group
+comp_help: possible completions:
+  <txt>     as-path-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
         echo -n ${params[@]##*/}
-comp_help: possible completions:
-  <txt>    as-path-list name
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../@) peer-group $VAR(../../@) filter-list export: as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def
index f6ed7739..940d10c9 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set an as-path-list to filter incoming route updates from this peer-group
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/as-path-list/* )
-        echo -n ${params[@]##*/}
 comp_help: possible completions:
   <txt>     as-path-list name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"protocols bgp $VAR(../../../@) peer-group $VAR(../../@) filter-list import: as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def
index 7b4604bf..7b525a6f 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def
@@ -1,16 +1,11 @@
 type: txt
-
 help: Set a prefix-list to filter outgoing route updates to this peer-group
-
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* )
-        echo -n ${params[@]##*/}
-
 comp_help: possible completions:
   <txt>     prefix-list name
-
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
+        echo -n ${params[@]##*/}
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; \
 "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) prefix-list export: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/export/) == ""; "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) prefix-list export: you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def
index bfe394b7..4cc48f27 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def
@@ -1,17 +1,11 @@
 type: txt
-
 help: Set a prefix-list to filter incoming route updates from this peer-group
-
+comp_help: possible completions:
+  <txt>     prefix-list name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
         echo -n ${params[@]##*/}
-
-comp_help: possible completions:
-  <txt>    prefix-list name
-
-
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; \
 "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) prefix-list import: prefix-list $VAR(@) doesn't exist"
-
 commit:expression: $VAR(../../distribute-list/import/) == ""; "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) prefix-list import: you can't set both a prefix-list and a distribute list"
 
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def
index c600c873..919fd488 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter outgoing route updates to this peer-group
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) peer-group $VAR(../../@) export: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def
index bafdf89b..e9557c5b 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set a route-map to filter incoming route updates from this peer-group
+comp_help: possible completions:
+  <txt>    route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* ) 
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) peer-group $VAR(../../@) import: route-map $VAR(@) doesn't exist"
-comp_help: possible completions:
-  <txt>    route-map name
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def
index 954f88d4..f3a5369b 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def
@@ -1,2 +1 @@
 help: Set inbound soft reconfiguration for this peer-group [REQUIRED]
-                           --as $VAR(../../../@) --neighbor $VAR(../../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def
index 8a740837..07c76466 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def
@@ -3,6 +3,6 @@ help: Set a route-map to selectively unsuppress suppressed routes
 comp_help: possible completions:
   <txt>  route-map name
 allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/route-map/* )
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../@) peer-group $VAR(../@): route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
index 026de05a..b0da440f 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute connected: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
index e513130e..ba345828 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute kernel: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
index e2b5c019..82d9992b 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute ospf: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
index b8461b4c..09dd58af 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute rip: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
index 61352932..c1deb5a3 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
@@ -1,4 +1,8 @@
 type: txt
 help: Set a route map to filter redistributed routes
-comp_help: \1  <txt>\t\troute-map name
+comp_help: possible completions:
+  <txt>  route-map name
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
+        echo -n ${params[@]##*/}
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute static: route-map $VAR(@) doesn't exist"