addressing Angie's comment

openshift-kni · Oct 3, 2024 · d500c6a · d500c6a
1 parent 0250cde
commit d500c6a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 68 deletions.
diff --git a/bundle/manifests/oran-o2ims.clusterserviceversion.yaml b/bundle/manifests/oran-o2ims.clusterserviceversion.yaml
diff --git a/internal/controllers/clusterrequest_controller_test.go b/internal/controllers/clusterrequest_controller_test.go
@@ -409,9 +409,29 @@ const (
 }`
 	testPolicyTemplateInput = `{
 	"cpu-isolated": "1-2"
+}`
+	testFullClusterSchemaTemplate = `{
+	"properties": {
+		"nodeClusterName": {"type": "string"},
+		"oCloudSiteId": {"type": "string"},
+		"%s": %s,
+		"%s": %s
+	},
+	"type": "object",
+	"required": [
+"nodeClusterName",
+"oCloudSiteId",
+"policyTemplateParameters",
+"clusterInstanceParameters"
+]
 }`
 )
 
+var (
+	testFullTemplateSchema = fmt.Sprintf(testFullClusterSchemaTemplate, clusterInstanceParametersString, testClusterTemplateSchema,
+		policyTemplateParametersString, testPolicyTemplateSchema)
+)
+
 func verifyStatusCondition(actualCond, expectedCon metav1.Condition) {
 	Expect(actualCond.Type).To(Equal(expectedCon.Type))
 	Expect(actualCond.Status).To(Equal(expectedCon.Status))
@@ -544,24 +564,6 @@ var _ = Describe("ClusterRequestReconcile", func() {
 				},
 			},
 		}
-		var (
-			testFullTemplateSchema = fmt.Sprintf(`{
-				"properties": {
-					"nodeClusterName": {"type": "string"},
-					"oCloudSiteId": {"type": "string"},
-					"%s": %s,
-					"%s": %s
-				},
-				"type": "object",
-				"required": [
-    "nodeClusterName",
-    "oCloudSiteId",
-    "policyTemplateParameters",
-    "clusterInstanceParameters"
-  ]
-			}`, clusterInstanceParametersString, testClusterTemplateSchema,
-				policyTemplateParametersString, testPolicyTemplateSchema)
-		)
 		// Define the cluster template.
 		ct = &provisioningv1alpha1.ClusterTemplate{
 			ObjectMeta: metav1.ObjectMeta{
@@ -1514,21 +1516,6 @@ var _ = Describe("getCrClusterTemplateRef", func() {
 	})
 
 	It("returns the referred ClusterTemplate if it exists", func() {
-		var (
-			testFullTemplateSchema = fmt.Sprintf(`{
-				"properties": {
-					"nodeClusterName": {"type": "string"},
-					"oCloudSiteId": {"type": "string"},
-					"%s": {}
-				},
-				"type": "object",
-				"required": [
-    "nodeClusterName",
-    "oCloudSiteId",
-    "policyTemplateParameters",
-    "clusterInstanceParameters"
-  ]}`, clusterInstanceParametersString)
-		)
 		// Define the cluster template.
 		ctName := getClusterTemplateRefName(tName, tVersion)
 		ct := &provisioningv1alpha1.ClusterTemplate{
@@ -2398,24 +2385,6 @@ var _ = Describe("policyManagement", func() {
 	)
 
 	BeforeEach(func() {
-		var (
-			testFullTemplateSchema = fmt.Sprintf(`{
-				"properties": {
-					"nodeClusterName": {"type": "string"},
-					"oCloudSiteId": {"type": "string"},
-					"%s": %s,
-					"%s": %s
-				},
-				"type": "object",
-				"required": [
-    "nodeClusterName",
-    "oCloudSiteId",
-    "policyTemplateParameters",
-    "clusterInstanceParameters"
-  ]
-			}`, clusterInstanceParametersString, testClusterTemplateSchema,
-				policyTemplateParametersString, testPolicyTemplateSchema)
-		)
 		// Define the needed resources.
 		crs := []client.Object{
 			// Cluster Template Namespace.

diff --git a/internal/controllers/clustertemplate_controller_test.go b/internal/controllers/clustertemplate_controller_test.go
@@ -31,22 +31,6 @@ var _ = Describe("ClusterTemplateReconciler", func() {
 
 	BeforeEach(func() {
 		ctx = context.Background()
-		var (
-			testFullTemplateSchema = fmt.Sprintf(`{
-				"properties": {
-					"nodeClusterName": {"type": "string"},
-					"oCloudSiteId": {"type": "string"},
-					"%s": {}
-				},
-				"type": "object",
-				"required": [
-    "nodeClusterName",
-    "oCloudSiteId",
-    "policyTemplateParameters",
-    "clusterInstanceParameters"
-  ]
-			}`, clusterInstanceParametersString)
-		)
 		ct := &provisioningv1alpha1.ClusterTemplate{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      getClusterTemplateRefName(tName, tVersion),