Merge pull request vmware-tanzu#1450 from bryanv/bryanv/vm-create-match-vmic-by-profile-id

🐛 Match VMIC location by storage profile ID

Author: bryanv

pkg/providers/vsphere/vmprovider_vm.go

@@ -1884,7 +1884,10 @@ func (vs *vSphereVMProvider) vmCreateGetSourceFilePaths(
 	// Check if the files are cached.
 	for i := range obj.Status.Locations {
 		l := obj.Status.Locations[i]
-		if l.DatacenterID == datacenterID && l.DatastoreID == datastoreID {
+		if l.DatacenterID == datacenterID &&
+			l.DatastoreID == datastoreID &&
+			l.ProfileID == createArgs.StorageProfileID {
+
 			if c := pkgcnd.Get(l, vmopv1.ReadyConditionType); c != nil {
 				switch c.Status {
 				case metav1.ConditionTrue:

pkg/providers/vsphere/vmprovider_vm_test.go

@@ -1906,21 +1906,36 @@ func vmTests() {
 							conditions.MarkTrue(
 								&vmic,
 								vmopv1.VirtualMachineImageCacheConditionFilesReady)
+							cachedFiles := []vmopv1.VirtualMachineImageCacheFileStatus{
+								{
+									ID:       ctx.ContentLibraryItemDiskPath,
+									Type:     vmopv1.VirtualMachineImageCacheFileTypeDisk,
+									DiskType: vmopv1.VolumeTypeClassic,
+								},
+								{
+									ID:   ctx.ContentLibraryItemNVRAMPath,
+									Type: vmopv1.VirtualMachineImageCacheFileTypeOther,
+								},
+							}
+
 							vmic.Status.Locations = []vmopv1.VirtualMachineImageCacheLocationStatus{
 								{
 									DatacenterID: ctx.Datacenter.Reference().Value,
 									DatastoreID:  ctx.Datastore.Reference().Value,
-									Files: []vmopv1.VirtualMachineImageCacheFileStatus{
-										{
-											ID:       ctx.ContentLibraryItemDiskPath,
-											Type:     vmopv1.VirtualMachineImageCacheFileTypeDisk,
-											DiskType: vmopv1.VolumeTypeClassic,
-										},
+									ProfileID:    ctx.StorageProfileID,
+									Files:        cachedFiles,
+									Conditions: []metav1.Condition{
 										{
-											ID:   ctx.ContentLibraryItemNVRAMPath,
-											Type: vmopv1.VirtualMachineImageCacheFileTypeOther,
+											Type:   vmopv1.ReadyConditionType,
+											Status: metav1.ConditionTrue,
 										},
 									},
+								},
+								{
+									DatacenterID: ctx.Datacenter.Reference().Value,
+									DatastoreID:  ctx.Datastore.Reference().Value,
+									ProfileID:    ctx.EncryptedStorageProfileID,
+									Files:        cachedFiles,
 									Conditions: []metav1.Condition{
 										{
 											Type:   vmopv1.ReadyConditionType,
@@ -4538,6 +4553,7 @@ func vmTests() {
 							{
 								DatacenterID: ctx.Datacenter.Reference().Value,
 								DatastoreID:  ctx.Datastore.Reference().Value,
+								ProfileID:    ctx.StorageProfileID,
 								Files:        []vmopv1.VirtualMachineImageCacheFileStatus{},
 								Conditions: []metav1.Condition{
 									{

pkg/providers/vsphere/vmprovider_vm_unmanaged_volumes_test.go

@@ -337,6 +337,7 @@ func unmanagedVolumesTests() {
 				{
 					DatacenterID: ctx.Datacenter.Reference().Value,
 					DatastoreID:  ctx.Datastore.Reference().Value,
+					ProfileID:    ctx.StorageProfileID,
 					Files: []vmopv1.VirtualMachineImageCacheFileStatus{
 						{
 							ID:       ctx.ContentLibraryItemDiskPath,