Resolves: MTV-3738 | Provider create form - VMware vSphere

Signed-off-by: Jeff Puzzo <[email protected]>

Author: jpuzz0

locales/en/plugin__forklift-console-plugin.json

@@ -238,6 +238,7 @@
   "Condition": "Condition",
   "Conditions": "Conditions",
   "Conditions not found": "Conditions not found",
+  "Configure a VDDK image for a more efficient migration by enabling direct, block-level access to a VM's disk data.": "Configure a VDDK image for a more efficient migration by enabling direct, block-level access to a VM's disk data.",
   "Configure certificate validation": "Configure certificate validation",
   "Configure disk decryption settings including passphrases for LUKS-encrypted devices or network-bound disk encryption (NBDE/Clevis) for the VMs you want to migrate.": "Configure disk decryption settings including passphrases for LUKS-encrypted devices or network-bound disk encryption (NBDE/Clevis) for the VMs you want to migrate.",
   "Confirm selections": "Confirm selections",
@@ -437,6 +438,7 @@
   "For applications that need to be available 24/7, warm migration is the preferred choice to ensure business continuity.": "For applications that need to be available 24/7, warm migration is the preferred choice to ensure business continuity.",
   "For each LUKS-encrypted device, migration toolkit for virtualization (MTV) tries each passphrase until one unlocks the device.": "For each LUKS-encrypted device, migration toolkit for virtualization (MTV) tries each passphrase until one unlocks the device.",
   "For example: 10.10.0.10:/ova": "For example: 10.10.0.10:/ova",
+  "For example: https://host-example.com/sdk.": "For example: https://host-example.com/sdk.",
   "For VMs used for development, testing, or other non-essential tasks, the downtime is unlikely to have a major business impact.": "For VMs used for development, testing, or other non-essential tasks, the downtime is unlikely to have a major business impact.",
   "Forklift controller logs": "Forklift controller logs",
   "Forklift controller logs capture migration toolkit for virtualization (MTV) related events.": "Forklift controller logs capture migration toolkit for virtualization (MTV) related events.",
@@ -565,6 +567,7 @@
   "Manage columns": "Manage columns",
   "Manage the SSL/TLS certificate used to secure the connection to the provider. You can upload a custom CA certificate or skip this step.": "Manage the SSL/TLS certificate used to secure the connection to the provider. You can upload a custom CA certificate or skip this step.",
   "Managed resource": "Managed resource",
+  "Manually specify the VDDK image URL": "Manually specify the VDDK image URL",
   "Map": "Map",
   "Mappings": "Mappings",
   "Maximum concurrent VM migrations": "Maximum concurrent VM migrations",
@@ -750,6 +753,8 @@
   "Page table": "Page table",
   "Passphrases for LUKS encrypted devices": "Passphrases for LUKS encrypted devices",
   "Password": "Password",
+  "Password for connecting to the vSphere API endpoint.": "Password for connecting to the vSphere API endpoint.",
+  "Password input": "Password input",
   "Password is required": "Password is required",
   "Path": "Path",
   "paused": "paused",
@@ -946,6 +951,7 @@
   "Skip certificate validation": "Skip certificate validation",
   "Skip guest conversion": "Skip guest conversion",
   "Skip to review": "Skip to review",
+  "Skip VDDK setup (not recommended)": "Skip VDDK setup (not recommended)",
   "Skip VMware Virtual Disk Development Kit (VDDK) SDK acceleration (not recommended).": "Skip VMware Virtual Disk Development Kit (VDDK) SDK acceleration (not recommended).",
   "Small precopy interval": "Small precopy interval",
   "Snapshot polling interval": "Snapshot polling interval",
@@ -1107,11 +1113,13 @@
   "Upload": "Upload",
   "Upload a CA certificate to be trusted when connecting to Openshift API endpoint, or leave empty to use the system CA certificate.": "Upload a CA certificate to be trusted when connecting to Openshift API endpoint, or leave empty to use the system CA certificate.",
   "Upload a VDDK archive and build a VDDK init image from it.": "Upload a VDDK archive and build a VDDK init image from it.",
