Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg-quagga into larkspur

3 files changed, 1110 insertions, 633 deletions

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index bdb31f56..b2119dbc 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -38,531 +38,1061 @@ use Vyatta::Config;
 use Vyatta::Quagga::Config;
 use Vyatta::Misc;
 
-my %qcom = ( 
-  "protocols" => undef,
-  "protocols bgp" => undef,
-  "protocols bgp var" => "router bgp #3",
-  "protocols bgp var aggregate-address" => undef,
-  "protocols bgp var aggregate-address var" => "router bgp #3 ; no aggregate-address #5 ; aggregate-address #5 ?as-set ?summary-only",
-  "protocols bgp var address-family" => undef,
-  "protocols bgp var address-family ipv6-unicast" => undef,
-  "protocols bgp var address-family ipv6-unicast aggregate-address" => undef,
-  "protocols bgp var address-family ipv6-unicast aggregate-address var" => "router bgp #3 ; no ipv6 bgp aggregate-address #7 ; ipv6 bgp aggregate-address #7 ?summary-only",
-  "protocols bgp var address-family ipv6-unicast network" => "router bgp #3 ; no ipv6 bgp network #7 ; ipv6 bgp network #7",
-  "protocols bgp var address-family ipv6-unicast redistribute" => undef,
-  "protocols bgp var address-family ipv6-unicast redistribute connected" => "router bgp #3 ; address-family ipv6 ; redistribute connected",
-  "protocols bgp var address-family ipv6-unicast redistribute connected metric" => "router bgp #3 ; address-family ipv6 ; redistribute connected metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute connected route-map" => "router bgp #3 ; address-family ipv6 ; redistribute connected route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute kernel" => "router bgp #3 ; address-family ipv6 ; redistribute kernel",
-  "protocols bgp var address-family ipv6-unicast redistribute kernel metric" => "router bgp #3 ; address-family ipv6 ; redistribute kernel metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute kernel route-map" => "router bgp #3 ; address-family ipv6 ; redistribute kernel route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3" => "router bgp #3 ; address-family ipv6 ; redistribute ospfv3",
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3 metric" => "router bgp #3 ; address-family ipv6 ; redistribute ospfv3 metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3 route-map" => "router bgp #3 ; address-family ipv6 ; redistribute ospfv3 route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ripng" => "router bgp #3 ; address-family ipv6 ; redistribute ripng",
-  "protocols bgp var address-family ipv6-unicast redistribute ripng metric" => "router bgp #3 ; address-family ipv6 ; redistribute ripng metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ripng route-map" => "router bgp #3 ; address-family ipv6 ; redistribute ripng route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute static" => "router bgp #3 ; address-family ipv6 ; redistribute static",
-  "protocols bgp var address-family ipv6-unicast redistribute static metric" => "router bgp #3 ; address-family ipv6 ; redistribute static metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute static route-map" => "router bgp #3 ; address-family ipv6 ; redistribute static route-map #9",
-  "protocols bgp var neighbor" => undef,
-  "protocols bgp var neighbor var" => "router bgp #3 ; neighbor #5",
-  "protocols bgp var neighbor var address-family" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast" => "router bgp #3 ; address-family ipv6 ; neighbor #5 activate",,
-  "protocols bgp var neighbor var address-family ipv6-unicast allowas-in" => "router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in",
-  "protocols bgp var neighbor var address-family ipv6-unicast attribute-unchanged" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop",
-  "protocols bgp var neighbor var address-family ipv6-unicast capability" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast capability dynamic" => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability dynamic",
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list receive" => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list receive",
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list send" => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list send",
-  "protocols bgp var neighbor var address-family ipv6-unicast default-originate" => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate",
-  "protocols bgp var neighbor var address-family ipv6-unicast default-originate route-map" => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate route-map #10",
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community extended" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community extended",
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community standard" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community standard",
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 out",
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 in",
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 out",
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 in",
-  "protocols bgp var neighbor var address-family ipv6-unicast maximum-prefix" => "router bgp #3 ; address-family ipv6 ; neighbor #5 maximum-prefix #9",
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-local" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-local" => "router bgp #3 ; address-family ipv6 ; neighbor #5 nexthop-local unchanged",
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-self" => "router bgp #3 ; address-family ipv6 ; neighbor #5 next-hop-self",
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 out",
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 in",
-  "protocols bgp var neighbor var address-family ipv6-unicast remove-private-as" => "router bgp #3 ; address-family ipv6 ; neighbor #5 remove-private-AS",
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 out",
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 in",
-  "protocols bgp var neighbor var address-family ipv6-unicast route-reflector-client" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-reflector-client",
-  "protocols bgp var neighbor var address-family ipv6-unicast route-server-client" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-server-client",
-  "protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration inbound" => "router bgp #3 ; address-family ipv6 ; neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var neighbor var address-family ipv6-unicast unsuppress-map" => "router bgp #3 ; address-family ipv6 ; neighbor #5 unsuppress-map #9",
-  "protocols bgp var neighbor var advertisement-interval" => "router bgp #3 ; neighbor #5 advertisement-interval #7",
-  # allowas-in as a standalone means any number of times.  append number and you will only accept local-as N number of times in as-path
-  "protocols bgp var neighbor var allowas-in" => "router bgp #3 ; neighbor #5 allowas-in",
-  # default is 3, default won't be shown in quagga
-  "protocols bgp var neighbor var allowas-in number" => "router bgp #3 ; neighbor #5 allowas-in #8",
-  # it looks like "attribute-unchanged" as a standalone is really "attribute-unchanged as-path med next-hop"
-  "protocols bgp var neighbor var attribute-unchanged" => "router bgp #3 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop",
-  "protocols bgp var neighbor var capability" => undef,
-  "protocols bgp var neighbor var capability dynamic" => "router bgp #3 ; neighbor #5 capability dynamic",
-  "protocols bgp var neighbor var capability orf" => undef,
-  "protocols bgp var neighbor var capability orf prefix-list" => undef,
-  # if both send and receive are sent then this gets translated to both in Quagga config.  Doesn't mess up the delete though.
-  "protocols bgp var neighbor var capability orf prefix-list receive" => "router bgp #3 ; neighbor #5 capability orf prefix-list receive",
-  "protocols bgp var neighbor var capability orf prefix-list send" => "router bgp #3 ; neighbor #5 capability orf prefix-list send",
-  "protocols bgp var neighbor var default-originate" => "router bgp #3 ; neighbor #5 default-originate",
-  "protocols bgp var neighbor var default-originate route-map" => "router bgp #3 ; neighbor #5 default-originate route-map #8",
-  "protocols bgp var neighbor var disable-capability-negotiation" => "router bgp #3 ; neighbor #5 dont-capability-negotiate",
-  "protocols bgp var neighbor var disable-connected-check" => "router bgp #3 ; neighbor #5 disable-connected-check",
-  "protocols bgp var neighbor var disable-send-community" => undef,
-  "protocols bgp var neighbor var disable-send-community extended" => "router bgp #3 ; no neighbor #5 send-community extended",
-  "protocols bgp var neighbor var disable-send-community standard" => "router bgp #3 ; no neighbor #5 send-community standard",
-  "protocols bgp var neighbor var distribute-list" => undef,
-  "protocols bgp var neighbor var distribute-list export" => "router bgp #3 ; neighbor #5 distribute-list #8 out",
-  "protocols bgp var neighbor var distribute-list import" => "router bgp #3 ; neighbor #5 distribute-list #8 in",
-  "protocols bgp var neighbor var ebgp-multihop" => "router bgp #3 ; neighbor #5 ebgp-multihop #7",
-  "protocols bgp var neighbor var ttl-security" => undef,
-  "protocols bgp var neighbor var ttl-security hops" => "router bgp #3 ; neighbor #5 ttl-security hops #8",
-  "protocols bgp var neighbor var filter-list" => undef,
-  "protocols bgp var neighbor var filter-list export" => "router bgp #3 ; neighbor #5 filter-list #8 out",
-  "protocols bgp var neighbor var filter-list import" => "router bgp #3 ; neighbor #5 filter-list #8 in",
-  "protocols bgp var neighbor var local-as" => undef,
-  "protocols bgp var neighbor var local-as var" => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7",
-  "protocols bgp var neighbor var local-as var no-prepend" => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7 no-prepend",
-  "protocols bgp var neighbor var maximum-prefix" => "router bgp #3 ; neighbor #5 maximum-prefix #7",
-  "protocols bgp var neighbor var nexthop-self" => "router bgp #3 ; neighbor #5 next-hop-self",
-  "protocols bgp var neighbor var override-capability" => "router bgp #3 ; neighbor #5 override-capability",
-  "protocols bgp var neighbor var passive" => "router bgp #3 ; neighbor #5 passive",
-  "protocols bgp var neighbor var password" => "router bgp #3 ; neighbor #5 password #7",
-  "protocols bgp var neighbor var peer-group" => "router bgp #3 ; neighbor #5 peer-group #7",
-  "protocols bgp var neighbor var port" => "router bgp #3 ; neighbor #5 port #7",
-  "protocols bgp var neighbor var prefix-list" => undef,
-  "protocols bgp var neighbor var prefix-list export" => "router bgp #3 ; neighbor #5 prefix-list #8 out",
-  "protocols bgp var neighbor var prefix-list import" => "router bgp #3 ; neighbor #5 prefix-list #8 in",
-  "protocols bgp var neighbor var remote-as" => "router bgp #3 ; neighbor #5 remote-as #7",
-  "protocols bgp var neighbor var remove-private-as" => "router bgp #3 ; neighbor #5 remove-private-AS",
-  "protocols bgp var neighbor var route-map" => undef,
-  "protocols bgp var neighbor var route-map export" => "router bgp #3 ; neighbor #5 route-map #8 out",
-  "protocols bgp var neighbor var route-map import" => "router bgp #3 ; neighbor #5 route-map #8 in",
-  "protocols bgp var neighbor var route-reflector-client" => "router bgp #3 ; neighbor #5 route-reflector-client",
-  "protocols bgp var neighbor var route-server-client" => "router bgp #3 ; neighbor #5 route-server-client",
-  "protocols bgp var neighbor var shutdown" => "router bgp #3 ; neighbor #5 shutdown",
-  "protocols bgp var neighbor var soft-reconfiguration" => undef,
-  "protocols bgp var neighbor var soft-reconfiguration inbound" => "router bgp #3 ; neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var neighbor var strict-capability-match" => "router bgp #3 ; neighbor #5 strict-capability-match", 
-  "protocols bgp var neighbor var timers" => 'router bgp #3 ; neighbor #5 timers @keepalive @holdtime',
-  "protocols bgp var neighbor var timers connect" => "router bgp #3 ; neighbor #5 timers connect #8",
-  "protocols bgp var neighbor var unsuppress-map" => "router bgp #3 ; neighbor #5 unsuppress-map #7",
-  "protocols bgp var neighbor var update-source" => "router bgp #3 ; neighbor #5 update-source #7",
-  "protocols bgp var neighbor var weight" => "router bgp #3 ; neighbor #5 weight #7",
-  "protocols bgp var network" => undef,
-  "protocols bgp var network var" => "router bgp #3 ; network #5 ?backdoor",
-  "protocols bgp var network var route-map" => "router bgp #3 ; network #5 route-map #7",
-  "protocols bgp var parameters" => undef,
-  "protocols bgp var parameters always-compare-med" => "router bgp #3 ; bgp always-compare-med",
-  "protocols bgp var parameters bestpath" => undef,
-  "protocols bgp var parameters bestpath as-path" => undef,
-  "protocols bgp var parameters bestpath as-path confed" => "router bgp #3 ; bgp bestpath as-path confed",
-  "protocols bgp var parameters bestpath as-path ignore" => "router bgp #3 ; bgp bestpath as-path ignore",
-  "protocols bgp var parameters bestpath compare-routerid" => "router bgp #3 ; bgp bestpath compare-routerid",
-  "protocols bgp var parameters bestpath med" => undef,
-  "protocols bgp var parameters bestpath med confed" => "router bgp #3 ; bgp bestpath med confed",
-  "protocols bgp var parameters bestpath med missing-as-worst" => "router bgp #3 ; bgp bestpath med missing-as-worst",
-  "protocols bgp var parameters cluster-id" => "router bgp #3 ; bgp cluster-id #6",
-  "protocols bgp var parameters confederation" => undef,
-  "protocols bgp var parameters confederation identifier" => "router bgp #3 ; bgp confederation identifier #7",
-  "protocols bgp var parameters confederation peers" => "router bgp #3 ; bgp confederation peers #7",
-  "protocols bgp var parameters dampening" => 'router bgp #3 ; no bgp dampening ; bgp dampening @half-life @re-use @start-suppress-time @max-suppress-time',
-  "protocols bgp var parameters default" => undef,
-  "protocols bgp var parameters default local-pref" => "router bgp #3 ; bgp default local-preference #7",
-  "protocols bgp var parameters default no-ipv4-unicast" => "router bgp #3 ; no bgp default ipv4-unicast",
-  "protocols bgp var parameters deterministic-med" => "router bgp #3 ; bgp deterministic-med",
-  "protocols bgp var parameters disable-network-import-check" => "router bgp #3 ; no bgp network import-check",
-  "protocols bgp var parameters enforce-first-as" => "router bgp #3 ; bgp enforce-first-as",
-  "protocols bgp var parameters graceful-restart" => undef,
-  "protocols bgp var parameters graceful-restart stalepath-time" => "router bgp #3 ; bgp graceful-restart stalepath-time #7",
-  "protocols bgp var parameters log-neighbor-changes" => "router bgp #3 ; bgp log-neighbor-changes",
-  "protocols bgp var parameters no-client-to-client-reflection" => "router bgp #3 ; no bgp client-to-client reflection",
-  "protocols bgp var parameters no-fast-external-failover" => "router bgp #3 ; no bgp fast-external-failover",
-  "protocols bgp var parameters router-id" => "router bgp #3 ; bgp router-id #6",
-  "protocols bgp var parameters scan-time" => "router bgp #3 ; bgp scan-time #6",
-  "protocols bgp var peer-group" => undef,
-  "protocols bgp var peer-group var" => "router bgp #3 ; neighbor #5 peer-group",
-  "protocols bgp var peer-group var address-family" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast" =>  "router bgp #3 ; address-family ipv6 ; neighbor #5 activate",
-  "protocols bgp var peer-group var address-family ipv6-unicast allowas-in" => "router bgp #3 ; address-family ipv6 ; neighbor #5 allowas-in",
-  "protocols bgp var peer-group var address-family ipv6-unicast attribute-unchanged" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop",
-  "protocols bgp var peer-group var address-family ipv6-unicast capability" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast capability dynamic" => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability dynamic",
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list receive" => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list receive",
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list send" => "router bgp #3 ; address-family ipv6 ; neighbor #5 capability orf prefix-list send",
-  "protocols bgp var peer-group var address-family ipv6-unicast default-originate" => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate",
-  "protocols bgp var peer-group var address-family ipv6-unicast default-originate route-map" => "router bgp #3 ; address-family ipv6 ; neighbor #5 default-originate route-map #10",
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community extended" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community extended",
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community standard" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 send-community standard",
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 out",
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 distribute-list #10 in",
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 out",
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 filter-list #10 in",
-  "protocols bgp var peer-group var address-family ipv6-unicast maximum-prefix" => "router bgp #3 ; address-family ipv6 ; neighbor #5 maximum-prefix #9",
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-local" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-local" => "router bgp #3 ; address-family ipv6 ; neighbor #5 nexthop-local unchanged",
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-self" => "router bgp #3 ; address-family ipv6 ; neighbor #5 next-hop-self",
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 out",
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 prefix-list #10 in",
-  "protocols bgp var peer-group var address-family ipv6-unicast remove-private-as" => "router bgp #3 ; address-family ipv6 ; neighbor #5 remove-private-AS",
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map export" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 out",
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map import" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-map #10 in",
-  "protocols bgp var peer-group var address-family ipv6-unicast route-reflector-client" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-reflector-client",
-  "protocols bgp var peer-group var address-family ipv6-unicast route-server-client" => "router bgp #3 ; address-family ipv6 ; neighbor #5 route-server-client",
-  "protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration inbound" => "router bgp #3 ; address-family ipv6 ; neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var peer-group var address-family ipv6-unicast unsuppress-map" => "router bgp #3 ; address-family ipv6 ; neighbor #5 unsuppress-map #9",
-  "protocols bgp var peer-group var allowas-in" => "router bgp #3 ; neighbor #5 allowas-in",
-  "protocols bgp var peer-group var allowas-in number" => "router bgp #3 ; neighbor #5 allowas-in #8",
-  "protocols bgp var peer-group var attribute-unchanged" => "router bgp #3 ; no neighbor #5 attribute-unchanged ; neighbor #5 attribute-unchanged ?as-path ?med ?next-hop",
-  "protocols bgp var peer-group var capability" => undef,
-  "protocols bgp var peer-group var capability dynamic" => "router bgp #3 ; neighbor #5 capability dynamic",
-  "protocols bgp var peer-group var capability orf" => undef,
-  "protocols bgp var peer-group var capability orf prefix-list" => undef,
-  "protocols bgp var peer-group var capability orf prefix-list receive" => "router bgp #3 ; neighbor #5 capability orf prefix-list receive",
-  "protocols bgp var peer-group var capability orf prefix-list send" => "router bgp #3 ; neighbor #5 capability orf prefix-list send",
-  "protocols bgp var peer-group var default-originate" => "router bgp #3 ; neighbor #5 default-originate",
-  "protocols bgp var peer-group var default-originate route-map" => "router bgp #3 ; neighbor #5 default-originate route-map #8",
-  "protocols bgp var peer-group var disable-capability-negotiation" => "router bgp #3 ; neighbor #5 dont-capability-negotiate",
-  "protocols bgp var peer-group var disable-connected-check" => "router bgp #3 ; neighbor #5 disable-connected-check",
-  "protocols bgp var peer-group var disable-send-community" => undef,
-  "protocols bgp var peer-group var disable-send-community extended" => "router bgp #3 ; no neighbor #5 send-community extended",
-  "protocols bgp var peer-group var disable-send-community standard" => "router bgp #3 ; no neighbor #5 send-community standard",
-  "protocols bgp var peer-group var distribute-list" => undef,
-  "protocols bgp var peer-group var distribute-list export" => "router bgp #3 ; neighbor #5 distribute-list #8 out",
-  "protocols bgp var peer-group var distribute-list import" => "router bgp #3 ; neighbor #5 distribute-list #8 in",
-  "protocols bgp var peer-group var ebgp-multihop" => "router bgp #3 ; neighbor #5 ebgp-multihop #7",
-  "protocols bgp var peer-group var filter-list" => undef,
-  "protocols bgp var peer-group var filter-list export" => "router bgp #3 ; neighbor #5 filter-list #8 out",
-  "protocols bgp var peer-group var filter-list import" => "router bgp #3 ; neighbor #5 filter-list #8 in",
-  "protocols bgp var peer-group var local-as" => undef,
-  "protocols bgp var peer-group var local-as var" => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7",
-  "protocols bgp var peer-group var local-as var no-prepend" => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7 no-prepend",
-  "protocols bgp var peer-group var maximum-prefix" => "router bgp #3 ; neighbor #5 maximum-prefix #7",
-  "protocols bgp var peer-group var nexthop-self" => "router bgp #3 ; neighbor #5 next-hop-self",
-  "protocols bgp var peer-group var override-capability" => "router bgp #3 ; neighbor #5 override-capability",
-  "protocols bgp var peer-group var passive" => "router bgp #3 ; neighbor #5 passive",
-  "protocols bgp var peer-group var password" => "router bgp #3 ; neighbor #5 password #7",
-  "protocols bgp var peer-group var port" => "router bgp #3 ; neighbor #5 port #7",
-  "protocols bgp var peer-group var prefix-list" => undef,
-  "protocols bgp var peer-group var prefix-list export" => "router bgp #3 ; neighbor #5 prefix-list #8 out",
-  "protocols bgp var peer-group var prefix-list import" => "router bgp #3 ; neighbor #5 prefix-list #8 in",
-  "protocols bgp var peer-group var remote-as" => "router bgp #3 ; neighbor #5 peer-group ; neighbor #5 remote-as #7",
-  "protocols bgp var peer-group var remove-private-as" => "router bgp #3 ; neighbor #5 remove-private-AS",
-  "protocols bgp var peer-group var route-map" => undef,
-  "protocols bgp var peer-group var route-map export" => "router bgp #3 ; neighbor #5 route-map #8 out",
-  "protocols bgp var peer-group var route-map import" => "router bgp #3 ; neighbor #5 route-map #8 in",
-  "protocols bgp var peer-group var route-reflector-client" => "router bgp #3 ; neighbor #5 route-reflector-client",
-  "protocols bgp var peer-group var route-server-client" => "router bgp #3 ; neighbor #5 route-server-client",
-  "protocols bgp var peer-group var shutdown" => "router bgp #3 ; neighbor #5 shutdown",
-  "protocols bgp var peer-group var soft-reconfiguration" => undef,
-  "protocols bgp var peer-group var soft-reconfiguration inbound" => "router bgp #3 ; neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var peer-group var timers" => 'router bgp #3 ; neighbor #5 timers @keepalive @holdtime',
-  "protocols bgp var peer-group var timers connect" => "router bgp #3 ; neighbor #5 timers connect #8",
-  "protocols bgp var peer-group var unsuppress-map" => "router bgp #3 ; neighbor #5 unsuppress-map #7",
-  "protocols bgp var peer-group var update-source" => "router bgp #3 ; neighbor #5 update-source #7",
-  "protocols bgp var peer-group var weight" => "router bgp #3 ; neighbor #5 weight #7",
-  "protocols bgp var redistribute" => undef,
-  "protocols bgp var redistribute connected" => "router bgp #3 ; redistribute connected",
-  "protocols bgp var redistribute connected metric" => "router bgp #3 ; redistribute connected metric #7",
-  "protocols bgp var redistribute connected route-map" => "router bgp #3 ; redistribute connected route-map #7",
-  "protocols bgp var redistribute kernel" => "router bgp #3 ; redistribute kernel",
-  "protocols bgp var redistribute kernel metric" => "router bgp #3 ; redistribute kernel metric #7",
-  "protocols bgp var redistribute kernel route-map" => "router bgp #3 ; redistribute kernel route-map #7",
-  "protocols bgp var redistribute ospf" => "router bgp #3 ; redistribute ospf",
-  "protocols bgp var redistribute ospf metric" => "router bgp #3 ; redistribute ospf metric #7",
-  "protocols bgp var redistribute ospf route-map" => "router bgp #3 ; redistribute ospf route-map #7",
-  "protocols bgp var redistribute rip" => "router bgp #3 ; redistribute rip",
-  "protocols bgp var redistribute rip metric" => "router bgp #3 ; redistribute rip metric #7",
-  "protocols bgp var redistribute rip route-map" => "router bgp #3 ; redistribute rip route-map #7",
-  "protocols bgp var redistribute static" => "router bgp #3 ; redistribute static",
-  "protocols bgp var redistribute static metric" => "router bgp #3 ; redistribute static metric #7",
-  "protocols bgp var redistribute static route-map" => "router bgp #3 ; redistribute static route-map #7",
-  "protocols bgp var timers" => 'router bgp #3 ; timers bgp @keepalive @holdtime',
-);
-
-my %qcomdel = (
-  "protocols" => undef,
-  "protocols bgp" => undef,
-  "protocols bgp var" => "no router bgp #3",
-  "protocols bgp var aggregate-address" => undef,
-  "protocols bgp var aggregate-address var" => "router bgp #3 ; no aggregate-address #5 ?as-set ?summary-only",
-  "protocols bgp var address-family" => undef,
-  "protocols bgp var address-family ipv6-unicast" => undef,
-  "protocols bgp var address-family ipv6-unicast aggregate-address" => undef,
-  "protocols bgp var address-family ipv6-unicast aggregate-address var" => "router bgp #3 ; no ipv6 bgp aggregate-address #7",
-  "protocols bgp var address-family ipv6-unicast network" => "router bgp #3 ; no ipv6 bgp network #7 ; no ipv6 bgp network #7",
-  "protocols bgp var address-family ipv6-unicast redistribute" => undef,
-  "protocols bgp var address-family ipv6-unicast redistribute connected" => "router bgp #3 ; address-family ipv6 ; no redistribute connected",
-  "protocols bgp var address-family ipv6-unicast redistribute connected metric" => "router bgp #3 ; address-family ipv6 ; no redistribute connected metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute connected route-map" => "router bgp #3 ; address-family ipv6 ; no redistribute connected route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute kernel" => "router bgp #3 ; address-family ipv6 ; no redistribute kernel",
-  "protocols bgp var address-family ipv6-unicast redistribute kernel metric" => "router bgp #3 ; address-family ipv6 ; no redistribute kernel metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute kernel route-map" => "router bgp #3 ; address-family ipv6 ; no redistribute kernel route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3" => "router bgp #3 ; address-family ipv6 ; no redistribute ospfv3",
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3 metric" => "router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ospfv3 route-map" => "router bgp #3 ; address-family ipv6 ; no redistribute ospfv3 route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ripng" => "router bgp #3 ; address-family ipv6 ; no redistribute ripng",
-  "protocols bgp var address-family ipv6-unicast redistribute ripng metric" => "router bgp #3 ; address-family ipv6 ; no redistribute ripng metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute ripng route-map" => "router bgp #3 ; address-family ipv6 ; no redistribute ripng route-map #9",
-  "protocols bgp var address-family ipv6-unicast redistribute static" => "router bgp #3 ; address-family ipv6 ; no redistribute static",
-  "protocols bgp var address-family ipv6-unicast redistribute static metric" => "router bgp #3 ; address-family ipv6 ; no redistribute static metric #9",
-  "protocols bgp var address-family ipv6-unicast redistribute static route-map" => "router bgp #3 ; address-family ipv6 ; no redistribute static route-map #9",
-  "protocols bgp var neighbor" => undef,
-  "protocols bgp var neighbor var" => "router bgp #3 ; no neighbor #5",
-  "protocols bgp var neighbor var address-family" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast" =>  "router bgp #3 ; address-family ipv6 ; no neighbor #5 activate",
-  "protocols bgp var neighbor var address-family ipv6-unicast allowas-in" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in",
-  "protocols bgp var neighbor var address-family ipv6-unicast attribute-unchanged" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged",
-  "protocols bgp var neighbor var address-family ipv6-unicast capability" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast capability dynamic" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability dynamic",
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast capability orf prefix-list receive" => "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" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 default-originate",
-  "protocols bgp var neighbor var address-family ipv6-unicast default-originate route-map" => "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" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community extended" => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community extended",
-  "protocols bgp var neighbor var address-family ipv6-unicast disable-send-community standard" => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community standard",
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast distribute-list export" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 distribute-list #10 in",
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast filter-list export" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 filter-list #10 in",
-  "protocols bgp var neighbor var address-family ipv6-unicast maximum-prefix" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 maximum-prefix #9",
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-local" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-local" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 nexthop-local unchanged",
-  "protocols bgp var neighbor var address-family ipv6-unicast nexthop-self" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 next-hop-self",
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast prefix-list export" => "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" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 remove-private-AS",
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast route-map export" => "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" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-reflector-client",
-  "protocols bgp var neighbor var address-family ipv6-unicast route-server-client" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-server-client",
-  "protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration" => undef,
-  "protocols bgp var neighbor var address-family ipv6-unicast soft-reconfiguration inbound" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var neighbor var address-family ipv6-unicast unsuppress-map" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 unsuppress-map #9",
-  "protocols bgp var neighbor var advertisement-interval" => "router bgp #3 ; no neighbor #5 advertisement-interval",
-  "protocols bgp var neighbor var allowas-in" => "router bgp #3 ; no neighbor #5 allowas-in",
-  "protocols bgp var neighbor var allowas-in number" => "router bgp #3 ; no neighbor #5 allowas-in #8 ; neighbor #5 allowas-in",
-  "protocols bgp var neighbor var attribute-unchanged" => "router bgp #3 ; no neighbor #5 attribute-unchanged ?as-path ?med ?next-hop",
-  "protocols bgp var neighbor var capability" => undef,
-  "protocols bgp var neighbor var capability dynamic" => "router bgp #3 ; no neighbor #5 capability dynamic",
-  "protocols bgp var neighbor var capability orf" => undef,
-  "protocols bgp var neighbor var capability orf prefix-list" => undef,
-  "protocols bgp var neighbor var capability orf prefix-list receive" => "router bgp #3 ; no neighbor #5 capability orf prefix-list receive",
-  "protocols bgp var neighbor var capability orf prefix-list send" => "router bgp #3 ; no neighbor #5 capability orf prefix-list send",
-  "protocols bgp var neighbor var default-originate" => "router bgp #3 ; no neighbor #5 default-originate",
-  "protocols bgp var neighbor var default-originate route-map" => "router bgp #3 ; no neighbor #5 default-originate route-map #8",
-  "protocols bgp var neighbor var disable-capability-negotiation" => "router bgp #3 ; no neighbor #5 dont-capability-negotiate",
-  "protocols bgp var neighbor var disable-connected-check" => "router bgp #3 ; no neighbor #5 disable-connected-check",
-  "protocols bgp var neighbor var disable-send-community" => undef,
-  "protocols bgp var neighbor var disable-send-community extended" => "router bgp #3 ; neighbor #5 send-community extended",
-  "protocols bgp var neighbor var disable-send-community standard" => "router bgp #3 ; neighbor #5 send-community standard",
-  "protocols bgp var neighbor var distribute-list" => undef,
-  "protocols bgp var neighbor var distribute-list export" => "router bgp #3 ; no neighbor #5 distribute-list #8 out",
-  "protocols bgp var neighbor var distribute-list import" => "router bgp #3 ; no neighbor #5 distribute-list #8 in",
-  "protocols bgp var neighbor var ebgp-multihop" => "router bgp #3 ; no neighbor #5 ebgp-multihop",
-  "protocols bgp var neighbor var ttl-security" => undef,
-  "protocols bgp var neighbor var ttl-security hops" => "router bgp #3 ; no neighbor #5 ttl-security hops",
-  "protocols bgp var neighbor var filter-list" => undef,
-  "protocols bgp var neighbor var filter-list export" => "router bgp #3 ; no neighbor #5 filter-list #8 out",
-  "protocols bgp var neighbor var filter-list import" => "router bgp #3 ; no neighbor #5 filter-list #8 in",
-  "protocols bgp var neighbor var local-as" => "router bgp #3 ; no neighbor #5 local-as",
-  "protocols bgp var neighbor var local-as no-prepend" => "router bgp #3 ; no neighbor #5 local-as #7 no-prepend ; neighbor #5 local-as #7",
-  "protocols bgp var neighbor var maximum-prefix" => "router bgp #3 ; no neighbor #5 maximum-prefix",
-  "protocols bgp var neighbor var nexthop-self" => "router bgp #3 ; no neighbor #5 next-hop-self",
-  "protocols bgp var neighbor var override-capability" => "router bgp #3 ; no neighbor #5 override-capability",
-  "protocols bgp var neighbor var passive" => "router bgp #3 ; no neighbor #5 passive",
-  "protocols bgp var neighbor var password" => "router bgp #3 ; no neighbor #5 password",
-  "protocols bgp var neighbor var peer-group" => "router bgp #3 ; no neighbor #5 peer-group #7",
-  "protocols bgp var neighbor var port" => "router bgp #3 ; no neighbor #5 port",
-  "protocols bgp var neighbor var prefix-list" => undef,
-  "protocols bgp var neighbor var prefix-list export" => "router bgp #3 ; no neighbor #5 prefix-list #8 out",
-  "protocols bgp var neighbor var prefix-list import" => "router bgp #3 ; no neighbor #5 prefix-list #8 in",
-  "protocols bgp var neighbor var remote-as" => "router bgp #3 ; no neighbor #5 remote-as #7",
-  "protocols bgp var neighbor var remove-private-as" => "router bgp #3 ; no neighbor #5 remove-private-AS",
-  "protocols bgp var neighbor var route-map" => undef,
-  "protocols bgp var neighbor var route-map export" => "router bgp #3 ; no neighbor #5 route-map #8 out",
-  "protocols bgp var neighbor var route-map import" => "router bgp #3 ; no neighbor #5 route-map #8 in",
-  "protocols bgp var neighbor var route-reflector-client" => "router bgp #3 ; no neighbor #5 route-reflector-client",
-  "protocols bgp var neighbor var route-server-client" => "router bgp #3 ; no neighbor #5 route-server-client",
-  "protocols bgp var neighbor var shutdown" => "router bgp #3 ; no neighbor #5 shutdown",
-  "protocols bgp var neighbor var soft-reconfiguration" => undef,
-  "protocols bgp var neighbor var soft-reconfiguration inbound" => "router bgp #3 ; no neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var neighbor var strict-capability-match" => "router bgp #3 ; no neighbor #5 strict-capability-match",
-  "protocols bgp var neighbor var timers" => 'router bgp #3 ; no neighbor #5 timers',
-  "protocols bgp var neighbor var timers connect" => "router bgp #3 ; no neighbor #5 timers connect",
-  "protocols bgp var neighbor var unsuppress-map" => "router bgp #3 ; no neighbor #5 unsuppress-map #7",
-  "protocols bgp var neighbor var update-source" => "router bgp #3 ; no neighbor #5 update-source",
-  "protocols bgp var neighbor var weight" => "router bgp #3 ; no neighbor #5 weight",
-  "protocols bgp var network" => undef,
-  "protocols bgp var network var" => "router bgp #3 ; no network #5",
-  "protocols bgp var network var route-map" => "router bgp #3 ; no network #5 route-map #7",
-  "protocols bgp var parameters" => undef,
-  "protocols bgp var parameters always-compare-med" => "router bgp #3 ; no bgp always-compare-med",
-  "protocols bgp var parameters bestpath" => undef,
-  "protocols bgp var parameters bestpath as-path" => undef,
-  "protocols bgp var parameters bestpath as-path confed" => "router bgp #3 ; no bgp bestpath as-path confed",
-  "protocols bgp var parameters bestpath as-path ignore" => "router bgp #3 ; no bgp bestpath as-path ignore",
-  "protocols bgp var parameters bestpath compare-routerid" => "router bgp #3 ; no bgp bestpath compare-routerid",
-  "protocols bgp var parameters bestpath med" => undef,
-  "protocols bgp var parameters bestpath med confed" => "router bgp #3 ; no bgp bestpath med confed",
-  "protocols bgp var parameters bestpath med missing-as-worst" => "router bgp #3 ; no bgp bestpath med missing-as-worst",
-  "protocols bgp var parameters cluster-id" => "router bgp #3 ; no bgp cluster-id #6",
-  "protocols bgp var parameters confederation" => undef,
-  "protocols bgp var parameters confederation identifier" => "router bgp #3 ; no bgp confederation identifier #7",
-  "protocols bgp var parameters confederation peers" => "router bgp #3 ; no bgp confederation peers #7",
-  "protocols bgp var parameters dampening" => "router bgp #3 ; no bgp dampening",
-  "protocols bgp var parameters default" => undef,
-  "protocols bgp var parameters default local-pref" => "router bgp #3 ; no bgp default local-preference #7",
-  "protocols bgp var parameters default no-ipv4-unicast" => "router bgp #3 ; bgp default ipv4-unicast",
-  "protocols bgp var parameters deterministic-med" => "router bgp #3 ; no bgp deterministic-med",
-  "protocols bgp var parameters disable-network-import-check" => "router bgp #3 ; bgp network import-check",
-  "protocols bgp var parameters enforce-first-as" => "router bgp #3 ; no bgp enforce-first-as",
-  "protocols bgp var parameters graceful-restart" => undef,
-  "protocols bgp var parameters graceful-restart stalepath-time" => "router bgp #3 ; no bgp graceful-restart stalepath-time #7",
-  "protocols bgp var parameters log-neighbor-changes" => "router bgp #3 ; no bgp log-neighbor-changes",
-  "protocols bgp var parameters no-client-to-client-reflection" => "router bgp #3 ; bgp client-to-client reflection",
-  "protocols bgp var parameters no-fast-external-failover" => "router bgp #3 ; bgp fast-external-failover",
-  "protocols bgp var parameters router-id" => "router bgp #3 ; no bgp router-id #6",
-  "protocols bgp var parameters scan-time" => "router bgp #3 ; no bgp scan-time #6",
-  "protocols bgp var peer-group" => undef,
-  "protocols bgp var peer-group var" => "router bgp #3 ; no neighbor #5 peer-group",
-  "protocols bgp var peer-group var address-family" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 activate",
-  "protocols bgp var peer-group var address-family ipv6-unicast allowas-in" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 allowas-in",
-  "protocols bgp var peer-group var address-family ipv6-unicast attribute-unchanged" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 attribute-unchanged",
-  "protocols bgp var peer-group var address-family ipv6-unicast capability" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast capability dynamic" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 capability dynamic",
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast capability orf prefix-list receive" => "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" => "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" => "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" => "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" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast disable-send-community extended" => "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" => "router bgp #3 ; address-family ipv6 ; neighbor #5 send-community standard",
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast distribute-list export" => "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" => "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" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast filter-list export" => "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" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 maximum-prefix #9",
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-local" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-local" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 nexthop-local unchanged",
-  "protocols bgp var peer-group var address-family ipv6-unicast nexthop-self" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 next-hop-self",
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast prefix-list export" => "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" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 remove-private-AS",
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast route-map export" => "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" => "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" => "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" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 route-server-client",
-  "protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration" => undef,
-  "protocols bgp var peer-group var address-family ipv6-unicast soft-reconfiguration inbound" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var peer-group var address-family ipv6-unicast unsuppress-map" => "router bgp #3 ; address-family ipv6 ; no neighbor #5 unsuppress-map #9",
-  "protocols bgp var peer-group var allowas-in" => "router bgp #3 ; no neighbor #5 allowas-in",
-  "protocols bgp var peer-group var allowas-in number" => "router bgp #3 ; no neighbor #5 allowas-in #8 ; neighbor #5 allowas-in",
-  "protocols bgp var peer-group var attribute-unchanged" => "router bgp #3 ; no neighbor #5 attribute-unchanged ?as-path ?med ?next-hop",
-  "protocols bgp var peer-group var capability" => undef,
-  "protocols bgp var peer-group var capability dynamic" => "router bgp #3 ; no neighbor #5 capability dynamic",
-  "protocols bgp var peer-group var capability orf" => undef,
-  "protocols bgp var peer-group var capability orf prefix-list" => undef,
-  "protocols bgp var peer-group var capability orf prefix-list receive" => "router bgp #3 ; no neighbor #5 capability orf prefix-list receive",
-  "protocols bgp var peer-group var capability orf prefix-list send" => "router bgp #3 ; no neighbor #5 capability orf prefix-list send",
-  "protocols bgp var peer-group var default-originate" => "router bgp #3 ; no neighbor #5 default-originate",
-  "protocols bgp var peer-group var default-originate route-map" => "router bgp #3 ; no neighbor #5 default-originate route-map #8",
-  "protocols bgp var peer-group var disable-capability-negotiation" => "router bgp #3 ; no neighbor #5 dont-capability-negotiate",
-  "protocols bgp var peer-group var disable-connected-check" => "router bgp #3 ; no neighbor #5 disable-connected-check",
-  "protocols bgp var peer-group var disable-send-community" => undef,
-  "protocols bgp var peer-group var disable-send-community extended" => "router bgp #3 ; neighbor #5 send-community extended",
-  "protocols bgp var peer-group var disable-send-community standard" => "router bgp #3 ; neighbor #5 send-community standard",
-  "protocols bgp var peer-group var distribute-list" => undef,
-  "protocols bgp var peer-group var distribute-list export" => "router bgp #3 ; no neighbor #5 distribute-list #8 out",
-  "protocols bgp var peer-group var distribute-list import" => "router bgp #3 ; no neighbor #5 distribute-list #8 in",
-  "protocols bgp var peer-group var ebgp-multihop" => "router bgp #3 ; no neighbor #5 ebgp-multihop #7",
-  "protocols bgp var peer-group var filter-list" => undef,
-  "protocols bgp var peer-group var filter-list export" => "router bgp #3 ; no neighbor #5 filter-list #8 out",
-  "protocols bgp var peer-group var filter-list import" => "router bgp #3 ; no neighbor #5 filter-list #8 in",
-  "protocols bgp var peer-group var local-as" => undef,
-  "protocols bgp var peer-group var local-as var" => "router bgp #3 ; no neighbor #5 local-as #7",
-  "protocols bgp var peer-group var local-as var no-prepend" => "router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as",
-  "protocols bgp var peer-group var maximum-prefix" => "router bgp #3 ; no neighbor #5 maximum-prefix #7",
-  "protocols bgp var peer-group var nexthop-self" => "router bgp #3 ; no neighbor #5 next-hop-self",
-  "protocols bgp var peer-group var override-capability" => "router bgp #3 ; no neighbor #5 override-capability",
-  "protocols bgp var peer-group var passive" => "router bgp #3 ; no neighbor #5 passive",
-  "protocols bgp var peer-group var password" => "router bgp #3 ; no neighbor #5 password #7",
-  "protocols bgp var peer-group var port" => "router bgp #3 ; no neighbor #5 port #7",
-  "protocols bgp var peer-group var prefix-list" => undef,
-  "protocols bgp var peer-group var prefix-list export" => "router bgp #3 ; no neighbor #5 prefix-list #8 out",
-  "protocols bgp var peer-group var prefix-list import" => "router bgp #3 ; no neighbor #5 prefix-list #8 in",
-  "protocols bgp var peer-group var remote-as" => "router bgp #3 ; no neighbor #5",
-  "protocols bgp var peer-group var remove-private-as" => "router bgp #3 ; no neighbor #5 remove-private-AS",
-  "protocols bgp var peer-group var route-map" => undef,
-  "protocols bgp var peer-group var route-map export" => "router bgp #3 ; no neighbor #5 route-map #8 out",
-  "protocols bgp var peer-group var route-map import" => "router bgp #3 ; no neighbor #5 route-map #8 in",
-  "protocols bgp var peer-group var route-reflector-client" => "router bgp #3 ; no neighbor #5 route-reflector-client",
-  "protocols bgp var peer-group var route-server-client" => "router bgp #3 ; no neighbor #5 route-server-client",
-  "protocols bgp var peer-group var shutdown" => "router bgp #3 ; no neighbor #5 shutdown",
-  "protocols bgp var peer-group var soft-reconfiguration" => undef,
-  "protocols bgp var peer-group var soft-reconfiguration inbound" => "router bgp #3 ; no neighbor #5 soft-reconfiguration inbound",
-  "protocols bgp var peer-group var timers" => "router bgp #3 ; no neighbor #5",
-  "protocols bgp var peer-group var timers connect" => "router bgp #3 ; no neighbor #5 timers connect #8",
-  "protocols bgp var peer-group var unsuppress-map" => "router bgp #3 ; no neighbor #5 unsuppress-map #7",
-  "protocols bgp var peer-group var update-source" => "router bgp #3 ; no neighbor #5 update-source #7",
-  "protocols bgp var peer-group var weight" => "router bgp #3 ; no neighbor #5 weight #7",
-  "protocols bgp var redistribute" => undef,
-  "protocols bgp var redistribute connected" => "router bgp #3 ; no redistribute connected",
-  "protocols bgp var redistribute connected metric" => "router bgp #3 ; no redistribute connected metric #7",
-  "protocols bgp var redistribute connected route-map" => "router bgp #3 ; no redistribute connected route-map #7",
-  "protocols bgp var redistribute kernel" => "router bgp #3 ; no redistribute kernel",
-  "protocols bgp var redistribute kernel metric" => "router bgp #3 ; no redistribute kernel metric #7",
-  "protocols bgp var redistribute kernel route-map" => "router bgp #3 ; no redistribute kernel route-map #7",
-  "protocols bgp var redistribute ospf" => "router bgp #3 ; no redistribute ospf",
-  "protocols bgp var redistribute ospf metric" => "router bgp #3 ; no redistribute ospf metric #7",
-  "protocols bgp var redistribute ospf route-map" => "router bgp #3 ; no redistribute ospf route-map #7",
-  "protocols bgp var redistribute rip" => "router bgp #3 ; no redistribute rip",
-  "protocols bgp var redistribute rip metric" => "router bgp #3 ; no redistribute rip metric #7",
-  "protocols bgp var redistribute rip route-map" => "router bgp #3 ; no redistribute rip route-map #7",
-  "protocols bgp var redistribute static" => "router bgp #3 ; no redistribute static",
-  "protocols bgp var redistribute static metric" => "router bgp #3 ; no redistribute static metric #7",
-  "protocols bgp var redistribute static route-map" => "router bgp #3 ; no redistribute static route-map #7",
-  "protocols bgp var timers" => "router bgp #3 ; no timers bgp",
+my %qcom = (
+  'protocols' => {
+      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 address-family' => {
+      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 var' => {
+      set => 'router bgp #3 ; 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',
+  },
+  '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 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 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 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 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 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 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 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 aggregate-address' => {
+      set => undef,
+      del => undef,
+  },
+  'protocols bgp var aggregate-address var' => {
+      set => 'router bgp #3 ; 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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-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 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 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 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 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 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 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 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 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-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 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 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 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 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 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 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 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 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 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 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 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 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 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-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 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 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 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 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 #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 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 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 route-map' => {
+      set => 'router bgp #3 ; network #5 route-map #7',
+      del => 'router bgp #3 ; no network #5 route-map #7 ; network #5',
+  },
+  '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 bestpath' => {
+      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 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 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 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 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 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 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 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 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 distance' => {
+      set => undef,
+      del => undef,
+  },
+  'protocols bgp var parameters distance global' => {
+      set => 'router bgp #3 ; distance bgp @external @internal @local',
+      del => 'router bgp #3 ; no distance bgp',
+  },
+  'protocols bgp var parameters distance prefix' => {
+      set => undef,
+      del => undef,
+  },
+  'protocols bgp var parameters distance prefix var' => {
+      set => undef,
+      del => undef,
+  },
+  'protocols bgp var parameters distance prefix var distance' => {
+      set => 'router bgp #3 ; distance #9 #7 ',
+      del => 'router bgp #3 ; no distance #9 #7',
+  },
+  '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 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 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 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 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',
+      noerr => 'set',
+  },
+  '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 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 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 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 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 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 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 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 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 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 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 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-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 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 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 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-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 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 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 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 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 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 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 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 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-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 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 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 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 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 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 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 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 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 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 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 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 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 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-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 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 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 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 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 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 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 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 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 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 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 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 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',
+  },
 );
 
 my ( $pg, $as, $neighbor );
