diff --git a/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2 b/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2 index 3ec4ef543e880d1d8132d56c91175d6a51b4077b..296e9fbc28e9f943128d98b361e7748d28eebcc2 100644 --- a/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2 +++ b/geant/gap_ansible/roles/edge_port/templates/nokia/edge_port_create.j2 @@ -5,7 +5,7 @@ <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>enable</admin-state> - <description>PHY {{ ep.edge_port_type }} {{ partner_name }} P_{{ ep.edge_port_name }} | {{ member.interface_description }}</description> + <description>PHY {{ ep.edge_port_type }} {{ partner_name }} P_{{ ep.edge_port_name }} | {{ member.interface_description }}</description> <ethernet> <mode>access</mode> <mtu>{{ mtu_phy | default(9192) }}</mtu> @@ -37,13 +37,13 @@ <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>{{ ep.edge_port_name | lower }}</lag-name> <admin-state>enable</admin-state> - {% if ep.edge_port_geant_ga_id is string %} - <description>LAG {{ ep.edge_port_type }} {{ partner_name }} ${{ ep.edge_port_geant_ga_id }} | </description> + {% if ep.geant_ga_id is string %} + <description>LAG {{ ep.edge_port_type }} {{ partner_name }} ${{ ep.geant_ga_id }} |</description> {% else %} - <description>LAG {{ ep.edge_port_type }} {{ partner_name }} | </description> + <description>LAG {{ ep.edge_port_type }} {{ partner_name }} |</description> {% endif %} <mode>access</mode> - {% if ep.edge_port_enable_lacp is true %} + {% if ep.enable_lacp is true %} <lacp> <mode>active</mode> <administrative-key>{{ (ep.edge_port_name|split("-"))[1] }}</administrative-key> @@ -54,9 +54,9 @@ <port-id>{{ member.interface_name }}</port-id> </port> {% endfor %} - {% if ( ep.edge_port_minimum_links | int) > 1 %} + {% if ( ep.minimum_links | int) > 1 %} <port-threshold> - <value>{{ ( ep.edge_port_minimum_links | int) - 1 }}</value> + <value>{{ ( ep.minimum_links | int) - 1 }}</value> <action>down</action> </port-threshold> {% endif %}