Merge branch 'fix/l3-core-fixes' into 'develop'

Fix/l3 core fixes

See merge request !210

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

     {% for vprn in pe_vprns %}
-    <vprn alu:operation="replace">
+    <vprn>
         <service-name>{{ vprn.name }}</service-name>
         <admin-state>{{ vprn.admin_state | default('enable') }}</admin-state>
         {% if vprn.description is defined %}

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

@@ -5,11 +5,12 @@
                     {% if neighbor.bfd_enabled %}
                     <bfd-liveness>true</bfd-liveness>
                     {% endif %}
-                    <description>{{ partner_name | upper }}_{{ partner.type }}</description>
 
                     {% if neighbor.ip_type == 'ipv4' %}
+                    <description>-- Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv4 }}</group>
                     {% elif neighbor.ip_type == 'ipv6' %}
+                    <description>-- IPv6 Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv6 }}</group>
                     {% endif %}
                     <peer-as>{{ partner.asn }}</peer-as>

geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2

+{% set gaid_prefix = '$' %}
+{% set csn_prefix = '#' %}
 <config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:alu="urn:ietf:params:xml:ns:netconf:base:1.0">
     <configure xmlns="urn:nokia.com:sros:ns:yang:sr:conf">
 
@@ -5,7 +7,7 @@
       <port xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
           <port-id>{{ member.interface_name }}</port-id>
           <admin-state>enable</admin-state>
-          <description>PHY {{ ep.edge_port_type }} {{ partner_name }} P_{{ ep.edge_port_name }} | {{ member.interface_description }}</description>
+          <description>PHY {{ ep.edge_port_type }} {{ partner_name }} P_{{ ep.edge_port_name }}{{ ' | '+member.interface_description if member.interface_description is string }}</description>
           <ethernet>
               <mode>access</mode>
               <encap-type>{{ ep.encapsulation }}</encap-type>
@@ -39,11 +41,7 @@
           <lag-name>{{ ep.edge_port_name | lower }}</lag-name>
           <admin-state>enable</admin-state>
           <encap-type>{{ ep.encapsulation }}</encap-type>
-          {% if ep.ga_id is string %}
-          <description>LAG {{ ep.edge_port_type }} {{ partner_name }} ${{ ep.ga_id }} |</description>
-          {% else %}
-          <description>LAG {{ ep.edge_port_type }} {{ partner_name }} |</description>
-          {% endif %}
+          <description>LAG {{ ep.edge_port_type }} {{ partner_name }}{{ ' | '+gaid_prefix+ep.ga_id if ep.ga_id is string }}{{ ' | '+csn_prefix+(ep.custom_service_name | replace("#","")) if ep.custom_service_name is string }}{{ ' | '+ep.edge_port_description if ep.edge_port_description is string }}</description>
           <mode>access</mode>
          {% if ep.enable_lacp is true %} 
           <lacp>

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

@@ -14,9 +14,9 @@
                 <interface alu:operation="replace">
                     <interface-name>{{ lag_name }}.{{ ap.sbp.vlan_id }}</interface-name>
                 {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %}
-                    <description>SRV_GLOBAL CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
+                    <description>SRV_GLOBAL CUSTOMER {{ partner_name }} {{ '#'+ap.custom_service_name if ap.custom_service_name is string }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
                 {% elif subscription.l3_core_service_type in ['LHCONE'] %}
-                    <description>SRV_L3VPN CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
+                    <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>
                     <sap>