Update functional tests for ansible lib

This change updates the functional tests to work with the changes
from Ansibleeev1 to the new lib-common AnsibleEE library.

Signed-off-by: Brendan Shephard <[email protected]>

Author: bshephar

tests/functional/dataplane/base_test.go

@@ -5,6 +5,7 @@ import (
 
 	. "github.com/onsi/gomega" //revive:disable:dot-imports
 	"gopkg.in/yaml.v3"
+	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -13,7 +14,6 @@ import (
 
 	infrav1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	"github.com/openstack-k8s-operators/openstack-ansibleee-operator/api/v1beta1"
 	dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/apis/dataplane/v1beta1"
 )
 
@@ -590,8 +590,8 @@ func DataplaneDeploymentConditionGetter(name types.NamespacedName) condition.Con
 	return instance.Status.Conditions
 }
 
-func GetAnsibleee(name types.NamespacedName) *v1beta1.OpenStackAnsibleEE {
-	instance := &v1beta1.OpenStackAnsibleEE{}
+func GetAnsibleee(name types.NamespacedName) *batchv1.Job {
+	instance := &batchv1.Job{}
 	Eventually(func(g Gomega) {
 		g.Expect(k8sClient.Get(ctx, name, instance)).Should(Succeed())
 	}, timeout, interval).Should(Succeed())
@@ -620,3 +620,12 @@ func getCtlPlaneIP(secret *corev1.Secret) string {
 	}
 	return inv.EdpmComputeNodeset.Hosts.Node.CtlPlaneIP
 }
+
+func findEnvVar(envVars []corev1.EnvVar) corev1.EnvVar {
+	for _, envVar := range envVars {
+		if envVar.Name == "RUNNER_EXTRA_VARS" {
+			return envVar
+		}
+	}
+	return corev1.EnvVar{}
+}

tests/functional/dataplane/openstackdataplanedeployment_controller_test.go

@@ -12,7 +12,6 @@ import (
 
 	//revive:disable-next-line:dot-imports
 	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
-	ansibleeev1 "github.com/openstack-k8s-operators/openstack-ansibleee-operator/api/v1beta1"
 	baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -134,7 +133,8 @@ var _ = Describe("Dataplane Deployment Test", func() {
 			CreateDataplaneService(dataplaneGlobalServiceName, true)
 			// with EDPMServiceType set
 			CreateDataPlaneServiceFromSpec(dataplaneUpdateServiceName, map[string]interface{}{
-				"EDPMServiceType": "foo-service"})
+				"edpmServiceType":               "foo-update-service",
+				"openStackAnsibleEERunnerImage": "foo-image:latest"})
 
 			DeferCleanup(th.DeleteService, dataplaneServiceName)
 			DeferCleanup(th.DeleteService, dataplaneGlobalServiceName)
@@ -210,25 +210,22 @@ var _ = Describe("Dataplane Deployment Test", func() {
 						Name:      aeeName,
 						Namespace: dataplaneDeploymentName.Namespace,
 					}
-					ansibleEE := &ansibleeev1.OpenStackAnsibleEE{
-						ObjectMeta: metav1.ObjectMeta{
-							Name:      ansibleeeName.Name,
-							Namespace: ansibleeeName.Namespace,
-						}}
-					g.Expect(th.K8sClient.Get(th.Ctx, ansibleeeName, ansibleEE)).To(Succeed())
-					ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+					ansibleEE := GetAnsibleee(ansibleeeName)
 
+					ansibleEE.Status.Succeeded = 1
 					g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
-					g.Expect(ansibleEE.Spec.ExtraVars).To(HaveKey("edpm_override_hosts"))
 					if service.Spec.EDPMServiceType != "" {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_service_type"])).To(Equal(fmt.Sprintf("\"%s\"", service.Spec.EDPMServiceType)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring("edpm_service_type"))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(service.Spec.EDPMServiceType))
 					} else {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_service_type"])).To(Equal(fmt.Sprintf("\"%s\"", serviceName)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(serviceName))
 					}
 					if service.Spec.DeployOnAllNodeSets {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_override_hosts"])).To(Equal("\"all\""))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring("edpm_override_hosts"))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring("all"))
 					} else {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_override_hosts"])).To(Equal(fmt.Sprintf("\"%s\"", dataplaneNodeSetName.Name)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring("edpm_override_hosts"))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(dataplaneNodeSetName.Name))
 					}
 				}, th.Timeout, th.Interval).Should(Succeed())
 			}
@@ -281,7 +278,8 @@ var _ = Describe("Dataplane Deployment Test", func() {
 			CreateDataplaneService(dataplaneServiceName, false)
 			CreateDataplaneService(dataplaneGlobalServiceName, true)
 			CreateDataPlaneServiceFromSpec(dataplaneUpdateServiceName, map[string]interface{}{
-				"EDPMServiceType": "foo-service"})
+				"edpmServiceType":               "foo-update-service",
+				"openStackAnsibleEERunnerImage": "foo-image:latest"})
 
 			DeferCleanup(th.DeleteService, dataplaneServiceName)
 			DeferCleanup(th.DeleteService, dataplaneGlobalServiceName)
