Skip to content

Commit a66b32f

Browse files
author
Joshua Reed
committed
Update types
1 parent f2f1c0f commit a66b32f

File tree

2 files changed

+122
-117
lines changed

2 files changed

+122
-117
lines changed

‎test/dummies/vars.go

Lines changed: 68 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/utils/pointer"
13-
capcv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
13+
infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
1414
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
15-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
15+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1616
)
1717

1818
// GetYamlVal fetches the values in test/e2e/config/cloudstack.yaml by yaml node. A common config file.
@@ -24,23 +24,25 @@ func GetYamlVal(variable string) string {
2424

2525
var ( // Declare exported dummy vars.
2626
AffinityGroup *cloud.AffinityGroup
27-
CSAffinityGroup *capcv1.CloudStackAffinityGroup
28-
CSCluster *capcv1.CloudStackCluster
29-
CAPIMachine *capiv1.Machine
30-
CSMachine1 *capcv1.CloudStackMachine
31-
CAPICluster *capiv1.Cluster
27+
CSAffinityGroup *infrav1.CloudStackAffinityGroup
28+
CSCluster *infrav1.CloudStackCluster
29+
CAPIMachine *clusterv1.Machine
30+
CSMachine1 *infrav1.CloudStackMachine
31+
CAPICluster *clusterv1.Cluster
3232
ClusterLabel map[string]string
3333
ClusterName string
3434
ClusterNameSpace string
35-
CSMachineTemplate1 *capcv1.CloudStackMachineTemplate
36-
Zone1 capcv1.Zone
37-
Zone2 capcv1.Zone
38-
CSZone1 *capcv1.CloudStackZone
39-
CSZone2 *capcv1.CloudStackZone
40-
Net1 capcv1.Network
41-
Net2 capcv1.Network
42-
ISONet1 capcv1.Network
43-
CSISONet1 *capcv1.CloudStackIsolatedNetwork
35+
CSMachineTemplate1 *infrav1.CloudStackMachineTemplate
36+
Zone1 infrav1.Zone
37+
Zone2 infrav1.Zone
38+
CSZone1 *infrav1.CloudStackZone
39+
CSZone2 *infrav1.CloudStackZone
40+
CSFailureDomain1 *infrav1.CloudStackFailureDomain
41+
CSFailureDomain2 *infrav1.CloudStackFailureDomain
42+
Net1 infrav1.Network
43+
Net2 infrav1.Network
44+
ISONet1 infrav1.Network
45+
CSISONet1 *infrav1.CloudStackIsolatedNetwork
4446
Domain cloud.Domain
4547
DomainPath string
4648
DomainName string
@@ -75,7 +77,7 @@ var ( // Declare exported dummy vars.
7577
EndPointHost string
7678
EndPointPort int32
7779
CSConf *simpleyaml.Yaml
78-
DiskOffering capcv1.CloudStackResourceDiskOffering
80+
DiskOffering infrav1.CloudStackResourceDiskOffering
7981
BootstrapSecret *corev1.Secret
8082
BootstrapSecretName string
8183
)
@@ -106,23 +108,23 @@ func SetDummyVars() {
106108
}
107109

108110
func SetDiskOfferingVars() {
109-
DiskOffering = capcv1.CloudStackResourceDiskOffering{CloudStackResourceIdentifier: capcv1.CloudStackResourceIdentifier{Name: "Small"},
111+
DiskOffering = infrav1.CloudStackResourceDiskOffering{CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{Name: "Small"},
110112
MountPath: "/data",
111113
Device: "/dev/vdb",
112114
Filesystem: "ext4",
113115
Label: "data_disk",
114116
}
115117
}
116118

117-
func CAPCNetToCSAPINet(net *capcv1.Network) *csapi.Network {
119+
func CAPCNetToCSAPINet(net *infrav1.Network) *csapi.Network {
118120
return &csapi.Network{
119121
Name: net.Name,
120122
Id: net.ID,
121123
Type: net.Type,
122124
}
123125
}
124126

125-
func CAPCZoneToCSAPIZone(net *capcv1.Zone) *csapi.Zone {
127+
func CAPCZoneToCSAPIZone(net *infrav1.Zone) *csapi.Zone {
126128
return &csapi.Zone{
127129
Name: net.Name,
128130
Id: net.ID,
@@ -147,7 +149,7 @@ func SetDummyTagVars() {
147149

148150
// SetDummyCSMachineTemplateVars resets the values in each of the exported CloudStackMachinesTemplate dummy variables.
149151
func SetDummyCSMachineTemplateVars() {
150-
CSMachineTemplate1 = &capcv1.CloudStackMachineTemplate{
152+
CSMachineTemplate1 = &infrav1.CloudStackMachineTemplate{
151153
TypeMeta: metav1.TypeMeta{
152154
APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
153155
Kind: "CloudStackMachineTemplate",
@@ -156,21 +158,21 @@ func SetDummyCSMachineTemplateVars() {
156158
Name: "test-machinetemplate-1",
157159
Namespace: "default",
158160
},
159-
Spec: capcv1.CloudStackMachineTemplateSpec{
160-
Spec: capcv1.CloudStackMachineTemplateResource{
161+
Spec: infrav1.CloudStackMachineTemplateSpec{
162+
Spec: infrav1.CloudStackMachineTemplateResource{
161163
ObjectMeta: metav1.ObjectMeta{
162164
Name: "test-machinetemplateresource",
163165
Namespace: "default",
164166
},
165-
Spec: capcv1.CloudStackMachineSpec{
166-
IdentityRef: &capcv1.CloudStackIdentityReference{
167+
Spec: infrav1.CloudStackMachineSpec{
168+
IdentityRef: &infrav1.CloudStackIdentityReference{
167169
Kind: "Secret",
168170
Name: "IdentitySecret",
169171
},
170-
Template: capcv1.CloudStackResourceIdentifier{
172+
Template: infrav1.CloudStackResourceIdentifier{
171173
Name: GetYamlVal("CLOUDSTACK_TEMPLATE_NAME"),
172174
},
173-
Offering: capcv1.CloudStackResourceIdentifier{
175+
Offering: infrav1.CloudStackResourceIdentifier{
174176
Name: GetYamlVal("CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING"),
175177
},
176178
DiskOffering: DiskOffering,
@@ -185,7 +187,7 @@ func SetDummyCSMachineTemplateVars() {
185187

186188
// SetDummyCSMachineVars resets the values in each of the exported CloudStackMachine dummy variables.
187189
func SetDummyCSMachineVars() {
188-
CSMachine1 = &capcv1.CloudStackMachine{
190+
CSMachine1 = &infrav1.CloudStackMachine{
189191
TypeMeta: metav1.TypeMeta{
190192
APIVersion: CSApiVersion,
191193
Kind: "CloudStackMachine",
@@ -195,21 +197,21 @@ func SetDummyCSMachineVars() {
195197
Namespace: "default",
196198
Labels: ClusterLabel,
197199
},
198-
Spec: capcv1.CloudStackMachineSpec{
200+
Spec: infrav1.CloudStackMachineSpec{
199201
Name: "test-machine-1",
200-
IdentityRef: &capcv1.CloudStackIdentityReference{
202+
IdentityRef: &infrav1.CloudStackIdentityReference{
201203
Kind: "Secret",
202204
Name: "IdentitySecret",
203205
},
204206
InstanceID: pointer.String("Instance1"),
205-
Template: capcv1.CloudStackResourceIdentifier{
207+
Template: infrav1.CloudStackResourceIdentifier{
206208
Name: GetYamlVal("CLOUDSTACK_TEMPLATE_NAME"),
207209
},
208-
Offering: capcv1.CloudStackResourceIdentifier{
210+
Offering: infrav1.CloudStackResourceIdentifier{
209211
Name: GetYamlVal("CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING"),
210212
},
211-
DiskOffering: capcv1.CloudStackResourceDiskOffering{
212-
CloudStackResourceIdentifier: capcv1.CloudStackResourceIdentifier{
213+
DiskOffering: infrav1.CloudStackResourceDiskOffering{
214+
CloudStackResourceIdentifier: infrav1.CloudStackResourceIdentifier{
213215
Name: "DiskOffering",
214216
},
215217
MountPath: "/data",
@@ -225,25 +227,25 @@ func SetDummyCSMachineVars() {
225227
}
226228

227229
func SetDummyZoneVars() {
228-
Zone1 = capcv1.Zone{Network: Net1}
230+
Zone1 = infrav1.Zone{Network: Net1}
229231
Zone1.Name = GetYamlVal("CLOUDSTACK_ZONE_NAME")
230-
Zone2 = capcv1.Zone{Network: Net2}
232+
Zone2 = infrav1.Zone{Network: Net2}
231233
Zone2.Name = "Zone2"
232234
Zone2.ID = "FakeZone2ID"
233-
CSZone1 = &capcv1.CloudStackZone{
235+
CSZone1 = &infrav1.CloudStackZone{
234236
ObjectMeta: metav1.ObjectMeta{
235237
Name: ClusterName + "-" + Zone1.Name,
236238
Namespace: "default",
237239
Labels: ClusterLabel,
238240
},
239-
Spec: capcv1.CloudStackZoneSpec(Zone1)}
240-
CSZone2 = &capcv1.CloudStackZone{
241+
Spec: infrav1.CloudStackZoneSpec(Zone1)}
242+
CSZone2 = &infrav1.CloudStackZone{
241243
ObjectMeta: metav1.ObjectMeta{
242244
Name: ClusterName + "-" + Zone2.Name,
243245
Namespace: "default",
244246
Labels: ClusterLabel,
245247
},
246-
Spec: capcv1.CloudStackZoneSpec(Zone2)}
248+
Spec: infrav1.CloudStackZoneSpec(Zone2)}
247249
}
248250

249251
// SetDummyCAPCClusterVars resets the values in each of the exported CloudStackCluster related dummy variables.
@@ -266,18 +268,20 @@ func SetDummyCAPCClusterVars() {
266268
EndPointPort = int32(5309)
267269
PublicIPID = "FakePublicIPID"
268270
ClusterNameSpace = "default"
269-
ClusterLabel = map[string]string{capiv1.ClusterLabelName: ClusterName}
271+
ClusterLabel = map[string]string{clusterv1.ClusterLabelName: ClusterName}
270272
AffinityGroup = &cloud.AffinityGroup{
271273
Name: "fakeaffinitygroup",
272274
Type: cloud.AffinityGroupType,
273275
ID: "FakeAffinityGroupID"}
274-
CSAffinityGroup = &capcv1.CloudStackAffinityGroup{
276+
CSAffinityGroup = &infrav1.CloudStackAffinityGroup{
275277
ObjectMeta: metav1.ObjectMeta{Name: AffinityGroup.Name, Namespace: "default", UID: "0", Labels: ClusterLabel},
276-
Spec: capcv1.CloudStackAffinityGroupSpec{Name: AffinityGroup.Name, Type: AffinityGroup.Type, ID: AffinityGroup.ID}}
277-
Net1 = capcv1.Network{Name: GetYamlVal("CLOUDSTACK_NETWORK_NAME"), Type: cloud.NetworkTypeShared}
278-
Net2 = capcv1.Network{Name: "SharedGuestNet2", Type: cloud.NetworkTypeShared, ID: "FakeSharedNetID2"}
279-
ISONet1 = capcv1.Network{Name: "isoguestnet1", Type: cloud.NetworkTypeIsolated, ID: "FakeIsolatedNetID1"}
280-
CSCluster = &capcv1.CloudStackCluster{
278+
Spec: infrav1.CloudStackAffinityGroupSpec{Name: AffinityGroup.Name, Type: AffinityGroup.Type, ID: AffinityGroup.ID}}
279+
Net1 = infrav1.Network{Name: GetYamlVal("CLOUDSTACK_NETWORK_NAME"), Type: cloud.NetworkTypeShared}
280+
Net2 = infrav1.Network{Name: "SharedGuestNet2", Type: cloud.NetworkTypeShared, ID: "FakeSharedNetID2"}
281+
ISONet1 = infrav1.Network{Name: "isoguestnet1", Type: cloud.NetworkTypeIsolated, ID: "FakeIsolatedNetID1"}
282+
CSFailureDomain1 = &infrav1.CloudStackFailureDomain{Spec: infrav1.CloudStackFailureDomainSpec{Zone: Zone1}}
283+
CSFailureDomain2 = &infrav1.CloudStackFailureDomain{Spec: infrav1.CloudStackFailureDomainSpec{Zone: Zone1}}
284+
CSCluster = &infrav1.CloudStackCluster{
281285
TypeMeta: metav1.TypeMeta{
282286
APIVersion: CSApiVersion,
283287
Kind: CSClusterKind,
@@ -288,24 +292,24 @@ func SetDummyCAPCClusterVars() {
288292
UID: "0",
289293
Labels: ClusterLabel,
290294
},
291-
Spec: capcv1.CloudStackClusterSpec{
292-
IdentityRef: &capcv1.CloudStackIdentityReference{
295+
Spec: infrav1.CloudStackClusterSpec{
296+
IdentityRef: &infrav1.CloudStackIdentityReference{
293297
Kind: "Secret",
294298
Name: "IdentitySecret",
295299
},
296-
ControlPlaneEndpoint: capiv1.APIEndpoint{Host: EndPointHost, Port: EndPointPort},
297-
Zones: []capcv1.Zone{Zone1, Zone2},
300+
ControlPlaneEndpoint: clusterv1.APIEndpoint{Host: EndPointHost, Port: EndPointPort},
301+
FailureDomains: []infrav1.CloudStackFailureDomainSpec{CSFailureDomain1.Spec, CSFailureDomain2.Spec},
298302
},
299-
Status: capcv1.CloudStackClusterStatus{Zones: map[string]capcv1.Zone{}},
303+
Status: infrav1.CloudStackClusterStatus{Zones: map[string]infrav1.Zone{}},
300304
}
301-
CSISONet1 = &capcv1.CloudStackIsolatedNetwork{
305+
CSISONet1 = &infrav1.CloudStackIsolatedNetwork{
302306
ObjectMeta: metav1.ObjectMeta{
303307
Name: ISONet1.Name,
304308
Namespace: "default",
305309
UID: "0",
306310
Labels: ClusterLabel,
307311
},
308-
Spec: capcv1.CloudStackIsolatedNetworkSpec{
312+
Spec: infrav1.CloudStackIsolatedNetworkSpec{
309313
ControlPlaneEndpoint: CSCluster.Spec.ControlPlaneEndpoint}}
310314
CSISONet1.Spec.Name = ISONet1.Name
311315
CSISONet1.Spec.ID = ISONet1.ID
@@ -330,14 +334,14 @@ func SetDummyDomainID() {
330334

331335
// SetDummyCapiCluster resets the values in each of the exported CAPICluster related dummy variables.
332336
func SetDummyCAPIClusterVars() {
333-
CAPICluster = &capiv1.Cluster{
337+
CAPICluster = &clusterv1.Cluster{
334338
ObjectMeta: metav1.ObjectMeta{
335339
Name: ClusterName,
336340
Namespace: ClusterNameSpace,
337341
},
338-
Spec: capiv1.ClusterSpec{
342+
Spec: clusterv1.ClusterSpec{
339343
InfrastructureRef: &corev1.ObjectReference{
340-
APIVersion: capcv1.GroupVersion.String(),
344+
APIVersion: infrav1.GroupVersion.String(),
341345
Kind: "CloudStackCluster",
342346
Name: "somename",
343347
},
@@ -362,29 +366,30 @@ func SetDummyBootstrapSecretVar() {
362366

363367
// Fills in cluster status vars.
364368
func SetDummyClusterStatus() {
365-
CSCluster.Status.Zones = capcv1.ZoneStatusMap{Zone1.ID: Zone1, Zone2.ID: Zone2}
369+
CSCluster.Status.Zones = infrav1.ZoneStatusMap{Zone1.ID: Zone1, Zone2.ID: Zone2}
366370
CSCluster.Status.LBRuleID = LBRuleID
367371
}
368372

369373
// Sets cluster spec to specified network.
370-
func SetClusterSpecToNet(net *capcv1.Network) {
374+
func SetClusterSpecToNet(net *infrav1.Network) {
371375
Zone1.Network = *net
372-
CSCluster.Spec.Zones = []capcv1.Zone{Zone1}
376+
CSFailureDomain1 = &infrav1.CloudStackFailureDomain{Spec: infrav1.CloudStackFailureDomainSpec{Zone: Zone1}}
377+
CSCluster.Spec.FailureDomains = []infrav1.CloudStackFailureDomainSpec{CSFailureDomain1.Spec}
373378
}
374379

375380
func SetDummyCAPIMachineVars() {
376-
CAPIMachine = &capiv1.Machine{
381+
CAPIMachine = &clusterv1.Machine{
377382
ObjectMeta: metav1.ObjectMeta{
378383
GenerateName: "capi-test-machine-",
379384
Namespace: "default",
380385
Labels: ClusterLabel,
381386
},
382-
Spec: capiv1.MachineSpec{
387+
Spec: clusterv1.MachineSpec{
383388
ClusterName: ClusterName,
384389
FailureDomain: pointer.String(Zone1.ID)},
385390
}
386391
}
387392

388393
func SetDummyCSMachineStatuses() {
389-
CSMachine1.Status = capcv1.CloudStackMachineStatus{ZoneID: Zone1.ID}
394+
CSMachine1.Status = infrav1.CloudStackMachineStatus{ZoneID: Zone1.ID}
390395
}

0 commit comments

Comments
 (0)