Merge branch 'feature/nat-667-terminate-router-ibgp' into 'develop'

ibgp_update modifications

See merge request !157

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

@@ -23,15 +23,21 @@
   ansible.builtin.debug:
     msg: "{{ opid }}"
 
-- name: Include P into PEs tasks if selected
-  ansible.builtin.include_tasks: add_p_to_pe.yaml
-  when: verb == "add_p_to_pe"
+- name: Include PE mesh modification tasks
+  ansible.builtin.include_tasks: modify_pe_mesh.yaml
+  when: >
+    verb in [ "add_p_to_pe", "remove_pe_from_pe", "remove_p_from_pe" ]
 
 - name: Include PE into P tasks if selected
   ansible.builtin.include_tasks: add_pe_to_p.yaml
   when: >
     verb in [ "add_pe_to_p", "verify_p_ibgp" ]
 
+- name: Include PE removal from P tasks if selected
+  ansible.builtin.include_tasks: remove_pe_from_p.yaml
+  when: >
+    verb in [ "remove_pe_from_p" ]
+
 - name: Check status of iBGP on P router
   ansible.builtin.include_tasks: check_p_ibgp.yaml
   when: verb == "check_p_ibgp"

geant/gap_ansible/roles/ibgp_update/tasks/add_p_to_pe.yaml → geant/gap_ansible/roles/ibgp_update/tasks/modify_pe_mesh.yaml

@@ -4,18 +4,17 @@
 
 - name: Adjust network connection according to the vendor
   block:
-  #
-   - name: Set variable to connect to nokia
-     ansible.legacy.set_fact:
-      ansible_network_os: nokia.sros.md
-      ansible_connection: netconf
-     when: vendor == "nokia"
+    - name: Set variable to connect to nokia
+      ansible.legacy.set_fact:
+        ansible_network_os: geant.gap_ansible.sros
+        ansible_connection: netconf
+      when: vendor == "nokia"
 
-   - name: Set variables for connecting to Junos
-     ansible.legacy.set_fact:
-      ansible_network_os: junos
-      ansible_connection: netconf
-     when: vendor == "juniper"
+    - name: Set variables for connecting to Junos
+      ansible.legacy.set_fact:
+        ansible_network_os: junos
+        ansible_connection: netconf
+      when: vendor == "juniper"
 
 - name: Include compile tasks
   ansible.builtin.include_tasks: compile.yaml

geant/gap_ansible/roles/ibgp_update/tasks/remove_pe_from_p.yaml

+# PE to P tasks:
+# This is th case of decomm of a PE router <- remove it from all Ps.
+# P routers will always be NOKIA
+# FIX: Load ansible_network_os via group_vars
+#
+- name: Set variable to connect to nokia
+  ansible.legacy.set_fact:
+    ansible_network_os: geant.gap_ansible.sros
+    ansible_connection: netconf
+
+# - name: Set ansible_host to terminal server when router is offline
+#   ansible.legacy.set_fact:
+#     ansible_host: "{{ subscription.router.router_site.site_ts_address }}"
+#     ansible_port: "{{ subscription.router.router_ts_port }}"
+#   when: ( subscription.router.router_access_via_ts | ansible.builtin.bool ) is true
+
+- name: Set vendor var for "remove_pe_from_p" case
+  ansible.builtin.set_fact:
+    vendor: "nokia"
+
+- name: Include compile tasks
+  ansible.builtin.include_tasks: compile.yaml
+
+- name: Include deploy tasks
+  ansible.builtin.include_tasks: deploy.yaml

geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_p_from_pe.j2

+delete protocols bgp group iGEANT6-P-ONLY neighbor {{ p_lo_ipv6_address }}
+delete protocols bgp group iGEANT-P-ONLY neighbor {{ p_lo_ipv4_address }}

geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_pe_from_pe.j2

+delete protocols bgp group iGEANT6 neighbor {{ subscription.router.router_lo_ipv6_address }}
+delete protocols bgp group iGEANT neighbor {{ subscription.router.router_lo_ipv4_address }}

geant/gap_ansible/roles/ibgp_update/templates/nokia/add_pe_to_p.j2

@@ -3,7 +3,7 @@
     <router>
       <router-name>Base</router-name>
         <bgp>
-          {% for pe_fqdn, pe_ipadd in pe_router_list.items() %}
+          {% for pe_fqdn, pe_ipadd in pe_router_list.all.hosts.items() %}
             <neighbor 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">
               <ip-address>{{ pe_ipadd.lo4 }}</ip-address>
               <description>{{ pe_fqdn }}</description>

geant/gap_ansible/roles/ibgp_update/templates/nokia/remove_pe_from_p.j2

+<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:alu="urn:ietf:params:xml:ns:netconf:base:1.0">
+  <configure xmlns="urn:nokia.com:sros:ns:yang:sr:conf">
+    <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>
+        <bgp 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">
+            <neighbor alu:operation="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv4_address }}</ip-address>
+            </neighbor>
+            <neighbor alu:operation="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv6_address }}</ip-address>
+            </neighbor>
+        </bgp>
+    </router>
+  </configure>
+</config>

geant/gap_ansible/roles/ibgp_update/templates/nokia/remove_pe_from_pe.j2

+<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:alu="urn:ietf:params:xml:ns:netconf:base:1.0">
+  <configure xmlns="urn:nokia.com:sros:ns:yang:sr:conf">
+    <router>
+      <router-name>Base</router-name>
+        <bgp 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">
+            <neighbor alu:operation="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv4_address }}</ip-address>
+              <group>iGEANT</group>
+            </neighbor>
+            <neighbor alu:operation="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv6_address }}</ip-address>
+              <group>iGEANT6</group>
+            </neighbor>
+        </bgp>
+    </router>
+  </configure>
+</config>

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

@@ -8,9 +8,10 @@ verbs:
   - check_p_ibgp
   - verify_p_ibgp  # Validates the config of BGP stanza including neighbors
   - remove_p_from_pe # placeholder for future use | Removes the P that is going to be promoted to PE from the P-GROUP on all PEs
+  - remove_pe_from_p # PE router termination workflow
+  - remove_pe_from_pe # When decommissiong a PE we remove it from PE-GROUP and P-GROUP on all the PE and P routers
   - add_pe_to_pe # placeholder for future use | Adds the newly installed PE (could be an EX-P or a new PE) to the PE-GROUP on all the other PEs
   - add_new_pe_to_p # placeholder for future use | Adds the newly installed PE (could be an EX-P or a new PE) the P-GROUP on all the Ps
-  - remove_pe_from_net # placeholder for future use | When decommissiong a PE we remove it from PE-GROUP and P-GROUP on all the PE and P routers
   - promote_p_to_pe # placeholder for future use | Deletes P-GROUP and adds
 wfo_router: "{{ subscription }}"
 p_lo_ipv4_address: "{{ wfo_router.router.router_lo_ipv4_address }}"