diff --git a/.ansible-lint b/.ansible-lint index ee60ce3fd6773e4e2fa6441a83cc65fa785bb156..9840ae0ef76c30eab5ee2643591d5d544114cdc9 100644 --- a/.ansible-lint +++ b/.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`." diff --git a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 index 30ad8d83fa41f9916a65497efb2f310310da7f38..b325ff1531d7b62beb5d1c5b529dd1588253b1f3 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 +++ b/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 %} 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 20ee86dc1a32619f16148f621d21f87d0efec9ce..5548f8db1d57af4627abbf63d1f78739f4203d8d 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 +++ b/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>