Merge branch 'fix/trunk-v1.0-templates' into 'develop'

Bring back QoS to router/interface level for trunks v1.0

See merge request !275

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">

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">