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 542b82b07c48b7d3d3504f4f84582c2f539b49b1..fcc15f0206dbec41808e61b2ab7468ee887d2a7c 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 @@ -7,11 +7,17 @@ {% set local= trunk.config.nodeA %} {% set remote= trunk.config.nodeB %} {% set common= trunk.config.common %} + {% if removed_ae_members is defined %} + {% set side_removed_ae_members= removed_ae_members[0] %} + {% endif %} {% endif %} {% if inventory_hostname == trunk.config.nodeB.name %} {% set local= trunk.config.nodeB %} {% set remote= trunk.config.nodeA %} {% set common= trunk.config.common %} + {% if removed_ae_members is defined %} + {% set side_removed_ae_members= removed_ae_members[1] %} + {% endif %} {% endif %} {% if local is defined %} @@ -78,8 +84,8 @@ } } {% endfor %} - {% if removed_ae_members is defined %} - {% for member in removed_ae_members %} + {% if side_removed_ae_members is defined %} + {% for member in side_removed_ae_members %} replace: {{ member.interface_name }} { description "PHY SPARE"; } @@ -91,8 +97,8 @@ {% for member in local.members %} replace: interface {{ member.interface_name }} ; {% endfor %} - {% if removed_ae_members is defined %} - {% for member in removed_ae_members %} + {% if side_removed_ae_members is defined %} + {% for member in side_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 5548f8db1d57af4627abbf63d1f78739f4203d8d..5890af48cb660bc6adfe34673ff22d02c586c2f5 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 @@ -7,11 +7,17 @@ {% set local= trunk.config.nodeA %} {% set remote= trunk.config.nodeB %} {% set common= trunk.config.common %} + {% if removed_ae_members is defined %} + {% set side_removed_ae_members= removed_ae_members[0] %} + {% endif %} {% endif %} {% if inventory_hostname == trunk.config.nodeB.name %} {% set local= trunk.config.nodeB %} {% set remote= trunk.config.nodeA %} {% set common= trunk.config.common %} + {% if removed_ae_members is defined %} + {% set side_removed_ae_members= removed_ae_members[1] %} + {% endif %} {% endif %} {% if local is defined %} @@ -43,13 +49,13 @@ </ethernet> </port> {% endfor %} -{% if removed_ae_members is defined %} +{% if side_removed_ae_members is defined %} +{% for member in side_removed_ae_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"> <port-id>{{ member.interface_name }}</port-id> <admin-state>disable</admin-state> - <description>PHY SPARE</description> + <description>''</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">