Add tests for WatcherAPI keystoneendpoint addition

tests/functional/watcher_controller_test.go

@@ -253,6 +253,9 @@ var _ = Describe("Watcher controller", func() {
 			// We validate the full Watcher CR readiness status here
 			// DB Ready
 
+			// Simulate KeystoneEndpoint success
+			keystone.SimulateKeystoneEndpointReady(watcherTest.WatcherKeystoneEndpointName)
+
 			// Simulate WatcherAPI deployment
 			th.SimulateDeploymentReplicaReady(watcherTest.WatcherAPIDeployment)
 			th.ExpectCondition(
@@ -641,6 +644,9 @@ var _ = Describe("Watcher controller", func() {
 			// Simulate dbsync success
 			th.SimulateJobSuccess(watcherTest.WatcherDBSync)
 
+			// Simulate KeystoneEndpoint success
+			keystone.SimulateKeystoneEndpointReady(watcherTest.WatcherKeystoneEndpointName)
+
 			// Simulate WatcherAPI deployment
 			th.SimulateDeploymentReplicaReady(watcherTest.WatcherAPIDeployment)
 

tests/functional/watcher_test_data.go

@@ -51,6 +51,7 @@ type WatcherTestData struct {
 	WatcherInternalServiceName   types.NamespacedName
 	WatcherRouteName             types.NamespacedName
 	WatcherInternalRouteName     types.NamespacedName
+	WatcherKeystoneEndpointName  types.NamespacedName
 }
 
 // GetWatcherTestData is a function that initialize the WatcherTestData
@@ -135,5 +136,9 @@ func GetWatcherTestData(watcherName types.NamespacedName) WatcherTestData {
 			Namespace: watcherName.Namespace,
 			Name:      "watcher-internal",
 		},
+		WatcherKeystoneEndpointName: types.NamespacedName{
+			Namespace: watcherName.Namespace,
+			Name:      "watcher",
+		},
 	}
 }

tests/functional/watcherapi_controller_test.go

@@ -181,11 +181,30 @@ var _ = Describe("WatcherAPI controller", func() {
 				condition.ExposeServiceReadyCondition,
 				corev1.ConditionTrue,
 			)
+			th.AssertRouteExists(watcherTest.WatcherRouteName)
 			public := th.GetService(watcherTest.WatcherPublicServiceName)
 			Expect(public.Labels["service"]).To(Equal("watcher-api"))
+			Expect(public.Labels["public"]).To(Equal("true"))
 			internal := th.GetService(watcherTest.WatcherInternalServiceName)
 			Expect(internal.Labels["service"]).To(Equal("watcher-api"))
-			th.AssertRouteExists(watcherTest.WatcherRouteName)
+			Expect(internal.Labels["internal"]).To(Equal("true"))
+		})
+		It("created the keystone endpoint for the watcher-api service", func() {
+			keystone.SimulateKeystoneEndpointReady(watcherTest.WatcherKeystoneEndpointName)
+			// it registers the endpointURL as the public endpoint and svc
+			// for the internal
+			keystoneEndpoint := keystone.GetKeystoneEndpoint(watcherTest.WatcherKeystoneEndpointName)
+			endpoints := keystoneEndpoint.Spec.Endpoints
+			// jgilaber: the public endpoint returned by the exposeEndpoint
+			// function of lib-common has an empty hostname
+			Expect(endpoints).To(HaveKeyWithValue("public", "http://"))
+			Expect(endpoints).To(HaveKeyWithValue("internal", "http://watcher-internal."+watcherTest.WatcherAPI.Namespace+".svc:9322"))
+			th.ExpectCondition(
+				watcherTest.WatcherAPI,
+				ConditionGetterFunc(WatcherAPIConditionGetter),
+				condition.KeystoneEndpointReadyCondition,
+				corev1.ConditionTrue,
+			)
 		})
 	})
 	When("the secret is created but missing fields", func() {
@@ -356,13 +375,18 @@ var _ = Describe("WatcherAPI controller", func() {
 		})
 		It("creates MetalLB service", func() {
 			th.SimulateDeploymentReplicaReady(watcherTest.WatcherAPIDeployment)
+			// simulate that the internal service got a LoadBalancerIP
+			// assigned
+			th.SimulateLoadBalancerServiceIP(watcherTest.WatcherInternalServiceName)
 
 			// As the public endpoint is not mentioned in the service override
 			// a generic Service and a Route is created
 			public := th.GetService(watcherTest.WatcherPublicServiceName)
 			Expect(public.Annotations).NotTo(HaveKey("metallb.universe.tf/address-pool"))
 			Expect(public.Annotations).NotTo(HaveKey("metallb.universe.tf/allow-shared-ip"))
 			Expect(public.Annotations).NotTo(HaveKey("metallb.universe.tf/loadBalancerIPs"))
+			Expect(public.Labels["service"]).To(Equal("watcher-api"))
+			Expect(public.Labels["public"]).To(Equal("true"))
 			th.AssertRouteExists(watcherTest.WatcherRouteName)
 
 			// As the internal endpoint is configure in the service override it
@@ -372,12 +396,12 @@ var _ = Describe("WatcherAPI controller", func() {
 			Expect(internal.Annotations).To(HaveKeyWithValue("metallb.universe.tf/address-pool", "osp-internalapi"))
 			Expect(internal.Annotations).To(HaveKeyWithValue("metallb.universe.tf/allow-shared-ip", "osp-internalapi"))
 			Expect(internal.Annotations).To(HaveKeyWithValue("metallb.universe.tf/loadBalancerIPs", "internal-lb-ip-1,internal-lb-ip-2"))
+			Expect(internal.Labels["service"]).To(Equal("watcher-api"))
+			Expect(internal.Labels["internal"]).To(Equal("true"))
 			th.AssertRouteNotExists(watcherTest.WatcherInternalRouteName)
 
-			// simulate that the internal service got a LoadBalancerIP
-			// assigned
-			th.SimulateLoadBalancerServiceIP(watcherTest.WatcherInternalServiceName)
-
+			// simulate the keystone endpoint
+			keystone.SimulateKeystoneEndpointReady(watcherTest.WatcherKeystoneEndpointName)
 			th.ExpectCondition(
 				watcherTest.WatcherAPI,
 				ConditionGetterFunc(WatcherAPIConditionGetter),

tests/kuttl/test-suites/default/watcher-api-service-override/05-errors.yaml → tests/kuttl/test-suites/default/common/cleanup-errors.yaml

@@ -91,3 +91,8 @@ metadata:
     public: "true"
     service: watcher-api
   name: watcher-public
+---
+apiVersion: keystone.openstack.org/v1beta1
+kind: KeystoneEndpoint
+metadata:
+  name: watcher

tests/kuttl/test-suites/default/deps/infra.yaml

@@ -32,3 +32,8 @@ spec:
     enabled: false
   telemetry:
     enabled: false
+  tls:
+    ingress:
+      enabled: false
+    podLevel:
+      enabled: false

tests/kuttl/test-suites/default/watcher-api-service-override/01-assert.yaml

@@ -141,6 +141,7 @@ metadata:
   finalizers:
   - openstack.org/watcher
   - openstack.org/keystoneservice
+  - openstack.org/keystoneendpoint-watcher
 spec:
   enabled: true
   passwordSelector: WatcherPassword
@@ -216,6 +217,10 @@ status:
     reason: Ready
     status: "True"
     type: InputReady
+  - message: Setup complete
+    reason: Ready
+    status: "True"
+    type: KeystoneEndpointReady
   - message: " Memcached instance has been provisioned"
     reason: Ready
     status: "True"
@@ -307,6 +312,13 @@ spec:
     kind: Service
     name: watcher-public
 ---
+apiVersion: keystone.openstack.org/v1beta1
+kind: KeystoneEndpoint
+metadata:
+  name: watcher
+spec:
+  serviceName: watcher
+---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 namespaced: true

tests/kuttl/test-suites/default/watcher-api-service-override/02-assert.yaml

@@ -0,0 +1 @@
+../common/cleanup-assert.yaml

tests/kuttl/test-suites/default/watcher-api-service-override/02-errors.yaml

@@ -0,0 +1 @@
+../common/cleanup-errors.yaml

tests/kuttl/test-suites/default/watcher/01-assert.yaml

@@ -141,6 +141,7 @@ metadata:
   finalizers:
   - openstack.org/watcher
   - openstack.org/keystoneservice
+  - openstack.org/keystoneendpoint-watcher
 spec:
   enabled: true
   passwordSelector: WatcherPassword
@@ -216,6 +217,10 @@ status:
     reason: Ready
     status: "True"
     type: InputReady
+  - message: Setup complete
+    reason: Ready
+    status: "True"
+    type: KeystoneEndpointReady
   - message: " Memcached instance has been provisioned"
     reason: Ready
     status: "True"
@@ -302,6 +307,13 @@ spec:
     kind: Service
     name: watcher-public
 ---
+apiVersion: keystone.openstack.org/v1beta1
+kind: KeystoneEndpoint
+metadata:
+  name: watcher
+spec:
+  serviceName: watcher
+---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 namespaced: true

tests/kuttl/test-suites/default/watcher/04-assert.yaml

@@ -141,6 +141,7 @@ metadata:
   finalizers:
   - openstack.org/watcher
   - openstack.org/keystoneservice
+  - openstack.org/keystoneendpoint-watcher
 spec:
   enabled: true
   passwordSelector: WatcherPassword
@@ -197,6 +198,10 @@ status:
     reason: Ready
     status: "True"
     type: InputReady
+  - message: Setup complete
+    reason: Ready
+    status: "True"
+    type: KeystoneEndpointReady
   - message: " Memcached instance has been provisioned"
     reason: Ready
     status: "True"

tests/kuttl/test-suites/default/watcher/05-assert.yaml

@@ -0,0 +1 @@
+../common/cleanup-assert.yaml

tests/kuttl/test-suites/default/watcher/05-errors.yaml

@@ -0,0 +1 @@
+../common/cleanup-errors.yaml