@@ -759,13 +759,17 @@ var _ = Describe("Nova controller", func() {
759759
760760 DeferCleanup (infra .DeleteMemcached , infra .CreateMemcached (novaNames .NovaName .Namespace , MemcachedInstance , memcachedSpec ))
761761 infra .SimulateMemcachedReady (novaNames .MemcachedNamespace )
762- DeferCleanup (keystone .DeleteKeystoneAPI , keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace ))
762+
763+ // Create KeystoneAPI first to get correct name
764+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
765+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
763766
764767 spec := GetDefaultNovaSpec ()
765768 cell0template := GetDefaultNovaCellTemplate ()
766769 cell0template ["cellDatabaseInstance" ] = cell0 .MariaDBDatabaseName .Name
767770 spec ["cellTemplates" ] = map [string ]interface {}{"cell0" : cell0template }
768771 spec ["apiDatabaseInstance" ] = novaNames .APIMariaDBDatabaseName .Name
772+ spec ["keystoneInstance" ] = keystoneAPIName .Name
769773
770774 DeferCleanup (th .DeleteInstance , CreateNova (novaNames .NovaName , spec ))
771775 })
@@ -1100,7 +1104,9 @@ var _ = Describe("Nova controller", func() {
11001104 DeferCleanup (infra .DeleteMemcached , infra .CreateMemcached (novaNames .NovaName .Namespace , MemcachedInstance , memcachedSpec ))
11011105 infra .SimulateMemcachedReady (novaNames .MemcachedNamespace )
11021106
1103- DeferCleanup (keystone .DeleteKeystoneAPI , keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace ))
1107+ // Create KeystoneAPI first to get the correct name
1108+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1109+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
11041110
11051111 spec := GetDefaultNovaSpec ()
11061112 cell0template := GetDefaultNovaCellTemplate ()
@@ -1109,6 +1115,7 @@ var _ = Describe("Nova controller", func() {
11091115 spec ["apiDatabaseInstance" ] = novaNames .APIMariaDBDatabaseName .Name
11101116 spec ["apiDatabaseAccount" ] = novaNames .APIMariaDBDatabaseAccount .Name
11111117 spec ["topologyRef" ] = map [string ]interface {}{"name" : "foo" }
1118+ spec ["keystoneInstance" ] = keystoneAPIName .Name
11121119
11131120 DeferCleanup (th .DeleteInstance , CreateNova (novaNames .NovaName , spec ))
11141121
@@ -1176,14 +1183,17 @@ var _ = Describe("Nova controller", func() {
11761183 // Create a global Test Topology
11771184 _ , topologyRef = infra .CreateTopology (novaNames .NovaTopologies [0 ], topologySpec )
11781185
1179- DeferCleanup (keystone .DeleteKeystoneAPI , keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace ))
1186+ // Create keystoneAPI first to get correct name
1187+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1188+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
11801189
11811190 spec := GetDefaultNovaSpec ()
11821191 cell0template := GetDefaultNovaCellTemplate ()
11831192 cell0template ["cellDatabaseInstance" ] = cell0 .MariaDBDatabaseName .Name
11841193 spec ["cellTemplates" ] = map [string ]interface {}{"cell0" : cell0template }
11851194 spec ["apiDatabaseInstance" ] = novaNames .APIMariaDBDatabaseName .Name
11861195 spec ["apiDatabaseAccount" ] = novaNames .APIMariaDBDatabaseAccount .Name
1196+ spec ["keystoneInstance" ] = keystoneAPIName .Name
11871197
11881198 // We reference the global topology and is inherited by the sub components
11891199 spec ["topologyRef" ] = map [string ]interface {}{"name" : topologyRef .Name }
@@ -1284,6 +1294,9 @@ var _ = Describe("Nova controller", func() {
12841294 DeferCleanup (mariadb .DeleteDBService , mariadb .CreateDBService (novaNames .APIMariaDBDatabaseName .Namespace , novaNames .APIMariaDBDatabaseName .Name , serviceSpec ))
12851295 DeferCleanup (mariadb .DeleteDBService , mariadb .CreateDBService (cell0 .MariaDBDatabaseName .Namespace , cell0 .MariaDBDatabaseName .Name , serviceSpec ))
12861296 DeferCleanup (mariadb .DeleteDBService , mariadb .CreateDBService (cell1 .MariaDBDatabaseName .Namespace , cell1 .MariaDBDatabaseName .Name , serviceSpec ))
1297+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1298+ keystoneAPI := keystone .GetKeystoneAPI (keystoneAPIName )
1299+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
12871300 // cell0
12881301 spec := GetDefaultNovaSpec ()
12891302 cell0Template := GetDefaultNovaCellTemplate ()
@@ -1313,13 +1326,11 @@ var _ = Describe("Nova controller", func() {
13131326 // We reference the global topology and is inherited by the sub components
13141327 // except cell1 that has an override
13151328 spec ["topologyRef" ] = map [string ]interface {}{"name" : topologyRefTopLevel .Name }
1329+ spec ["keystoneInstance" ] = keystoneAPIName .Name
13161330 DeferCleanup (th .DeleteInstance , CreateNova (novaNames .NovaName , spec ))
13171331 memcachedSpec := infra .GetDefaultMemcachedSpec ()
13181332 DeferCleanup (infra .DeleteMemcached , infra .CreateMemcached (novaNames .NovaName .Namespace , MemcachedInstance , memcachedSpec ))
13191333 infra .SimulateMemcachedReady (novaNames .MemcachedNamespace )
1320- keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1321- DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
1322- keystoneAPI := keystone .GetKeystoneAPI (keystoneAPIName )
13231334 Eventually (func (g Gomega ) {
13241335 g .Expect (k8sClient .Status ().Update (ctx , keystoneAPI .DeepCopy ())).Should (Succeed ())
13251336 }, timeout , interval ).Should (Succeed ())
@@ -1449,11 +1460,16 @@ var _ = Describe("Nova controller", func() {
14491460 DeferCleanup (infra .DeleteMemcached , infra .CreateMemcached (novaNames .NovaName .Namespace , MemcachedInstance , memcachedSpec ))
14501461 infra .SimulateMemcachedReady (novaNames .MemcachedNamespace )
14511462
1463+ // Create keystoneAPI first to get the correct name
1464+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1465+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
1466+
14521467 DeferCleanup (keystone .DeleteKeystoneAPI , keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace ))
14531468
14541469 spec := GetDefaultNovaSpec ()
14551470 cell0 := GetDefaultNovaCellTemplate ()
14561471 spec ["cellTemplates" ] = map [string ]interface {}{"cell0" : cell0 }
1472+ spec ["keystoneInstance" ] = keystoneAPIName .Name
14571473 // This nova is created without any container image is specified in
14581474 // the request
14591475 DeferCleanup (th .DeleteInstance , CreateNova (novaNames .NovaName , spec ))
@@ -1533,14 +1549,17 @@ var _ = Describe("Nova controller", func() {
15331549 DeferCleanup (infra .DeleteMemcached , infra .CreateMemcached (novaNames .NovaName .Namespace , MemcachedInstance , memcachedSpec ))
15341550 infra .SimulateMemcachedReady (novaNames .MemcachedNamespace )
15351551
1536- DeferCleanup (keystone .DeleteKeystoneAPI , keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace ))
1552+ // Create keystoneAPI first to get the correct name
1553+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1554+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
15371555
15381556 spec := GetDefaultNovaSpec ()
15391557 cell0template := GetDefaultNovaCellTemplate ()
15401558 cell0template ["cellDatabaseInstance" ] = cell0 .MariaDBDatabaseName .Name
15411559 spec ["cellTemplates" ] = map [string ]interface {}{"cell0" : cell0template }
15421560 spec ["apiDatabaseInstance" ] = novaNames .APIMariaDBDatabaseName .Name
15431561 spec ["apiDatabaseAccount" ] = accountName .Name
1562+ spec ["keystoneInstance" ] = keystoneAPIName .Name
15441563
15451564 DeferCleanup (th .DeleteInstance , CreateNova (novaNames .NovaName , spec ))
15461565
@@ -1637,14 +1656,17 @@ var _ = Describe("Nova controller", func() {
16371656 DeferCleanup (infra .DeleteMemcached , infra .CreateMemcached (novaNames .NovaName .Namespace , MemcachedInstance , memcachedSpec ))
16381657 infra .SimulateMemcachedReady (novaNames .MemcachedNamespace )
16391658
1640- DeferCleanup (keystone .DeleteKeystoneAPI , keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace ))
1659+ // Create keystoneAPI first to get the correct name
1660+ keystoneAPIName := keystone .CreateKeystoneAPI (novaNames .NovaName .Namespace )
1661+ DeferCleanup (keystone .DeleteKeystoneAPI , keystoneAPIName )
16411662
16421663 spec := GetDefaultNovaSpec ()
16431664 cell0template := GetDefaultNovaCellTemplate ()
16441665 cell0template ["cellDatabaseInstance" ] = cell0 .MariaDBDatabaseName .Name
16451666 cell0template ["cellDatabaseAccount" ] = accountName .Name
16461667 spec ["cellTemplates" ] = map [string ]interface {}{"cell0" : cell0template }
16471668 spec ["apiDatabaseInstance" ] = novaNames .APIMariaDBDatabaseName .Name
1669+ spec ["keystoneInstance" ] = keystoneAPIName .Name
16481670
16491671 DeferCleanup (th .DeleteInstance , CreateNova (novaNames .NovaName , spec ))
16501672
0 commit comments