Fix functional tests

* manila introduced validation webhooks check in [1] for required
fields. This adds thise fields in the manila template.
* fixes heat password selector from AuthEncryptionKey -> authEncryptionKey
* openstackclient does not (yet) have an Enabled parameter

[1] openstack-k8s-operators/manila-operator#418

Signed-off-by: Martin Schuppert <mschuppert@redhat.com>

Author: stuggi

tests/functional/ctlplane/base_test.go

@@ -504,7 +504,7 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 		"databaseInstance": "openstack",
 		"secret":           "osp-secret",
 		"passwordSelectors": map[string]interface{}{
-			"AuthEncryptionKey": "HeatAuthEncryptionKey",
+			"authEncryptionKey": "HeatAuthEncryptionKey",
 		},
 	}
 	telemetryTemplate := map[string]interface{}{
@@ -521,6 +521,22 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 			"enabled": false,
 		},
 	}
+	manilaTemplate := map[string]interface{}{
+		"rabbitMqClusterName": "rabbitmq",
+		"memcachedInstance":   "memcached",
+		"databaseAccount":     "account",
+		"manilaAPI": map[string]interface{}{
+			"replicas": 1,
+		},
+		"manilaScheduler": map[string]interface{}{
+			"replicas": 1,
+		},
+		"manilaShares": map[string]interface{}{
+			"share1": map[string]interface{}{
+				"replicas": 1,
+			},
+		},
+	}
 
 	return map[string]interface{}{
 		"secret":       "osp-secret",
@@ -578,11 +594,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 		"barbican": map[string]interface{}{
 			"enabled": false,
 		},
-		"openstackclient": map[string]interface{}{
-			"enabled": true,
-		},
+		"openstackclient": map[string]interface{}{},
 		"manila": map[string]interface{}{
-			"enabled": true,
+			"enabled":  true,
+			"template": manilaTemplate,
 		},
 		"heat": map[string]interface{}{
 			"enabled":  true,

tests/functional/ctlplane/openstackoperator_controller_test.go

@@ -1459,22 +1459,6 @@ var _ = Describe("OpenStackOperator controller", func() {
 		BeforeEach(func() {
 			spec := GetDefaultOpenStackControlPlaneSpec()
 			spec["tls"] = GetTLSPublicSpec()
-			spec["manila"] = map[string]interface{}{
-				"enabled": true,
-				"template": map[string]interface{}{
-					"manilaAPI": map[string]interface{}{
-						"replicas": 1,
-					},
-					"manilaScheduler": map[string]interface{}{
-						"replicas": 1,
-					},
-					"manilaShares": map[string]interface{}{
-						"share1": map[string]interface{}{
-							"replicas": 1,
-						},
-					},
-				},
-			}
 			DeferCleanup(
 				th.DeleteInstance,
 				CreateOpenStackControlPlane(names.OpenStackControlplaneName, spec),