Merge branch 'main' into private/geet/main/cleanup-builds-final

Author: geet-pf9

deploy/00crds.yaml

@@ -985,6 +985,8 @@ spec:
                     description: NICOverride defines per-NIC overrides for IP and
                       MAC preservation during migration
                     properties:
+                      UserAssignedIP:
+                        type: string
                       interfaceIndex:
                         description: InterfaceIndex is the zero-based index of the
                           NIC

deploy/installer.yaml

@@ -985,6 +985,8 @@ spec:
                     description: NICOverride defines per-NIC overrides for IP and
                       MAC preservation during migration
                     properties:
+                      UserAssignedIP:
+                        type: string
                       interfaceIndex:
                         description: InterfaceIndex is the zero-based index of the
                           NIC

k8s/migration/api/v1alpha1/migrationplan_types.go

@@ -86,6 +86,8 @@ type NICOverride struct {
 	// PreserveMAC indicates whether to preserve the source VM's MAC address for this NIC.
 	// When nil the migration default (preserve) is used.
 	PreserveMAC *bool `json:"preserveMAC,omitempty"`
+
+	UserAssignedIP string `json:"UserAssignedIP,omitempty"`
 }
 
 // MigrationPlanSpec defines the desired state of MigrationPlan including

k8s/migration/config/crd/bases/vjailbreak.k8s.pf9.io_migrationplans.yaml

@@ -156,6 +156,8 @@ spec:
                     description: NICOverride defines per-NIC overrides for IP and
                       MAC preservation during migration
                     properties:
+                      UserAssignedIP:
+                        type: string
                       interfaceIndex:
                         description: InterfaceIndex is the zero-based index of the
                           NIC

k8s/migration/go.mod

