[BGPD]: add bgp dynamic neighbor configuration (#708)

* add bgp dynamic neighbor configuration

* [bgpd]: update as comments

* update as comment

* update to deployment_id_asn_map

* minor change

dockers/docker-fpm-quagga/bgpd.conf.j2

@@ -19,6 +19,10 @@ log facility local4
 !
 ! bgp multiple-instance
 !
+route-map FROM_BGP_SPEAKER_V4 permit 10
+!
+route-map TO_BGP_SPEAKER_V4 deny 10
+!
 router bgp {{ minigraph_bgp_asn }}
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
@@ -65,6 +69,19 @@ router bgp {{ minigraph_bgp_asn }}
 {% endif %}
 {% endfor %}
 {% endblock bgp_sessions %}
+{% block bgp_peers_with_range %}
+{% for bgp_peer in minigraph_bgp_peers_with_range %}
+  neighbor {{ bgp_peer['name'] }} peer-group
+  neighbor {{ bgp_peer['name'] }} passive
+  neighbor {{ bgp_peer['name'] }} remote-as {{deployment_id_asn_map[deployment_id] }}
+  neighbor {{ bgp_peer['name'] }} ebgp-multihop 255
+  neighbor {{ bgp_peer['name'] }} soft-reconfiguration inbound
+  neighbor {{ bgp_peer['name'] }} update-source Loopback0
+  neighbor {{ bgp_peer['name'] }} route-map FROM_BGP_SPEAKER_V4 in
+  neighbor {{ bgp_peer['name'] }} route-map TO_BGP_SPEAKER_V4 out
+  bgp listen range {{ bgp_peer['ip_range'] }} peer-group {{ bgp_peer['name'] }}
+{% endfor %}
+{% endblock bgp_peers_with_range %}
 !
 {% if minigraph_bgp_asn is not none %}
 maximum-paths 64

dockers/docker-fpm-quagga/start.sh

@@ -2,9 +2,9 @@
 
 mkdir -p /etc/quagga
 if [ -f /etc/sonic/bgp_admin.yml ]; then
-    sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/bgp_admin.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
+    sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/bgp_admin.yml -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
 else
-    sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
+    sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
 fi
 sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf
 

files/build_templates/sonic_debian_extension.j2

@@ -138,6 +138,9 @@ sudo bash -c "echo '  all: off' >> $FILESYSTEM_ROOT/etc/sonic/bgp_admin.yml"
 # Copy SNMP configuration files
 sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/
 
+# Copy ASN configuration files
+sudo cp $IMAGE_CONFIGS/asn/deployment_id_asn_map.yml $FILESYSTEM_ROOT/etc/sonic/
+
 # Copy sudoers configuration file
 sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
 

files/image_config/asn/deployment_id_asn_map.yml

@@ -0,0 +1,2 @@
+deployment_id_asn_map:
+  "1" : 65432

src/sonic-config-engine/minigraph.py

@@ -244,6 +244,7 @@ def parse_dpg(dpg, hname):
 def parse_cpg(cpg, hname):
     bgp_sessions = []
     myasn = None
+    bgp_peers_with_range = []
     for child in cpg:
         tag = child.tag
         if tag == str(QName(ns, "PeeringSessions")):
@@ -270,12 +271,22 @@ def parse_cpg(cpg, hname):
                 hostname = router.find(str(QName(ns1, "Hostname"))).text
                 if hostname == hname:
                     myasn = int(asn)
+                    peers = router.find(str(QName(ns1, "Peers")))
+                    for bgpPeer in peers.findall(str(QName(ns, "BGPPeer"))):
+			addr = bgpPeer.find(str(QName(ns, "Address"))).text
+                        if bgpPeer.find(str(QName(ns1, "PeersRange"))) is not None:
+                            name = bgpPeer.find(str(QName(ns1, "Name"))).text
+                            ip_range = bgpPeer.find(str(QName(ns1, "PeersRange"))).text
+                            bgp_peers_with_range.append({
+                                'name': name,
+                                'ip_range': ip_range
+                            })
                 else:
                     for bgp_session in bgp_sessions:
                         if hostname == bgp_session['name']:
                             bgp_session['asn'] = int(asn)
 
-    return bgp_sessions, myasn
+    return bgp_sessions, myasn, bgp_peers_with_range
 
 
 def parse_meta(meta, hname):
@@ -284,6 +295,7 @@ def parse_meta(meta, hname):
     ntp_servers = []
     mgmt_routes = []
     erspan_dst = []
+    deployment_id = None
     device_metas = meta.find(str(QName(ns, "Devices")))
     for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
         if device.find(str(QName(ns1, "Name"))).text == hname:
@@ -302,7 +314,9 @@ def parse_meta(meta, hname):
                     mgmt_routes = value_group
                 elif name == "ErspanDestinationIpv4":
                     erspan_dst = value_group
-    return syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst
+                elif name == "DeploymentId":
+                    deployment_id = value
+    return syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst, deployment_id
 
 
 def get_console_info(devices, dev, port):
@@ -396,6 +410,8 @@ def parse_xml(filename, platform=None, port_config_file=None):
     ntp_servers = []
     mgmt_routes = []
     erspan_dst = []
+    bgp_peers_with_range = None
+    deployment_id = None
 
     hwsku_qn = QName(ns, "HwSku")
     hostname_qn = QName(ns, "Hostname")
@@ -411,13 +427,13 @@ def parse_xml(filename, platform=None, port_config_file=None):
         if child.tag == str(QName(ns, "DpgDec")):
             (intfs, lo_intfs, mgmt_intf, vlans, pcs, acls) = parse_dpg(child, hostname)
         elif child.tag == str(QName(ns, "CpgDec")):
-            (bgp_sessions, bgp_asn) = parse_cpg(child, hostname)
+            (bgp_sessions, bgp_asn, bgp_peers_with_range) = parse_cpg(child, hostname)
         elif child.tag == str(QName(ns, "PngDec")):
             (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port) = parse_png(child, hostname)
         elif child.tag == str(QName(ns, "UngDec")):
             (u_neighbors, u_devices, _, _, _, _) = parse_png(child, hostname)
         elif child.tag == str(QName(ns, "MetadataDeclaration")):
-            (syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst) = parse_meta(child, hostname)
+            (syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst, deployment_id) = parse_meta(child, hostname)
 
     Tree = lambda: defaultdict(Tree)
 
@@ -428,6 +444,7 @@ def parse_xml(filename, platform=None, port_config_file=None):
     # TODO: alternatively (preferred), implement class containers for multiple-attribute entries, enabling sort by attr
     results['minigraph_bgp'] = sorted(bgp_sessions, key=lambda x: x['addr'])
     results['minigraph_bgp_asn'] = bgp_asn
+    results['minigraph_bgp_peers_with_range'] = bgp_peers_with_range
     # TODO: sort does not work properly on all interfaces of varying lengths. Need to sort by integer group(s).
 
     phyport_intfs = []
@@ -466,6 +483,7 @@ def parse_xml(filename, platform=None, port_config_file=None):
     results['ntp_servers'] = ntp_servers
     results['forced_mgmt_routes'] = mgmt_routes
     results['erspan_dst'] = erspan_dst
+    results['deployment_id'] = deployment_id
 
     return results