@@ -430,19 +428,21 @@ var _ = Describe("Dataplane Deployment Test", func() {
 					}
 					ansibleEE := GetAnsibleee(ansibleeeName)
 					if service.Spec.DeployOnAllNodeSets {
-						g.Expect(ansibleEE.Spec.ExtraMounts[0].Volumes).Should(HaveLen(4))
+						g.Expect(ansibleEE.Spec.Template.Spec.Volumes).Should(HaveLen(4))
 					} else {
-						g.Expect(ansibleEE.Spec.ExtraMounts[0].Volumes).Should(HaveLen(2))
+						g.Expect(ansibleEE.Spec.Template.Spec.Volumes).Should(HaveLen(2))
 					}
-					ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+					ansibleEE.Status.Succeeded = 1
 					g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 					if service.Spec.EDPMServiceType != "" {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_service_type"])).To(Equal(fmt.Sprintf("\"%s\"", service.Spec.EDPMServiceType)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(service.Spec.EDPMServiceType))
 					} else {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_service_type"])).To(Equal(fmt.Sprintf("\"%s\"", serviceName)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(serviceName))
 					}
 					if service.Spec.DeployOnAllNodeSets {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_override_hosts"])).To(Equal("\"all\""))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring("edpm_override_hosts"))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring("all"))
+
 					}
 				}, th.Timeout, th.Interval).Should(Succeed())
 			}
@@ -467,16 +467,16 @@ var _ = Describe("Dataplane Deployment Test", func() {
 					}
 					ansibleEE := GetAnsibleee(ansibleeeName)
 					if service.Spec.DeployOnAllNodeSets {
-						g.Expect(ansibleEE.Spec.ExtraMounts[0].Volumes).Should(HaveLen(4))
+						g.Expect(ansibleEE.Spec.Template.Spec.Volumes).Should(HaveLen(4))
 					} else {
-						g.Expect(ansibleEE.Spec.ExtraMounts[0].Volumes).Should(HaveLen(2))
+						g.Expect(ansibleEE.Spec.Template.Spec.Volumes).Should(HaveLen(2))
 					}
-					ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+					ansibleEE.Status.Succeeded = 1
 					g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 					if service.Spec.EDPMServiceType != "" {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_service_type"])).To(Equal(fmt.Sprintf("\"%s\"", service.Spec.EDPMServiceType)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(service.Spec.EDPMServiceType))
 					} else {
-						g.Expect(string(ansibleEE.Spec.ExtraVars["edpm_service_type"])).To(Equal(fmt.Sprintf("\"%s\"", serviceName)))
+						g.Expect(findEnvVar(ansibleEE.Spec.Template.Spec.Containers[0].Env).Value).To(ContainSubstring(serviceName))
 					}
 				}, th.Timeout, th.Interval).Should(Succeed())
 			}
@@ -694,7 +694,7 @@ var _ = Describe("Dataplane Deployment Test", func() {
 			}
 			Eventually(func(g Gomega) {
 				ansibleEE := GetAnsibleee(ansibleeeName)
-				ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+				ansibleEE.Status.Succeeded = 1
 				g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 			}, th.Timeout, th.Interval).Should(Succeed())
 
@@ -897,7 +897,7 @@ var _ = Describe("Dataplane Deployment Test", func() {
 						Namespace: dataplaneMultiNodesetDeploymentName.Namespace,
 					}
 					ansibleEE := GetAnsibleee(ansibleeeName)
-					ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+					ansibleEE.Status.Succeeded = 1
 					g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 				}, th.Timeout, th.Interval).Should(Succeed())
 			}
@@ -922,7 +922,7 @@ var _ = Describe("Dataplane Deployment Test", func() {
 						Namespace: dataplaneMultiNodesetDeploymentName.Namespace,
 					}
 					ansibleEE := GetAnsibleee(ansibleeeName)
-					ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+					ansibleEE.Status.Succeeded = 1
 					g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 				}, th.Timeout, th.Interval).Should(Succeed())
 			}
@@ -1023,7 +1023,7 @@ var _ = Describe("Dataplane Deployment Test", func() {
 			}
 			Eventually(func(g Gomega) {
 				ansibleEE := GetAnsibleee(ansibleeeName)
-				ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+				ansibleEE.Status.Succeeded = 1
 				g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 			}, th.Timeout, th.Interval).Should(Succeed())
 

tests/functional/dataplane/openstackdataplanenodeset_controller_test.go

@@ -23,7 +23,6 @@ import (
 	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
 	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	ansibleeev1 "github.com/openstack-k8s-operators/openstack-ansibleee-operator/api/v1beta1"
 	openstackv1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"
 	dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/apis/dataplane/v1beta1"
 
@@ -1301,6 +1300,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 	When("A DataPlaneNodeSet is created with NoNodes and a MinorUpdate OpenStackDataPlaneDeployment is created", func() {
 		BeforeEach(func() {
 
+			dataplanev1.SetupDefaults()
 			updateServiceSpec := map[string]interface{}{
 				"playbook": "osp.edpm.update",
 			}
@@ -1331,7 +1331,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 					Namespace: namespace,
 				}
 				ansibleEE := GetAnsibleee(ansibleeeName)
-				ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded
+				ansibleEE.Status.Succeeded = 1
 				g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed())
 			}, th.Timeout, th.Interval).Should(Succeed())