Skip to content

Commit 2d7071f

Browse files
damdodamdo
committed
bump k8s 1.34: fix govmomi breaking change
1 parent 964d435 commit 2d7071f

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎pkg/controller/vsphere/actuator_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestMachineEvents(t *testing.T) {
5858
credentialsSecretPassword := fmt.Sprintf("%s.password", host)
5959
password, _ := server.URL.User.Password()
6060

61-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
61+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
6262
vm.Config.Version = minimumHWVersionString
6363

6464
testEnv := &envtest.Environment{

‎pkg/controller/vsphere/reconciler_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func TestClone(t *testing.T) {
144144

145145
password, _ := server.URL.User.Password()
146146
namespace := "test"
147-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
147+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
148148
vm.Config.Version = minimumHWVersionString
149149

150150
machine := object.NewVirtualMachine(session.Client.Client, vm.Reference())
@@ -635,7 +635,7 @@ func TestPowerOn(t *testing.T) {
635635

636636
t.Run("Test powering on vm with RDS (via datacenter)", func(t *testing.T) {
637637
g := NewWithT(t)
638-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
638+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
639639
object.NewVirtualMachine(simSession.Client.Client, vm.Reference())
640640

641641
scope := getMachineScope(getMinimalProviderSpec(), vm.Name)
@@ -651,7 +651,7 @@ func TestPowerOn(t *testing.T) {
651651

652652
t.Run("Test powering on vm without a datacenter", func(t *testing.T) {
653653
g := NewWithT(t)
654-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
654+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
655655
object.NewVirtualMachine(simSession.Client.Client, vm.Reference())
656656

657657
scope := getMachineScope(getMinimalProviderSpec(), vm.Name)
@@ -672,7 +672,7 @@ func TestGetPowerState(t *testing.T) {
672672
defer model.Remove()
673673
defer server.Close()
674674

675-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
675+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
676676
ref := simulatorVM.VirtualMachine.Reference()
677677

678678
testCases := []struct {
@@ -732,7 +732,7 @@ func TestTaskIsFinished(t *testing.T) {
732732
defer model.Remove()
733733
defer server.Close()
734734

735-
obj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
735+
obj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
736736
// Validate VM is powered on
737737
if obj.Runtime.PowerState != poweredOnState {
738738
t.Fatal(obj.Runtime.PowerState)
@@ -1027,7 +1027,7 @@ func testStaticIPsWithSimulator(t *testing.T, model *simulator.Model, server *si
10271027

10281028
func testGetNetworkDevicesWithSimulator(t *testing.T, model *simulator.Model, server *simulator.Server, session *session.Session) {
10291029

1030-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1030+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
10311031
objVM := object.NewVirtualMachine(session.Client.Client, managedObj.Reference())
10321032

10331033
devices, err := objVM.Device(context.TODO())
@@ -1187,7 +1187,7 @@ func TestGetDiskSpec(t *testing.T) {
11871187
defer model.Remove()
11881188
defer server.Close()
11891189

1190-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1190+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
11911191
objVM := object.NewVirtualMachine(session.Client.Client, managedObj.Reference())
11921192

11931193
testCases := []struct {
@@ -1291,7 +1291,7 @@ func TestCreateDataDisks(t *testing.T) {
12911291
model, session, server := initSimulator(t)
12921292
t.Cleanup(model.Remove)
12931293
t.Cleanup(server.Close)
1294-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1294+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
12951295
machine := object.NewVirtualMachine(session.Client.Client, vm.Reference())
12961296

12971297
deviceList, err := machine.Device(context.TODO())
@@ -1472,7 +1472,7 @@ func TestGetNetworkStatusList(t *testing.T) {
14721472
defer model.Remove()
14731473
defer server.Close()
14741474

1475-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1475+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
14761476
defaultFakeIPs := []string{"127.0.0.1"}
14771477
managedObj.Guest.Net[0].IpAddress = defaultFakeIPs
14781478
managedObjRef := object.NewVirtualMachine(session.Client.Client, managedObj.Reference()).Reference()
@@ -1518,7 +1518,7 @@ func TestReconcileNetwork(t *testing.T) {
15181518
defer model.Remove()
15191519
defer server.Close()
15201520

1521-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1521+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
15221522
managedObj.Guest.Net[0].IpAddress = []string{"127.0.0.1"}
15231523
managedObjRef := object.NewVirtualMachine(session.Client.Client, managedObj.Reference()).Reference()
15241524

@@ -1576,7 +1576,7 @@ func TestReconcileTags(t *testing.T) {
15761576
defer model.Remove()
15771577
defer server.Close()
15781578

1579-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1579+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
15801580
managedObjRef := object.NewVirtualMachine(sessionObj.Client.Client, managedObj.Reference()).Reference()
15811581

15821582
vm := &virtualMachine{
@@ -1718,7 +1718,7 @@ func TestCheckAttachedTag(t *testing.T) {
17181718
defer model.Remove()
17191719
defer server.Close()
17201720

1721-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1721+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
17221722
managedObjRef := object.NewVirtualMachine(sessionObj.Client.Client, managedObj.Reference()).Reference()
17231723

17241724
vm := &virtualMachine{
@@ -1885,7 +1885,7 @@ func TestReconcileProviderID(t *testing.T) {
18851885
defer model.Remove()
18861886
defer server.Close()
18871887

1888-
managedObj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
1888+
managedObj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
18891889
objectVM := object.NewVirtualMachine(session.Client.Client, managedObj.Reference())
18901890
managedObjRef := objectVM.Reference()
18911891

@@ -2162,7 +2162,7 @@ func TestDelete(t *testing.T) {
21622162

21632163
for _, tc := range testCases {
21642164
t.Run(tc.testCase, func(t *testing.T) {
2165-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
2165+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
21662166
vm.Config.InstanceUuid = instanceUUID
21672167

21682168
simParams, err := getVcenterSimParams(server, namespace)
@@ -2436,11 +2436,11 @@ func TestDelete(t *testing.T) {
24362436
t.Run(tc.name, func(t *testing.T) {
24372437
g := NewWithT(t)
24382438

2439-
_, sess, srv := initSimulator(t)
2439+
model, sess, srv := initSimulator(t)
24402440
simParams, err := getVcenterSimParams(srv, namespace)
24412441
g.Expect(err).NotTo(HaveOccurred())
24422442

2443-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
2443+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
24442444
vm.Config.InstanceUuid = instanceUUID
24452445

24462446
if tc.attachDisks {
@@ -2498,7 +2498,7 @@ func TestCreate(t *testing.T) {
24982498
vmGroup := "testVMGroupName"
24992499
vmName := "testName"
25002500
namespace := "test"
2501-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
2501+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
25022502
vm.Name = vmName
25032503
vm.Config.Version = minimumHWVersionString
25042504

@@ -3006,7 +3006,7 @@ func TestUpdate(t *testing.T) {
30063006

30073007
password, _ := server.URL.User.Password()
30083008
namespace := "test"
3009-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
3009+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
30103010
instanceUUID := "a5764857-ae35-34dc-8f25-a9c9e73aa898"
30113011
vm.Config.InstanceUuid = instanceUUID
30123012

@@ -3178,7 +3178,7 @@ func TestExists(t *testing.T) {
31783178

31793179
password, _ := server.URL.User.Password()
31803180
namespace := "test"
3181-
VMs := simulator.Map.All("VirtualMachine")
3181+
VMs := model.Map().All("VirtualMachine")
31823182
poweredOffVM := VMs[0].(*simulator.VirtualMachine)
31833183
poweredOnVM := VMs[1].(*simulator.VirtualMachine)
31843184

@@ -3300,7 +3300,7 @@ func TestReconcileMachineWithCloudState(t *testing.T) {
33003300
defer model.Remove()
33013301
defer server.Close()
33023302

3303-
vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
3303+
vm := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
33043304
instanceUUID := "a5764857-ae35-34dc-8f25-a9c9e73aa898"
33053305
vm.Config.InstanceUuid = instanceUUID
33063306

@@ -3310,8 +3310,8 @@ func TestReconcileMachineWithCloudState(t *testing.T) {
33103310
t.Fatal(err)
33113311
}
33123312

3313-
cluster := simulator.Map.Any("ClusterComputeResource").(*simulator.ClusterComputeResource)
3314-
dc := simulator.Map.Any("Datacenter").(*simulator.Datacenter)
3313+
cluster := model.Map().Any("ClusterComputeResource").(*simulator.ClusterComputeResource)
3314+
dc := model.Map().Any("Datacenter").(*simulator.Datacenter)
33153315

33163316
if _, err := createTagAndCategory(session, zoneKey, testZone); err != nil {
33173317
t.Fatalf("cannot create tag and category: %v", err)
@@ -3448,7 +3448,7 @@ func TestVmDisksManipulation(t *testing.T) {
34483448
defer model.Remove()
34493449
defer server.Close()
34503450

3451-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
3451+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
34523452
managedObjRef := simulatorVM.VirtualMachine.Reference()
34533453
vmObj := object.NewVirtualMachine(session.Client.Client, managedObjRef)
34543454
machineObj := &machinev1.Machine{
@@ -3590,7 +3590,7 @@ func TestReconcilePowerStateAnnontation(t *testing.T) {
35903590
defer model.Remove()
35913591
defer server.Close()
35923592

3593-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
3593+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
35943594
managedObjRef := simulatorVM.VirtualMachine.Reference()
35953595
vmObj := object.NewVirtualMachine(session.Client.Client, simulatorVM.Reference())
35963596
_, err := vmObj.PowerOn(context.Background())

‎pkg/controller/vsphere/session/session_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestFindVMByName(t *testing.T) {
6767
model, session, server := initSimulator(t)
6868
defer model.Remove()
6969
defer server.Close()
70-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
70+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
7171

7272
testCases := []struct {
7373
testCase string
@@ -106,7 +106,7 @@ func TestFindRefByInstanceUUID(t *testing.T) {
106106
model, session, server := initSimulator(t)
107107
defer model.Remove()
108108
defer server.Close()
109-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
109+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
110110
instanceUUID := "instanceUUID"
111111
simulatorVM.Config.InstanceUuid = instanceUUID
112112

@@ -144,7 +144,7 @@ func TestFindVM(t *testing.T) {
144144
model, session, server := initSimulator(t)
145145
defer model.Remove()
146146
defer server.Close()
147-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
147+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
148148
instanceUUID := "a5764857-ae35-34dc-8f25-a9c9e73aa898"
149149
invalidInstanceUUID := "a5764857-ae35-34dc-8f25-a9c9e73aa899"
150150
simulatorVM.Config.InstanceUuid = instanceUUID
@@ -201,7 +201,7 @@ func TestGetTask(t *testing.T) {
201201
defer model.Remove()
202202
defer server.Close()
203203

204-
obj := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
204+
obj := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
205205
// Validate VM is powered on
206206
if obj.Runtime.PowerState != "poweredOn" {
207207
t.Fatal(obj.Runtime.PowerState)
@@ -263,7 +263,7 @@ func TestClientTimeout(t *testing.T) {
263263
Delay: int(time.Second.Milliseconds()),
264264
}
265265

266-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
266+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
267267

268268
_, err := session.FindVM(context.TODO(), simulatorVM.Config.Uuid, simulatorVM.Config.Name)
269269
g.Expect(err).ShouldNot(HaveOccurred())
@@ -281,7 +281,7 @@ func TestClientTimeout(t *testing.T) {
281281
"RetrievePropertiesEx": int(300),
282282
},
283283
}
284-
simulatorVM := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
284+
simulatorVM := model.Map().Any("VirtualMachine").(*simulator.VirtualMachine)
285285

286286
ctx, cancel := context.WithTimeout(context.TODO(), time.Duration(time.Millisecond*100))
287287
defer cancel()

0 commit comments

Comments
 (0)