add test case for peering id removal and verify status update

ironcore-dev · Apr 29, 2024 · afabf60 · afabf60
1 parent 4da0420
commit afabf60
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 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
@@ -294,9 +294,9 @@ func (r *NetworkReconciler) reconcilePeeredVNIs(ctx context.Context, log logr.Lo
 	missing := r.setDifference(mbPeerVnis, specPeerVnis)
 	added := r.setDifference(specPeerVnis, mbPeerVnis)
 
-	statusPeerVnis := map[uint32]metalnetv1alpha1.NetworkPeeringState{}
+	networkPeeringState := map[uint32]metalnetv1alpha1.NetworkPeeringState{}
 	for _, v := range network.Status.Peerings {
-		statusPeerVnis[uint32(v.ID)] = v.State
+		networkPeeringState[uint32(v.ID)] = v.State
 	}
 
 	var errs []error
@@ -313,7 +313,7 @@ func (r *NetworkReconciler) reconcilePeeredVNIs(ctx context.Context, log logr.Lo
 					continue
 				}
 			}
-			delete(statusPeerVnis, peeredVNI)
+			delete(networkPeeringState, peeredVNI)
 		}
 
 		if err := errors.Join(errs...); err != nil {
@@ -356,53 +356,53 @@ func (r *NetworkReconciler) reconcilePeeredVNIs(ctx context.Context, log logr.Lo
 				}
 			}
 
-			delete(statusPeerVnis, peeredVNI)
+			delete(networkPeeringState, peeredVNI)
 		}
 
 		for _, peeredVNI := range added.UnsortedList() {
 			if !ownVniAvail {
 				return nil
 			}
-			statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStatePending
+			networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStatePending
 			log.V(1).Info("Checking the existence of the peeredVNI in dp-service (added)", "peeredVNI", peeredVNI)
 			peeredVniAvail, err := r.DPDK.GetVni(ctx, peeredVNI, 0)
 			if err != nil {
-				statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
+				networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
 				errs = append(errs, err)
 				continue
 			}
 			log.V(1).Info("Checked the existence of the peeredVNI in dp-service (added)", "peeredVNI", peeredVNI, "peeredVniAvail", peeredVniAvail)
 			if err := r.MetalnetCache.AddVniToPeerVnis(vni, peeredVNI); err != nil {
-				statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
+				networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
 				errs = append(errs, err)
 				continue
 			}
 			if ownVniAvail && !peeredVniAvail.Spec.InUse {
 				if err := r.subscribeIfNotSubscribed(ctx, peeredVNI); err != nil {
-					statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
+					networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
 					errs = append(errs, err)
 					continue
 				}
 			}
 			if ownVniAvail && peeredVniAvail.Spec.InUse {
 				if err := r.recycleVNISubscription(ctx, vni); err != nil {
-					statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
+					networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
 					errs = append(errs, err)
 					continue
 				}
 				if err := r.recycleVNISubscription(ctx, peeredVNI); err != nil {
-					statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
+					networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateError
 					errs = append(errs, err)
 					continue
 				}
 			}
 
-			statusPeerVnis[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateReady
+			networkPeeringState[peeredVNI] = metalnetv1alpha1.NetworkPeeringStateReady
 		}
 	}
 
-	newStatusPeerings := make([]metalnetv1alpha1.NetworkPeeringStatus, 0, len(statusPeerVnis))
-	for peeredId, status := range statusPeerVnis {
+	newStatusPeerings := make([]metalnetv1alpha1.NetworkPeeringStatus, 0, len(networkPeeringState))
+	for peeredId, status := range networkPeeringState {
 		newStatusPeerings = append(newStatusPeerings, metalnetv1alpha1.NetworkPeeringStatus{
 			ID:    int32(peeredId),
 			State: status,

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -130,7 +130,7 @@ var _ = BeforeSuite(func() {
 	logger := zap.New(zap.UseFlagOptions(&opts))
 
 	metalnetCache = internal.NewMetalnetCache(&logger)
-	metalnetMBClient := metalbond.NewMetalnetClient(&logger, dpdkClient, metalnetCache, &defaultRouterAddr, metalbond.ClientOptions{
+	metalnetMBClient = metalbond.NewMetalnetClient(&logger, dpdkClient, metalnetCache, &defaultRouterAddr, metalbond.ClientOptions{
 		IPv4Only:         true,
 		PreferredNetwork: nil,
 	})

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