+  "Upload a VDDK archive to generate the image URL": "Upload a VDDK archive to generate the image URL",
   "Upload an OVA file which will be added to provider's virtual machines. The uploaded file name extension should be .ova": "Upload an OVA file which will be added to provider's virtual machines. The uploaded file name extension should be .ova",
   "Upload local OVA file": "Upload local OVA file",
   "Upload local OVA files": "Upload local OVA files",
   "Uploading...": "Uploading...",
   "URL": "URL",
+  "URL is required": "URL is required",
   "URL of the API endpoint of the Red Hat Virtualization Manager (RHVM) on which the source VM is mounted. Ensure that the URL includes the path leading to the RHVM API server, usually /ovirt-engine/api. For example, https://rhv-host-example.com/ovirt-engine/api.": "URL of the API endpoint of the Red Hat Virtualization Manager (RHVM) on which the source VM is mounted. Ensure that the URL includes the path leading to the RHVM API server, usually /ovirt-engine/api. For example, https://rhv-host-example.com/ovirt-engine/api.",
   "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk</1>.<3></3><4></4>For example: <6>https://vCenter-host-example.com/sdk</6>.<8></8><9></9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.": "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk</1>.<3></3><4></4>For example: <6>https://vCenter-host-example.com/sdk</6>.<8></8><9></9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.",
   "URL of the NFS file share that serves the OVA., for example, 10.10.0.10:/ova": "URL of the NFS file share that serves the OVA., for example, 10.10.0.10:/ova",
@@ -1145,6 +1153,7 @@
   "User password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint": "User password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint",
   "Username": "Username",
   "Username for connecting to OpenStack Identity (Keystone)": "Username for connecting to OpenStack Identity (Keystone)",
+  "Username for connecting to the vSphere API endpoint.": "Username for connecting to the vSphere API endpoint.",
   "Username is required": "Username is required",
   "Username is required. The username usually includes @ character, for example: name@internal": "Username is required. The username usually includes @ character, for example: name@internal",
   "Validation Failed": "Validation Failed",
@@ -1171,6 +1180,7 @@
   "View storage map details": "View storage map details",
   "Virtual appliance used by virtualization applications. Only supports OVA files created by VMware vSphere.": "Virtual appliance used by virtualization applications. Only supports OVA files created by VMware vSphere.",
   "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path in the format of <2>registry_route_or_server_path/vddk:&#8249;tag&#8250;</2>.<4></4><5></5>To accelerate migration and reduce the risk of a plan failing, it is strongly recommended to specify a VDDK init image.": "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path in the format of <2>registry_route_or_server_path/vddk:&#8249;tag&#8250;</2>.<4></4><5></5>To accelerate migration and reduce the risk of a plan failing, it is strongly recommended to specify a VDDK init image.",
+  "Virtual Disk Development Kit (VDDK) setup": "Virtual Disk Development Kit (VDDK) setup",
   "Virtual machine": "Virtual machine",
   "Virtual machines": "Virtual machines",
   "Virtualization platform from Red Hat. Currently in maintenance for existing customers only.": "Virtualization platform from Red Hat. Currently in maintenance for existing customers only.",
@@ -1190,13 +1200,15 @@
   "VMs included in live migrations migrate without downtime.": "VMs included in live migrations migrate without downtime.",
   "VMs included in warm migrations migrate with minimal downtime.": "VMs included in warm migrations migrate with minimal downtime.",
   "VMware only: vSphere product name.": "VMware only: vSphere product name.",