-my ( $main, $checkas, $peername, $isneighbor, $checkpeergroupas, $checkpeergroups, $checksource );
+my ( $main, $peername, $isneighbor, $checkpeergroups, $checksource );
 
 GetOptions(
     "peergroup=s"             => \$pg,
@@ -570,8 +1100,6 @@ GetOptions(
     "neighbor=s"              => \$neighbor,
     "check-peergroup-name=s"  => \$peername,
     "check-neighbor-ip"       => \$isneighbor,
-    "check-as"                => \$checkas,
-    "check-peergroup-as"      => \$checkpeergroupas,
     "check-peer-groups"       => \$checkpeergroups,
     "check-source=s"	      => \$checksource,
     "main"                    => \$main,
@@ -581,8 +1109,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_peergroup_as( $neighbor, $as)     if ($checkpeergroupas);
 check_source($checksource)	        if ($checksource);
 
 exit 0;
@@ -628,7 +1154,7 @@ sub check_for_peer_groups {
 
     foreach my $node (@neighbors) {
         my $peergroup = $config->returnValue("$node peer-group");
-        if ( $peergroup eq $pg ) { push @peers, $node; }
+        if ((defined $peergroup) && ($peergroup eq $pg)) { push @peers, $node; }
     }
 
     # if we found peers in the previous statements
@@ -642,52 +1168,30 @@ 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;
-
+# check that changed neighbors have a remote-as or peer-group defined
+sub check_remote_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");
+    $config->setLevel('protocols bgp');
 
-    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 @asns = $config->listNodes();
+    foreach my $as (@asns) {
+      my @neighbors = $config->listNodes("$as neighbor");
+      foreach my $neighbor (@neighbors) {
+        if ($config->isChanged("$as neighbor $neighbor")) {
+          my $remoteas = $config->returnValue("$as neighbor $neighbor remote-as");
+          if ($remoteas) {
+            return;
+          }
+          my $peergroup = $config->returnValue("$as neighbor $neighbor peer-group");
+          die "protocols bgp $as neighbor $neighbor: must define a remote-as or peer-group\n"
+            unless $peergroup;
+  
+          my $peergroupas = $config->returnValue("$as 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 $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))
-}
-
-# make sure peer-group has a remote-as
-sub check_peergroup_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 peer-group $neighbor");
-    my $remoteas = $config->returnValue("remote-as");
-    return if defined $remoteas;
-    die "protocols bgp $as peer-group $neighbor: must define a remote-as\n";
 }
 
 # check that value is either an IPV4 address on system or an interface
@@ -707,20 +1211,39 @@ sub check_source {
 
 sub main {
    # initialize the Quagga Config object with data from Vyatta config tree
-   my $qconfig = new Vyatta::Quagga::Config('protocols', \%qcom, \%qcomdel);
+   my $qconfig = new Vyatta::Quagga::Config('protocols', \%qcom);
 
+   # debug routines
    #$qconfig->setDebugLevel('3');
    #$qconfig->_reInitialize();
 
+   # check that all changed neighbors have a proper remote-as or peer-group defined
+   check_remote_as();
+
    # deletes with priority
+   # delete everything in neighbor except for the important nodes
+   my @skip_array = ('remote-as', 'route-map', 'filter-list', 'prefix-list', 'distribute-list', 'unsuppress-map');
+   # notice the extra space in the level string.  keeps the parent from being deleted.
+   $qconfig->deleteConfigTreeRecursive('protocols bgp var neighbor var ', @skip_array) || die "exiting $?\n";
+   # now delete everything in neighbor except remote-as
+   @skip_array = ('remote-as');
+   $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";
-   # would be cool if I could add a recursive delete such as everything but (protocols bgp var neigh var remote-as)
 
    # sets with priority
    $qconfig->setConfigTreeRecursive('protocols bgp var parameters') || die "exiting $?\n";
    $qconfig->setConfigTree('protocols bgp var peer-group var remote-as') || die "exiting $?\n";
    $qconfig->setConfigTreeRecursive('protocols bgp var peer-group') || die "exiting $?\n";
    $qconfig->setConfigTree('protocols bgp var neighbor var remote-as') || die "exiting $?\n";
+   $qconfig->setConfigTree('protocols bgp var neighbor var peer-group') || die "exiting $?\n";
    $qconfig->setConfigTree('protocols bgp var neighbor var shutdown') || die "exiting $?\n";
    $qconfig->setConfigTreeRecursive('protocols bgp var neighbor var route-map') || die "exiting $?\n";
    $qconfig->setConfigTreeRecursive('protocols bgp var neighbor var filter-list') || die "exiting $?\n";
@@ -730,6 +1253,7 @@ sub main {
    $qconfig->setConfigTreeRecursive('protocols bgp var neighbor') || die "exiting $?\n";
    $qconfig->setConfigTreeRecursive('protocols bgp') || die "exiting $?\n";
 
+   # old priorities we are emulating with the above sets
    #705 protocols bgp var neighbhor shutdown
    #715 protocols bgp var neighbhor route-map
    #716 protocols bgp var neighbhor filter-list
@@ -739,4 +1263,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/scripts/vyatta-show-protocols b/scripts/vyatta-show-protocols
deleted file mode 100755
index 51450632..00000000
--- a/scripts/vyatta-show-protocols
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /usr/bin/perl
-# Author: Stephen Hemminger
-# Date: 2009
-# Description: Helper script to display configured protocols
-
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2006, 2007, 2008 Vyatta, Inc.
-# All Rights Reserved.
-# **** End License ****
-
-use lib "/opt/vyatta/share/perl5";
-use Vyatta::Config;
-use strict;
-use warnings;
-
-# Map from command line to config->XXX() function
-my %actions = (
-    'original'   => 'existsOrig',
-    'exists'	 => 'exists',
-    'added'	 => 'isAdded',
-    'changed'	 => 'isChanged',
-    'deleted'	 => 'isDeleted',
-    'modified'	 => 'isChangedOrDeleted',
-);
-
-my %daemons = (
-    'bgp'	=> 'bgpd',
-    'ospf'	=> 'ospfd',
-    'ospfv3'	=> 'ospf6d',
-    'rip'	=> 'ripd',
-    'ripng'	=> 'ripngd',
-    'isis'	=> 'isisd',
-);
-
-sub usage {
-    die "Usage: $0 {",join('|',keys %actions),"}\n"
-}
-
-usage if ($#ARGV == -1);
-my $match = $actions{$ARGV[0]};
-usage unless $match;
-
-my $config = new Vyatta::Config;
-$config->setLevel('protocols');
-    
-# Should have avoided the urge to do Perl golf here...
-my @found = grep { $config->$match($_) } keys %daemons;
-print join(' ', map { $daemons{$_} } @found),"\n";
-