add test case for peering id removal and verify status update

ironcore-dev · Apr 26, 2024 · d42d42c · d42d42c
1 parent 4da0420
commit d42d42c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/controllers/controller_test.go b/controllers/controller_test.go
@@ -217,6 +217,27 @@ var _ = Describe("Network Controller", Label("network"), Ordered, func() {
 					State: metalnetv1alpha1.NetworkPeeringStateReady,
 				}))))
 
+			By("Removing peeredIDs")
+			// Update the k8s network object
+			baseNetwork := network.DeepCopy()
+			network.Spec.PeeredIDs = []int32{}
+			Expect(k8sClient.Patch(ctx, network, client.MergeFrom(baseNetwork))).To(Succeed())
+
+			// Update the k8s network object
+			baseNetwork2 := network2.DeepCopy()
+			network2.Spec.PeeredIDs = []int32{}
+			Expect(k8sClient.Patch(ctx, network2, client.MergeFrom(baseNetwork2))).To(Succeed())
+
+			Expect(networkReconcile(ctx, *network)).To(Succeed())
+			Expect(networkReconcile(ctx, *network2)).To(Succeed())
+
+			By("Verifying peering information removed from status")
+			Eventually(Object(network)).Should(SatisfyAll(
+				HaveField("Status.Peerings", BeEmpty())))
+
+			Eventually(Object(network2)).Should(SatisfyAll(
+				HaveField("Status.Peerings", BeEmpty())))
+
 			// Deletes the k8s network object after spec is completed
 			DeferCleanup(func(ctx SpecContext) {
 				Expect(k8sClient.Delete(ctx, networkInterface)).To(Succeed())

diff --git a/controllers/network_controller.go b/controllers/network_controller.go
@@ -341,16 +341,16 @@ func (r *NetworkReconciler) reconcilePeeredVNIs(ctx context.Context, log logr.Lo
 					continue
 				}
 			} else if peeredVniAvail.Spec.InUse && ownVniAvail {
-				if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(vni); err != nil {
+				if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(ctx, vni); err != nil {
 					errs = append(errs, err)
 					continue
 				}
-				if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(peeredVNI); err != nil {
+				if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(ctx, peeredVNI); err != nil {
 					errs = append(errs, err)
 					continue
 				}
 			} else {
-				if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(vni); err != nil {
+				if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(ctx, vni); err != nil {
 					errs = append(errs, err)
 					continue
 				}
@@ -452,7 +452,7 @@ func (r *NetworkReconciler) deletePeeredVNIs(ctx context.Context, log logr.Logge
 				return err
 			}
 		} else {
-			if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(peeredVNI); err != nil {
+			if err := r.MetalnetMBClient.CleanupNotPeeredRoutes(ctx, peeredVNI); err != nil {
 				return err
 			}
 		}

diff --git a/metalbond/metalbond_client.go b/metalbond/metalbond_client.go
@@ -264,9 +264,7 @@ func (c *MetalnetClient) RemoveRoute(vni mb.VNI, dest mb.Destination, hop mb.Nex
 	return nil
 }
 
-func (c *MetalnetClient) CleanupNotPeeredRoutes(vni uint32) error {
-	ctx := context.TODO()
-
+func (c *MetalnetClient) CleanupNotPeeredRoutes(ctx context.Context, vni uint32) error {
 	routes, err := c.dpdk.ListRoutes(ctx, vni)
 	if err != nil {
 		return fmt.Errorf("error listing dpdk routes for vni %d: %w", vni, err)