Make vcsim work with moid

Author: Ricardo Katz

test/infrastructure/vcsim/controllers/vmip_controller.go

@@ -20,6 +20,7 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -52,9 +53,16 @@ func (r *vmIPReconciler) ReconcileIP(ctx context.Context) (ctrl.Result, error) {
 		return reconcile.Result{}, errors.Wrapf(err, "failed to get vcenter session")
 	}
 
-	vm, err := authSession.Finder.VirtualMachine(ctx, r.GetVMPath())
-	if err != nil {
-		return reconcile.Result{}, errors.Wrapf(err, "failed to find vm")
+	vmPath := r.GetVMPath()
+	var vm *object.VirtualMachine
+	vmRef := object.ReferenceFromString(vmPath)
+	if vmRef != nil {
+		vm = object.NewVirtualMachine(authSession.Client.Client, *vmRef)
+	} else {
+		vm, err = authSession.Finder.VirtualMachine(ctx, r.GetVMPath())
+		if err != nil {
+			return reconcile.Result{}, errors.Wrapf(err, "failed to find vm")
+		}
 	}
 
 	// Check if the VM already has network status (but it is not yet surfaced in conditions)

test/infrastructure/vcsim/controllers/vspherevm_controller.go

@@ -19,7 +19,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"path"
 
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -264,8 +263,8 @@ func (r *VSphereVMReconciler) getVMIpReconciler(vSphereCluster *infrav1.VSphereC
 			return !vSphereVM.Status.Ready && conditions.IsFalse(vSphereVM, infrav1.VMProvisionedCondition) && conditions.GetReason(vSphereVM, infrav1.VMProvisionedCondition) == infrav1.WaitingForIPAllocationReason
 		},
 		GetVMPath: func() string {
-			// Return the path where the VM is stored.
-			return path.Join(vSphereVM.Spec.Folder, vSphereVM.Name)
+			// Return vmref of the VM as it is populated already by CAPV
+			return vSphereVM.Status.VMRef
 		},
 	}
 }