diff --git a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 index 0ceb11225ff8f5e0ac67cb51773ee1f8fe31b9d9..e19c82c981638763a6a1ac34a36b7a8711307bc9 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 @@ -20,80 +20,32 @@ {% set trunk_direction_name = [ local.name.split(".")[1] | upper, remote.name.split(".")[1] | upper ] %} {% set trunk_direction_name_sorted = trunk_direction_name|sort %} {##} -{% 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="delete"> - <port-id>{{ member.interface_name }}</port-id> - <admin-state>enable</admin-state> - <description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}</description> - <ethernet> - <mode>network</mode> - <mtu>9212</mtu> - <lldp> - <dest-mac> - <mac-type>nearest-bridge</mac-type> - <receive>true</receive> - <transmit>true</transmit> - <tx-tlvs> - <port-desc>true</port-desc> - <sys-name>true</sys-name> - <sys-cap>true</sys-cap> - </tx-tlvs> - </dest-mac> - </lldp> - </ethernet> -</port> -{% endfor %} -<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="delete"> - <lag-name>{{local.ae_name}}</lag-name> - <admin-state>enable</admin-state> - <description>LAG INFRASTRUCTURE BACKBONE ${{ local.port_sid }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}</description> - <mode>network</mode> - <lacp> - <mode>active</mode> - <administrative-key>{{(local.ae_name|split("-"))[1]}}</administrative-key> - </lacp> {% for member in local.members %} - <port> - <port-id>{{ member.interface_name }}</port-id> - </port> + <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="delete"> + <port-id>{{ member.interface_name }}</port-id> + </port> {% endfor %} -</lag> -<router 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"> - <router-name>Base</router-name> - <interface alu:operation="delete"> - <interface-name>{{local.ae_name}}.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> - <port>{{local.ae_name}}</port> - <ipv4> - <primary> - <address>{{(local.ipv4_address| split('/'))[0]}}</address> - <prefix-length>{{(local.ipv4_address| split('/'))[1]}}</prefix-length> - </primary> - </ipv4> - <ipv6> - <address> - <ipv6-address>{{(local.ipv6_address| split('/'))[0]}}</ipv6-address> - <prefix-length>{{(local.ipv6_address| split('/'))[1]}}</prefix-length> - </address> - </ipv6> - </interface> - <isis 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"> - <isis-instance>0</isis-instance> - <interface 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="delete"> - <interface-name>{{ local.ae_name }}.0</interface-name> - <admin-state>enable</admin-state> - <interface-type>point-to-point</interface-type> - <level> - <level-number>2</level-number> - <metric>{{ common.isis_metric }}</metric> - </level> - </interface> - </isis> - </router> + + <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="delete"> + <lag-name>{{ local.ae_name }}</lag-name> + </lag> + + <router 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"> + <router-name>Base</router-name> + <interface alu:operation="delete"> + <interface-name>{{ local.ae_name }}.0</interface-name> + </interface> + <isis 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"> + <isis-instance>0</isis-instance> + <interface 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="delete"> + <interface-name>{{ local.ae_name }}.0</interface-name> + </interface> + </isis> + </router> + {% endif %} {% endfor %} -</configure> + </configure> </config>