Skip to content
Snippets Groups Projects
Commit 3eb299d8 authored by Simone Spinelli's avatar Simone Spinelli
Browse files

Merge branch 'fix_trunk_provisioning' into 'develop'

Fix IPtrunk to use iptrunk sides members in the last format

See merge request !66
parents 9a6dd753 e6849919
No related branches found
No related tags found
1 merge request!66Fix IPtrunk to use iptrunk sides members in the last format
Pipeline #85243 passed
- name: Manage iptrunks playbook - name: Manage iptrunks playbook
hosts: all hosts: all
remote_user: admin remote_user: "{{ automation_user }}"
gather_facts: false gather_facts: false
roles: roles:
- Juniper.junos - Juniper.junos
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
{% if local is defined %} {% if local is defined %}
delete protocols isis interface {{ local.ae_name }} delete protocols isis interface {{ local.ae_name }}
delete interfaces {{ local.ae_name }} delete interfaces {{ local.ae_name }}
{% for iface in local.members %} {% for member in local.members %}
delete interfaces {{ iface }} delete interfaces {{ member.interface_name }}
delete protocols lldp interface {{ iface }} delete protocols lldp interface {{ member.interface_name }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{% if local is defined %} {% if local is defined %}
{##} {##}
{# I need to sort the source and the destination alfabetically #} {# I need to sort the source and the destination alfabetically #}
{% set trunk_direction_name = [ local.name.split(".")[1] | upper, remote.name.split(".")[1] | upper ] %} {% set trunk_direction_name = [ local.name.split(".")[1] | upper, remote.name.split(".")[1] | upper ] %}
{% set trunk_direction_name_sorted = trunk_direction_name|sort %} {% set trunk_direction_name_sorted = trunk_direction_name|sort %}
{##} {##}
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
} }
mtu 9000; mtu 9000;
filter { filter {
input bone-in; input bone-in;
output bone-out; output bone-out;
} }
address {{local.ipv4_address}}; address {{local.ipv4_address}};
...@@ -67,10 +67,10 @@ ...@@ -67,10 +67,10 @@
maximum-labels 5; maximum-labels 5;
} }
} }
} }
{% for member in local.members %} {% for member in local.members %}
replace: {{member}} { replace: {{ member.interface_name }} {
description "PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{local.members_descriptions[loop.index0]}}"; description "PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}";
gigether-options { gigether-options {
802.3ad {{local.ae_name}}; 802.3ad {{local.ae_name}};
} }
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
{% for member in local.members %} {% for member in local.members %}
replace: interface {{member}} ; replace: interface {{member}} ;
{% endfor %} {% endfor %}
} }
} }
{% endif %} {% endif %}
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
{% for member in local.members %} {% 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 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 }}</port-id> <port-id>{{ member.interface_name }}</port-id>
<admin-state>enable</admin-state> <admin-state>enable</admin-state>
<description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{local.members_descriptions[loop.index0]}}</description> <description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}</description>
<ethernet> <ethernet>
<mode>network</mode> <mode>network</mode>
<mtu>9212</mtu> <mtu>9212</mtu>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</lacp> </lacp>
{% for member in local.members %} {% for member in local.members %}
<port> <port>
<port-id>{{member}}</port-id> <port-id>{{ member.interface_name }}</port-id>
</port> </port>
{% endfor %} {% endfor %}
</lag> </lag>
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
{% for member in local.members %} {% 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="replace"> <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 }}</port-id> <port-id>{{ member.interface_name }}</port-id>
<admin-state>enable</admin-state> <admin-state>enable</admin-state>
<description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{local.members_descriptions[loop.index0]}}</description> <description>PHY INFRASTRUCTURE BACKBONE P_{{ local.ae_name }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}</description>
<ethernet> <ethernet>
<mode>network</mode> <mode>network</mode>
<mtu>9212</mtu> <mtu>9212</mtu>
...@@ -45,17 +45,17 @@ ...@@ -45,17 +45,17 @@
</port> </port>
{% endfor %} {% 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="replace"> <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}}</lag-name> <lag-name>{{ local.ae_name }}</lag-name>
<admin-state>enable</admin-state> <admin-state>enable</admin-state>
<description>LAG INFRASTRUCTURE BACKBONE ${{ local.port_sid }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}</description> <description>LAG INFRASTRUCTURE BACKBONE ${{ local.port_sid }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}</description>
<mode>network</mode> <mode>network</mode>
<lacp> <lacp>
<mode>active</mode> <mode>active</mode>
<administrative-key>{{(local.ae_name|split("-"))[1]}}</administrative-key> <administrative-key>{{ (local.ae_name|split("-"))[1] }}</administrative-key>
</lacp> </lacp>
{% for member in local.members %} {% for member in local.members %}
<port> <port>
<port-id>{{member}}</port-id> <port-id>{{ member.interface_description }}</port-id>
</port> </port>
{% endfor %} {% endfor %}
</lag> </lag>
......
...@@ -45,7 +45,6 @@ trunks: ...@@ -45,7 +45,6 @@ trunks:
ipv4_address: "{{ side_a_ipv4_address }}" ipv4_address: "{{ side_a_ipv4_address }}"
ipv6_address: "{{ side_a_ipv6_address }}" ipv6_address: "{{ side_a_ipv6_address }}"
members: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members }}" members: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members }}"
members_descriptions: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members_description }}"
port_sid: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid }}" port_sid: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid }}"
nodeB: nodeB:
name: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn }}" name: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn }}"
...@@ -55,5 +54,4 @@ trunks: ...@@ -55,5 +54,4 @@ trunks:
ipv4_address: "{{ side_b_ipv4_address }}" ipv4_address: "{{ side_b_ipv4_address }}"
ipv6_address: "{{ side_b_ipv6_address }}" ipv6_address: "{{ side_b_ipv6_address }}"
members: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members }}" members: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members }}"
members_descriptions: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members_description }}"
port_sid: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid }}" port_sid: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid }}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment