Resolves: MTV-3738 | Provider create form - Ovirt

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

Author: jpuzz0

locales/en/plugin__forklift-console-plugin.json

@@ -113,6 +113,7 @@
   "A username and domain for the vCenter API endpoint, for example: [email protected]. [required]": "A username and domain for the vCenter API endpoint, for example: [email protected]. [required]",
   "A username for connecting to the OpenStack Identity (Keystone) endpoint.": "A username for connecting to the OpenStack Identity (Keystone) endpoint.",
   "A username for connecting to the OpenStack Identity (Keystone) endpoint. [required]": "A username for connecting to the OpenStack Identity (Keystone) endpoint. [required]",
+  "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint, for example: name@internal": "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint, for example: name@internal",
   "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint, for example: name@internal . [required]": "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint, for example: name@internal . [required]",
   "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the username is in the format of username@user-domain. For example: admin@internal.": "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the username is in the format of username@user-domain. For example: admin@internal.",
   "A username for connecting to the vCenter API endpoint. Ensure the username includes the user domain. For example: <1>[email protected]</1>.": "A username for connecting to the vCenter API endpoint. Ensure the username includes the user domain. For example: <1>[email protected]</1>.",
@@ -451,6 +452,7 @@
   "Guest conversion uses the virt-v2v tool to modify all of the internal configurations of the VMs in the plan to make them compatible with Red Hat OpenShift Virtualization.": "Guest conversion uses the virt-v2v tool to modify all of the internal configurations of the VMs in the plan to make them compatible with Red Hat OpenShift Virtualization.",
   "Health": "Health",
   "Health indicates the current status of the pods related to the migration toolkit for virtualization, including whether any have failed. For more details, refer to the logs.": "Health indicates the current status of the pods related to the migration toolkit for virtualization, including whether any have failed. For more details, refer to the logs.",
+  "Hide password": "Hide password",
   "Hide token": "Hide token",
   "Hide values": "Hide values",
   "Hide variables": "Hide variables",
@@ -935,6 +937,7 @@
   "Short snapshot polling interval": "Short snapshot polling interval",
   "Show archived": "Show archived",
   "Show default projects": "Show default projects",
+  "Show password": "Show password",
   "Show token": "Show token",
   "Show variables": "Show variables",
   "Since the VM is offline, there are no live changes to track, making the data copy a one-time, full-disk transfer.": "Since the VM is offline, there are no live changes to track, making the data copy a one-time, full-disk transfer.",
@@ -1044,9 +1047,11 @@
   "The target storage mapping data from the inventory is not available: {{resourcesError}}.": "The target storage mapping data from the inventory is not available: {{resourcesError}}.",
   "The uploaded file name extension should be .ova": "The uploaded file name extension should be .ova",
   "The URL is invalid. URL should include the schema, for example: https://example.com:6443.": "The URL is invalid. URL should include the schema, for example: https://example.com:6443.",
+  "The URL is required. URL should include the schema and path, for example: https://rhv-host-example.com/ovirt-engine/api": "The URL is required. URL should include the schema and path, for example: https://rhv-host-example.com/ovirt-engine/api",
   "The URL of the API endpoint, for example: https://example.com:6443.": "The URL of the API endpoint, for example: https://example.com:6443.",
   "The URL of the OpenStack Identity (Keystone) API endpoint, for example: https://identity_service.com:5000/v3.": "The URL of the OpenStack Identity (Keystone) API endpoint, for example: https://identity_service.com:5000/v3.",
   "The URL of the OpenStack Identity (Keystone) endpoint, for example: https://identity_service.com:5000/v3": "The URL of the OpenStack Identity (Keystone) endpoint, for example: https://identity_service.com:5000/v3",
+  "The URL of the Red Hat Virtualization Manager (RHVM) API endpoint, for example: https://rhv-host-example.com/ovirt-engine/api": "The URL of the Red Hat Virtualization Manager (RHVM) API endpoint, for example: https://rhv-host-example.com/ovirt-engine/api",
   "The URL of the Red Hat Virtualization Manager (RHVM) API endpoint, for example: https://rhv-host-example.com/ovirt-engine/api .": "The URL of the Red Hat Virtualization Manager (RHVM) API endpoint, for example: https://rhv-host-example.com/ovirt-engine/api .",
   "The URL of the vCenter API endpoint, for example: https://vCenter-host-example.com/sdk.": "The URL of the vCenter API endpoint, for example: https://vCenter-host-example.com/sdk.",
   "The username for the ESXi host admin": "The username for the ESXi host admin",
