fix: ignore category value delete error

added basic test which creates 2 clusters with same name and deletes last one
nutanix-cloud-native · Aug 9, 2024 · f1de4e2 · f1de4e2
1 parent ce22e6b
commit f1de4e2
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 8 deletions.
diff --git a/controllers/helpers.go b/controllers/helpers.go
@@ -504,9 +504,11 @@ func deleteCategoryKeyValues(ctx context.Context, client *prismclientv3.Client,
 
 			err = client.V3.DeleteCategoryValue(ctx, key, value)
 			if err != nil {
-				errorMsg := fmt.Errorf("failed to delete category with key %s. error: %v", key, err)
-				log.Error(errorMsg, "failed to delete category")
-				return errorMsg
+				errorMsg := fmt.Errorf("failed to delete category value with key:value %s:%s. error: %v", key, value, err)
+				log.Error(errorMsg, "failed to delete category value")
+				// NCN-101935: If the category value still has VMs assigned, do not delete the category key:value
+				// TODO:deepakmntnx Add a check for specific error mentioned in NCN-101935
+				return nil
 			}
 		}
 

diff --git a/test/e2e/categories_test.go b/test/e2e/categories_test.go
@@ -20,6 +20,7 @@ package e2e
 
 import (
 	"context"
+	"os"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -41,23 +42,31 @@ var _ = Describe("Nutanix categories", Label("capx-feature-test", "categories"),
 	)
 
 	var (
-		namespace        *corev1.Namespace
-		clusterName      string
-		clusterResources *clusterctl.ApplyClusterTemplateAndWaitResult
-		cancelWatches    context.CancelFunc
-		testHelper       testHelperInterface
+		namespace         *corev1.Namespace
+		namespace2        *corev1.Namespace
+		clusterName       string
+		clusterResources  *clusterctl.ApplyClusterTemplateAndWaitResult
+		clusterResources2 *clusterctl.ApplyClusterTemplateAndWaitResult
+		cancelWatches     context.CancelFunc
+		cancelWatches2    context.CancelFunc
+		testHelper        testHelperInterface
 	)
 
 	BeforeEach(func() {
 		testHelper = newTestHelper(e2eConfig)
 		clusterName = testHelper.generateTestClusterName(specName)
 		clusterResources = new(clusterctl.ApplyClusterTemplateAndWaitResult)
+		clusterResources2 = new(clusterctl.ApplyClusterTemplateAndWaitResult)
 		Expect(bootstrapClusterProxy).NotTo(BeNil(), "BootstrapClusterProxy can't be nil")
 		namespace, cancelWatches = setupSpecNamespace(ctx, specName, bootstrapClusterProxy, artifactFolder)
+		namespace2, cancelWatches2 = setupSpecNamespace(ctx, specName+"-2", bootstrapClusterProxy, artifactFolder)
 	})
 
 	AfterEach(func() {
 		dumpSpecResourcesAndCleanup(ctx, specName, bootstrapClusterProxy, artifactFolder, namespace, cancelWatches, clusterResources.Cluster, e2eConfig.GetIntervals, skipCleanup)
+		if clusterResources2 != nil {
+			dumpSpecResourcesAndCleanup(ctx, specName+"-2", bootstrapClusterProxy, artifactFolder, namespace2, cancelWatches2, clusterResources2.Cluster, e2eConfig.GetIntervals, skipCleanup)
+		}
 	})
 
 	It("Create a cluster with default cluster categories (no additional categories)", func() {
@@ -174,4 +183,92 @@ var _ = Describe("Nutanix categories", Label("capx-feature-test", "categories"),
 
 		By("PASSED!")
 	})
+
+	It("Create and delete 2 clusters with same name with default cluster categories and should succeed", Label("same-name-two-cluster-test"), func() {
+		Expect(namespace).NotTo(BeNil())
+		flavor := clusterctl.DefaultFlavor
+		expectedClusterNameCategoryKey := infrav1.DefaultCAPICategoryKeyForName
+		By("Creating a workload cluster 1", func() {
+			testHelper.deployClusterAndWait(
+				deployClusterParams{
+					clusterName:           clusterName,
+					namespace:             namespace,
+					flavor:                flavor,
+					clusterctlConfigPath:  clusterctlConfigPath,
+					artifactFolder:        artifactFolder,
+					bootstrapClusterProxy: bootstrapClusterProxy,
+				}, clusterResources)
+		})
+
+		By("Checking cluster category condition is true", func() {
+			testHelper.verifyConditionOnNutanixCluster(verifyConditionParams{
+				clusterName:           clusterName,
+				namespace:             namespace,
+				bootstrapClusterProxy: bootstrapClusterProxy,
+				expectedCondition: clusterv1.Condition{
+					Type:   infrav1.ClusterCategoryCreatedCondition,
+					Status: corev1.ConditionTrue,
+				},
+			})
+		})
+
+		By("Checking if a category was created", func() {
+			testHelper.verifyCategoryExists(ctx, expectedClusterNameCategoryKey, clusterName)
+		})
+
+		By("Checking if there are VMs assigned to this category", func() {
+			expectedCategories := map[string]string{
+				expectedClusterNameCategoryKey: clusterName,
+			}
+			testHelper.verifyCategoriesNutanixMachines(ctx, clusterName, namespace.Name, expectedCategories)
+		})
+
+		By("Setting different Control plane endpoint IP for 2nd cluster", func() {
+			cp2EndpointIP := testHelper.getVariableFromE2eConfig("CONTROL_PLANE_ENDPOINT_IP_2")
+			if cp2EndpointIP == "" {
+				cp2EndpointIP = os.Getenv("CONTROL_PLANE_ENDPOINT_IP_2")
+				if cp2EndpointIP == "" {
+					Fail("CONTROL_PLANE_ENDPOINT_IP_2 not set")
+				}
+			}
+			testHelper.updateVariableInE2eConfig("CONTROL_PLANE_ENDPOINT_IP", cp2EndpointIP)
+		})
+
+		By("Creating a workload cluster 2 with same name", func() {
+			testHelper.deployClusterAndWait(
+				deployClusterParams{
+					clusterName:           clusterName,
+					namespace:             namespace2,
+					flavor:                flavor,
+					clusterctlConfigPath:  clusterctlConfigPath,
+					artifactFolder:        artifactFolder,
+					bootstrapClusterProxy: bootstrapClusterProxy,
+				}, clusterResources2)
+		})
+
+		By("Checking cluster category condition is true", func() {
+			testHelper.verifyConditionOnNutanixCluster(verifyConditionParams{
+				clusterName:           clusterName,
+				namespace:             namespace2,
+				bootstrapClusterProxy: bootstrapClusterProxy,
+				expectedCondition: clusterv1.Condition{
+					Type:   infrav1.ClusterCategoryCreatedCondition,
+					Status: corev1.ConditionTrue,
+				},
+			})
+		})
+
+		By("Checking if a category was created", func() {
+			testHelper.verifyCategoryExists(ctx, expectedClusterNameCategoryKey, clusterName)
+		})
+
+		By("Checking if there are VMs assigned to this category", func() {
+			expectedCategories := map[string]string{
+				expectedClusterNameCategoryKey: clusterName,
+			}
+			testHelper.verifyCategoriesNutanixMachines(ctx, clusterName, namespace2.Name, expectedCategories)
+		})
+
+		// TODO delete one cluster and verify the other one is still running
+	})
 })
diff --git a/test/e2e/test_helpers.go b/test/e2e/test_helpers.go
@@ -144,6 +144,7 @@ type testHelperInterface interface {
 	getNutanixResourceIdentifierFromEnv(envVarKey string) infrav1.NutanixResourceIdentifier
 	getNutanixResourceIdentifierFromE2eConfig(variableKey string) infrav1.NutanixResourceIdentifier
 	getVariableFromE2eConfig(variableKey string) string
+	updateVariableInE2eConfig(variableKey string, variableValue string)
 	stripNutanixIDFromProviderID(providerID string) string
 	verifyCategoryExists(ctx context.Context, categoryKey, categoyValue string)
 	verifyCategoriesNutanixMachines(ctx context.Context, clusterName, namespace string, expectedCategories map[string]string)
@@ -559,6 +560,10 @@ func (t testHelper) getVariableFromE2eConfig(variableKey string) string {
 	return variableValue
 }
 
+func (t testHelper) updateVariableInE2eConfig(variableKey string, variableValue string) {
+	t.e2eConfig.Variables[variableKey] = variableValue
+}
+
 func (t testHelper) stripNutanixIDFromProviderID(providerID string) string {
 	return strings.TrimPrefix(providerID, nutanixProviderIDPrefix)
 }