Merge branch 'fix/ga_gs_id' into 'develop'

Fix/ga gs

See merge request !204

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

@@ -38,8 +38,8 @@
       <lag 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">
           <lag-name>{{ ep.edge_port_name | lower }}</lag-name>
           <admin-state>enable</admin-state>
-          {% if ep.edge_port_geant_ga_id is string %}
-          <description>LAG {{ ep.edge_port_type }} {{ partner_name }} ${{ ep.edge_port_geant_ga_id }} | </description>
+          {% if ep.edge_port_ga_id is string %}
+          <description>LAG {{ ep.edge_port_type }} {{ partner_name }} ${{ ep.edge_port_ga_id }} | </description>
           {% else %}
           <description>LAG {{ ep.edge_port_type }} {{ partner_name }} | </description>
           {% endif %}

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

@@ -39,8 +39,8 @@
           <lag-name>{{ ep.edge_port_name | lower }}</lag-name>
           <admin-state>enable</admin-state>
           <encap-type>{{ ep.encapsulation }}</encap-type>
-          {% if ep.geant_ga_id is string %}
-          <description>LAG {{ ep.edge_port_type }} {{ partner_name }} ${{ ep.geant_ga_id }} |</description>
+          {% 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 %}

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

@@ -36,7 +36,7 @@ icmp_ttl_expired:
   seconds: 2
 
 trunks:
-  - id: "{{ wfo_trunk.iptrunk.geant_s_sid }}"
+  - id: "{{ wfo_trunk.iptrunk.gs_id }}"
     config:
       common:
         description: "{{ wfo_trunk.iptrunk.iptrunk_description }}"

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

@@ -25,7 +25,7 @@ side_b_ipv4_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv4_network | ansible.utils.
 side_b_ipv6_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv6_network | ansible.utils.ipaddr('net') | ansible.utils.ipaddr('2') | ansible.utils.ipaddr('address') }}/126"
 
 trunks:
-  - id: "{{ wfo_trunk.iptrunk.geant_s_sid }}"
+  - id: "{{ wfo_trunk.iptrunk.gs_id }}"
     config:
       common:
         description: "{{ wfo_trunk.iptrunk.iptrunk_description }}"

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

@@ -35,7 +35,7 @@ old_node:
   vendor: "{{ wfo_trunk.iptrunk.iptrunk_sides[replace_index | int].iptrunk_side_node.vendor }}"
 
 new_side:
-  id: "{{ wfo_trunk.iptrunk.geant_s_sid }}"
+  id: "{{ wfo_trunk.iptrunk.gs_id }}"
   description: "{{ wfo_trunk.iptrunk.iptrunk_description }}"
   speed: "{{ wfo_trunk.iptrunk.iptrunk_speed }}"
   trunk_type: "{{ wfo_trunk.iptrunk.iptrunk_type }}"

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

@@ -10,7 +10,7 @@ side_a_ipv4_address: "{{ subscription.iptrunk.iptrunk_ipv4_network | ansible.uti
 side_b_ipv4_address: "{{ subscription.iptrunk.iptrunk_ipv4_network | ansible.utils.ipaddr('net') | ansible.utils.ipaddr('1') | ansible.utils.ipaddr('address') }}"
 
 trunks:
-  - id: "{{ subscription.iptrunk.geant_s_sid }}"
+  - id: "{{ subscription.iptrunk.gs_id }}"
     config:
       common:
         description: "{{ subscription.iptrunk.iptrunk_description }}"

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

@@ -8,7 +8,7 @@
                 <service-name>{{ ies_re_name }}</service-name>
                 <interface alu:operation="replace">
                     <interface-name>{{ lag_name }}.{{ ap.sbp.vlan_id }}</interface-name>
-                    <description>SRV_GLOBAL CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.geant_sid }} | ASN{{ partner.asn }} | </description>
+                    <description>SRV_GLOBAL CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
                     <ip-mtu>{{ sbp_params.ip_mtu }}</ip-mtu>
                     <sap>
                       {% if ap.sbp.is_tagged %}