Merge branch 'fix/iptrunk-suffix' into 'develop'

Trunk suffix addition

See merge request !251

geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2

@@ -25,6 +25,7 @@
     {# I need to sort the source and the destination alfabetically #}
     {% set trunk_direction_name = [ local.name.split(".")[1] | upper, remote.name.split(".")[1] | upper ] %}
     {% set trunk_direction_name_sorted = trunk_direction_name|sort %}
+    {% set trunk_suffix = '-'+wfo_trunk.iptrunk.iptrunk_description_suffix if wfo_trunk.iptrunk.iptrunk_description_suffix is string %}
     {##}
     interfaces {
     replace: {{local.ae_name}} {
@@ -48,7 +49,7 @@
                 }
             }
             unit 0 {
-	    description "SRV_GLOBAL INFRASTRUCTURE BACKBONE #{{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}-IPTRUNK ${{ trunk.id }}| {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ common.description }}";
+	    description "SRV_GLOBAL INFRASTRUCTURE BACKBONE #{{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}{{ trunk_suffix if trunk_suffix is defined }}-IPTRUNK ${{ trunk.id }}| {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ common.description }}";
                 family inet {
                     accounting {
                         source-class-usage {

geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2

@@ -25,6 +25,8 @@
     {# I need to sort the source and the destination alfabetically #}
     {% set trunk_direction_name = [ local.name.split(".")[1] | upper, remote.name.split(".")[1] | upper ] %}
     {% set trunk_direction_name_sorted = trunk_direction_name|sort %}
+
+    {% set trunk_suffix = '-'+wfo_trunk.iptrunk.iptrunk_description_suffix if wfo_trunk.iptrunk.iptrunk_description_suffix is string %}
 {##}
 {% for member in local.members %}
       <port 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">
@@ -96,7 +98,7 @@
           <interface alu:operation="replace">
               <interface-name>{{ local.ae_name | lower }}.0</interface-name>
               <admin-state>enable</admin-state>
-              <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #{{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}-IPTRUNK ${{ trunk.id }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ common.description }}</description>
+              <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #{{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}{{ trunk_suffix if trunk_suffix is defined }}-IPTRUNK ${{ trunk.id }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ common.description }}</description>
               <ip-mtu>{{ mtu_ip }}</ip-mtu>
               <port>{{ local.ae_name | lower }}</port>
               <ipv4>