Skip to content

Commit 78b18ed

Browse files
feiskyerfeiskyer
committed
Swith to mock clients for route/routetable/networkinterface tests
1 parent fc573f9 commit 78b18ed

17 files changed

+769
-445
lines changed

‎staging/src/k8s.io/legacy-cloud-providers/azure/BUILD‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,14 @@ go_library(
6868
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/loadbalancerclient:go_default_library",
6969
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/publicipclient:go_default_library",
7070
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routeclient:go_default_library",
71+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routeclient/mockrouteclient:go_default_library",
7172
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routetableclient:go_default_library",
73+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routetableclient/mockroutetableclient:go_default_library",
7274
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/securitygroupclient:go_default_library",
7375
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/snapshotclient:go_default_library",
7476
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/storageaccountclient:go_default_library",
7577
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/subnetclient:go_default_library",
78+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/subnetclient/mocksubnetclient:go_default_library",
7679
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmclient:go_default_library",
7780
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmsizeclient:go_default_library",
7881
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmssclient:go_default_library",
@@ -85,6 +88,7 @@ go_library(
8588
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
8689
"//vendor/github.com/Azure/go-autorest/autorest/azure:go_default_library",
8790
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
91+
"//vendor/github.com/golang/mock/gomock:go_default_library",
8892
"//vendor/github.com/rubiojr/go-vhd/vhd:go_default_library",
8993
"//vendor/k8s.io/klog:go_default_library",
9094
"//vendor/k8s.io/utils/net:go_default_library",
@@ -125,11 +129,15 @@ go_test(
125129
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library",
126130
"//staging/src/k8s.io/legacy-cloud-providers/azure/cache:go_default_library",
127131
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients:go_default_library",
132+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routetableclient/mockroutetableclient:go_default_library",
133+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/subnetclient/mocksubnetclient:go_default_library",
134+
"//staging/src/k8s.io/legacy-cloud-providers/azure/mockvmsets:go_default_library",
128135
"//staging/src/k8s.io/legacy-cloud-providers/azure/retry:go_default_library",
129136
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute:go_default_library",
130137
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network:go_default_library",
131138
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage:go_default_library",
132139
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
140+
"//vendor/github.com/golang/mock/gomock:go_default_library",
133141
"//vendor/github.com/stretchr/testify/assert:go_default_library",
134142
"//vendor/k8s.io/utils/pointer:go_default_library",
135143
"//vendor/sigs.k8s.io/yaml:go_default_library",
@@ -151,6 +159,7 @@ filegroup(
151159
"//staging/src/k8s.io/legacy-cloud-providers/azure/cache:all-srcs",
152160
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients:all-srcs",
153161
"//staging/src/k8s.io/legacy-cloud-providers/azure/metrics:all-srcs",
162+
"//staging/src/k8s.io/legacy-cloud-providers/azure/mockvmsets:all-srcs",
154163
"//staging/src/k8s.io/legacy-cloud-providers/azure/retry:all-srcs",
155164
],
156165
tags = ["automanaged"],

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@ import (
2424
"testing"
2525

2626
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
27+
"github.com/golang/mock/gomock"
2728
"github.com/stretchr/testify/assert"
2829

2930
"k8s.io/apimachinery/pkg/types"
3031
"k8s.io/utils/pointer"
3132
)
3233

3334
func TestCommonAttachDisk(t *testing.T) {
35+
ctrl := gomock.NewController(t)
36+
defer ctrl.Finish()
37+
3438
testCases := []struct {
3539
desc string
3640
vmList map[string]string
@@ -63,7 +67,7 @@ func TestCommonAttachDisk(t *testing.T) {
6367
}
6468

6569
for i, test := range testCases {
66-
testCloud := GetTestCloud()
70+
testCloud := GetTestCloud(ctrl)
6771
common := &controllerCommon{
6872
location: testCloud.Location,
6973
storageEndpointSuffix: testCloud.Environment.StorageEndpointSuffix,
@@ -83,6 +87,9 @@ func TestCommonAttachDisk(t *testing.T) {
8387
}
8488

8589
func TestCommonDetachDisk(t *testing.T) {
90+
ctrl := gomock.NewController(t)
91+
defer ctrl.Finish()
92+
8693
testCases := []struct {
8794
desc string
8895
vmList map[string]string
@@ -112,7 +119,7 @@ func TestCommonDetachDisk(t *testing.T) {
112119
}
113120

114121
for i, test := range testCases {
115-
testCloud := GetTestCloud()
122+
testCloud := GetTestCloud(ctrl)
116123
common := &controllerCommon{
117124
location: testCloud.Location,
118125
storageEndpointSuffix: testCloud.Environment.StorageEndpointSuffix,
@@ -131,6 +138,9 @@ func TestCommonDetachDisk(t *testing.T) {
131138
}
132139

133140
func TestGetDiskLun(t *testing.T) {
141+
ctrl := gomock.NewController(t)
142+
defer ctrl.Finish()
143+
134144
testCases := []struct {
135145
desc string
136146
diskName string
@@ -153,7 +163,7 @@ func TestGetDiskLun(t *testing.T) {
153163
}
154164

155165
for i, test := range testCases {
156-
testCloud := GetTestCloud()
166+
testCloud := GetTestCloud(ctrl)
157167
common := &controllerCommon{
158168
location: testCloud.Location,
159169
storageEndpointSuffix: testCloud.Environment.StorageEndpointSuffix,
@@ -171,6 +181,9 @@ func TestGetDiskLun(t *testing.T) {
171181
}
172182

173183
func TestGetNextDiskLun(t *testing.T) {
184+
ctrl := gomock.NewController(t)
185+
defer ctrl.Finish()
186+
174187
testCases := []struct {
175188
desc string
176189
isDataDisksFull bool
@@ -192,7 +205,7 @@ func TestGetNextDiskLun(t *testing.T) {
192205
}
193206

194207
for i, test := range testCases {
195-
testCloud := GetTestCloud()
208+
testCloud := GetTestCloud(ctrl)
196209
common := &controllerCommon{
197210
location: testCloud.Location,
198211
storageEndpointSuffix: testCloud.Environment.StorageEndpointSuffix,
@@ -210,6 +223,9 @@ func TestGetNextDiskLun(t *testing.T) {
210223
}
211224

212225
func TestDisksAreAttached(t *testing.T) {
226+
ctrl := gomock.NewController(t)
227+
defer ctrl.Finish()
228+
213229
testCases := []struct {
214230
desc string
215231
diskNames []string
@@ -234,7 +250,7 @@ func TestDisksAreAttached(t *testing.T) {
234250
}
235251

236252
for i, test := range testCases {
237-
testCloud := GetTestCloud()
253+
testCloud := GetTestCloud(ctrl)
238254
common := &controllerCommon{
239255
location: testCloud.Location,
240256
storageEndpointSuffix: testCloud.Environment.StorageEndpointSuffix,

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard_test.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
2626
"github.com/Azure/go-autorest/autorest/to"
27+
"github.com/golang/mock/gomock"
2728
"github.com/stretchr/testify/assert"
2829

2930
"k8s.io/apimachinery/pkg/types"
@@ -35,6 +36,9 @@ var (
3536
)
3637

3738
func TestStandardAttachDisk(t *testing.T) {
39+
ctrl := gomock.NewController(t)
40+
defer ctrl.Finish()
41+
3842
testCases := []struct {
3943
desc string
4044
nodeName types.NodeName
@@ -53,7 +57,7 @@ func TestStandardAttachDisk(t *testing.T) {
5357
}
5458

5559
for i, test := range testCases {
56-
testCloud := GetTestCloud()
60+
testCloud := GetTestCloud(ctrl)
5761
vmSet := testCloud.vmSet
5862
setTestVirtualMachines(testCloud, map[string]string{"vm1": "PowerState/Running"}, false)
5963

@@ -64,6 +68,9 @@ func TestStandardAttachDisk(t *testing.T) {
6468
}
6569

6670
func TestStandardDetachDisk(t *testing.T) {
71+
ctrl := gomock.NewController(t)
72+
defer ctrl.Finish()
73+
6774
testCases := []struct {
6875
desc string
6976
nodeName types.NodeName
@@ -90,7 +97,7 @@ func TestStandardDetachDisk(t *testing.T) {
9097
}
9198

9299
for i, test := range testCases {
93-
testCloud := GetTestCloud()
100+
testCloud := GetTestCloud(ctrl)
94101
vmSet := testCloud.vmSet
95102
setTestVirtualMachines(testCloud, map[string]string{"vm1": "PowerState/Running"}, false)
96103

@@ -100,6 +107,9 @@ func TestStandardDetachDisk(t *testing.T) {
100107
}
101108

102109
func TestGetDataDisks(t *testing.T) {
110+
ctrl := gomock.NewController(t)
111+
defer ctrl.Finish()
112+
103113
var testCases = []struct {
104114
desc string
105115
nodeName types.NodeName
@@ -140,7 +150,7 @@ func TestGetDataDisks(t *testing.T) {
140150
},
141151
}
142152
for i, test := range testCases {
143-
testCloud := GetTestCloud()
153+
testCloud := GetTestCloud(ctrl)
144154
vmSet := testCloud.vmSet
145155
setTestVirtualMachines(testCloud, map[string]string{"vm1": "PowerState/Running"}, false)
146156

0 commit comments

Comments
 (0)