From 63a2f40a1501975f331e398a0d09236b94c64ab2 Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Fri, 27 Sep 2024 11:38:04 -0400 Subject: [PATCH] Func comment update and fix unittests --- internal/controllers/clusterrequest_controller_test.go | 6 ++++-- internal/controllers/utils/conditions.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/controllers/clusterrequest_controller_test.go b/internal/controllers/clusterrequest_controller_test.go index d4387819..43703d60 100644 --- a/internal/controllers/clusterrequest_controller_test.go +++ b/internal/controllers/clusterrequest_controller_test.go @@ -1334,6 +1334,7 @@ var _ = Describe("ClusterRequestReconcile", func() { cr.Status.Conditions = append(cr.Status.Conditions, provisionedCond) cr.Status.ClusterDetails = &oranv1alpha1.ClusterDetails{} cr.Status.ClusterDetails.Name = crName + cr.Status.ClusterDetails.ClusterProvisionStartedAt = metav1.Now() Expect(c.Status().Update(ctx, cr)).To(Succeed()) }) @@ -1342,7 +1343,7 @@ var _ = Describe("ClusterRequestReconcile", func() { result, err := reconciler.Reconcile(ctx, req) // Verify the reconciliation result Expect(err).ToNot(HaveOccurred()) - Expect(result).To(Equal(requeueWithMediumInterval())) + Expect(result).To(Equal(requeueWithLongInterval())) reconciledCR := &oranv1alpha1.ClusterRequest{} Expect(c.Get(ctx, req.NamespacedName, reconciledCR)).To(Succeed()) @@ -1364,6 +1365,7 @@ var _ = Describe("ClusterRequestReconcile", func() { Expect(c.Status().Update(ctx, policy)).To(Succeed()) // Complete the cluster provisioning. cr.Status.Conditions[0].Status = metav1.ConditionTrue + cr.Status.Conditions[0].Reason = string(utils.CRconditionReasons.Completed) Expect(c.Status().Update(ctx, cr)).To(Succeed()) // Start reconciliation. result, err := reconciler.Reconcile(ctx, req) @@ -1392,7 +1394,7 @@ var _ = Describe("ClusterRequestReconcile", func() { result, err := reconciler.Reconcile(ctx, req) // Verify the reconciliation result. Expect(err).ToNot(HaveOccurred()) - Expect(result).To(Equal(requeueWithMediumInterval())) + Expect(result).To(Equal(requeueWithLongInterval())) reconciledCR := &oranv1alpha1.ClusterRequest{} Expect(c.Get(ctx, req.NamespacedName, reconciledCR)).To(Succeed()) diff --git a/internal/controllers/utils/conditions.go b/internal/controllers/utils/conditions.go index c7f394e5..23210042 100644 --- a/internal/controllers/utils/conditions.go +++ b/internal/controllers/utils/conditions.go @@ -86,7 +86,7 @@ func SetStatusCondition(existingConditions *[]metav1.Condition, conditionType Co ) } -// IsStatusConditionPresent checks if the cluster provision condition is present +// IsClusterProvisionPresent checks if the cluster provision condition is present func IsClusterProvisionPresent(cr *oranv1alpha1.ClusterRequest) bool { condition := meta.FindStatusCondition(cr.Status.Conditions, (string(CRconditionTypes.ClusterProvisioned))) return condition != nil