bgp: remove references to new XML/Python implementation not yet available in equuleus

9 files changed, 0 insertions, 2941 deletions

diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
deleted file mode 100644
index 16355a1e5..000000000
--- a/data/templates/frr/bgp.frr.tmpl
+++ /dev/null
@@ -1,287 +0,0 @@
-{### MACRO definition for recurring peer patter, this can be either fed by a ###}
-{### peer-group or an individual BGP neighbor ###}
-{% macro bgp_neighbor(neighbor, config, peer_group=false) %}
-{%   if peer_group == true %}
- neighbor {{ neighbor }} peer-group
-{%   elif config.peer_group is defined and config.peer_group is not none %}
- neighbor {{ neighbor }} peer-group {{ config.peer_group }}
-{%   endif %}
-{%   if config.remote_as is defined and config.remote_as is not none %}
- neighbor {{ neighbor }} remote-as {{ config.remote_as }}
-{%   endif %}
-{%   if config.bfd is defined %}
- neighbor {{ neighbor }} bfd
-{%   endif %}
-{%   if config.capability is defined and config.capability is not none %}
-{%     if config.capability.dynamic is defined %}
- neighbor {{ neighbor }} capability dynamic
-{%     endif %}
-{%     if config.capability.extended_nexthop is defined %}
- neighbor {{ neighbor }} capability extended-nexthop
-{%     endif %}
-{%   endif %}
-{%   if config.description is defined and config.description is not none %}
- neighbor {{ neighbor }} description {{ config.description }}
-{%   endif %}
-{%   if config.disable_capability_negotiation is defined %}
- neighbor {{ neighbor }} disable-capability-negotiation
-{%   endif %}
-{%   if config.ebgp_multihop is defined and config.ebgp_multihop is not none %}
- neighbor {{ neighbor }} ebgp-multihop {{ config.ebgp_multihop }}
-{%   endif %}
-{%   if config.local_as is defined and config.local_as is not none %}
-{%     for local_asn in config.local_as %}
- neighbor {{ neighbor }} local-as {{ local_asn }} {{ 'no-prepend' if config.local_as[local_asn].no_prepend is defined }}
-{%     endfor %}
-{%   endif %}
-{%   if config.override_capability is defined %}
- neighbor {{ neighbor }} override-capability
-{%   endif %}
-{%   if config.passive is defined %}
- neighbor {{ neighbor }} passive
-{%   endif %}
-{%   if config.password is defined and config.password is not none %}
- neighbor {{ neighbor }} password {{ config.password }}
-{%   endif %}
-{%   if config.shutdown is defined %}
- neighbor {{ neighbor }} shutdown
-{%   endif %}
-{%   if config.ttl_security is defined and config.ttl_security.hops is defined and config.ttl_security.hops is not none %}
- neighbor {{ neighbor }} ttl-security hops {{ config.ttl_security.hops }}
-{%   endif %}
-{%   if config.update_source is defined and config.update_source is not none %}
- neighbor {{ neighbor }} update-source {{ config.update_source }}
-{%   endif %}
- !
-{%   if config.address_family is defined and config.address_family is not none %}
-{%     for af in config.address_family %}
-{%       if af == 'ipv4_unicast' %}
- address-family ipv4 unicast
-{%       elif af == 'ipv6_unicast' %}
- address-family ipv6 unicast
-{%       endif %}
-{%       if config.address_family[af].allowas_in is defined and config.address_family[af].allowas_in is not none %}
-  neighbor {{ neighbor }} allowas-in {{ config.address_family[af].allowas_in.number if config.address_family[af].allowas_in.number is defined }}
-{%       endif %}
-{%       if config.address_family[af].remove_private_as is defined %}
-  neighbor {{ neighbor }} remove-private-AS
-{%       endif %}
-{%       if config.address_family[af].route_reflector_client is defined %}
-  neighbor {{ neighbor }} route-reflector-client
-{%       endif %}
-{%       if config.address_family[af].weight is defined and config.address_family[af].weight is not none %}
-  neighbor {{ neighbor }} weight {{ config.address_family[af].weight }}
-{%       endif %}
-{%       if config.address_family[af].attribute_unchanged is defined and config.address_family[af].attribute_unchanged is not none %}
-  neighbor {{ neighbor }} attribute-unchanged {{ 'as-path ' if config.address_family[af].attribute_unchanged.as_path is defined }}{{ 'med ' if config.address_family[af].attribute_unchanged.med is defined }}{{ 'next-hop ' if config.address_family[af].attribute_unchanged.next_hop is defined }}
-{%       endif %}
-{%       if config.address_family[af].capability is defined and config.address_family[af].capability.orf is defined and config.address_family[af].capability.orf.prefix_list is defined and config.address_family[af].capability.orf.prefix_list is not none %}
-  neighbor {{ neighbor }} capability orf prefix-list {{ config.address_family[af].capability.orf.prefix_list }}
-{%       endif %}
-{%       if config.address_family[af].default_originate is defined %}
-  neighbor {{ neighbor }} default-originate {{ 'route-map ' + config.address_family[af].default_originate.route_map if config.address_family[af].default_originate.route_map is defined }}
-{%       endif %}
-{%       if config.address_family[af].distribute_list is defined and config.address_family[af].distribute_list is not none %}
-{%         if config.address_family[af].distribute_list.export is defined and config.address_family[af].distribute_list.export is not none %}
-  neighbor {{ neighbor }} distribute-list {{ config.address_family[af].distribute_list.export }} out
-{%         elif config.address_family[af].distribute_list.import is defined and config.address_family[af].distribute_list.import is not none %}
-  neighbor {{ neighbor }} distribute-list {{ config.address_family[af].distribute_list.export }} in
-{%         endif %}
-{%       endif %}
-{%       if config.address_family[af].filter_list is defined and config.address_family[af].filter_list is not none %}
-{%         if config.address_family[af].filter_list.export is defined and config.address_family[af].filter_list.export is not none %}
-  neighbor {{ neighbor }} filter-list {{ config.address_family[af].filter_list.export }} out
-{%         elif config.address_family[af].filter_list.import is defined and config.address_family[af].filter_list.import is not none %}
-  neighbor {{ neighbor }} filter-list {{ config.address_family[af].filter_list.import }} in
-{%         endif %}
-{%       endif %}
-{%       if config.address_family[af].maximum_prefix is defined and config.address_family[af].maximum_prefix is not none %}
-  neighbor {{ neighbor }} maximum-prefix {{ config.address_family[af].maximum_prefix }}
-{%       endif %}
-{%       if config.address_family[af].nexthop_self is defined %}
-{#         https://phabricator.vyos.net/T1817 #}
-  neighbor {{ neighbor }} next-hop-self {{ 'force' if config.address_family[af].nexthop_self.force is defined }}
-{%       endif %}
-{%       if config.address_family[af].route_server_client is defined %}
-  neighbor {{ neighbor }} route-server-client
-{%       endif %}
-{%       if config.address_family[af].route_map is defined and config.address_family[af].route_map is not none %}
-{%         if config.address_family[af].route_map.export is defined and config.address_family[af].route_map.export is not none %}
-  neighbor {{ neighbor }} route-map {{ config.address_family[af].route_map.export }} out
-{%         elif config.address_family[af].route_map.import is defined and config.address_family[af].route_map.import is not none %}
-  neighbor {{ neighbor }} route-map {{ config.address_family[af].route_map.import }} in
-{%         endif %}
-{%       endif %}
-{%       if config.address_family[af].prefix_list is defined and config.address_family[af].prefix_list is not none %}
-{%         if config.address_family[af].prefix_list.export is defined and config.address_family[af].prefix_list.export is not none %}
-  neighbor {{ neighbor }} prefix-list  {{ config.address_family[af].prefix_list.export }} out
-{%         elif config.address_family[af].prefix_list.import is defined and config.address_family[af].prefix_list.import is not none %}
-  neighbor {{ neighbor }} prefix-list  {{ config.address_family[af].prefix_list.import }} in
-{%         endif %}
-{%       endif %}
-{%       if config.address_family[af].soft_reconfiguration is defined and config.address_family[af].soft_reconfiguration.inbound is defined %}
-  neighbor {{ neighbor }} soft-reconfiguration inbound
-{%       endif %}
-{%       if config.address_family[af].unsuppress_map is defined and config.address_family[af].unsuppress_map is not none %}
-  neighbor {{ neighbor }} unsuppress-map {{ config.address_family[af].unsuppress_map }}
-{%       endif %}
-  neighbor {{ neighbor }} activate
- exit-address-family
- !
-{%     endfor %}
-{%   endif %}
-{% endmacro %}
-!
-router bgp {{ asn }}
- no bgp default ipv4-unicast
-{% if address_family is defined and address_family is not none %}
-{%   for af in address_family %}
- !
-{%     if af == 'ipv4_unicast' %}
- address-family ipv4 unicast
-{%     elif af == 'ipv6_unicast' %}
- address-family ipv6 unicast
-{%     endif %}
-{%     if address_family[af].aggregate_address is defined and address_family[af].aggregate_address is not none %}
-{%       for ip in address_family[af].aggregate_address %}
-  aggregate-address {{ ip }}{{ ' as-set' if address_family[af].aggregate_address[ip].as_set is defined }}{{ ' summary-only' if address_family[af].aggregate_address[ip].summary_only is defined }}
-{%       endfor %}
-{%     endif %}
-{%     if address_family[af].redistribute is defined and address_family[af].redistribute is not none %}
-{%       for protocol in address_family[af].redistribute %}
-{%         if protocol == 'table' %}
-  redistribute table {{ address_family[af].redistribute[protocol].table }}
-{%         else %}
-  redistribute {{ protocol }}{% if address_family[af].redistribute[protocol].metric is defined %} metric {{ address_family[af].redistribute[protocol].metric }}{% endif %}{% if address_family[af].redistribute[protocol].route_map is defined %} route-map {{ address_family[af].redistribute[protocol].route_map }}{% endif %}
-{#######   we need this blank line!! #######}
-
-{%         endif %}
-{%       endfor %}
-{%     endif %}
-{%     if address_family[af].network is defined and address_family[af].network is not none %}
-{%       for network in address_family[af].network %}
-  network {{ network }}{% if address_family[af].network[network].route_map is defined %} route-map {{ address_family[af].network[network].route_map }}{% endif %}{% if address_family[af].network[network].backdoor is defined %} backdoor{% endif %}
-{#######   we need this blank line!! #######}
-
-{%       endfor %}
-{%     endif %}
- exit-address-family
-{%   endfor %}
-{% endif %}
- !
-{# set protocols bgp xxxx maximum-paths ibgp x, Generated by default for afi_4 #}
-{# We don't have this parameter in afi_6. But this is supported in FRR #}
-{% if maximum_paths is defined and maximum_paths is not none %}
-{%   if maximum_paths.ebgp is defined and maximum_paths.ebgp is not none %}
- !
- address-family ipv4 unicast
-  maximum-paths {{ maximum_paths.ebgp }}
- exit-address-family
- !
-{%   endif %}
-{%   if maximum_paths.ibgp is defined and maximum_paths.ibgp is not none %}
- !
- address-family ipv4 unicast
-  maximum-paths ibgp {{ maximum_paths.ibgp }}
- exit-address-family
- !
-{%   endif %}
-{% endif %}
- !
-{% if peer_group is defined and peer_group is not none %}
-{%   for peer, config in peer_group.items() %}
-{{ bgp_neighbor(peer, config, true) }}
-{%   endfor %}
-{% endif %}
- !
-{% if neighbor is defined and neighbor is not none %}
-{%   for n, config in neighbor.items() %}
-{{ bgp_neighbor(n, config) }}
-{%   endfor %}
-{% endif %}
- !
-{% if parameters is defined %}
-{%   if parameters.always_compare_med is defined %}
- bgp always-compare-med
-{%   endif %}
-{%   if parameters.bestpath is defined and parameters.bestpath is not none %}
-{%     if parameters.bestpath.compare_routerid is defined %}
- bgp bestpath compare-routerid
-{%     endif %}
-{%     if parameters.bestpath.as_path is defined and parameters.bestpath.as_path is not none %}
-{%       for option in parameters.bestpath.as_path %}
- bgp bestpath as-path {{ option|replace('_', '-') }}
-{%       endfor %}
-{%     endif %}
-{%     if parameters.bestpath.med is defined and parameters.bestpath.med is not none %}
- bgp bestpath med {{ 'confed' if parameters.bestpath.med.confed is defined }} {{ 'missing-as-worst' if parameters.bestpath.med.missing_as_worst is defined }}
-{%     endif %}
-{%   endif %}
-{%   if parameters.cluster_id is defined and parameters.cluster_id is not none %}
- bgp cluster-id {{ parameters.cluster_id }}
-{%   endif %}
-{%   if parameters.confederation is defined and parameters.confederation is not none %}
-{%     if parameters.confederation.identifier is defined and parameters.confederation.identifier is not none %}
- bgp confederation identifier {{ parameters.confederation.identifier }}
-{%     endif %}
-{%     if parameters.confederation.peers is defined and parameters.confederation.peers is not none %}
- bgp confederation peers {{ parameters.confederation.peers }}
-{%     endif %}
-{%   endif %}
-{%   if parameters.dampening is defined and parameters.dampening is defined and parameters.dampening.half_life is defined and parameters.dampening.half_life is not none %}
-{# Doesn't work in current FRR configuration; vtysh (bgp dampening 16 751 2001 61) #}
- bgp dampening {{ parameters.dampening.half_life }} {{ parameters.dampening.re_use if parameters.dampening.re_use is defined }} {{ parameters.dampening.start_suppress_time if parameters.dampening.start_suppress_time is defined }} {{ parameters.dampening.max_suppress_time if parameters.dampening.max_suppress_time is defined }}
-{%   endif %}
-{%   if parameters.default is defined and parameters.default is not none %}
-{%     if parameters.default.local_pref is defined and parameters.default.local_pref is not none %}
- bgp default local-preference {{ parameters.default.local_pref }}
-{%     endif %}
-{%     if parameters.default.no_ipv4_unicast is defined %}
-{#     We use this is parameter as default in template (5-th string) #}
- no bgp default ipv4-unicast
-{%     endif %}
-{%   endif %}
-{%   if parameters.deterministic_med is defined %}
- bgp deterministic-med
-{%   endif %}
-{%   if parameters.distance is defined and parameters.distance is not none %}
- !
- address-family ipv4 unicast
-{%     if parameters.distance.global is defined and parameters.distance.global.external is defined and parameters.distance.global.internal is defined and parameters.distance.global.local is defined %}
-  distance bgp {{ parameters.distance.global.external }} {{ parameters.distance.global.internal }} {{ parameters.distance.global.local }}
-{%     endif %}
-{%     if parameters.distance.prefix is defined and parameters.distance.prefix is not none %}
-{%       for prefix in parameters.distance.prefix %}
-  distance {{ parameters.distance.prefix[prefix].distance }} {{ prefix }}
-{%       endfor %}
-{%     endif %}
- exit-address-family
- !
-{%   endif %}
-{%   if parameters.graceful_restart is defined %}
- bgp graceful-restart {{ 'stalepath-time ' + parameters.graceful_restart.stalepath_time if parameters.graceful_restart.stalepath_time is defined }}
-{%   endif %}
-{%   if parameters.log_neighbor_changes is defined %}
- bgp log-neighbor-changes
-{%   endif %}
-{%   if parameters.network_import_check is defined %}
- bgp network import-check
-{%   endif %}
-{%   if parameters.no_client_to_client_reflection is defined %}
- no bgp client-to-client reflection
-{%   endif %}
-{%   if parameters.no_fast_external_failover is defined %}
- no bgp fast-external-failover
-{%   endif %}
-{%   if parameters.router_id is defined and parameters.router_id is not none %}
- bgp router-id {{ parameters.router_id }}
-{%   endif %}
-{% endif %}
-{% if timers is defined and timers.keepalive is defined and timers.holdtime is defined %}
- timers bgp {{ timers.keepalive }} {{ timers.holdtime }}
-{% endif %}
- !
-{% if route_map is defined and route_map is not none %}
- ip protocol bgp route-map {{ route_map }}
-{% endif %}
- !
diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
deleted file mode 100644
index c731e970b..000000000
--- a/interface-definitions/include/bgp-afi-aggregate-address.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from bgp-afi-aggregate-address.xml.i -->
-<leafNode name="as-set">
-  <properties>
-    <help>Generate AS-set path information for this aggregate address</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<leafNode name="summary-only">
-  <properties>
-    <help>Announce the aggregate summary network only</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
deleted file mode 100644
index 29c2568c2..000000000
--- a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- include start from bgp-afi-redistribute-metric-route-map.xml.i -->
-<leafNode name="metric">
-  <properties>
-    <help>Metric for redistributed routes</help>
-    <valueHelp>
-      <format>u32:1-4294967295</format>
-      <description>Metric for redistributed routes</description>
-    </valueHelp>
-  </properties>
-</leafNode>
-<leafNode name="route-map">
-  <properties>
-    <help>Route map to filter redistributed routes</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
deleted file mode 100644
index a480e8dce..000000000
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ /dev/null
@@ -1,286 +0,0 @@
-<!-- include start from bgp-neighbor-afi-ipv4-unicast.xml.i -->
-<node name="ipv4-unicast">
-  <properties>
-    <help>IPv4 BGP neighbor parameters</help>
-  </properties>
-  <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a IPv4-route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="as-override">
-      <properties>
-        <help>AS for routes sent to this neighbor to be the local AS</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged (IPv4)</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged (IPv4)</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged (IPv4)</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged (IPv4)</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="capability">
-      <properties>
-        <help>Advertise capabilities to this neighbor (IPv4)</help>
-      </properties>
-      <children>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this neighbor</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this neighbor</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default IPv4-route to this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>IPv4-Route-map to specify criteria of the default</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter IPv4-route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing IPv4-route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing IPv4-route updates to this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming IPv4-route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming IPv4-route updates from this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter IPv4-route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing IPv4-route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming IPv4-route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of IPv4-prefixes to accept from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for IPv4-routes sent to this neighbor to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="prefix-list">
-      <properties>
-        <help>IPv4-Prefix-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>IPv4-Prefix-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>IPv4-Prefix-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound IPv4-route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter IPv4-route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>IPv4-Route-map to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>IPv4-Route-map to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Neighbor as a IPv4-route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Neighbor is IPv4-route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for neighbor (IPv4)</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this neighbor [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed IPv4-routes</help>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this neighbor</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
deleted file mode 100644
index 6742bf08b..000000000
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ /dev/null
@@ -1,331 +0,0 @@
-<!-- include start from bgp-neighbor-afi-ipv6-unicast.xml.i -->
-<node name="ipv6-unicast">
-  <properties>
-    <help>IPv6 BGP neighbor parameters</help>
-  </properties>
-  <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a IPv6-route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="as-override">
-      <properties>
-        <help>AS for routes sent to this neighbor to be the local AS</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="capability">
-      <properties>
-        <help>Advertise capabilities to this neighbor (IPv6)</help>
-      </properties>
-      <children>
-        <!-- Capability dynamic in the afi ipv6 does nothing T3037 -->
-        <leafNode name="dynamic">
-          <properties>
-            <help>Advertise dynamic capability to this neighbor</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this neighbor</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this neighbor</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default IPv6-route to this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>Route-map to specify criteria of the default</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="disable-send-community">
-      <properties>
-        <help>Disable sending community attributes to this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="extended">
-          <properties>
-            <help>Disable sending extended community attributes to this neighbor</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="standard">
-          <properties>
-            <help>Disable sending standard community attributes to this neighbor</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing route updates to this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming route updates from this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of prefixes to accept from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-local">
-      <properties>
-        <help>Nexthop attributes</help>
-      </properties>
-      <children>
-        <leafNode name="unchanged">
-          <properties>
-            <help>Leave link-local nexthop unchanged for this peer</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for IPv6-routes sent to this neighbor to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="peer-group">
-      <properties>
-        <help>IPv6 peer group for this peer</help>
-      </properties>
-    </leafNode>
-    <node name="prefix-list">
-      <properties>
-        <help>Prefix-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Prefix-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Prefix-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Route-map to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Route-map to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Neighbor as a IPv6-route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Neighbor is IPv6-route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for neighbor (IPv6)</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this neighbor [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed IPv6-routes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this neighbor</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
deleted file mode 100644
index d7d6e7c84..000000000
--- a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
+++ /dev/null
@@ -1,303 +0,0 @@
-<!-- include start from bgp-peer-group-afi-ipv4-unicast.xml.i -->
-<node name="ipv4-unicast">
-  <properties>
-    <help>IPv4 BGP peer group parameters</help>
-  </properties>
-  <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="capability">
-      <properties>
-        <help>Advertise capabilities to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="dynamic">
-          <properties>
-            <help>Advertise dynamic capability to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this peer-group</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this peer-group</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default route to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>Route-map to specify criteria of the default</help>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="disable-send-community">
-      <properties>
-        <help>Disable sending community attributes to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="extended">
-          <properties>
-            <help>Disable sending extended community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="standard">
-          <properties>
-            <help>Disable sending standard community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing route updates to this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming route updates from this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of prefixes to accept from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for routes sent to this peer-group to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="prefix-list">
-      <properties>
-        <help>Prefix-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Prefix-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Prefix-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Route-map to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Route-map to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Peer-group as a route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Peer-group as route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this peer-group [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed routes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this peer-group</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
deleted file mode 100644
index 56f73a627..000000000
--- a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
+++ /dev/null
@@ -1,319 +0,0 @@
-<!-- include start from bgp-peer-group-afi-ipv6-unicast.xml.i -->
-<node name="ipv6-unicast">
-  <properties>
-    <help>IPv6 BGP neighbor parameters</help>
-  </properties>
-  <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a IPv6-route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="capability">
-      <properties>
-        <help>Advertise capabilities to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="dynamic">
-          <properties>
-            <help>Advertise dynamic capability to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this peer-group</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this peer-group</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default route to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>Route-map to specify criteria of the default</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="disable-send-community">
-      <properties>
-        <help>Disable sending community attributes to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="extended">
-          <properties>
-            <help>Disable sending extended community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="standard">
-          <properties>
-            <help>Disable sending standard community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing route updates to this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming route updates from this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of prefixes to accept from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-local">
-      <properties>
-        <help>Nexthop attributes</help>
-      </properties>
-      <children>
-        <leafNode name="unchanged">
-          <properties>
-            <help>Leave link-local nexthop unchanged for this peer</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for routes sent to this peer-group to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="prefix-list">
-      <properties>
-        <help>Prefix-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Prefix-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Prefix-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Route-map to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Route-map to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Peer-group as a route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Peer-group as route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this peer-group [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed routes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this peer-group</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
deleted file mode 100644
index 27cbc919a..000000000
--- a/interface-definitions/protocols-bgp.xml.in
+++ /dev/null
@@ -1,1208 +0,0 @@
-<?xml version="1.0"?>
-<!-- Border Gateway Protocol (BGP) configuration -->
-<interfaceDefinition>
-  <node name="protocols">
-    <children>
-      <tagNode name="nbgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py">
-        <properties>
-          <help>Border Gateway Protocol (BGP) parameters</help>
-          <valueHelp>
-            <format>u32:1-4294967294</format>
-            <description>AS number</description>
-          </valueHelp>
-          <constraint>
-            <validator name="numeric" argument="--range 1-4294967294"/>
-          </constraint>
-          <priority>820</priority>
-        </properties>
-        <children>
-          <node name="address-family">
-            <properties>
-              <help>BGP address-family parameters</help>
-            </properties>
-            <children>
-              <node name="ipv4-unicast">
-                <properties>
-                  <help>IPv4 BGP settings</help>
-                </properties>
-                <children>
-                  <tagNode name="aggregate-address">
-                    <properties>
-                      <help>BGP aggregate network</help>
-                      <valueHelp>
-                        <format>ipv4net</format>
-                        <description>BGP aggregate network</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-prefix"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      #include <include/bgp-afi-aggregate-address.xml.i>
-                    </children>
-                  </tagNode>
-                  <tagNode name="network">
-                    <properties>
-                      <help>BGP network</help>
-                      <valueHelp>
-                        <format>ipv4net</format>
-                        <description>BGP network</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-prefix"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      <leafNode name="backdoor">
-                        <properties>
-                          <help>Network as a backdoor route</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="route-map">
-                        <properties>
-                          <help>Route-map to modify route attributes</help>
-                          <completionHelp>
-                            <path>policy route-map</path>
-                          </completionHelp>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="redistribute">
-                    <properties>
-                      <help>Redistribute routes from other protocols into BGP</help>
-                    </properties>
-                    <children>
-                      <node name="connected">
-                        <properties>
-                          <help>Redistribute connected routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="kernel">
-                        <properties>
-                          <help>Redistribute kernel routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="ospf">
-                        <properties>
-                          <help>Redistribute OSPF routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="rip">
-                        <properties>
-                          <help>Redistribute RIP routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="static">
-                        <properties>
-                          <help>Redistribute static routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <leafNode name="table">
-                        <properties>
-                          <help>Redistribute non-main Kernel Routing Table</help>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </node>
-              <node name="ipv6-unicast">
-                <properties>
-                  <help>IPv6 BGP settings</help>
-                </properties>
-                <children>
-                  <tagNode name="aggregate-address">
-                    <properties>
-                      <help>BGP aggregate network</help>
-                      <valueHelp>
-                        <format>ipv6net</format>
-                        <description>Aggregate network</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv6-prefix"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      #include <include/bgp-afi-aggregate-address.xml.i>
-                    </children>
-                  </tagNode>
-                  <tagNode name="network">
-                    <properties>
-                      <help>BGP network</help>
-                      <valueHelp>
-                        <format>ipv6net</format>
-                        <description>Aggregate network</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv6-prefix"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      <leafNode name="path-limit">
-                        <properties>
-                          <help>AS-path hopcount limit</help>
-                          <valueHelp>
-                            <format>u32:0-255</format>
-                            <description>AS path hop count limit</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 0-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="route-map">
-                        <properties>
-                          <help>Route-map to modify route attributes</help>
-                          <completionHelp>
-                            <path>policy route-map</path>
-                          </completionHelp>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="redistribute">
-                    <properties>
-                      <help>Redistribute routes from other protocols into BGP</help>
-                    </properties>
-                    <children>
-                      <node name="connected">
-                        <properties>
-                          <help>Redistribute connected routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="kernel">
-                        <properties>
-                          <help>Redistribute kernel routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="ospf">
-                        <properties>
-                          <help>Redistribute OSPF routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="rip">
-                        <properties>
-                          <help>Redistribute RIP routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <node name="static">
-                        <properties>
-                          <help>Redistribute static routes into BGP</help>
-                        </properties>
-                        <children>
-                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
-                        </children>
-                      </node>
-                      <leafNode name="table">
-                        <properties>
-                          <help>Redistribute non-main Kernel Routing Table</help>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </node>
-            </children>
-          </node>
-          <node name="maximum-paths">
-            <properties>
-              <help>BGP multipaths</help>
-            </properties>
-            <children>
-              <leafNode name="ebgp">
-                <properties>
-                  <help>Maximum ebgp multipaths</help>
-                  <valueHelp>
-                    <format>u32:1-255</format>
-                    <description>EBGP multipaths</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="ibgp">
-                <properties>
-                  <help>Maximum ibgp multipaths</help>
-                  <valueHelp>
-                    <format>u32:1-255</format>
-                    <description>EBGP multipaths</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <tagNode name="neighbor">
-            <properties>
-              <help>BGP neighbor</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>BGP neighbor IP address</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6</format>
-                <description>BGP neighbor IPv6 address</description>
-              </valueHelp>
-              <valueHelp>
-                <format>txt</format>
-                <description>Interface name</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ipv4-address"/>
-                <validator name="ipv6-address"/>
-                <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex>
-              </constraint>
-            </properties>
-            <children>
-              <node name="address-family">
-                <properties>
-                  <help>Parameters relating to IPv4 or IPv6 routes</help>
-                </properties>
-                <children>
-                  #include <include/bgp-neighbor-afi-ipv4-unicast.xml.i>
-                  #include <include/bgp-neighbor-afi-ipv6-unicast.xml.i>
-                </children>
-              </node>
-              <leafNode name="advertisement-interval">
-                <properties>
-                  <help>Minimum interval for sending routing updates</help>
-                  <valueHelp>
-                    <format>u32:0-600</format>
-                    <description>Advertisement interval in seconds</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-600"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <node name="bfd">
-                <properties>
-                  <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
-                </properties>
-                <children>
-                  <leafNode name="check-control-plane-failure">
-                    <properties>
-                      <help>Allow to write CBIT independence in BFD outgoing packets and read both C-BIT value of BFD and lookup BGP peer status</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="capability">
-                <properties>
-                  <help>Advertise capabilities to this neighbor</help>
-                </properties>
-                <children>
-                  <leafNode name="dynamic">
-                    <properties>
-                      <help>Advertise dynamic capability to this neighbor</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="extended-nexthop">
-                    <properties>
-                      <help>Advertise extended-nexthop capability to this neighbor</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="description">
-                <properties>
-                  <help>Description for this neighbor</help>
-                </properties>
-              </leafNode>
-              <leafNode name="disable-capability-negotiation">
-                <properties>
-                  <help>Disable capability negotiation with this neighbor</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="disable-connected-check">
-                <properties>
-                  <help>Disable check to see if eBGP peer address is a connected route</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="disable-send-community">
-                <properties>
-                  <help>Disable sending community attributes to this neighbor (IPv4)</help>
-                </properties>
-                <children>
-                  <leafNode name="extended">
-                    <properties>
-                      <help>Disable sending extended community attributes to this neighbor (IPv4)</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="standard">
-                    <properties>
-                      <help>Disable sending standard community attributes to this neighbor (IPv4)</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="ebgp-multihop">
-                <properties>
-                  <help>Allow this EBGP neighbor to not be on a directly connected network</help>
-                  <valueHelp>
-                    <format>u32:1-255</format>
-                    <description>Number of hops</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <node name="interface">
-                <properties>
-                  <help>Interface parameters</help>
-                </properties>
-                <children>
-                  <leafNode name="peer-group">
-                    <properties>
-                      <help>Peer group for this peer</help>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="remote-as">
-                    <properties>
-                      <help>Neighbor BGP AS number [REQUIRED]</help>
-                      <completionHelp>
-                        <list>external internal</list>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>u32:1-4294967294</format>
-                        <description>Neighbor AS number</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>external</format>
-                        <description>Any AS different from the local AS</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>internal</format>
-                        <description>Neighbor AS number</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-4294967294"/>
-                        <regex>(external|internal)</regex>
-                      </constraint>
-                      <constraintErrorMessage>Invalid ASN value</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
-                  <node name="v6only">
-                    <properties>
-                      <help>Enable BGP with v6 link-local only</help>
-                    </properties>
-                    <children>
-                      <leafNode name="peer-group">
-                        <properties>
-                          <help>Peer group for this peer</help>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="remote-as">
-                        <properties>
-                          <help>Neighbor BGP AS number [REQUIRED]</help>
-                          <completionHelp>
-                            <list>external internal</list>
-                          </completionHelp>
-                          <valueHelp>
-                            <format>u32:1-4294967294</format>
-                            <description>Neighbor AS number</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>external</format>
-                            <description>Any AS different from the local AS</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>internal</format>
-                            <description>Neighbor AS number</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-4294967294"/>
-                            <regex>(external|internal)</regex>
-                          </constraint>
-                          <constraintErrorMessage>Invalid ASN value</constraintErrorMessage>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </node>
-              <tagNode name="local-as">
-                <properties>
-                  <help>Local AS number</help>
-                  <valueHelp>
-                    <format>u32:1-4294967294</format>
-                    <description>Local AS number</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967294"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <leafNode name="no-prepend">
-                    <properties>
-                      <help>Disable prepending local-as to updates from EBGP peers</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
-              <leafNode name="override-capability">
-                <properties>
-                  <help>Ignore capability negotiation with specified neighbor</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="passive">
-                <properties>
-                  <help>Do not initiate a session with this neighbor</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="password">
-                <properties>
-                  <help>BGP MD5 password</help>
-                </properties>
-              </leafNode>
-              <leafNode name="peer-group">
-                <properties>
-                  <help>IPv4 peer group for this peer</help>
-                </properties>
-              </leafNode>
-              <leafNode name="port">
-                <properties>
-                  <help>Neighbor BGP port</help>
-                  <valueHelp>
-                    <format>u32:1-65535</format>
-                    <description>Neighbor BGP port number</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="remote-as">
-                <properties>
-                  <help>Neighbor BGP AS number [REQUIRED]</help>
-                  <completionHelp>
-                    <list>external internal</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>u32:1-4294967294</format>
-                    <description>Neighbor AS number</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>external</format>
-                    <description>Any AS different from the local AS</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>internal</format>
-                    <description>Neighbor AS number</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967294"/>
-                    <regex>(external|internal)</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid ASN value</constraintErrorMessage>
-                </properties>
-              </leafNode>
-              <leafNode name="shutdown">
-                <properties>
-                  <help>Administratively shut down neighbor</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="strict-capability-match">
-                <properties>
-                  <help>Enable strict capability negotiation</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="timers">
-                <properties>
-                  <help>Neighbor timers</help>
-                </properties>
-                <children>
-                  <leafNode name="connect">
-                    <properties>
-                      <help>BGP connect timer for this neighbor</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Connect timer in seconds</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>0</format>
-                        <description>Disable connect timer</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-65535"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="holdtime">
-                    <properties>
-                      <help>BGP hold timer for this neighbor</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Hold timer in seconds</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>0</format>
-                        <description>Hold timer disabled</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-65535"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="keepalive">
-                    <properties>
-                      <help>BGP keepalive interval for this neighbor</help>
-                      <valueHelp>
-                        <format>u32:1-65535</format>
-                        <description>Keepalive interval in seconds (default 60)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-65535"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="ttl-security">
-                <properties>
-                  <help>Ttl security mechanism for this BGP peer</help>
-                </properties>
-                <children>
-                  <leafNode name="hops">
-                    <properties>
-                      <help>Number of the maximum number of hops to the BGP peer</help>
-                      <valueHelp>
-                        <format>u32:1-254</format>
-                        <description>Number of hops</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-254"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="update-source">
-                <!-- Need to check format interfaces -->
-                <properties>
-                  <help>Source IP of routing updates</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 address of route source</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address of route source</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Interface as route source</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                    <validator name="ipv6-address"/>
-                    <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </tagNode>
-          <node name="parameters">
-            <properties>
-              <help>BGP parameters</help>
-            </properties>
-            <children>
-              <leafNode name="always-compare-med">
-                <properties>
-                  <help>Always compare MEDs from different neighbors</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="bestpath">
-                <properties>
-                  <help>Default bestpath selection mechanism</help>
-                </properties>
-                <children>
-                  <node name="as-path">
-                    <properties>
-                      <help>AS-path attribute comparison parameters</help>
-                    </properties>
-                    <children>
-                      <leafNode name="confed">
-                        <properties>
-                          <help>Compare AS-path lengths including confederation sets and sequences</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="ignore">
-                        <properties>
-                          <help>Ignore AS-path length in selecting a route</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="multipath-relax">
-                        <properties>
-                          <help>Allow load sharing across routes that have different AS paths (but same length)</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <leafNode name="compare-routerid">
-                    <properties>
-                      <help>Compare the router-id for identical EBGP paths</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <node name="med">
-                    <properties>
-                      <help>MED attribute comparison parameters</help>
-                    </properties>
-                    <children>
-                      <leafNode name="confed">
-                        <properties>
-                          <help>Compare MEDs among confederation paths</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="missing-as-worst">
-                        <properties>
-                          <help>Treat missing route as a MED as the least preferred one</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </node>
-              <leafNode name="cluster-id">
-                <properties>
-                  <help>Route-reflector cluster-id</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>Route-reflector cluster-id</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <node name="confederation">
-                <properties>
-                  <help>AS confederation parameters</help>
-                </properties>
-                <children>
-                  <leafNode name="identifier">
-                    <properties>
-                      <help>Confederation AS identifier [REQUIRED]</help>
-                      <valueHelp>
-                        <format>u32:1-4294967294</format>
-                        <description>Confederation AS id</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-4294967294"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="peers">
-                    <properties>
-                      <help>Peer ASs in the BGP confederation</help>
-                      <valueHelp>
-                        <format>u32:1-4294967294</format>
-                        <description>Peer AS number</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-4294967294"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="dampening">
-                <properties>
-                  <help>Enable route-flap dampening</help>
-                </properties>
-                <children>
-                  <leafNode name="half-life">
-                    <properties>
-                      <help>Half-life time for dampening [REQUIRED]</help>
-                      <valueHelp>
-                        <format>u32:1-45</format>
-                        <description>Half-life penalty in seconds</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-45"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="max-suppress-time">
-                    <properties>
-                      <help>Maximum duration to suppress a stable route [REQUIRED]</help>
-                      <valueHelp>
-                        <format>u32:1-255</format>
-                        <description>Maximum suppress duration in seconds</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="re-use">
-                    <properties>
-                      <help>Time to start reusing a route [REQUIRED]</help>
-                      <valueHelp>
-                        <format>u32:1-20000</format>
-                        <description>Re-use time in seconds</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-20000"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="start-suppress-time">
-                    <properties>
-                      <help>When to start suppressing a route [REQUIRED]</help>
-                      <valueHelp>
-                        <format>u32:1-20000</format>
-                        <description>Start-suppress-time</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-20000"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="default">
-                <properties>
-                  <help>BGP defaults</help>
-                </properties>
-                <children>
-                  <leafNode name="local-pref">
-                    <properties>
-                      <help>Default local preference</help>
-                      <valueHelp>
-                        <format>u32</format>
-                        <description>Local preference</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 0-4294967295"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="no-ipv4-unicast">
-                    <properties>
-                      <help>Deactivate IPv4 unicast for a peer by default</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="deterministic-med">
-                <properties>
-                  <help>Compare MEDs between different peers in the same AS</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="distance">
-                <properties>
-                  <help>Administratives distances for BGP routes</help>
-                </properties>
-                <children>
-                  <node name="global">
-                    <properties>
-                      <help>Global administratives distances for BGP routes</help>
-                    </properties>
-                    <children>
-                      <leafNode name="external">
-                        <properties>
-                          <help>Administrative distance for external BGP routes</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Administrative distance for external BGP routes</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="internal">
-                        <properties>
-                          <help>Administrative distance for internal BGP routes</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Administrative distance for internal BGP routes</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="local">
-                        <properties>
-                          <help>Administrative distance for local BGP routes</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Administrative distance for internal BGP routes</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <tagNode name="prefix">
-                    <properties>
-                      <help>Administrative distance for a specific BGP prefix</help>
-                      <valueHelp>
-                        <format>ipv4net</format>
-                        <description>Administrative distance for a specific BGP prefix</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-prefix"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Administrative distance for prefix</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Administrative distance for external BGP routes</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </node>
-              <node name="graceful-restart">
-                <properties>
-                  <help>Graceful restart capability parameters</help>
-                </properties>
-                <children>
-                  <leafNode name="stalepath-time">
-                    <properties>
-                      <help>Maximum time to hold onto restarting neighbors stale paths</help>
-                      <valueHelp>
-                        <format>u32:1-3600</format>
-                        <description>Hold time in seconds</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-3600"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="log-neighbor-changes">
-                <properties>
-                  <help>Log neighbor up/down changes and reset reason</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="network-import-check">
-                <properties>
-                  <help>Enable IGP route check for network statements</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="no-client-to-client-reflection">
-                <properties>
-                  <help>Disable client to client route reflection</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="no-fast-external-failover">
-                <properties>
-                  <help>Disable immediate session reset on peer link down event</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="router-id">
-                <properties>
-                  <help>BGP router id</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>BGP router id</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <tagNode name="peer-group">
-            <properties>
-              <help>BGP peer-group</help>
-            </properties>
-            <children>
-              <node name="address-family">
-                <properties>
-                  <help>BGP peer-group address-family parameters</help>
-                </properties>
-                <children>
-                  #include <include/bgp-peer-group-afi-ipv4-unicast.xml.i>
-                  #include <include/bgp-peer-group-afi-ipv6-unicast.xml.i>
-                </children>
-              </node>
-              <leafNode name="bfd">
-                <properties>
-                  <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="capability">
-                <properties>
-                  <help>Advertise capabilities to this peer-group</help>
-                </properties>
-                <children>
-                  <leafNode name="dynamic">
-                    <properties>
-                      <help>Advertise dynamic capability to this peer-group</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="extended-nexthop">
-                    <properties>
-                      <help>Advertise extended-nexthop capability to this neighbor</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="description">
-                <properties>
-                  <help>Description for this peer-group</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="disable-capability-negotiation">
-                <properties>
-                  <help>Disable capability negotiation with this peer-group</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="disable-connected-check">
-                <properties>
-                  <help>Disable check to see if eBGP peer address is a connected route</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="ebgp-multihop">
-                <properties>
-                  <help>Allow this EBGP peer-group to not be on a directly connected network</help>
-                  <valueHelp>
-                    <format>u32:1-255</format>
-                    <description>Number of hops</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-255"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <tagNode name="local-as">
-                <properties>
-                  <help>Local AS number [REQUIRED]</help>
-                  <valueHelp>
-                    <format>u32:1-4294967294</format>
-                    <description>Local AS number</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967294"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <leafNode name="no-prepend">
-                    <properties>
-                      <help>Disable prepending local-as to updates from EBGP peers</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
-              <leafNode name="override-capability">
-                <properties>
-                  <help>Ignore capability negotiation with specified peer-group</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="passive">
-                <properties>
-                  <help>Do not intiate a session with this peer-group</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <leafNode name="password">
-                <properties>
-                  <help>BGP MD5 password</help>
-                </properties>
-              </leafNode>
-              <leafNode name="remote-as">
-                <properties>
-                  <help>Neighbor BGP AS number [REQUIRED]</help>
-                  <completionHelp>
-                    <list>external internal</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>u32:1-4294967294</format>
-                    <description>Neighbor AS number</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>external</format>
-                    <description>Any AS different from the local AS</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>internal</format>
-                    <description>Neighbor AS number</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967294"/>
-                    <regex>(external|internal)</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid ASN value</constraintErrorMessage>
-                </properties>
-              </leafNode>
-              <leafNode name="shutdown">
-                <properties>
-                  <help>Administratively shut down peer-group</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
-              <node name="ttl-security">
-                <properties>
-                  <help>Ttl security mechanism</help>
-                </properties>
-                <children>
-                  <leafNode name="hops">
-                    <properties>
-                      <help>Number of the maximum number of hops to the BGP peer</help>
-                      <valueHelp>
-                        <format>u32:1-254</format>
-                        <description>Number of hops</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-254"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="update-source">
-                <!-- Need to check format interfaces -->
-                <properties>
-                  <help>Source IP of routing updates</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 address of route source</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address of route source</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Interface as route source</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                    <validator name="ipv6-address"/>
-                    <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </tagNode>
-          <leafNode name="route-map">
-            <properties>
-              <help>Filter routes installed in local route map</help>
-              <completionHelp>
-                <path>policy route-map</path>
-              </completionHelp>
-            </properties>
-          </leafNode>
-          <node name="timers">
-            <properties>
-              <help>BGP protocol timers</help>
-            </properties>
-            <children>
-              <leafNode name="holdtime">
-                <properties>
-                  <help>BGP holdtime interval</help>
-                  <valueHelp>
-                    <format>u32:4-65535</format>
-                    <description>Hold-time in seconds (default 180)</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>0</format>
-                    <description>Do not hold routes</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 0-65535"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="keepalive">
-                <properties>
-                  <help>Keepalive interval</help>
-                  <valueHelp>
-                    <format>u32:1-65535</format>
-                    <description>Keep-alive time in seconds (default 60)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-        </children>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
deleted file mode 100755
index 678be5066..000000000
--- a/src/conf_mode/protocols_bgp.py
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2020 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from sys import exit
-
-from vyos.config import Config
-from vyos.configdict import dict_merge
-from vyos.template import render
-from vyos.template import render_to_string
-from vyos.util import call
-from vyos.util import dict_search
-from vyos import ConfigError
-from vyos import frr
-from vyos import airbag
-airbag.enable()
-
-config_file = r'/tmp/bgp.frr'
-
-def get_config():
-    conf = Config()
-    base = ['protocols', 'nbgp']
-    bgp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
-
-    # XXX: any reason we can not move this into the FRR template?
-    # we shall not call vtysh directly, especially not in get_config()
-    if not conf.exists(base):
-        bgp = {}
-        call('vtysh -c \"conf t\" -c \"no ip protocol bgp\" ')
-
-    if not conf.exists(base + ['route-map']):
-        call('vtysh -c \"conf t\" -c \"no ip protocol bgp\" ')
-
-    # We also need some additional information from the config,
-    # prefix-lists and route-maps for instance.
-    base = ['policy']
-    tmp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
-    # As we only support one ASN (later checked in begin of verify()) we add the
-    # new information only to the first AS number
-    asn = next(iter(bgp))
-    # Merge policy dict into bgp dict
-    bgp[asn] = dict_merge(tmp, bgp[asn])
-
-    return bgp
-
-def verify(bgp):
-    if not bgp:
-        return None
-
-    # Check if declared more than one ASN
-    if len(bgp) > 1:
-        raise ConfigError('Only one BGP AS number can be defined!')
-
-    for asn, asn_config in bgp.items():
-        import pprint
-        pprint.pprint(asn_config)
-
-        # Common verification for both peer-group and neighbor statements
-        for neighbor in ['neighbor', 'peer_group']:
-            # bail out early if there is no neighbor or peer-group statement
-            # this also saves one indention level
-            if neighbor not in asn_config:
-                print(f'no {neighbor} found in config')
-                continue
-
-            for peer, peer_config in asn_config[neighbor].items():
-                # Only regular "neighbor" statement can have a peer-group set
-                # Check if the configure peer-group exists
-                if 'peer_group' in peer_config:
-                    peer_group = peer_config['peer_group']
-                    if peer_group not in asn_config['peer_group']:
-                        raise ConfigError(f'Specified peer-group "{peer_group}" for '\
-                                          f'neighbor "{neighbor}" does not exist!')
-
-                # Some checks can/must only be done on a neighbor and nor a peer-group
-                if neighbor == 'neighbor':
-                    # remote-as must be either set explicitly for the neighbor
-                    # or for the entire peer-group
-                    if 'remote_as' not in peer_config:
-                        if 'peer_group' not in peer_config or 'remote_as' not in asn_config['peer_group'][peer_config['peer_group']]:
-                            raise ConfigError('Remote AS must be set for neighbor or peer-group!')
-
-                for afi in ['ipv4_unicast', 'ipv6_unicast']:
-                    # Bail out early if address family is not configured
-                    if 'address_family' not in peer_config or afi not in peer_config['address_family']:
-                        continue
-
-                    afi_config = peer_config['address_family'][afi]
-                    # Validate if configured Prefix list exists
-                    if 'prefix_list' in afi_config:
-                        for tmp in ['import', 'export']:
-                            if tmp in afi_config['prefix_list']:
-                                if afi == 'ipv4_unicast':
-                                    prefix_list = afi_config['prefix_list'][tmp]
-                                    if 'prefix_list' not in asn_config or prefix_list not in asn_config['prefix_list']:
-                                        raise ConfigError(f'prefix-list "{prefix_list}" used for "{tmp}" does not exist!')
-                                if afi == 'ipv6_unicast':
-                                    prefix_list = afi_config['prefix_list6'][tmp]
-                                    if 'prefix_list6' not in asn_config or prefix_list not in asn_config['prefix_list6']:
-                                        raise ConfigError(f'prefix-list "{prefix_list}" used for "{tmp}" does not exist!')
-
-
-                    if 'route_map' in afi_config:
-                        for tmp in ['import', 'export']:
-                            if tmp in afi_config['route_map']:
-                                route_map = afi_config['route_map'][tmp]
-                                if 'route_map' not in asn_config or route_map not in asn_config['route_map']:
-                                    raise ConfigError(f'route-map "{route_map}" used for "{tmp}" does not exist!')
-
-
-    return None
-
-def generate(bgp):
-    if not bgp:
-        bgp['new_frr_config'] = ''
-        return None
-
-    # only one BGP AS is supported, so we can directly send the first key
-    # of the config dict
-    asn = list(bgp.keys())[0]
-    bgp[asn]['asn'] = asn
-
-    # render(config) not needed, its only for debug
-    render(config_file, 'frr/bgp.frr.tmpl', bgp[asn])
-    bgp['new_frr_config'] = render_to_string('frr/bgp.frr.tmpl', bgp[asn])
-
-    return None
-
-def apply(bgp):
-    # Save original configuration prior to starting any commit actions
-    frr_cfg = frr.FRRConfig()
-    frr_cfg.load_configuration(daemon='bgpd')
-    frr_cfg.modify_section(f'router bgp \S+', '')
-    frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', bgp['new_frr_config'])
-    frr_cfg.commit_configuration(daemon='bgpd')
-
-    # If FRR config is blank, rerun the blank commit x times due to frr-reload
-    # behavior/bug not properly clearing out on one commit.
-    if bgp['new_frr_config'] == '':
-        for a in range(5):
-            frr_cfg.commit_configuration(daemon='bgpd')
-
-    # Debugging
-    '''
-    print('')
-    print('--------- DEBUGGING ----------')
-    print(f'Existing config:\n{frr_cfg["original_config"]}\n\n')
-    print(f'Replacement config:\n{bgp["new_frr_config"]}\n\n')
-    print(f'Modified config:\n{frr_cfg["modified_config"]}\n\n')
-    '''
-
-    return None
-
-if __name__ == '__main__':
-    try:
-        c = get_config()
-        verify(c)
-        generate(c)
-        apply(c)
-    except ConfigError as e:
-        print(e)
-        exit(1)