From 99987f5c4670fd552df95f522b13ca13f4413776 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Thu, 5 Jun 2025 13:18:47 +0100
Subject: [PATCH] Bring back QoS to router/interface level for trunks v1.0
---
.../roles/iptrunk/templates/nokia/trunk_interface.j2 | 5 +++++
.../iptrunk_migration/templates/nokia/trunk_interface.j2 | 5 +++++
2 files changed, 10 insertions(+)
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 bda28ceb..6a0f26ac 100644
--- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
+++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
@@ -137,6 +137,11 @@
<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 4bc78a90..cc997bc4 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,6 +101,11 @@
<prefix-length>{{ (new_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">
--
GitLab