From 0f12ab8f78e59b1813b5963aa7197c5ee0f634a5 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Fri, 13 Dec 2024 12:23:52 +0000
Subject: [PATCH 1/3] edge_port: geant_ga_id -> ga_id
---
.../gap_ansible/roles/edge_port/templates/nokia/edge_port.j2 | 4 ++--
.../roles/edge_port/templates/nokia/edge_port_create.j2 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port.j2 b/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port.j2
index 1799ca4e..73a9686d 100644
--- a/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port.j2
+++ b/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 %}
diff --git a/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2 b/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2
index af6f3156..b6b130a6 100644
--- a/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2
+++ b/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 %}
--
GitLab
From cd8b9efbce4dfeac87541bf128872f0a4fbf4034 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Fri, 13 Dec 2024 12:36:23 +0000
Subject: [PATCH 2/3] iptrunks: geant_s_sid -> gs_id
---
geant/gap_ansible/roles/iptrunk/vars/main.yml | 2 +-
geant/gap_ansible/roles/iptrunk_checks/vars/main.yml | 2 +-
geant/gap_ansible/roles/iptrunk_migration/vars/main.yml | 2 +-
geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/geant/gap_ansible/roles/iptrunk/vars/main.yml b/geant/gap_ansible/roles/iptrunk/vars/main.yml
index f4df17e9..b6903bd4 100644
--- a/geant/gap_ansible/roles/iptrunk/vars/main.yml
+++ b/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 }}"
diff --git a/geant/gap_ansible/roles/iptrunk_checks/vars/main.yml b/geant/gap_ansible/roles/iptrunk_checks/vars/main.yml
index b7050df1..2efccc39 100644
--- a/geant/gap_ansible/roles/iptrunk_checks/vars/main.yml
+++ b/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 }}"
diff --git a/geant/gap_ansible/roles/iptrunk_migration/vars/main.yml b/geant/gap_ansible/roles/iptrunk_migration/vars/main.yml
index cedec3f7..864b5760 100644
--- a/geant/gap_ansible/roles/iptrunk_migration/vars/main.yml
+++ b/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 }}"
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
index 8085d754..a6eaec1c 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
+++ b/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 }}"
--
GitLab
From c1a5ea68ea9f4fdf96806f58217d2a2fbdb0652b Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Fri, 13 Dec 2024 12:42:39 +0000
Subject: [PATCH 3/3] sbp: geant_sid -> gs_id
---
geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 b/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2
index 18748b50..cda9f6d5 100644
--- a/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2
+++ b/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 %}
--
GitLab