l2circuit: changes to include ExpressRoute circuits

and to correctly calculate description_prefix

geant/gap_ansible/playbooks/l2circuit.yaml

@@ -6,9 +6,13 @@
       ansible.builtin.include_vars:
         dir: /opt/ansible_inventory/group_vars/all
 
-    - name: Import standard variables for "{{ subscription.product.product_type }}/{{ subscription.layer_2_circuit_service_type | upper | replace(' ', '_') }}"
+    - name: Set gso_product_name variable
+      ansible.builtin.set_fact:
+        gso_product_name: "{{ subscription.product.name | upper | replace(' ', '_') }}"
+
+    - name: Import standard variables for "{{ subscription.product.product_type }}/{{ gso_product_name }}"
       ansible.builtin.include_vars:
-        dir: /opt/ansible_inventory/geant_services/{{ subscription.product.product_type }}/{{ subscription.layer_2_circuit_service_type | upper | replace(' ', '_') }}
+        dir: /opt/ansible_inventory/geant_services/{{ subscription.product.product_type }}/{{ gso_product_name }}
 
     - name: Configure L2circuit as Local cross connect
       when: subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.edge_port.node.router_fqdn ==

geant/gap_ansible/roles/l2circuits/tasks/merge_vars.yaml

@@ -31,6 +31,11 @@
   ansible.builtin.set_fact:
     ims_service_name: "{{ subscription.layer_2_circuit.custom_service_name | upper }}"
 
+- name: Set the service description prefix
+  when: ims_service_name is defined
+  ansible.builtin.set_fact:
+    srv_description_prefix: "{{ 'SRV_GCS' if gso_product_name == 'AZURE_EXPRESSROUTE' else 'SRV_L2CIRCUIT' }}"
+
 - name: Calculate IMS service name
   when: subscription.layer_2_circuit.custom_service_name is none
   block:

geant/gap_ansible/roles/l2circuits/templates/nokia/deploy/l2circuit.j2

@@ -23,7 +23,7 @@
             <epipe alu:operation="replace">
             <service-name>EPIPE:{{ ims_service_name }}:{{ l2circuits_l2c_vcid }}</service-name>
                 <admin-state>enable</admin-state>
-                <description>SRV_L2CIRCUIT CUSTOMER {{ partners_sorted if partners_sorted is defined else local_partner_name }} #{{ ims_service_name }} ${{ local_side.sbp.gs_id }}</description>
+                <description>{{ srv_description_prefix | default('SRV_L2CIRCUIT') }} CUSTOMER {{ partners_sorted if partners_sorted is defined else local_partner_name }} #{{ ims_service_name }} ${{ local_side.sbp.gs_id }}</description>
                 <service-id>{{ l2circuits_l2c_vcid }}</service-id>
                 <customer>1</customer>
                 <service-mtu>{{ service_mtu.nokia }}</service-mtu>