Merge branch 'v1.0.x' into 'develop'

Merge the latest changes in v1.0.x into develop

See merge request !161

geant/gap_ansible/CHANGELOG.md

 # GAP Ansible changelog
+1.0.86:
+- Update in `iptrunk` vars: `minimum_links` now only come as part of `iptrunk` object from GSO. This will rectify misconfiguration on the Juniper side.
+1.0.85:
+- Update in `port-threshold` calculation in `iptrunk` role.
+- Update in `iptrunk_checks` role (Skip Juniper side checks if interface is not 'et-'; skip optical diff if not called from `iptrunk_migration` role).
+1.0.84:
+- Update config parameters for TTL-expired in `iptrunk` and `iptrunk_migration` roles.
 1.0.83:
 - Update iBGP groups when terminating PE router: a) Remove PE from PE mesh; b) Remove PE from P routers config.
 1.0.82:

geant/gap_ansible/galaxy.yml

@@ -8,7 +8,7 @@ namespace: geant
 name: gap_ansible
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.83
+version: 1.0.86
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2

@@ -72,9 +72,9 @@
               <port-id>{{ member.interface_name }}</port-id>
           </port>
 {% endfor %}
-          {% if (common.minimum_links | int) > 1 %}
+          {% if (wfo_trunk.iptrunk.iptrunk_minimum_links | int) > 1 %}
           <port-threshold>
-            <value>{{ (common.minimum_links | int) - 1 }}</value>
+            <value>{{ (wfo_trunk.iptrunk.iptrunk_minimum_links | int) - 1 }}</value>
             <action>down</action>
           </port-threshold>
           {% endif %}

geant/gap_ansible/roles/iptrunk/vars/main.yml

@@ -33,7 +33,7 @@ mtu_phy: 9212
 mtu_ip: 9000
 icmp_ttl_expired:
   number: 2000
-  seconds: 5
+  seconds: 2
 
 trunks:
   - id: "{{ wfo_trunk.iptrunk.geant_s_sid }}"
@@ -41,10 +41,8 @@ trunks:
       common:
         description: "{{ wfo_trunk.iptrunk.iptrunk_description }}"
         speed: "{{ wfo_trunk.iptrunk.iptrunk_speed }}"
-        # is_leased_line: false ## Fix it to use iptrunk_type
         isis_metric: "{{ wfo_trunk.iptrunk.iptrunk_isis_metric }}"
-        # minimum_links: "{{ wfo_trunk.iptrunk.iptrunk_minimum_links }}"
-        minimum_links: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members | length - 1 }}"
+        minimum_links: "{{ wfo_trunk.iptrunk.iptrunk_minimum_links }}"
         trunk_type: "{{ wfo_trunk.iptrunk.iptrunk_type }}"
       nodeA:
         name: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_fqdn }}"

geant/gap_ansible/roles/iptrunk_checks/tasks/check_optical_levels.yaml

 ---
 - name: Get Junos attributes for optical levels of interface "{{ item }}"
-  when: local_side.iptrunk_side_node.vendor == "juniper"
+  when: >-
+      local_side.iptrunk_side_node.vendor == "juniper"
+      and
+      ae_member.interface_name is regex("^et-*")
   block:
     - name: Run Juniper Optical info
       junipernetworks.junos.junos_command:

geant/gap_ansible/roles/iptrunk_checks/tasks/main.yml

@@ -152,5 +152,7 @@
   when: >-
     check == "optical_post"
     and
+    new_node is defined
+    and
     inventory_hostname != new_node.router.router_fqdn
   ansible.builtin.include_tasks: diff_optical_results.yaml

geant/gap_ansible/roles/iptrunk_migration/vars/main.yml

@@ -21,7 +21,7 @@ mtu_phy: 9212
 mtu_ip: 9000
 icmp_ttl_expired:
   number: 2000
-  seconds: 5
+  seconds: 2
 
 wfo_trunk: "{{ wfo_trunk_json }}"
 config_object: "{{ object }}"