+  "VMware Virtual Disk Development Kit (VDDK) image.": "VMware Virtual Disk Development Kit (VDDK) image.",
   "VMware vSphere": "VMware vSphere",
   "VMware vSphere UI": "VMware vSphere UI",
   "VMware: A popular method is to use a Storage vMotion. This migration process automatically renames the VM's files and folder on the datastore to match the new name you have given it in the vSphere Client. You can also manually remove the VM from inventory, rename the files and folders, edit the .vmx file to update the references, and then re-add the VM to the inventory.": "VMware: A popular method is to use a Storage vMotion. This migration process automatically renames the VM's files and folder on the datastore to match the new name you have given it in the vSphere Client. You can also manually remove the VM from inventory, rename the files and folders, edit the .vmx file to update the references, and then re-add the VM to the inventory.",
   "Volume name template": "Volume name template",
   "Volume name template is a template for generating volume interface names in the target virtual machine.": "Volume name template is a template for generating volume interface names in the target virtual machine.",
   "Volume types": "Volume types",
   "Volumes": "Volumes",
+  "vSphere endpoint": "vSphere endpoint",
   "vSphere product name.": "vSphere product name.",
   "vSphere XCOPY": "vSphere XCOPY",
   "Waiting": "Waiting",

src/modules/Providers/utils/validators/provider/vsphere/validateVCenterURL.ts

