kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make setupmockopenstack standalone

This commit is contained in:
Ole Markus With 2020-09-20 07:47:19 +02:00
parent 53d7ce58d1
commit 7c8ff94631
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/lifecycle_integration_test.go
View File

@ -336,7 +336,7 @@ func runLifecycleTestOpenstack(o *LifecycleTestOptions) {
}() }()
h.MockKopsVersion("1.19.0-alpha.3") h.MockKopsVersion("1.19.0-alpha.3")
cloud := h.SetupMockOpenstack() cloud := testutils.SetupMockOpenstack()
var beforeIds []string var beforeIds []string
for id := range AllOpenstackResources(cloud) { for id := range AllOpenstackResources(cloud) {

2
pkg/model/openstackmodel/servergroup_test.go
View File

@ -986,7 +986,7 @@ func RunGoldenTest(t *testing.T, basedir string, testCase serverGroupModelBuilde
defer h.Close() defer h.Close()
h.MockKopsVersion("1.18.0") h.MockKopsVersion("1.18.0")
h.SetupMockOpenstack() testutils.SetupMockOpenstack()
clusterLifecycle := fi.LifecycleSync clusterLifecycle := fi.LifecycleSync
bootstrapScriptBuilder := &model.BootstrapScriptBuilder{ bootstrapScriptBuilder := &model.BootstrapScriptBuilder{

2
pkg/testutils/integrationtestharness.go
View File

@ -253,7 +253,7 @@ func (h *IntegrationTestHarness) SetupMockGCE() {
gce.InstallMockGCECloud("us-test1", "testproject") gce.InstallMockGCECloud("us-test1", "testproject")
} }
func (h *IntegrationTestHarness) SetupMockOpenstack() *openstack.MockCloud { func SetupMockOpenstack() *openstack.MockCloud {
c := openstack.InstallMockOpenstackCloud("us-test1") c := openstack.InstallMockOpenstackCloud("us-test1")
c.MockCinderClient = mockblockstorage.CreateClient() c.MockCinderClient = mockblockstorage.CreateClient()