Skip to content

Commit 345aecf

Browse files
committed
WIP tests based on cells deletion pr
Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
1 parent 2cd77aa commit 345aecf

1 file changed

Lines changed: 36 additions & 8 deletions

File tree

tests/functional/ctlplane/openstackoperator_controller_test.go

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import (
5353
clientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1"
5454
corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"
5555
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
56+
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
5657
)
5758

5859
var _ = Describe("OpenStackOperator controller", func() {
@@ -1836,12 +1837,12 @@ var _ = Describe("OpenStackOperator controller", func() {
18361837
// gomega.Expect(th.K8sClient.Create(th.Ctx, keystoneAPI.DeepCopy())).Should(gomega.Succeed())
18371838
// DeferCleanup(k8sClient.Delete, ctx, keystoneAPI)
18381839

1839-
Eventually(func(g Gomega) {
1840-
keystoneAPI := keystone.GetKeystoneAPI(names.KeystoneAPIName)
1841-
g.Expect(keystoneAPI).Should(Not(BeNil()))
1842-
}, timeout, interval).Should(Succeed())
1843-
// make keystoneAPI ready and create secrets usually created by keystone-controller
1844-
keystone.SimulateKeystoneAPIReady(names.KeystoneAPIName)
1840+
// Eventually(func(g Gomega) {
1841+
// keystoneAPI := keystone.GetKeystoneAPI(names.KeystoneAPIName)
1842+
// g.Expect(keystoneAPI).Should(Not(BeNil()))
1843+
// }, timeout, interval).Should(Succeed())
1844+
// // make keystoneAPI ready and create secrets usually created by keystone-controller
1845+
// keystone.SimulateKeystoneAPIReady(names.KeystoneAPIName)
18451846

18461847
// openstackversion exists
18471848
// Eventually(func(g Gomega) {
@@ -1856,8 +1857,35 @@ var _ = Describe("OpenStackOperator controller", func() {
18561857
// )
18571858
// }, timeout, interval).Should(Succeed())
18581859

1859-
th.CreateSecret(types.NamespacedName{Name: "openstack-config-secret", Namespace: namespace}, map[string][]byte{"secure.yaml": []byte("foo")})
1860-
th.CreateConfigMap(types.NamespacedName{Name: "openstack-config", Namespace: namespace}, map[string]interface{}{"clouds.yaml": string("foo"), "OS_CLOUD": "default"})
1860+
// th.CreateSecret(types.NamespacedName{Name: "openstack-config-secret", Namespace: namespace}, map[string][]byte{"secure.yaml": []byte("foo")})
1861+
// th.CreateConfigMap(types.NamespacedName{Name: "openstack-config", Namespace: namespace}, map[string]interface{}{"clouds.yaml": string("foo"), "OS_CLOUD": "default"})
1862+
1863+
// create cert secrets for ovn instance
1864+
DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.OVNNorthdCertName))
1865+
DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.OVNControllerCertName))
1866+
DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.NeutronOVNCertName))
1867+
1868+
// create cert secrets for memcached instance
1869+
DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.MemcachedCertName))
1870+
1871+
// enable Nova and dependencies
1872+
Eventually(func(g Gomega) {
1873+
OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
1874+
OSCtlplane.Spec.Nova.Enabled = true
1875+
OSCtlplane.Spec.Nova.Template = &novav1.NovaSpecCore{}
1876+
// enable "Galera, Memcached, RabbitMQ, Keystone, Glance, Neutron, Placement" too
1877+
1878+
OSCtlplane.Spec.Keystone.Enabled = true
1879+
OSCtlplane.Spec.Glance.Enabled = true
1880+
OSCtlplane.Spec.Neutron.Enabled = true
1881+
OSCtlplane.Spec.Placement.Enabled = true
1882+
1883+
if OSCtlplane.Spec.Placement.Template == nil {
1884+
OSCtlplane.Spec.Placement.Template = &placementv1.PlacementAPISpecCore{}
1885+
OSCtlplane.Spec.Placement.Template.APITimeout = 10
1886+
}
1887+
g.Expect(k8sClient.Update(ctx, OSCtlplane)).Should(Succeed())
1888+
}, timeout, interval).Should(Succeed())
18611889

18621890
spec := GetDefaultOpenStackControlPlaneSpec()
18631891
spec["placement"] = map[string]interface{}{

0 commit comments

Comments
 (0)