From 771d65e4699539157125d963d23aacef2149f508 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Thu, 29 May 2025 16:18:52 +0100
Subject: [PATCH] `iptrunk` and `iptrunk_migration`: remove QoS from
router/interface in Nokia templates.
QoS should not be applied on the router/interface level.
---
.../roles/iptrunk/templates/nokia/trunk_interface.j2 | 5 -----
.../iptrunk_migration/templates/nokia/trunk_interface.j2 | 3 ---
2 files changed, 8 deletions(-)
diff --git a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
index d8e57d4..bda28ce 100644
--- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
+++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
@@ -137,11 +137,6 @@
<prefix-length>{{(local.ipv6_address| split('/'))[1]}}</prefix-length>
</address>
</ipv6>
- {% if trunk_version | float < 2.0 %}
- <qos>
- <network-policy>GEANT_BASIC</network-policy>
- </qos>
- {% endif %}
</interface>
{# Add new LAG trunk into standard protocols #}
<mpls 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">
diff --git a/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2
index e49c7b3..4bc78a9 100644
--- a/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2
+++ b/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2
@@ -101,9 +101,6 @@
<prefix-length>{{ (new_ipv6_address| split('/'))[1] }}</prefix-length>
</address>
</ipv6>
- <qos>
- <network-policy>GEANT_BASIC</network-policy>
- </qos>
</interface>
{# Add new LAG trunk into standard protocols #}
<mpls 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">
--
GitLab