Update functional tests with the new storage interface

Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Jun 11, 2024 · a770223 · a770223
1 parent 3537fdc
commit a770223
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/test/functional/base_test.go b/test/functional/base_test.go
@@ -70,8 +70,10 @@ func CreateDefaultGlance(name types.NamespacedName) client.Object {
 			"keystoneEndpoint":  "default",
 			"databaseInstance":  "openstack",
 			"databaseAccount":   glanceTest.GlanceDatabaseAccount.Name,
-			"storageRequest":    glanceTest.GlancePVCSize,
-			"glanceAPIs":        GetAPIList(),
+			"storage": map[string]interface{}{
+				"storageRequest": glanceTest.GlancePVCSize,
+			},
+			"glanceAPIs": GetAPIList(),
 		},
 	}
 	return th.CreateUnstructured(raw)
@@ -84,8 +86,10 @@ func GetGlanceEmptySpec() map[string]interface{} {
 		"keystoneEndpoint": "default",
 		"secret":           SecretName,
 		"databaseInstance": "openstack",
-		"storageRequest":   glanceTest.GlancePVCSize,
-		"glanceAPIs":       map[string]interface{}{},
+		"storage": map[string]interface{}{
+			"storageRequest": glanceTest.GlancePVCSize,
+		},
+		"glanceAPIs": map[string]interface{}{},
 	}
 }
 
@@ -97,7 +101,9 @@ func GetGlanceDefaultSpec() map[string]interface{} {
 		"serviceUser":      glanceName.Name,
 		"secret":           SecretName,
 		"glanceAPIs":       GetAPIList(),
-		"storageRequest":   glanceTest.GlancePVCSize,
+		"storage": map[string]interface{}{
+			"storageRequest": glanceTest.GlancePVCSize,
+		},
 	}
 }
 
@@ -109,9 +115,11 @@ func GetGlanceDefaultSpecWithQuota() map[string]interface{} {
 		"serviceUser":      glanceName.Name,
 		"secret":           SecretName,
 		"glanceAPIs":       GetAPIList(),
-		"storageRequest":   glanceTest.GlancePVCSize,
-		"quotas":           glanceTest.GlanceQuotas,
-		"memcached":        glanceTest.MemcachedInstance,
+		"storage": map[string]interface{}{
+			"storageRequest": glanceTest.GlancePVCSize,
+		},
+		"quotas":    glanceTest.GlanceQuotas,
+		"memcached": glanceTest.MemcachedInstance,
 	}
 }
 
@@ -125,8 +133,10 @@ func GetAPIList() map[string]interface{} {
 
 func GetGlanceAPIDefaultSpec() map[string]interface{} {
 	return map[string]interface{}{
-		"replicas":        1,
-		"storageRequest":  glanceTest.GlancePVCSize,
+		"replicas": 1,
+		"storage": map[string]interface{}{
+			"storageRequest": glanceTest.GlancePVCSize,
+		},
 		"databaseAccount": glanceTest.GlanceDatabaseAccount.Name,
 	}
 }
@@ -183,10 +193,12 @@ func GetDefaultGlanceSpec() map[string]interface{} {
 // CreateGlanceAPISpec -
 func CreateGlanceAPISpec(apiType APIType) map[string]interface{} {
 	spec := map[string]interface{}{
-		"replicas":         1,
-		"serviceAccount":   glanceTest.GlanceSA.Name,
-		"containerImage":   glanceTest.ContainerImage,
-		"storageRequest":   glanceTest.GlancePVCSize,
+		"replicas":       1,
+		"serviceAccount": glanceTest.GlanceSA.Name,
+		"containerImage": glanceTest.ContainerImage,
+		"storage": map[string]interface{}{
+			"storageRequest": glanceTest.GlancePVCSize,
+		},
 		"apiType":          apiType,
 		"name":             "default",
 		"databaseHostname": "openstack",
@@ -199,10 +211,12 @@ func CreateGlanceAPISpec(apiType APIType) map[string]interface{} {
 // GetDefaultGlanceAPISpec -
 func GetDefaultGlanceAPISpec(apiType APIType) map[string]interface{} {
 	spec := map[string]interface{}{
-		"replicas":         1,
-		"containerImage":   glanceTest.ContainerImage,
-		"serviceAccount":   glanceTest.GlanceSA.Name,
-		"storageRequest":   glanceTest.GlancePVCSize,
+		"replicas":       1,
+		"containerImage": glanceTest.ContainerImage,
+		"serviceAccount": glanceTest.GlanceSA.Name,
+		"storage": map[string]interface{}{
+			"storageRequest": glanceTest.GlancePVCSize,
+		},
 		"type":             apiType,
 		"name":             "default",
 		"databaseHostname": "openstack",

diff --git a/test/functional/glance_controller_test.go b/test/functional/glance_controller_test.go
@@ -351,6 +351,9 @@ var _ = Describe("Glance controller", func() {
 				},
 			}
 			rawSpec := map[string]interface{}{
+				"storage": map[string]interface{}{
+					"storageRequest": glanceTest.GlancePVCSize,
+				},
 				"storageRequest":      glanceTest.GlancePVCSize,
 				"secret":              SecretName,
 				"databaseInstance":    "openstack",