@@ -22,6 +22,7 @@ require (
 	github.com/prometheus/client_golang v1.22.0
 	github.com/vmware/govmomi v0.51.0
 	go.uber.org/zap v1.27.0
+	golang.org/x/crypto v0.44.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.33.3
 	k8s.io/apimachinery v0.33.3
@@ -86,7 +87,6 @@ require (
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/crypto v0.44.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect

k8s/migration/internal/controller/migrationplan_controller.go

@@ -1704,7 +1704,8 @@ func (r *MigrationPlanReconciler) reconcileMapping(ctx context.Context,
 	// Skip storage mapping reconciliation for StorageCopyMethod storage copy method
 	// as it uses ArrayCredsMapping instead of StorageMapping
 	if migrationtemplate.Spec.StorageCopyMethod != StorageCopyMethod {
-		openstackvolumetypes, err = r.reconcileStorage(ctx, migrationtemplate, openstackcreds, vmMachine.Spec.VMInfo.Datastores)
+		vmDatastores := getDatastoresForVolumeMapping(vmMachine)
+		openstackvolumetypes, err = r.reconcileStorage(ctx, migrationtemplate, openstackcreds, vmDatastores)
 		if err != nil {
 			return nil, nil, errors.Wrap(err, "failed to reconcile storage")
 		}
@@ -1713,6 +1714,22 @@ func (r *MigrationPlanReconciler) reconcileMapping(ctx context.Context,
 	return openstacknws, openstackvolumetypes, nil
 }
 
+// getDatastoresForVolumeMapping returns datastores in per-disk order so
+// StorageMapping produces one Cinder volume type for each virtual disk.
+func getDatastoresForVolumeMapping(vmMachine *vjailbreakv1alpha1.VMwareMachine) []string {
+	if len(vmMachine.Spec.VMInfo.Disks) > 0 {
+		vmds := make([]string, 0, len(vmMachine.Spec.VMInfo.Disks))
+		for _, disk := range vmMachine.Spec.VMInfo.Disks {
+			vmds = append(vmds, disk.Datastore)
+		}
+		if len(vmds) > 0 {
+			return vmds
+		}
+	}
+
+	return vmMachine.Spec.VMInfo.Datastores
+}
+
 //nolint:dupl // Similar logic to storages reconciliation, excluding from linting to keep it readable
 func (r *MigrationPlanReconciler) reconcileNetwork(ctx context.Context,
 	migrationtemplate *vjailbreakv1alpha1.MigrationTemplate,
@@ -1785,15 +1802,21 @@ func (r *MigrationPlanReconciler) reconcileStorage(ctx context.Context,
 	}
 
 	openstackvolumetypes := []string{}
-	for _, vmdatastore := range vmds {
+	for diskIdx, vmdatastore := range vmds {
+		if vmdatastore == "" {
+			return nil, errors.Errorf("VMware datastore is empty for disk index %d", diskIdx)
+		}
+		found := false
 		for _, storagemaptype := range storagemap.Spec.Storages {
 			if vmdatastore == storagemaptype.Source {
 				openstackvolumetypes = append(openstackvolumetypes, storagemaptype.Target)
+				found = true
+				break
 			}
 		}
-	}
-	if len(openstackvolumetypes) != len(vmds) {
-		return nil, errors.Errorf("VMware Datastore(s) not found in StorageMapping vm(%d) openstack(%d)", len(vmds), len(openstackvolumetypes))
+		if !found {
+			return nil, errors.Errorf("VMware datastore %q not found in StorageMapping for disk index %d", vmdatastore, diskIdx)
+		}
 	}
 	if storagemap.Status.StoragemappingValidationStatus != string(corev1.PodSucceeded) {
 		err = utils.VerifyStorage(ctx, r.Client, openstackcreds, openstackvolumetypes)

k8s/migration/internal/controller/migrationplan_controller_test.go

@@ -18,6 +18,8 @@ package controller
 
 import (
 	"context"
+	"reflect"
+	"testing"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
@@ -80,3 +82,61 @@ var _ = ginkgo.Describe("MigrationPlan Controller", func() {
 		})
 	})
 })
+
+func TestGetDatastoresForVolumeMapping_UsesPerDiskOrderWithDuplicates(t *testing.T) {
+	vmMachine := &vjailbreakv1alpha1.VMwareMachine{
+		Spec: vjailbreakv1alpha1.VMwareMachineSpec{
+			VMInfo: vjailbreakv1alpha1.VMInfo{
+				Datastores: []string{"nfs"},
+				Disks: []vjailbreakv1alpha1.Disk{
+					{Name: "Hard disk 1", Datastore: "nfs"},
+					{Name: "Hard disk 2", Datastore: "nfs"},
+					{Name: "Hard disk 3", Datastore: "ssd"},
+				},
+			},
+		},
+	}
+
+	got := getDatastoresForVolumeMapping(vmMachine)
+	want := []string{"nfs", "nfs", "ssd"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("unexpected datastore mapping: got %v, want %v", got, want)
+	}
+}
+
+func TestGetDatastoresForVolumeMapping_FallsBackToLegacyDatastores(t *testing.T) {
+	vmMachine := &vjailbreakv1alpha1.VMwareMachine{
+		Spec: vjailbreakv1alpha1.VMwareMachineSpec{
+			VMInfo: vjailbreakv1alpha1.VMInfo{
+				Datastores: []string{"nfs", "ssd"},
+				Disks:      nil,
+			},
+		},
+	}
+
+	got := getDatastoresForVolumeMapping(vmMachine)
+	want := []string{"nfs", "ssd"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("unexpected fallback datastore mapping: got %v, want %v", got, want)
+	}
+}
+
+func TestGetDatastoresForVolumeMapping_PreservesBlankDiskDatastore(t *testing.T) {
+	vmMachine := &vjailbreakv1alpha1.VMwareMachine{
+		Spec: vjailbreakv1alpha1.VMwareMachineSpec{
+			VMInfo: vjailbreakv1alpha1.VMInfo{
+				Datastores: []string{"legacy-ds"},
+				Disks: []vjailbreakv1alpha1.Disk{
+					{Name: "Hard disk 1", Datastore: ""},
+					{Name: "Hard disk 2", Datastore: "nfs"},
+				},
+			},
+		},
+	}
+
+	got := getDatastoresForVolumeMapping(vmMachine)
+	want := []string{"", "nfs"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("unexpected datastore mapping for blank datastore disks: got %v, want %v", got, want)
+	}
+}

pkg/common/validation/openstack/validate.go

@@ -149,6 +149,15 @@ func Validate(ctx context.Context, k8sClient client.Client, openstackcreds *vjai
 	}
 
 	if openstackCredential.VJBInstanceID != "" {
+		// Verify the provided instance ID exists in the OpenStack environment
+		_, err = verifyInstanceExists(providerClient, openstackCredential.RegionName, openstackCredential.VJBInstanceID)
+		if err != nil {
+			return ValidationResult{
+				Valid:   false,
+				Message: fmt.Sprintf("Failed to verify instance ID '%s': %s", openstackCredential.VJBInstanceID, err.Error()),
+				Error:   err,
+			}
+		}
 		return successfulValidationObject
 	}
 
@@ -284,6 +293,47 @@ func verifyCredentialsMatchCurrentEnvironment(providerClient *gophercloud.Provid
 	return true, nil
 }
 
+// verifyInstanceExists checks if the provided instance ID exists in the OpenStack environment
+func verifyInstanceExists(providerClient *gophercloud.ProviderClient, regionName string, instanceID string) (ok bool, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			ok = false
+			err = fmt.Errorf("panic while verifying instance existence: %v", r)
+		}
+	}()
+
+	if providerClient == nil {
+		return false, fmt.Errorf("provider client is nil")
+	}
+	if providerClient.EndpointLocator == nil {
+		return false, fmt.Errorf("OpenStack client is not authenticated (endpoint locator is not initialized)")
+	}
+	if strings.TrimSpace(regionName) == "" {
+		return false, fmt.Errorf("region name is empty")
+	}
+	if strings.TrimSpace(instanceID) == "" {
+		return false, fmt.Errorf("instance ID is empty")
+	}
+
+	computeClient, err := openstack.NewComputeV2(providerClient, gophercloud.EndpointOpts{
+		Region: regionName,
+	})
+	if err != nil {
+		return false, fmt.Errorf("failed to create OpenStack compute client: %w", err)
+	}
+
+	_, err = servers.Get(context.TODO(), computeClient, instanceID).Extract()
+	if err != nil {
+		if strings.Contains(err.Error(), "Resource not found") ||
+			strings.Contains(err.Error(), "No server with a name or ID") ||
+			strings.Contains(err.Error(), "404") {
+			return false, fmt.Errorf("instance ID '%s' not found in the OpenStack environment. Please verify the instance ID and ensure the credentials are for the correct OpenStack environment", instanceID)
+		}
+		return false, fmt.Errorf("failed to verify instance access: %w. Please check if the provided credentials have compute:get_server permission", err)
+	}
+	return true, nil
+}
+
 // PostValidationResources holds resources fetched after successful validation
 type PostValidationResources struct {
 	Flavors       []flavors.Flavor