Merge branch 'fix/remove-pe-from-p' into 'develop'

Fix/remove pe from p

See merge request !224

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

@@ -39,13 +39,13 @@
   ansible.builtin.include_tasks: modify_router_list.yaml
   when: >
     verb in [ "add_p_to_pe", "add_pe_to_pe_mesh", "add_pe_to_all_p",
-            "remove_p_from_pe", "remove_pe_from_pe" ]
+            "remove_p_from_pe", "remove_pe_from_pe", "remove_pe_from_p" ]
 
 - name: Include single router modification tasks
   ansible.builtin.include_tasks: modify_subscription_router.yaml
   when: >
     verb in [ "add_pe_to_p", "verify_p_ibgp", "add_pe_mesh_to_pe",
-              "add_all_p_to_pe", "remove_pe_from_p" ]
+              "add_all_p_to_pe"]
 
 - name: Check status of iBGP on Nokia router
   ansible.builtin.include_tasks: check_nokia_ibgp.yaml

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 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>{{ geant_bgp_groups.p_only.ipv4 }}</group>
+            </neighbor>
+            <neighbor alu:operation="delete">
+              <ip-address>{{ subscription.router.router_lo_ipv6_address }}</ip-address>
+              <group>{{ geant_bgp_groups.p_only.ipv6 }}</group>
+            </neighbor>
+        </bgp>
+    </router>
+  </configure>
+</config>