ibgp_update modifications

- rename of the tasks (`modify_pe_mesh`)
- adding templates to remove P from PE and PE from net

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

@@ -27,6 +27,11 @@
   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_net", "remove_p_from_pe" ]
+
 - name: Include PE into P tasks if selected
   ansible.builtin.include_tasks: add_pe_to_p.yaml
   when: >

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

@@ -7,7 +7,7 @@
   #
    - name: Set variable to connect to nokia
      ansible.legacy.set_fact:
-      ansible_network_os: nokia.sros.md
+      ansible_network_os: geant.gap_ansible.sros
       ansible_connection: netconf
      when: vendor == "nokia"
 

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_net.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/remove_pe_from_net.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>
+            <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="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv4_address }}</ip-address>
+              <group>iGEANT</group>
+            </neighbor>
+            <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="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/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>
+      <router-name>Base</router-name>
+        <bgp>
+            <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="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv4_address }}</ip-address>
+              <group>iGEANT-P-ONLY</group>
+            </neighbor>
+            <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="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv6_address }}</ip-address>
+              <group>iGEANT6-P-ONLY</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_net # 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 }}"