Skip to content

Commit

Permalink
Merge pull request openstack-k8s-operators#283 from gibizer/bump-lib-…
Browse files Browse the repository at this point in the history 
…common-mirror-fix

Adapt to Conditions.Mirror() change
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Mar 8, 2023
2 parents 452df11 + 6d2fe55 commit c235f47
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 13 deletions.
2 changes: 1 addition & 1 deletion api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/openstack-k8s-operators/nova-operator/api
go 1.19

require (
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230227110324-8f0c518c552b
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230307144813-39ed0da90b23
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
sigs.k8s.io/controller-runtime v0.14.4
Expand Down
13 changes: 11 additions & 2 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand Down Expand Up @@ -206,6 +207,7 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand All @@ -218,11 +220,13 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/onsi/ginkgo/v2 v2.8.4 h1:gf5mIQ8cLFieruNLAdgijHF1PYfLphKm2dxxcUtcqK0=
github.com/onsi/ginkgo/v2 v2.8.4/go.mod h1:427dEDQZkDKsBvCjc2A/ZPefhKxsTTrsQegMlayL730=
github.com/onsi/gomega v1.27.2 h1:SKU0CXeKE/WVgIV1T61kSa3+IRE8Ekrv9rdXDwwTqnY=
github.com/onsi/gomega v1.27.2/go.mod h1:5mR3phAHpkAVIDkHEUBY6HGVsU+cpcEscrGPB4oPlZI=
github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs=
github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230227110324-8f0c518c552b h1:prmJpppPg6kONSONIYxpVPKiOunjjfMIjUCiPSa9aag=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230227110324-8f0c518c552b/go.mod h1:wDUzrnAhtC0O99PYR8qQWQoGJzVQwGnfGepKzExCVk8=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230307144813-39ed0da90b23 h1:XPgJD+Z6iXzb4EmM/k3GtHBlCLEFM/ci8pGDyyZePRM=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230307144813-39ed0da90b23/go.mod h1:wDUzrnAhtC0O99PYR8qQWQoGJzVQwGnfGepKzExCVk8=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down Expand Up @@ -272,6 +276,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
Expand All @@ -289,9 +294,12 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Expand Down Expand Up @@ -601,6 +609,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ require (
github.com/openshift/api v3.9.0+incompatible
github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230221114633-d3cedda6974d
github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230228092947-37346b60ff49
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230227110324-8f0c518c552b
github.com/openstack-k8s-operators/lib-common/modules/database v0.0.0-20230227110324-8f0c518c552b
github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230227110324-8f0c518c552b
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230307144813-39ed0da90b23
github.com/openstack-k8s-operators/lib-common/modules/database v0.0.0-20230307144813-39ed0da90b23
github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230307144813-39ed0da90b23
github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230227100533-e49b65b3e3df
github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20221209164002-f9e6b9363961
go.uber.org/zap v1.24.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,14 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230221114633-d3c
github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230221114633-d3cedda6974d/go.mod h1:5kG0Ct412tO3fNkZ5b3/BwwSsV7LkSNfOB/apUlbMJI=
github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230228092947-37346b60ff49 h1:H6PZmooeNMULdMl7lBQyRlth+RwSpw0v4XjBrsWVtMQ=
github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230228092947-37346b60ff49/go.mod h1:/0wxx2Q+nlu3hgPMXZRfHwR/rxXaHFJumzhFn26VvJM=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230227110324-8f0c518c552b h1:prmJpppPg6kONSONIYxpVPKiOunjjfMIjUCiPSa9aag=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230227110324-8f0c518c552b/go.mod h1:wDUzrnAhtC0O99PYR8qQWQoGJzVQwGnfGepKzExCVk8=
github.com/openstack-k8s-operators/lib-common/modules/database v0.0.0-20230227110324-8f0c518c552b h1:Rnb60/rN5Gg7EObGe3MsbvjBA8lQ5KjbzUfCANOB0Cc=
github.com/openstack-k8s-operators/lib-common/modules/database v0.0.0-20230227110324-8f0c518c552b/go.mod h1:vqeexlJ8MOtp4N72V9I4Zdz02l/g9jO+wehVJDMoOOY=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230307144813-39ed0da90b23 h1:XPgJD+Z6iXzb4EmM/k3GtHBlCLEFM/ci8pGDyyZePRM=
github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230307144813-39ed0da90b23/go.mod h1:wDUzrnAhtC0O99PYR8qQWQoGJzVQwGnfGepKzExCVk8=
github.com/openstack-k8s-operators/lib-common/modules/database v0.0.0-20230307144813-39ed0da90b23 h1:owML9ABtWPMcVMsaEcKpW12qrCXL6yjO+rtm7Yc2DvQ=
github.com/openstack-k8s-operators/lib-common/modules/database v0.0.0-20230307144813-39ed0da90b23/go.mod h1:vqeexlJ8MOtp4N72V9I4Zdz02l/g9jO+wehVJDMoOOY=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230215134634-d31141e5bbba h1:gwYazA5cJmHle3bXkpxz/iZcx6IZW5HmKaKQVgZPHxQ=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230215134634-d31141e5bbba/go.mod h1:9tj29SmyP9izLIEKj5E44F7M7a82UwcPdIufc3MQpcY=
github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230227110324-8f0c518c552b h1:8J2UqGpfB2RKFttUIGI2PiS7ZYYHdDH1Xd+kRBDQKWk=
github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230227110324-8f0c518c552b/go.mod h1:tyzJ76+tCchxmRqQxD4SIzN3wxKwSWnc/XmVC0bz3KE=
github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230307144813-39ed0da90b23 h1:Gfes1OAFn5NLu94xX5I2uhdmxZyLV6YdGybGuSxBCxQ=
github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230307144813-39ed0da90b23/go.mod h1:tyzJ76+tCchxmRqQxD4SIzN3wxKwSWnc/XmVC0bz3KE=
github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230227100533-e49b65b3e3df h1:Ec7t8MVfLxZPcvWROqr1K7O0V1GAae995xlwojU1flY=
github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230227100533-e49b65b3e3df/go.mod h1:PM7XY+2Uq+rVQ53I/+IbLFUH22b67xMgnBsKJhQmBcA=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
10 changes: 9 additions & 1 deletion test/functional/nova_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var _ = Describe("Nova controller", func() {
var cell0DBSyncJobName types.NamespacedName
var novaAPIName types.NamespacedName
var novaAPIdeploymentName types.NamespacedName
var novaAPIKeystoneEndpointName types.NamespacedName
var novaKeystoneServiceName types.NamespacedName
var novaCell0ConductorStatefulSetName types.NamespacedName
var apiTransportURLName types.NamespacedName
Expand Down Expand Up @@ -96,6 +97,10 @@ var _ = Describe("Nova controller", func() {
Namespace: namespace,
Name: novaAPIName.Name,
}
novaAPIKeystoneEndpointName = types.NamespacedName{
Namespace: namespace,
Name: "nova",
}
novaKeystoneServiceName = types.NamespacedName{
Namespace: namespace,
Name: "nova",
Expand Down Expand Up @@ -307,7 +312,7 @@ var _ = Describe("Nova controller", func() {
Expect(api.Spec.ServiceUser).To(Equal("nova"))

th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)

th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)
th.ExpectCondition(
novaAPIName,
ConditionGetterFunc(NovaAPIConditionGetter),
Expand Down Expand Up @@ -336,6 +341,7 @@ var _ = Describe("Nova controller", func() {
th.SimulateJobSuccess(cell0DBSyncJobName)
th.SimulateStatefulSetReplicaReady(novaCell0ConductorStatefulSetName)
th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)

scheduler := GetNovaScheduler(novaSchedulerName)
Expect(scheduler.Spec.APIMessageBusSecretName).To(Equal("rabbitmq-secret"))
Expand Down Expand Up @@ -524,6 +530,7 @@ var _ = Describe("Nova controller", func() {
)

th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)

th.ExpectCondition(
cell0ConductorName,
Expand Down Expand Up @@ -697,6 +704,7 @@ var _ = Describe("Nova controller", func() {
novaAPIdeploymentName,
map[string][]string{namespace + "/internalapi": {"10.0.0.1"}},
)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)

th.ExpectCondition(
novaName,
Expand Down
12 changes: 12 additions & 0 deletions test/functional/nova_multicell_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ var _ = Describe("Nova controller", func() {
var cell2 Cell
var novaAPIName types.NamespacedName
var novaAPIdeploymentName types.NamespacedName
var novaAPIKeystoneEndpointName types.NamespacedName
var novaKeystoneServiceName types.NamespacedName
var novaSchedulerName types.NamespacedName
var novaSchedulerStatefulSetName types.NamespacedName
Expand Down Expand Up @@ -129,6 +130,10 @@ var _ = Describe("Nova controller", func() {
Namespace: namespace,
Name: "nova",
}
novaAPIKeystoneEndpointName = types.NamespacedName{
Namespace: namespace,
Name: "nova",
}
novaSchedulerName = types.NamespacedName{
Namespace: namespace,
Name: novaName.Name + "-scheduler",
Expand Down Expand Up @@ -285,6 +290,8 @@ var _ = Describe("Nova controller", func() {
condition.DeploymentReadyCondition,
corev1.ConditionTrue,
)

th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)
th.ExpectCondition(
novaName,
ConditionGetterFunc(NovaConditionGetter),
Expand All @@ -300,6 +307,7 @@ var _ = Describe("Nova controller", func() {
th.SimulateJobSuccess(cell0.CellDBSyncJobName)
th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)

th.SimulateMariaDBDatabaseCompleted(cell1.MariaDBDatabaseName)
th.ExpectCondition(
Expand Down Expand Up @@ -344,6 +352,7 @@ var _ = Describe("Nova controller", func() {
th.SimulateJobSuccess(cell0.CellDBSyncJobName)
th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)
th.SimulateMariaDBDatabaseCompleted(cell1.MariaDBDatabaseName)
th.SimulateTransportURLReady(cell1.TransportURLName)

Expand Down Expand Up @@ -398,6 +407,7 @@ var _ = Describe("Nova controller", func() {
th.SimulateJobSuccess(cell0.CellDBSyncJobName)
th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)
th.SimulateStatefulSetReplicaReady(novaSchedulerStatefulSetName)
th.SimulateMariaDBDatabaseCompleted(cell1.MariaDBDatabaseName)
th.SimulateTransportURLReady(cell1.TransportURLName)
Expand Down Expand Up @@ -518,6 +528,7 @@ var _ = Describe("Nova controller", func() {
// NovaAPI is still created
GetNovaAPI(novaAPIName)
th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)
th.ExpectCondition(
novaName,
ConditionGetterFunc(NovaConditionGetter),
Expand Down Expand Up @@ -630,6 +641,7 @@ var _ = Describe("Nova controller", func() {

// As cell0 is ready API is deployed
th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)
th.ExpectCondition(
novaName,
ConditionGetterFunc(NovaConditionGetter),
Expand Down
6 changes: 6 additions & 0 deletions test/functional/nova_reconfiguration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func CreateNovaWith3CellsAndEnsureReady(namespace string) types.NamespacedName {
var cell2 Cell
var novaAPIName types.NamespacedName
var novaAPIdeploymentName types.NamespacedName
var novaAPIKeystoneEndpointName types.NamespacedName
var novaKeystoneServiceName types.NamespacedName
var novaSchedulerName types.NamespacedName
var novaSchedulerStatefulSetName types.NamespacedName
Expand All @@ -59,6 +60,10 @@ func CreateNovaWith3CellsAndEnsureReady(namespace string) types.NamespacedName {
Namespace: namespace,
Name: novaAPIName.Name,
}
novaAPIKeystoneEndpointName = types.NamespacedName{
Namespace: namespace,
Name: "nova",
}
novaKeystoneServiceName = types.NamespacedName{
Namespace: namespace,
Name: "nova",
Expand Down Expand Up @@ -143,6 +148,7 @@ func CreateNovaWith3CellsAndEnsureReady(namespace string) types.NamespacedName {
th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)

th.SimulateStatefulSetReplicaReady(novaAPIdeploymentName)
th.SimulateKeystoneEndpointReady(novaAPIKeystoneEndpointName)

th.SimulateJobSuccess(cell1.CellDBSyncJobName)
th.SimulateStatefulSetReplicaReady(cell1.ConductorStatefulSetName)
Expand Down

0 comments on commit c235f47

Please sign in to comment.