Merge branch 'fix/bgp-neighbor-fix' into 'develop'

Add local address in BGP neighbor template

See merge request !211

geant/gap_ansible/roles/bc_templates/routers/nokia/router/vprn.j2

@@ -26,7 +26,19 @@
                 </auto-bind-tunnel>
             </mpls>
         </bgp-ipvpn>
+        {% if vprn.aggregates is defined %}
+        <aggregates>
+          {% for ag in vprn.aggregates %}
+            <aggregate>
+                <ip-prefix>{{ ag.ip_prefix }}</ip-prefix>
+                <community>{{ ag.community }}</community>
+                <discard-component-communities>{{ ag.dcc }}</discard-component-communities>
+            </aggregate>
+          {% endfor %}
+        </aggregates>
+        {% endif %}
         <bgp>
+          <description>{{ vprn.name }}</description>
           {% with bgp_base_obj=vprn.bgp, bgp_context='vprn' %}
             {% include 'router/bgp_base.j2' %}
           {% endwith %}

geant/gap_ansible/roles/bgp_config/templates/bgp_neighbor.j2

@@ -5,11 +5,12 @@
                     {% if neighbor.bfd_enabled %}
                     <bfd-liveness>true</bfd-liveness>
                     {% endif %}
-
                     {% if neighbor.ip_type == 'ipv4' %}
+                    <local-address>{{ ipv4_local_addr }}</local-address>
                     <description>-- Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv4 }}</group>
                     {% elif neighbor.ip_type == 'ipv6' %}
+                    <local-address>{{ ipv6_local_addr }}</local-address>
                     <description>-- IPv6 Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv6 }}</group>
                     {% endif %}

geant/gap_ansible/roles/bgp_config/vars/main.yml

@@ -3,3 +3,5 @@
 is_standalone_run: false
 
 bgp_obj: "{{ ap.sbp.bgp_session_list }}"
+ipv4_local_addr: "{{ ap.sbp.ipv4_address }}"
+ipv6_local_addr: "{{ ap.sbp.ipv6_address }}"

geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2

@@ -19,6 +19,14 @@
                     <description>SRV_L3VPN CUSTOMER {{ partner_name }} {{ '#'+ap.custom_service_name if ap.custom_service_name is string }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
                 {% endif %}
                     <ip-mtu>{{ sbp_params.ip_mtu }}</ip-mtu>
+                    <cflowd-parameters>
+                        <sampling>
+                            <sampling-type>unicast</sampling-type>
+                            <type>interface</type>
+                            <direction>ingress-only</direction>
+                            <sample-profile>1</sample-profile>
+                        </sampling>
+                    </cflowd-parameters>
                     <sap>
                       {% if ap.sbp.is_tagged %}
                         <sap-id>{{ lag_name }}:{{ ap.sbp.vlan_id }}</sap-id>