Skip to content

Commit 03938e4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1357 from shiftstack/remove-unnecessary-aliasing
🌱 Remove unnecessary mock import aliases
2 parents 02a3173 + 937b278 commit 03938e4

File tree

5 files changed

+75
-75
lines changed

5 files changed

+75
-75
lines changed

‎pkg/cloud/services/compute/instance_test.go

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545

4646
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6"
4747
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"
48-
mock_clients "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
48+
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
4949
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking"
5050
"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
5151
)
@@ -183,7 +183,7 @@ func TestService_getServerNetworks(t *testing.T) {
183183
name string
184184
networkParams []infrav1.NetworkParam
185185
want []infrav1.Network
186-
expect func(m *mock_clients.MockNetworkClientMockRecorder)
186+
expect func(m *mock.MockNetworkClientMockRecorder)
187187
wantErr bool
188188
}{
189189
{
@@ -194,7 +194,7 @@ func TestService_getServerNetworks(t *testing.T) {
194194
want: []infrav1.Network{
195195
{ID: networkAUUID, Subnet: &infrav1.Subnet{}},
196196
},
197-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
197+
expect: func(m *mock.MockNetworkClientMockRecorder) {
198198
},
199199
wantErr: false,
200200
},
@@ -207,7 +207,7 @@ func TestService_getServerNetworks(t *testing.T) {
207207
{ID: networkAUUID, Subnet: &infrav1.Subnet{}},
208208
{ID: networkBUUID, Subnet: &infrav1.Subnet{}},
209209
},
210-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
210+
expect: func(m *mock.MockNetworkClientMockRecorder) {
211211
// List tagged networks (A & B)
212212
m.ListNetwork(&testNetworkListOpts).
213213
Return([]networks.Network{testNetworkA, testNetworkB}, nil)
@@ -226,7 +226,7 @@ func TestService_getServerNetworks(t *testing.T) {
226226
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA2UUID}},
227227
{ID: networkBUUID, Subnet: &infrav1.Subnet{ID: subnetB1UUID}},
228228
},
229-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
229+
expect: func(m *mock.MockNetworkClientMockRecorder) {
230230
// List all tagged subnets in any network (A1, A2, and B1)
231231
m.ListSubnet(&testSubnetListOpts).
232232
Return([]subnets.Subnet{testSubnetA1, testSubnetA2, testSubnetB1}, nil)
@@ -247,7 +247,7 @@ func TestService_getServerNetworks(t *testing.T) {
247247
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA1UUID}},
248248
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA2UUID}},
249249
},
250-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
250+
expect: func(m *mock.MockNetworkClientMockRecorder) {
251251
// List tagged subnets in network A (A1 & A2)
252252
networkAFilter := testSubnetListOpts
253253
networkAFilter.NetworkID = networkAUUID
@@ -269,7 +269,7 @@ func TestService_getServerNetworks(t *testing.T) {
269269
want: []infrav1.Network{
270270
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA1UUID}},
271271
},
272-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
272+
expect: func(m *mock.MockNetworkClientMockRecorder) {
273273
},
274274
wantErr: false,
275275
},
@@ -289,7 +289,7 @@ func TestService_getServerNetworks(t *testing.T) {
289289
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA1UUID}},
290290
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA2UUID}},
291291
},
292-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
292+
expect: func(m *mock.MockNetworkClientMockRecorder) {
293293
// List tagged subnets in network A
294294
networkAFilter := testSubnetListOpts
295295
networkAFilter.NetworkID = networkAUUID
@@ -320,7 +320,7 @@ func TestService_getServerNetworks(t *testing.T) {
320320
{ID: networkAUUID, Subnet: &infrav1.Subnet{ID: subnetA2UUID}},
321321
{ID: networkBUUID, Subnet: &infrav1.Subnet{ID: subnetB1UUID}},
322322
},
323-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
323+
expect: func(m *mock.MockNetworkClientMockRecorder) {
324324
// List tagged networks (A & B)
325325
m.ListNetwork(&testNetworkListOpts).
326326
Return([]networks.Network{testNetworkA, testNetworkB}, nil)
@@ -346,7 +346,7 @@ func TestService_getServerNetworks(t *testing.T) {
346346
{Filter: testNetworkFilter},
347347
},
348348
want: nil,
349-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
349+
expect: func(m *mock.MockNetworkClientMockRecorder) {
350350
// List tagged networks (none for this test)
351351
m.ListNetwork(&testNetworkListOpts).Return([]networks.Network{}, nil)
352352
},
@@ -364,7 +364,7 @@ func TestService_getServerNetworks(t *testing.T) {
364364
},
365365
},
366366
want: nil,
367-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
367+
expect: func(m *mock.MockNetworkClientMockRecorder) {
368368
// List tagged subnets in network A
369369
networkAFilter := testSubnetListOpts
370370
networkAFilter.NetworkID = networkAUUID
@@ -380,7 +380,7 @@ func TestService_getServerNetworks(t *testing.T) {
380380
}},
381381
},
382382
want: nil,
383-
expect: func(m *mock_clients.MockNetworkClientMockRecorder) {
383+
expect: func(m *mock.MockNetworkClientMockRecorder) {
384384
},
385385
wantErr: true,
386386
},
@@ -389,7 +389,7 @@ func TestService_getServerNetworks(t *testing.T) {
389389
for _, tt := range tests {
390390
t.Run(tt.name, func(t *testing.T) {
391391
mockCtrl := gomock.NewController(t)
392-
mockNetworkClient := mock_clients.NewMockNetworkClient(mockCtrl)
392+
mockNetworkClient := mock.NewMockNetworkClient(mockCtrl)
393393
tt.expect(mockNetworkClient.EXPECT())
394394

395395
networkingService := networking.NewTestService(
@@ -420,31 +420,31 @@ func TestService_getImageID(t *testing.T) {
420420
testName string
421421
imageUUID string
422422
imageName string
423-
expect func(m *mock_clients.MockImageClientMockRecorder)
423+
expect func(m *mock.MockImageClientMockRecorder)
424424
want string
425425
wantErr bool
426426
}{
427427
{
428428
testName: "Return image uuid if uuid given",
429429
imageUUID: imageIDC,
430430
want: imageIDC,
431-
expect: func(m *mock_clients.MockImageClientMockRecorder) {
431+
expect: func(m *mock.MockImageClientMockRecorder) {
432432
},
433433
wantErr: false,
434434
},
435435
{
436436
testName: "Return through uuid if both uuid and name given",
437437
imageName: "dummy",
438438
imageUUID: imageIDC,
439-
expect: func(m *mock_clients.MockImageClientMockRecorder) {
439+
expect: func(m *mock.MockImageClientMockRecorder) {
440440
},
441441
want: imageIDC,
442442
wantErr: false,
443443
},
444444
{
445445
testName: "Return image ID",
446446
imageName: "test-image",
447-
expect: func(m *mock_clients.MockImageClientMockRecorder) {
447+
expect: func(m *mock.MockImageClientMockRecorder) {
448448
m.ListImages(images.ListOpts{Name: "test-image"}).Return(
449449
[]images.Image{{ID: imageIDA, Name: "test-image"}},
450450
nil)
@@ -455,7 +455,7 @@ func TestService_getImageID(t *testing.T) {
455455
{
456456
testName: "Return no results",
457457
imageName: "test-image",
458-
expect: func(m *mock_clients.MockImageClientMockRecorder) {
458+
expect: func(m *mock.MockImageClientMockRecorder) {
459459
m.ListImages(images.ListOpts{Name: "test-image"}).Return(
460460
[]images.Image{},
461461
nil)
@@ -466,7 +466,7 @@ func TestService_getImageID(t *testing.T) {
466466
{
467467
testName: "Return multiple results",
468468
imageName: "test-image",
469-
expect: func(m *mock_clients.MockImageClientMockRecorder) {
469+
expect: func(m *mock.MockImageClientMockRecorder) {
470470
m.ListImages(images.ListOpts{Name: "test-image"}).Return(
471471
[]images.Image{
472472
{ID: imageIDA, Name: "test-image"},
@@ -479,7 +479,7 @@ func TestService_getImageID(t *testing.T) {
479479
{
480480
testName: "OpenStack returns error",
481481
imageName: "test-image",
482-
expect: func(m *mock_clients.MockImageClientMockRecorder) {
482+
expect: func(m *mock.MockImageClientMockRecorder) {
483483
m.ListImages(images.ListOpts{Name: "test-image"}).Return(
484484
nil,
485485
fmt.Errorf("test error"))
@@ -491,7 +491,7 @@ func TestService_getImageID(t *testing.T) {
491491
for _, tt := range tests {
492492
t.Run(tt.testName, func(t *testing.T) {
493493
mockCtrl := gomock.NewController(t)
494-
mockImageClient := mock_clients.NewMockImageClient(mockCtrl)
494+
mockImageClient := mock.NewMockImageClient(mockCtrl)
495495
tt.expect(mockImageClient.EXPECT())
496496

497497
s := Service{
@@ -613,7 +613,7 @@ func TestService_ReconcileInstance(t *testing.T) {
613613
}
614614

615615
// Expected calls to create a server with a single default port
616-
expectUseExistingDefaultPort := func(networkRecorder *mock_clients.MockNetworkClientMockRecorder) {
616+
expectUseExistingDefaultPort := func(networkRecorder *mock.MockNetworkClientMockRecorder) {
617617
// Returning a pre-existing port requires fewer mocks
618618
networkRecorder.ListPort(ports.ListOpts{
619619
Name: portName,
@@ -626,7 +626,7 @@ func TestService_ReconcileInstance(t *testing.T) {
626626
}, nil)
627627
}
628628

629-
expectCreatePort := func(networkRecorder *mock_clients.MockNetworkClientMockRecorder, name string, networkID string) {
629+
expectCreatePort := func(networkRecorder *mock.MockNetworkClientMockRecorder, name string, networkID string) {
630630
networkRecorder.ListPort(ports.ListOpts{
631631
Name: name,
632632
NetworkID: networkID,
@@ -655,19 +655,19 @@ func TestService_ReconcileInstance(t *testing.T) {
655655
}
656656

657657
// Expected calls if we delete the network port
658-
expectCleanupDefaultPort := func(networkRecorder *mock_clients.MockNetworkClientMockRecorder) {
658+
expectCleanupDefaultPort := func(networkRecorder *mock.MockNetworkClientMockRecorder) {
659659
networkRecorder.ListExtensions()
660660
networkRecorder.DeletePort(portUUID).Return(nil)
661661
}
662662

663663
// Expected calls when using default image and flavor
664-
expectDefaultImageAndFlavor := func(computeRecorder *mock_clients.MockComputeClientMockRecorder, imageRecorder *mock_clients.MockImageClientMockRecorder) {
664+
expectDefaultImageAndFlavor := func(computeRecorder *mock.MockComputeClientMockRecorder, imageRecorder *mock.MockImageClientMockRecorder) {
665665
imageRecorder.ListImages(images.ListOpts{Name: imageName}).Return([]images.Image{{ID: imageUUID}}, nil)
666666
computeRecorder.GetFlavorIDFromName(flavorName).Return(flavorUUID, nil)
667667
}
668668

669669
// Expected calls and custom match function for creating a server
670-
expectCreateServer := func(computeRecorder *mock_clients.MockComputeClientMockRecorder, expectedCreateOpts map[string]interface{}, wantError bool) {
670+
expectCreateServer := func(computeRecorder *mock.MockComputeClientMockRecorder, expectedCreateOpts map[string]interface{}, wantError bool) {
671671
// This nonsense is because ConfigDrive is a bool pointer, so we
672672
// can't assert its exact contents with gomock.
673673
// Instead we call ToServerCreateMap() on it to obtain a
@@ -688,13 +688,13 @@ func TestService_ReconcileInstance(t *testing.T) {
688688
}
689689

690690
// Expected calls when polling for server creation
691-
expectServerPoll := func(computeRecorder *mock_clients.MockComputeClientMockRecorder, states []string) {
691+
expectServerPoll := func(computeRecorder *mock.MockComputeClientMockRecorder, states []string) {
692692
for _, state := range states {
693693
computeRecorder.GetServer(instanceUUID).Return(returnedServer(state), nil)
694694
}
695695
}
696696

697-
expectServerPollSuccess := func(computeRecorder *mock_clients.MockComputeClientMockRecorder) {
697+
expectServerPollSuccess := func(computeRecorder *mock.MockComputeClientMockRecorder) {
698698
expectServerPoll(computeRecorder, []string{"ACTIVE"})
699699
}
700700

@@ -706,13 +706,13 @@ func TestService_ReconcileInstance(t *testing.T) {
706706
}
707707

708708
// Expected calls when polling for server creation
709-
expectVolumePoll := func(volumeRecorder *mock_clients.MockVolumeClientMockRecorder, states []string) {
709+
expectVolumePoll := func(volumeRecorder *mock.MockVolumeClientMockRecorder, states []string) {
710710
for _, state := range states {
711711
volumeRecorder.GetVolume(volumeUUID).Return(returnedVolume(state), nil)
712712
}
713713
}
714714

715-
expectVolumePollSuccess := func(volumeRecorder *mock_clients.MockVolumeClientMockRecorder) {
715+
expectVolumePollSuccess := func(volumeRecorder *mock.MockVolumeClientMockRecorder) {
716716
expectVolumePoll(volumeRecorder, []string{"available"})
717717
}
718718

@@ -721,10 +721,10 @@ func TestService_ReconcileInstance(t *testing.T) {
721721
// *******************
722722

723723
type recorders struct {
724-
compute *mock_clients.MockComputeClientMockRecorder
725-
image *mock_clients.MockImageClientMockRecorder
726-
network *mock_clients.MockNetworkClientMockRecorder
727-
volume *mock_clients.MockVolumeClientMockRecorder
724+
compute *mock.MockComputeClientMockRecorder
725+
image *mock.MockImageClientMockRecorder
726+
network *mock.MockNetworkClientMockRecorder
727+
volume *mock.MockVolumeClientMockRecorder
728728
}
729729

730730
tests := []struct {
@@ -991,10 +991,10 @@ func TestService_ReconcileInstance(t *testing.T) {
991991
for _, tt := range tests {
992992
t.Run(tt.name, func(t *testing.T) {
993993
mockCtrl := gomock.NewController(t)
994-
mockComputeClient := mock_clients.NewMockComputeClient(mockCtrl)
995-
mockImageClient := mock_clients.NewMockImageClient(mockCtrl)
996-
mockNetworkClient := mock_clients.NewMockNetworkClient(mockCtrl)
997-
mockVolumeClient := mock_clients.NewMockVolumeClient(mockCtrl)
994+
mockComputeClient := mock.NewMockComputeClient(mockCtrl)
995+
mockImageClient := mock.NewMockImageClient(mockCtrl)
996+
mockNetworkClient := mock.NewMockNetworkClient(mockCtrl)
997+
mockVolumeClient := mock.NewMockVolumeClient(mockCtrl)
998998

999999
computeRecorder := mockComputeClient.EXPECT()
10001000
imageRecorder := mockImageClient.EXPECT()
@@ -1043,9 +1043,9 @@ func TestService_DeleteInstance(t *testing.T) {
10431043
// *******************
10441044

10451045
type recorders struct {
1046-
compute *mock_clients.MockComputeClientMockRecorder
1047-
network *mock_clients.MockNetworkClientMockRecorder
1048-
volume *mock_clients.MockVolumeClientMockRecorder
1046+
compute *mock.MockComputeClientMockRecorder
1047+
network *mock.MockNetworkClientMockRecorder
1048+
volume *mock.MockVolumeClientMockRecorder
10491049
}
10501050

10511051
tests := []struct {
@@ -1109,9 +1109,9 @@ func TestService_DeleteInstance(t *testing.T) {
11091109
for _, tt := range tests {
11101110
t.Run(tt.name, func(t *testing.T) {
11111111
mockCtrl := gomock.NewController(t)
1112-
mockComputeClient := mock_clients.NewMockComputeClient(mockCtrl)
1113-
mockNetworkClient := mock_clients.NewMockNetworkClient(mockCtrl)
1114-
mockVolumeClient := mock_clients.NewMockVolumeClient(mockCtrl)
1112+
mockComputeClient := mock.NewMockComputeClient(mockCtrl)
1113+
mockNetworkClient := mock.NewMockNetworkClient(mockCtrl)
1114+
mockVolumeClient := mock.NewMockVolumeClient(mockCtrl)
11151115

11161116
computeRecorder := mockComputeClient.EXPECT()
11171117
networkRecorder := mockNetworkClient.EXPECT()

‎pkg/cloud/services/loadbalancer/loadbalancer_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
. "github.com/onsi/gomega"
3131

3232
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6"
33-
mock_clients "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
33+
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
3434
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking"
3535
)
3636

@@ -55,27 +55,27 @@ func Test_ReconcileLoadBalancer(t *testing.T) {
5555
}
5656
type serviceFields struct {
5757
projectID string
58-
networkingClient *mock_clients.MockNetworkClient
59-
loadbalancerClient *mock_clients.MockLbClient
58+
networkingClient *mock.MockNetworkClient
59+
loadbalancerClient *mock.MockLbClient
6060
}
6161
lbtests := []struct {
6262
name string
6363
fields serviceFields
6464
prepareServiceMock func(sf *serviceFields)
65-
expectNetwork func(m *mock_clients.MockNetworkClientMockRecorder)
66-
expectLoadBalancer func(m *mock_clients.MockLbClientMockRecorder)
65+
expectNetwork func(m *mock.MockNetworkClientMockRecorder)
66+
expectLoadBalancer func(m *mock.MockLbClientMockRecorder)
6767
wantError error
6868
}{
6969
{
7070
name: "reconcile loadbalancer in non active state should wait for active state",
7171
prepareServiceMock: func(sf *serviceFields) {
72-
sf.networkingClient = mock_clients.NewMockNetworkClient(mockCtrl)
73-
sf.loadbalancerClient = mock_clients.NewMockLbClient(mockCtrl)
72+
sf.networkingClient = mock.NewMockNetworkClient(mockCtrl)
73+
sf.loadbalancerClient = mock.NewMockLbClient(mockCtrl)
7474
},
75-
expectNetwork: func(m *mock_clients.MockNetworkClientMockRecorder) {
75+
expectNetwork: func(m *mock.MockNetworkClientMockRecorder) {
7676
// add network api call results here
7777
},
78-
expectLoadBalancer: func(m *mock_clients.MockLbClientMockRecorder) {
78+
expectLoadBalancer: func(m *mock.MockLbClientMockRecorder) {
7979
// return loadbalancer providers
8080
providers := []providers.Provider{
8181
{Name: "amphora", Description: "The Octavia Amphora driver."},

0 commit comments

Comments
 (0)