diff --git a/cmd/kops/lifecycle_integration_test.go b/cmd/kops/lifecycle_integration_test.go index 8491022048..e82aeb755c 100644 --- a/cmd/kops/lifecycle_integration_test.go +++ b/cmd/kops/lifecycle_integration_test.go @@ -336,7 +336,7 @@ func runLifecycleTestOpenstack(o *LifecycleTestOptions) { }() h.MockKopsVersion("1.19.0-alpha.3") - cloud := h.SetupMockOpenstack() + cloud := testutils.SetupMockOpenstack() var beforeIds []string for id := range AllOpenstackResources(cloud) { diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go index 7c1f7ed77f..072378eb88 100644 --- a/pkg/model/openstackmodel/servergroup_test.go +++ b/pkg/model/openstackmodel/servergroup_test.go @@ -986,7 +986,7 @@ func RunGoldenTest(t *testing.T, basedir string, testCase serverGroupModelBuilde defer h.Close() h.MockKopsVersion("1.18.0") - h.SetupMockOpenstack() + testutils.SetupMockOpenstack() clusterLifecycle := fi.LifecycleSync bootstrapScriptBuilder := &model.BootstrapScriptBuilder{ diff --git a/pkg/testutils/integrationtestharness.go b/pkg/testutils/integrationtestharness.go index f71515c06f..312aa13087 100644 --- a/pkg/testutils/integrationtestharness.go +++ b/pkg/testutils/integrationtestharness.go @@ -253,7 +253,7 @@ func (h *IntegrationTestHarness) SetupMockGCE() { gce.InstallMockGCECloud("us-test1", "testproject") } -func (h *IntegrationTestHarness) SetupMockOpenstack() *openstack.MockCloud { +func SetupMockOpenstack() *openstack.MockCloud { c := openstack.InstallMockOpenstackCloud("us-test1") c.MockCinderClient = mockblockstorage.CreateClient()