Merge branch 'NAT_178_refinements_on_iptrunk_modification' into 'develop'

Update JUNOS and NOKIA trunk_interface template to manage interface removals

See merge request !108

.ansible-lint

@@ -4,3 +4,4 @@ skip_list:
   - 'no-free-form' # Avoid using free-form when calling module actions. (ansible.builtin.set_fact)
   - 'role-name[path]' # Avoid using paths when importing roles.
   - 'var-naming[no-role-prefix]' #
+  - 'fqcn[canonical]' # Avoid errors "You should use canonical module name `junipernetworks.junos.junos` instead of `junipernetworks.junos.junos_config`."

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

@@ -78,13 +78,23 @@
             }
         }
     {% endfor %}
+    {% if removed_ae_members is defined %}
+    {% for member in removed_ae_members %}
+    replace: {{ member.interface_name }} {
+    description "PHY SPARE";
+        }
+    {% endfor %}
+    {% endif %}
     }
     protocols {
         lldp {
         {% for member in local.members %}
         replace: interface {{ member.interface_name }}  ;
         {% endfor %}
-
+        {% if removed_ae_members is defined %}
+        {% for member in removed_ae_members %}
+        replace: interface {{ member.interface_name }} disable ;
+        {% endfor %}
         }
     }
     {% endif %}

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

@@ -43,6 +43,15 @@
           </ethernet>
       </port>
 {% endfor %}
+{% if removed_ae_members is defined %}
+      <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">
+          <port-id>{{ member.interface_name }}</port-id>
+          <admin-state>disable</admin-state>
+          <description>PHY SPARE</description>
+      </port>
+{% for member in removed_ae_members %}
+{% endfor %}
+{% endif %}
       <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>{{ local.ae_name | lower }}</lag-name>
           <admin-state>enable</admin-state>