@@ -20,7 +20,7 @@ export const validateVCenterURL = (
   // For a newly opened form where the field is not set yet, set the validation type to default.
   if (url === undefined) {
     return {
-      msg: 'The URL is required, URL of the vCenter API endpoint for example: https://host-example.com/sdk .',
+      msg: 'The URL is required, URL of the vCenter API endpoint for example: https://host-example.com/sdk.',
       type: ValidationState.Default,
     };
   }
@@ -38,14 +38,14 @@ export const validateVCenterURL = (
 
   if (trimmedUrl === '') {
     return {
-      msg: 'The URL is required, URL of the vCenter API endpoint for example: https://host-example.com/sdk .',
+      msg: 'The URL is required, URL of the vCenter API endpoint for example: https://host-example.com/sdk.',
       type: ValidationState.Error,
     };
   }
 
   if (!isValidURL) {
     return {
-      msg: 'The URL is invalid. URL should include the schema and path, for example: https://host-example.com/sdk .',
+      msg: 'The URL is invalid. URL should include the schema and path, for example: https://host-example.com/sdk.',
       type: ValidationState.Error,
     };
   }
@@ -63,12 +63,12 @@ export const validateVCenterURL = (
 
   if (!trimmedUrl.endsWith('sdk'))
     return {
-      msg: 'The URL does not end with a /sdk path, for example a URL with sdk path: https://host-example.com/sdk .',
+      msg: 'The URL does not end with a /sdk path, for example a URL with sdk path: https://host-example.com/sdk.',
       type: ValidationState.Warning,
     };
 
   return {
-    msg: 'The URL of the vCenter API endpoint for example: https://host-example.com/sdk .',
+    msg: 'The URL of the vCenter API endpoint for example: https://host-example.com/sdk.',
     type: ValidationState.Success,
   };
 };

src/providers/create-new/ProviderTypeFields.tsx

@@ -17,27 +17,35 @@ import OvirtUrlField from './fields/ovirt/OvirtUrlField';
 import ProviderNameField from './fields/ProviderNameField';
 import ProviderProjectField from './fields/ProviderProjectField';
 import ProviderTypeField from './fields/ProviderTypeField';
+import VsphereCredentialsFields from './fields/vsphere/VsphereCredentialsFields';
+import VsphereEndpointTypeField from './fields/vsphere/VsphereEndpointTypeField';
+import VsphereUrlField from './fields/vsphere/VsphereUrlField';
+import VsphereVddkField from './fields/vsphere/VsphereVddkField';
 import type { CreateProviderFormData } from './types';
 
 const ProviderTypeFields: FC = () => {
   const { t } = useForkliftTranslation();
   const { control } = useFormContext<CreateProviderFormData>();
 
-  const [selectedProviderType, openshiftUrl, ovirtUrl] = useWatch({
+  const [selectedProviderType, openshiftUrl, ovirtUrl, vsphereUrl] = useWatch({
     control,
     name: [
       ProviderFormFieldId.ProviderType,
       ProviderFormFieldId.OpenshiftUrl,
       ProviderFormFieldId.OvirtUrl,
+      ProviderFormFieldId.VsphereUrl,
     ],
   });
 
   return (
     <>
       <ProviderProjectField />
       <ProviderTypeField />
+
       {selectedProviderType && <ProviderNameField />}
+
       {selectedProviderType === PROVIDER_TYPES.ova && <NfsDirectoryField />}
+
       {selectedProviderType === PROVIDER_TYPES.openshift && (
         <>
           <OpenShiftUrlField />
@@ -46,6 +54,7 @@ const ProviderTypeFields: FC = () => {
           <CertificateValidationField />
         </>
       )}
+
       {selectedProviderType === PROVIDER_TYPES.openstack && (
         <>
           <OpenStackUrlField />
@@ -54,6 +63,7 @@ const ProviderTypeFields: FC = () => {
           <CertificateValidationField />
         </>
       )}
+
       {selectedProviderType === PROVIDER_TYPES.ovirt && (
         <>
           <OvirtUrlField />
@@ -62,6 +72,17 @@ const ProviderTypeFields: FC = () => {
           <CertificateValidationField />
         </>
       )}
+
+      {selectedProviderType === PROVIDER_TYPES.vsphere && (
+        <>
+          <VsphereEndpointTypeField />
+          <VsphereUrlField />
+          <VsphereVddkField />
+          <SectionHeading text={t('Provider credentials')} />
+          {vsphereUrl?.trim() && <VsphereCredentialsFields />}
+          <CertificateValidationField />
+        </>
+      )}
     </>
   );
 };

src/providers/create-new/__tests__/CreateProviderForm.openshift.test.tsx

@@ -0,0 +1,179 @@
+import { beforeEach, describe, expect, it } from '@jest/globals';
+import { render, screen, waitFor } from '@testing-library/react';
+import { userEvent } from '@testing-library/user-event';
+
+import CreateProviderForm from '../CreateProviderForm';
+
+import {
+  clearAllProviderMocks,
+  mockCreateProvider,
+  mockCreateProviderSecret,
+  mockNavigate,
+  mockPatchProviderSecretOwner,
+} from './test-utils';
+
+jest.mock('react-router-dom-v5-compat', () => ({
+  ...jest.requireActual('react-router-dom-v5-compat'),
+  useNavigate: () => mockNavigate,
+}));
+
+jest.mock('@utils/analytics/hooks/useForkliftAnalytics', () => ({
+  useForkliftAnalytics: () => ({
+    trackEvent: jest.fn(),
+  }),
+}));
+
+jest.mock('src/providers/create/utils/createProvider', () => ({
+  createProvider: (...args: unknown[]) => mockCreateProvider(...args),
+}));
+
+jest.mock('src/providers/create/utils/createProviderSecret', () => ({
+  createProviderSecret: (...args: unknown[]) => mockCreateProviderSecret(...args),
+}));
+
+jest.mock('src/providers/create/utils/patchProviderSecretOwner', () => ({
+  patchProviderSecretOwner: (...args: unknown[]) => mockPatchProviderSecretOwner(...args),
+}));
+
+jest.mock('@utils/hooks/useWatchProjectNames', () => ({
+  __esModule: true,
+  default: () => [['test-namespace'], true],
+}));
+
+jest.mock('../CreateProviderFormContextProvider', () => {
+  const { CreateProviderFormContext } = jest.requireActual('../constants');
+  return {
+    __esModule: true,
+    default: ({ children }: { children: React.ReactNode }) => (
+      <CreateProviderFormContext.Provider
+        value={{
+          providerNames: ['existing-provider'],
+          providerNamesLoaded: true,
+        }}
+      >
+        {children}
+      </CreateProviderFormContext.Provider>
+    ),
+  };
+});
+
+jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
+  useActiveNamespace: () => ['test-namespace', jest.fn()],
+  useK8sWatchResource: () => [[], true, null],
+  useModal: () => ({ isOpen: false, showModal: jest.fn(), hideModal: jest.fn() }),
+  useAccessReview: () => [true, false],
+  ProjectModel: {
+    apiGroup: 'project.openshift.io',
+    plural: 'projects',
+  },
+}));
+
+jest.mock('@utils/hooks/useDefaultProject', () => ({
+  useDefaultProject: () => 'test-namespace',
+}));
+
+jest.mock('../fields/ProviderTypeField', () => {
+  const { useController } = jest.requireActual('react-hook-form');
+  const { useCreateProviderFormContext } = jest.requireActual(
+    '../hooks/useCreateProviderFormContext',
+  );
+
+  return {
+    __esModule: true,
+    default: () => {
+      const { control } = useCreateProviderFormContext();
+      const { field } = useController({
+        control,
+        name: 'providerType',
+      });
+
+      return (
+        <div>
+          <label htmlFor="provider-type-select">Provider type</label>
+          <select id="provider-type-select" data-testid="provider-type-select" {...field}>
+            <option value="">Select a provider type</option>
+            <option value="openshift">OpenShift Virtualization</option>
+          </select>
+        </div>
+      );
+    },
+  };
+});
+
+describe('CreateProviderForm - OpenShift Provider', () => {
+  beforeEach(() => {
+    clearAllProviderMocks();
+  });
+
+  describe('Initial rendering', () => {
+    it('renders provider project and provider type fields', () => {
+      render(<CreateProviderForm />);
+
+      expect(screen.getByText('Provider project')).toBeInTheDocument();
+      expect(screen.getByLabelText(/provider type/i)).toBeInTheDocument();
+    });
+
+    it('disables create button when form is invalid', () => {
+      render(<CreateProviderForm />);
+
+      const submitButton = screen.getByRole('button', { name: /create provider/i });
+      expect(submitButton).toBeDisabled();
+    });
+
+    it('does not show provider name field before selecting type', () => {
+      render(<CreateProviderForm />);
+
+      expect(screen.queryByRole('textbox', { name: /provider name/i })).not.toBeInTheDocument();
+    });
+  });
+
+  it('shows OpenShift-specific fields after selecting OpenShift type', async () => {
+    const user = userEvent.setup();
+    render(<CreateProviderForm />);
+
+    await user.selectOptions(screen.getByLabelText(/provider type/i), 'openshift');
+
+    await waitFor(() => {
+      expect(screen.getByRole('textbox', { name: /provider name/i })).toBeInTheDocument();
+      expect(screen.getByRole('textbox', { name: /api endpoint url/i })).toBeInTheDocument();
+      expect(
+        screen.getByRole('radio', { name: /skip certificate validation/i }),
+      ).toBeInTheDocument();
+    });
+
+    expect(
+      screen.queryByRole('textbox', { name: /service account bearer token/i }),
+    ).not.toBeInTheDocument();
+  });
+
+  it('shows bearer token field when URL is provided for remote cluster', async () => {
+    const user = userEvent.setup();
+    render(<CreateProviderForm />);
+
+    await user.selectOptions(screen.getByLabelText(/provider type/i), 'openshift');
+
+    await waitFor(() => {
+      expect(screen.getByRole('textbox', { name: /api endpoint url/i })).toBeInTheDocument();
+    });
+
+    const urlInput = screen.getByRole('textbox', { name: /api endpoint url/i });
+    await user.type(urlInput, 'https://api.example.com:6443');
+
+    await waitFor(() => {
+      expect(screen.getByLabelText(/service account bearer token/i)).toBeInTheDocument();
+    });
+  });
+
+  it('hides OVA fields when OpenShift provider is selected', async () => {
+    const user = userEvent.setup();
+    render(<CreateProviderForm />);
+
+    await user.selectOptions(screen.getByLabelText(/provider type/i), 'openshift');
+
+    await waitFor(() => {
+      expect(screen.getByRole('textbox', { name: /api endpoint url/i })).toBeInTheDocument();
+    });
+
+    expect(screen.queryByLabelText(/nfs shared directory/i)).not.toBeInTheDocument();
+  });
+});