Skip to content

Commit 7a7a491

Browse files
bnallapetabnallapeta
committed
fix failed tests
Signed-off-by: Bharath Nallapeta <nr.bharath97@gmail.com>
1 parent 3a9771c commit 7a7a491

22 files changed

+831
-849
lines changed

‎api/v1beta1/conversion.go‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
3030
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
3131

32-
infrav1beta2 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
32+
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
3333
)
3434

3535
// ConvertTo converts this OpenStackCluster to the Hub version (v1beta2).
3636
func (src *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
37-
dst := dstRaw.(*infrav1beta2.OpenStackCluster)
37+
dst := dstRaw.(*infrav1.OpenStackCluster)
3838
if err := Convert_v1beta1_OpenStackCluster_To_v1beta2_OpenStackCluster(src, dst, nil); err != nil {
3939
return err
4040
}
@@ -48,7 +48,7 @@ func (src *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
4848
//
4949
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
5050
func (dst *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
51-
src := srcRaw.(*infrav1beta2.OpenStackCluster)
51+
src := srcRaw.(*infrav1.OpenStackCluster)
5252
if err := Convert_v1beta2_OpenStackCluster_To_v1beta1_OpenStackCluster(src, dst, nil); err != nil {
5353
return err
5454
}
@@ -58,7 +58,7 @@ func (dst *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
5858

5959
// ConvertTo converts this OpenStackMachine to the Hub version (v1beta2).
6060
func (src *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {
61-
dst := dstRaw.(*infrav1beta2.OpenStackMachine)
61+
dst := dstRaw.(*infrav1.OpenStackMachine)
6262
if err := Convert_v1beta1_OpenStackMachine_To_v1beta2_OpenStackMachine(src, dst, nil); err != nil {
6363
return err
6464
}
@@ -72,7 +72,7 @@ func (src *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {
7272
//
7373
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
7474
func (dst *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
75-
src := srcRaw.(*infrav1beta2.OpenStackMachine)
75+
src := srcRaw.(*infrav1.OpenStackMachine)
7676
if err := Convert_v1beta2_OpenStackMachine_To_v1beta1_OpenStackMachine(src, dst, nil); err != nil {
7777
return err
7878
}
@@ -82,7 +82,7 @@ func (dst *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
8282

8383
// ConvertTo converts this OpenStackClusterTemplate to the Hub version (v1beta2).
8484
func (src *OpenStackClusterTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {
85-
dst := dstRaw.(*infrav1beta2.OpenStackClusterTemplate)
85+
dst := dstRaw.(*infrav1.OpenStackClusterTemplate)
8686
if err := Convert_v1beta1_OpenStackClusterTemplate_To_v1beta2_OpenStackClusterTemplate(src, dst, nil); err != nil {
8787
return err
8888
}
@@ -93,7 +93,7 @@ func (src *OpenStackClusterTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error
9393
//
9494
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
9595
func (dst *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error {
96-
src := srcRaw.(*infrav1beta2.OpenStackClusterTemplate)
96+
src := srcRaw.(*infrav1.OpenStackClusterTemplate)
9797
if err := Convert_v1beta2_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(src, dst, nil); err != nil {
9898
return err
9999
}
@@ -103,7 +103,7 @@ func (dst *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) erro
103103

104104
// ConvertTo converts this OpenStackMachineTemplate to the Hub version (v1beta2).
105105
func (src *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {
106-
dst := dstRaw.(*infrav1beta2.OpenStackMachineTemplate)
106+
dst := dstRaw.(*infrav1.OpenStackMachineTemplate)
107107
if err := Convert_v1beta1_OpenStackMachineTemplate_To_v1beta2_OpenStackMachineTemplate(src, dst, nil); err != nil {
108108
return err
109109
}
@@ -114,7 +114,7 @@ func (src *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error
114114
//
115115
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
116116
func (dst *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error {
117-
src := srcRaw.(*infrav1beta2.OpenStackMachineTemplate)
117+
src := srcRaw.(*infrav1.OpenStackMachineTemplate)
118118
if err := Convert_v1beta2_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(src, dst, nil); err != nil {
119119
return err
120120
}
@@ -124,74 +124,74 @@ func (dst *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) erro
124124

125125
// ConvertTo converts this OpenStackClusterList to the Hub version (v1beta2).
126126
func (src *OpenStackClusterList) ConvertTo(dstRaw ctrlconversion.Hub) error {
127-
dst := dstRaw.(*infrav1beta2.OpenStackClusterList)
127+
dst := dstRaw.(*infrav1.OpenStackClusterList)
128128
return Convert_v1beta1_OpenStackClusterList_To_v1beta2_OpenStackClusterList(src, dst, nil)
129129
}
130130

131131
// ConvertFrom converts from the Hub version (v1beta2) to this version.
132132
//
133133
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
134134
func (dst *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
135-
src := srcRaw.(*infrav1beta2.OpenStackClusterList)
135+
src := srcRaw.(*infrav1.OpenStackClusterList)
136136
return Convert_v1beta2_OpenStackClusterList_To_v1beta1_OpenStackClusterList(src, dst, nil)
137137
}
138138

139139
// ConvertTo converts this OpenStackMachineList to the Hub version (v1beta2).
140140
func (src *OpenStackMachineList) ConvertTo(dstRaw ctrlconversion.Hub) error {
141-
dst := dstRaw.(*infrav1beta2.OpenStackMachineList)
141+
dst := dstRaw.(*infrav1.OpenStackMachineList)
142142
return Convert_v1beta1_OpenStackMachineList_To_v1beta2_OpenStackMachineList(src, dst, nil)
143143
}
144144

145145
// ConvertFrom converts from the Hub version (v1beta2) to this version.
146146
//
147147
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
148148
func (dst *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
149-
src := srcRaw.(*infrav1beta2.OpenStackMachineList)
149+
src := srcRaw.(*infrav1.OpenStackMachineList)
150150
return Convert_v1beta2_OpenStackMachineList_To_v1beta1_OpenStackMachineList(src, dst, nil)
151151
}
152152

153153
// ConvertTo converts this OpenStackClusterTemplateList to the Hub version (v1beta2).
154154
func (src *OpenStackClusterTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
155-
dst := dstRaw.(*infrav1beta2.OpenStackClusterTemplateList)
155+
dst := dstRaw.(*infrav1.OpenStackClusterTemplateList)
156156
return Convert_v1beta1_OpenStackClusterTemplateList_To_v1beta2_OpenStackClusterTemplateList(src, dst, nil)
157157
}
158158

159159
// ConvertFrom converts from the Hub version (v1beta2) to this version.
160160
//
161161
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
162162
func (dst *OpenStackClusterTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
163-
src := srcRaw.(*infrav1beta2.OpenStackClusterTemplateList)
163+
src := srcRaw.(*infrav1.OpenStackClusterTemplateList)
164164
return Convert_v1beta2_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(src, dst, nil)
165165
}
166166

167167
// ConvertTo converts this OpenStackMachineTemplateList to the Hub version (v1beta2).
168168
func (src *OpenStackMachineTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
169-
dst := dstRaw.(*infrav1beta2.OpenStackMachineTemplateList)
169+
dst := dstRaw.(*infrav1.OpenStackMachineTemplateList)
170170
return Convert_v1beta1_OpenStackMachineTemplateList_To_v1beta2_OpenStackMachineTemplateList(src, dst, nil)
171171
}
172172

173173
// ConvertFrom converts from the Hub version (v1beta2) to this version.
174174
//
175175
//nolint:revive // dst is the receiver here (converting FROM hub TO spoke)
176176
func (dst *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
177-
src := srcRaw.(*infrav1beta2.OpenStackMachineTemplateList)
177+
src := srcRaw.(*infrav1.OpenStackMachineTemplateList)
178178
return Convert_v1beta2_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(src, dst, nil)
179179
}
180180

181181
// Manual conversion functions for Status types that conversion-gen cannot
182182
// auto-generate due to FailureDomains (map↔slice), Conditions (CAPI↔metav1),
183183
// and deprecated fields (Ready, FailureReason, FailureMessage).
184184

185-
func Convert_v1beta1_OpenStackClusterStatus_To_v1beta2_OpenStackClusterStatus(in *OpenStackClusterStatus, out *infrav1beta2.OpenStackClusterStatus, _ apiconversion.Scope) error {
186-
out.Initialization = (*infrav1beta2.ClusterInitialization)(unsafe.Pointer(in.Initialization))
187-
out.Network = (*infrav1beta2.NetworkStatusWithSubnets)(unsafe.Pointer(in.Network))
188-
out.ExternalNetwork = (*infrav1beta2.NetworkStatus)(unsafe.Pointer(in.ExternalNetwork))
189-
out.Router = (*infrav1beta2.Router)(unsafe.Pointer(in.Router))
190-
out.APIServerLoadBalancer = (*infrav1beta2.LoadBalancer)(unsafe.Pointer(in.APIServerLoadBalancer))
191-
out.ControlPlaneSecurityGroup = (*infrav1beta2.SecurityGroupStatus)(unsafe.Pointer(in.ControlPlaneSecurityGroup))
192-
out.WorkerSecurityGroup = (*infrav1beta2.SecurityGroupStatus)(unsafe.Pointer(in.WorkerSecurityGroup))
193-
out.BastionSecurityGroup = (*infrav1beta2.SecurityGroupStatus)(unsafe.Pointer(in.BastionSecurityGroup))
194-
out.Bastion = (*infrav1beta2.BastionStatus)(unsafe.Pointer(in.Bastion))
185+
func Convert_v1beta1_OpenStackClusterStatus_To_v1beta2_OpenStackClusterStatus(in *OpenStackClusterStatus, out *infrav1.OpenStackClusterStatus, _ apiconversion.Scope) error {
186+
out.Initialization = (*infrav1.ClusterInitialization)(unsafe.Pointer(in.Initialization))
187+
out.Network = (*infrav1.NetworkStatusWithSubnets)(unsafe.Pointer(in.Network))
188+
out.ExternalNetwork = (*infrav1.NetworkStatus)(unsafe.Pointer(in.ExternalNetwork))
189+
out.Router = (*infrav1.Router)(unsafe.Pointer(in.Router))
190+
out.APIServerLoadBalancer = (*infrav1.LoadBalancer)(unsafe.Pointer(in.APIServerLoadBalancer))
191+
out.ControlPlaneSecurityGroup = (*infrav1.SecurityGroupStatus)(unsafe.Pointer(in.ControlPlaneSecurityGroup))
192+
out.WorkerSecurityGroup = (*infrav1.SecurityGroupStatus)(unsafe.Pointer(in.WorkerSecurityGroup))
193+
out.BastionSecurityGroup = (*infrav1.SecurityGroupStatus)(unsafe.Pointer(in.BastionSecurityGroup))
194+
out.Bastion = (*infrav1.BastionStatus)(unsafe.Pointer(in.Bastion))
195195

196196
if len(in.FailureDomains) > 0 {
197197
out.FailureDomains = make([]clusterv1.FailureDomain, 0, len(in.FailureDomains))
@@ -204,12 +204,12 @@ func Convert_v1beta1_OpenStackClusterStatus_To_v1beta2_OpenStackClusterStatus(in
204204
}
205205
}
206206

207-
out.Conditions = infrav1beta2.ConvertConditionsToV1Beta2(in.Conditions, 0)
207+
out.Conditions = infrav1.ConvertConditionsToV1Beta2(in.Conditions, 0)
208208

209209
return nil
210210
}
211211

212-
func Convert_v1beta2_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *infrav1beta2.OpenStackClusterStatus, out *OpenStackClusterStatus, _ apiconversion.Scope) error {
212+
func Convert_v1beta2_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, _ apiconversion.Scope) error {
213213
out.Initialization = (*ClusterInitialization)(unsafe.Pointer(in.Initialization))
214214
out.Network = (*NetworkStatusWithSubnets)(unsafe.Pointer(in.Network))
215215
out.ExternalNetwork = (*NetworkStatus)(unsafe.Pointer(in.ExternalNetwork))
@@ -230,35 +230,35 @@ func Convert_v1beta2_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in
230230
}
231231
}
232232

233-
out.Conditions = infrav1beta2.ConvertConditionsFromV1Beta2(in.Conditions)
234-
out.Ready = infrav1beta2.IsReady(in.Conditions)
233+
out.Conditions = infrav1.ConvertConditionsFromV1Beta2(in.Conditions)
234+
out.Ready = infrav1.IsReady(in.Conditions)
235235

236236
return nil
237237
}
238238

239-
func Convert_v1beta1_OpenStackMachineStatus_To_v1beta2_OpenStackMachineStatus(in *OpenStackMachineStatus, out *infrav1beta2.OpenStackMachineStatus, _ apiconversion.Scope) error {
240-
out.Initialization = (*infrav1beta2.MachineInitialization)(unsafe.Pointer(in.Initialization))
239+
func Convert_v1beta1_OpenStackMachineStatus_To_v1beta2_OpenStackMachineStatus(in *OpenStackMachineStatus, out *infrav1.OpenStackMachineStatus, _ apiconversion.Scope) error {
240+
out.Initialization = (*infrav1.MachineInitialization)(unsafe.Pointer(in.Initialization))
241241
out.InstanceID = in.InstanceID
242242
out.Addresses = in.Addresses
243-
out.InstanceState = (*infrav1beta2.InstanceState)(unsafe.Pointer(in.InstanceState))
244-
out.Resolved = (*infrav1beta2.ResolvedMachineSpec)(unsafe.Pointer(in.Resolved))
245-
out.Resources = (*infrav1beta2.MachineResources)(unsafe.Pointer(in.Resources))
243+
out.InstanceState = (*infrav1.InstanceState)(unsafe.Pointer(in.InstanceState))
244+
out.Resolved = (*infrav1.ResolvedMachineSpec)(unsafe.Pointer(in.Resolved))
245+
out.Resources = (*infrav1.MachineResources)(unsafe.Pointer(in.Resources))
246246

247-
out.Conditions = infrav1beta2.ConvertConditionsToV1Beta2(in.Conditions, 0)
247+
out.Conditions = infrav1.ConvertConditionsToV1Beta2(in.Conditions, 0)
248248

249249
return nil
250250
}
251251

252-
func Convert_v1beta2_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *infrav1beta2.OpenStackMachineStatus, out *OpenStackMachineStatus, _ apiconversion.Scope) error {
252+
func Convert_v1beta2_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, _ apiconversion.Scope) error {
253253
out.Initialization = (*MachineInitialization)(unsafe.Pointer(in.Initialization))
254254
out.InstanceID = in.InstanceID
255255
out.Addresses = in.Addresses
256256
out.InstanceState = (*InstanceState)(unsafe.Pointer(in.InstanceState))
257257
out.Resolved = (*ResolvedMachineSpec)(unsafe.Pointer(in.Resolved))
258258
out.Resources = (*MachineResources)(unsafe.Pointer(in.Resources))
259259

260-
out.Conditions = infrav1beta2.ConvertConditionsFromV1Beta2(in.Conditions)
261-
out.Ready = infrav1beta2.IsReady(in.Conditions)
260+
out.Conditions = infrav1.ConvertConditionsFromV1Beta2(in.Conditions)
261+
out.Ready = infrav1.IsReady(in.Conditions)
262262

263263
return nil
264264
}

‎api/v1beta1/conversion_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"k8s.io/utils/ptr"
2626
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2727

28-
infrav1beta2 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
28+
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
2929
)
3030

3131
func TestOpenStackClusterConversion(t *testing.T) {
@@ -83,7 +83,7 @@ func TestOpenStackClusterConversion(t *testing.T) {
8383
}
8484

8585
// Convert to v1beta2
86-
dst := &infrav1beta2.OpenStackCluster{}
86+
dst := &infrav1.OpenStackCluster{}
8787
g.Expect(src.ConvertTo(dst)).To(Succeed())
8888

8989
// Verify basic fields
@@ -175,7 +175,7 @@ func TestOpenStackMachineConversion(t *testing.T) {
175175
}
176176

177177
// Convert to v1beta2
178-
dst := &infrav1beta2.OpenStackMachine{}
178+
dst := &infrav1.OpenStackMachine{}
179179
g.Expect(src.ConvertTo(dst)).To(Succeed())
180180

181181
// Verify basic fields
@@ -234,7 +234,7 @@ func TestOpenStackClusterTemplateConversion(t *testing.T) {
234234
}
235235

236236
// Convert to v1beta2
237-
dst := &infrav1beta2.OpenStackClusterTemplate{}
237+
dst := &infrav1.OpenStackClusterTemplate{}
238238
g.Expect(src.ConvertTo(dst)).To(Succeed())
239239

240240
// Verify template spec
@@ -274,7 +274,7 @@ func TestOpenStackMachineTemplateConversion(t *testing.T) {
274274
}
275275

276276
// Convert to v1beta2
277-
dst := &infrav1beta2.OpenStackMachineTemplate{}
277+
dst := &infrav1.OpenStackMachineTemplate{}
278278
g.Expect(src.ConvertTo(dst)).To(Succeed())
279279

280280
// Verify template spec
@@ -313,7 +313,7 @@ func TestConditionConversion(t *testing.T) {
313313
},
314314
}
315315

316-
v1beta2Conditions := infrav1beta2.ConvertConditionsToV1Beta2(v1beta1Conditions, 10)
316+
v1beta2Conditions := infrav1.ConvertConditionsToV1Beta2(v1beta1Conditions, 10)
317317

318318
g.Expect(v1beta2Conditions).To(HaveLen(2))
319319
g.Expect(v1beta2Conditions[0].Type).To(Equal("Ready"))
@@ -323,7 +323,7 @@ func TestConditionConversion(t *testing.T) {
323323
g.Expect(v1beta2Conditions[1].Status).To(Equal(metav1.ConditionFalse))
324324

325325
// Test v1beta2 -> v1beta1 condition conversion
326-
restoredConditions := infrav1beta2.ConvertConditionsFromV1Beta2(v1beta2Conditions)
326+
restoredConditions := infrav1.ConvertConditionsFromV1Beta2(v1beta2Conditions)
327327

328328
g.Expect(restoredConditions).To(HaveLen(2))
329329
g.Expect(restoredConditions[0].Type).To(Equal(clusterv1beta1.ConditionType("Ready")))
@@ -367,7 +367,7 @@ func TestOpenStackClusterListConversion(t *testing.T) {
367367
}
368368

369369
// Convert to v1beta2
370-
dst := &infrav1beta2.OpenStackClusterList{}
370+
dst := &infrav1.OpenStackClusterList{}
371371
g.Expect(src.ConvertTo(dst)).To(Succeed())
372372

373373
// Verify items converted
@@ -395,7 +395,7 @@ func TestIsReadyHelper(t *testing.T) {
395395
Status: metav1.ConditionTrue,
396396
},
397397
}
398-
g.Expect(infrav1beta2.IsReady(conditions)).To(BeTrue())
398+
g.Expect(infrav1.IsReady(conditions)).To(BeTrue())
399399

400400
// Test with Ready condition False
401401
conditions = []metav1.Condition{
@@ -404,7 +404,7 @@ func TestIsReadyHelper(t *testing.T) {
404404
Status: metav1.ConditionFalse,
405405
},
406406
}
407-
g.Expect(infrav1beta2.IsReady(conditions)).To(BeFalse())
407+
g.Expect(infrav1.IsReady(conditions)).To(BeFalse())
408408

409409
// Test with no Ready condition
410410
conditions = []metav1.Condition{
@@ -413,9 +413,9 @@ func TestIsReadyHelper(t *testing.T) {
413413
Status: metav1.ConditionTrue,
414414
},
415415
}
416-
g.Expect(infrav1beta2.IsReady(conditions)).To(BeFalse())
416+
g.Expect(infrav1.IsReady(conditions)).To(BeFalse())
417417

418418
// Test with empty conditions
419-
g.Expect(infrav1beta2.IsReady(nil)).To(BeFalse())
420-
g.Expect(infrav1beta2.IsReady([]metav1.Condition{})).To(BeFalse())
419+
g.Expect(infrav1.IsReady(nil)).To(BeFalse())
420+
g.Expect(infrav1.IsReady([]metav1.Condition{})).To(BeFalse())
421421
}

0 commit comments

Comments
 (0)