@@ -1135,8 +1140,11 @@
   "User name password is required, user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.": "User name password is required, user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.",
   "User name usually include `@` char, for example: name@internal .": "User name usually include `@` char, for example: name@internal .",
   "User name usually include the domain, for example: [email protected]": "User name usually include the domain, for example: [email protected]",
+  "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 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",
   "Value": "Value",
   "Values": "Values",

src/providers/create-new/ProviderTypeFields.tsx

@@ -12,6 +12,8 @@ import ServiceAccountTokenField from './fields/openshift/ServiceAccountTokenFiel
 import OpenStackAuthenticationTypeField from './fields/openstack/OpenStackAuthenticationTypeField';
 import OpenStackUrlField from './fields/openstack/OpenStackUrlField';
 import NfsDirectoryField from './fields/ova/NfsDirectoryField';
+import OvirtCredentialsFields from './fields/ovirt/OvirtCredentialsFields';
+import OvirtUrlField from './fields/ovirt/OvirtUrlField';
 import ProviderNameField from './fields/ProviderNameField';
 import ProviderProjectField from './fields/ProviderProjectField';
 import ProviderTypeField from './fields/ProviderTypeField';
@@ -21,9 +23,13 @@ const ProviderTypeFields: FC = () => {
   const { t } = useForkliftTranslation();
   const { control } = useFormContext<CreateProviderFormData>();
 
-  const [selectedProviderType, openshiftUrl] = useWatch({
+  const [selectedProviderType, openshiftUrl, ovirtUrl] = useWatch({
     control,
-    name: [ProviderFormFieldId.ProviderType, ProviderFormFieldId.OpenshiftUrl],
+    name: [
+      ProviderFormFieldId.ProviderType,
+      ProviderFormFieldId.OpenshiftUrl,
+      ProviderFormFieldId.OvirtUrl,
+    ],
   });
 
   return (
@@ -48,6 +54,14 @@ const ProviderTypeFields: FC = () => {
           <CertificateValidationField />
         </>
       )}
+      {selectedProviderType === PROVIDER_TYPES.ovirt && (
+        <>
+          <OvirtUrlField />
+          <SectionHeading text={t('Provider credentials')} />
+          {ovirtUrl?.trim() && <OvirtCredentialsFields />}
+          <CertificateValidationField />
+        </>
+      )}
     </>
   );
 };

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

@@ -70,7 +70,6 @@ jest.mock('@utils/hooks/useDefaultProject', () => ({
 }));
 
 jest.mock('../fields/ProviderTypeField', () => {
-  const React = jest.requireActual('react');
   const { useController } = jest.requireActual('react-hook-form');
   const { useCreateProviderFormContext } = jest.requireActual(
     '../hooks/useCreateProviderFormContext',
@@ -85,30 +84,17 @@ jest.mock('../fields/ProviderTypeField', () => {
         name: 'providerType',
       });
 
-      return React.createElement(
-        'div',
-        null,
-        React.createElement('label', { htmlFor: 'provider-type-select' }, 'Provider type'),
-        React.createElement(
-          'select',
-          { id: 'provider-type-select', 'data-testid': 'provider-type-select', ...field },
-          React.createElement('option', { value: '' }, 'Select a provider type'),
-          React.createElement(
-            'option',
-            { value: 'openshift', 'data-testid': 'provider-type-option-openshift' },
-            'OpenShift Virtualization',
-          ),
-          React.createElement(
-            'option',
-            { value: 'openstack', 'data-testid': 'provider-type-option-openstack' },
-            'OpenStack',
-          ),
-          React.createElement(
-            'option',
-            { value: 'ova', 'data-testid': 'provider-type-option-ova' },
-            'OVA',
-          ),
-        ),
+      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>
+            <option value="openstack">OpenStack</option>
+            <option value="ova">Open Virtual Appliance</option>
+            <option value="ovirt">Red Hat Virtualization</option>
+          </select>
+        </div>
       );
     },
   };
@@ -146,8 +132,7 @@ describe('CreateProviderForm', () => {
       const user = userEvent.setup();
       render(<CreateProviderForm />);
 
-      const typeSelect = screen.getByLabelText(/provider type/i);
-      await user.selectOptions(typeSelect, 'openshift');
+      await user.selectOptions(screen.getByLabelText(/provider type/i), 'openshift');
 
       await waitFor(() => {
         expect(screen.getByRole('textbox', { name: /provider name/i })).toBeInTheDocument();
@@ -277,4 +262,60 @@ describe('CreateProviderForm', () => {
       ).not.toBeInTheDocument();
     });
   });
+
+  describe('oVirt provider', () => {
+    it('shows oVirt-specific fields after selecting oVirt type', async () => {
+      const user = userEvent.setup();
+      render(<CreateProviderForm />);
+
+      await user.selectOptions(screen.getByLabelText(/provider type/i), 'ovirt');
+
+      await waitFor(() => {
+        expect(screen.getByRole('textbox', { name: /provider name/i })).toBeInTheDocument();
+        expect(screen.getByTestId('ovirt-url-input')).toBeInTheDocument();
+        expect(
+          screen.getByRole('radio', { name: /skip certificate validation/i }),
+        ).toBeInTheDocument();
+      });
+
+      expect(screen.queryByTestId('ovirt-username-input')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('ovirt-password-input')).not.toBeInTheDocument();
+    });
+
+    it('shows credentials fields when URL is provided', async () => {
+      const user = userEvent.setup();
+      render(<CreateProviderForm />);
+
+      await user.selectOptions(screen.getByLabelText(/provider type/i), 'ovirt');
+
+      await waitFor(() => {
+        expect(screen.getByTestId('ovirt-url-input')).toBeInTheDocument();
+      });
+
+      const urlInput = screen.getByTestId('ovirt-url-input');
+      await user.type(urlInput, 'https://rhv.example.com/ovirt-engine/api');
+
+      await waitFor(() => {
+        expect(screen.getByTestId('ovirt-username-input')).toBeInTheDocument();
+        expect(screen.getByTestId('ovirt-password-input')).toBeInTheDocument();
+      });
+    });
+
+    it('hides other provider fields when oVirt provider is selected', async () => {
+      const user = userEvent.setup();
+      render(<CreateProviderForm />);
+
+      await user.selectOptions(screen.getByLabelText(/provider type/i), 'ovirt');
+
+      await waitFor(() => {
+        expect(screen.getByRole('textbox', { name: /provider name/i })).toBeInTheDocument();
+      });
+
+      expect(
+        screen.queryByRole('textbox', { name: /service account bearer token/i }),
+      ).not.toBeInTheDocument();
+      expect(screen.queryByLabelText(/nfs shared directory/i)).not.toBeInTheDocument();
+      expect(screen.queryByTestId('openstack-url-input')).not.toBeInTheDocument();
+    });
+  });
 });

src/providers/create-new/fields/CACertificateField.tsx

@@ -15,16 +15,17 @@ const CACertificateField: FC = () => {
   const { t } = useForkliftTranslation();
   const { control } = useFormContext();
 
-  const [certificateValidation, openshiftUrl, openstackUrl] = useWatch({
+  const [certificateValidation, openshiftUrl, openstackUrl, ovirtUrl] = useWatch({
     control,
     name: [
       ProviderFormFieldId.CertificateValidation,
       ProviderFormFieldId.OpenshiftUrl,
       ProviderFormFieldId.OpenstackUrl,
+      ProviderFormFieldId.OvirtUrl,
     ],
   });
 
-  const url = openshiftUrl ?? openstackUrl;
+  const url = openshiftUrl ?? openstackUrl ?? ovirtUrl;
 
   const {
     field: { onChange, value },

src/providers/create-new/fields/constants.ts

@@ -18,57 +18,52 @@ enum CertificateFormFieldId {
 }
 
 enum OpenshiftProviderFormFieldId {
-  Url = 'openshiftUrl',
+  OpenshiftUrl = 'openshiftUrl',
   ServiceAccountToken = 'serviceAccountToken',
 }
 
 enum OpenstackProviderFormFieldId {
-  Url = 'openstackUrl',
-  AuthType = 'openstackAuthType',
-  Username = 'openstackUsername',
-  Password = 'openstackPassword',
-  Token = 'openstackToken',
-  RegionName = 'openstackRegionName',
-  ProjectName = 'openstackProjectName',
-  DomainName = 'openstackDomainName',
-  UserId = 'openstackUserId',
-  ProjectId = 'openstackProjectId',
-  ApplicationCredentialName = 'openstackApplicationCredentialName',
-  ApplicationCredentialSecret = 'openstackApplicationCredentialSecret',
-  ApplicationCredentialId = 'openstackApplicationCredentialId',
+  OpenstackApplicationCredentialId = 'openstackApplicationCredentialId',
+  OpenstackApplicationCredentialName = 'openstackApplicationCredentialName',
+  OpenstackApplicationCredentialSecret = 'openstackApplicationCredentialSecret',
+  OpenstackAuthType = 'openstackAuthType',
+  OpenstackDomainName = 'openstackDomainName',
+  OpenstackPassword = 'openstackPassword',
+  OpenstackProjectId = 'openstackProjectId',
+  OpenstackProjectName = 'openstackProjectName',
+  OpenstackRegionName = 'openstackRegionName',
+  OpenstackToken = 'openstackToken',
+  OpenstackUrl = 'openstackUrl',
+  OpenstackUserId = 'openstackUserId',
+  OpenstackUsername = 'openstackUsername',
 }
 
 enum OvaProviderFormFieldId {
   NfsDirectory = 'nfsDirectory',
 }
 
+enum OvirtProviderFormFieldId {
+  OvirtPassword = 'ovirtPassword',
+  OvirtUrl = 'ovirtUrl',
+  OvirtUsername = 'ovirtUsername',
+}
+
 export const ProviderFormFieldId = {
   ...CommonProviderFormFieldId,
   ...CertificateFormFieldId,
-  NfsDirectory: OvaProviderFormFieldId.NfsDirectory,
-  OpenshiftUrl: OpenshiftProviderFormFieldId.Url,
-  OpenstackApplicationCredentialId: OpenstackProviderFormFieldId.ApplicationCredentialId,
-  OpenstackApplicationCredentialName: OpenstackProviderFormFieldId.ApplicationCredentialName,
-  OpenstackApplicationCredentialSecret: OpenstackProviderFormFieldId.ApplicationCredentialSecret,
-  OpenstackAuthType: OpenstackProviderFormFieldId.AuthType,
-  OpenstackDomainName: OpenstackProviderFormFieldId.DomainName,
-  OpenstackPassword: OpenstackProviderFormFieldId.Password,
-  OpenstackProjectId: OpenstackProviderFormFieldId.ProjectId,
-  OpenstackProjectName: OpenstackProviderFormFieldId.ProjectName,
-  OpenstackRegionName: OpenstackProviderFormFieldId.RegionName,
-  OpenstackToken: OpenstackProviderFormFieldId.Token,
-  OpenstackUrl: OpenstackProviderFormFieldId.Url,
-  OpenstackUserId: OpenstackProviderFormFieldId.UserId,
-  OpenstackUsername: OpenstackProviderFormFieldId.Username,
-  ServiceAccountToken: OpenshiftProviderFormFieldId.ServiceAccountToken,
+  ...OvaProviderFormFieldId,
+  ...OpenshiftProviderFormFieldId,
+  ...OpenstackProviderFormFieldId,
+  ...OvirtProviderFormFieldId,
 } as const;
 
 export type ProviderFormFieldIdType =
   | CommonProviderFormFieldId
   | CertificateFormFieldId
   | OpenshiftProviderFormFieldId
   | OpenstackProviderFormFieldId
-  | OvaProviderFormFieldId;
+  | OvaProviderFormFieldId
+  | OvirtProviderFormFieldId;
 
 export const providerFormFieldLabels = {
   [ProviderFormFieldId.CaCertificate]: t('CA certificate'),