@openshift-assisted/ui-lib 2.50.0 → 2.51.0

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.tsx

@@ -1,10 +1,25 @@
 import React from 'react';
-import { Content, ContentVariants, Alert, Grid } from '@patternfly/react-core';
+import {
+  Content,
+  ContentVariants,
+  Alert,
+  AlertVariant,
+  Grid,
+  FormGroup,
+  Switch,
+  Tooltip,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
 
 import { CustomManifests } from './components/CustomManifests';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { CustomManifestFormState } from './components/propTypes';
-import { ClusterWizardStepHeader } from '../../../../common';
+import { ClustersAPI, ClusterWizardStepHeader } from '../../../../common';
+import { isOciPlatformType, isThirdPartyCNI } from '../../utils';
+import DeleteCustomManifestModal from './DeleteCustomManifestModal';
+import { ClustersService } from '../../../services';
+import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';
 
 export const CustomManifestsPage = ({
   cluster,
@@ -12,22 +27,142 @@ export const CustomManifestsPage = ({
 }: {
   cluster: Cluster;
   onFormStateChange(formState: CustomManifestFormState): void;
-}) => (
-  <Grid hasGutter>
-    <Content>
-      <ClusterWizardStepHeader>Custom manifests</ClusterWizardStepHeader>
-      <Content component={ContentVariants.small}>
-        Upload additional manifests that will be applied at the install time for advanced
-        configuration of the cluster.
-      </Content>
-    </Content>
-    <Alert
-      isInline
-      variant="warning"
-      title={
-        'No validation is performed for the custom manifest contents. Only include resources that are necessary for initial setup to reduce the chance of installation failures.'
+}) => {
+  const clusterWizardContext = useClusterWizardContext();
+  const isRequired = isThirdPartyCNI(cluster.networkType) || isOciPlatformType(cluster);
+  const [useCustomManifests, setUseCustomManifests] = React.useState(isRequired);
+  const [isDeleteModalOpen, setDeleteModalOpen] = React.useState(false);
+
+  React.useEffect(() => {
+    if (isRequired || clusterWizardContext.uiSettings?.customManifestsAdded) {
+      setUseCustomManifests(true);
+    }
+  }, [isRequired, clusterWizardContext]);
+
+  // The form unmounts when the switch is off, but its last state persists in the parent.
+  React.useEffect(() => {
+    if (!useCustomManifests) {
+      onFormStateChange({
+        isValid: true,
+        isSubmitting: false,
+        isAutoSaveRunning: false,
+        errors: {},
+        touched: {},
+        isEmpty: true,
+      });
+    }
+  }, [useCustomManifests, onFormStateChange]);
+
+  const handleSwitchChange = React.useCallback(
+    (_event: React.FormEvent<HTMLInputElement>, on: boolean) => {
+      if (!on && clusterWizardContext.uiSettings?.customManifestsAdded) {
+        setDeleteModalOpen(true);
+      } else {
+        setUseCustomManifests(on);
+        if (!on) {
+          void clusterWizardContext.updateUISettings({ customManifestsAdded: false });
+        }
       }
-    />
-    <CustomManifests cluster={cluster} onFormStateChange={onFormStateChange} />
-  </Grid>
-);
+    },
+    [clusterWizardContext],
+  );
+
+  const handleCloseDeleteModal = React.useCallback(() => {
+    setDeleteModalOpen(false);
+  }, []);
+
+  const cleanCustomManifests = React.useCallback(async () => {
+    if (!clusterWizardContext.uiSettings?.customManifestsAdded || !cluster.id) return;
+    const { data: manifests } = await ClustersAPI.getManifests(cluster.id);
+    await ClustersService.removeClusterManifests(manifests, cluster.id);
+    setUseCustomManifests(false);
+    setDeleteModalOpen(false);
+    await clusterWizardContext.updateUISettings({ customManifestsAdded: false });
+  }, [cluster.id, clusterWizardContext]);
+
+  const tooltipWhenDisabled = isRequired
+    ? 'Custom manifests are required when using a third-party CNI or Oracle Cloud Infrastructure.'
+    : '';
+
+  const showExternalPlatformReminder = isOciPlatformType(cluster);
+  const showThirdPartyCnIReminder = isThirdPartyCNI(cluster.networkType);
+  const showCombinedReminder = showExternalPlatformReminder && showThirdPartyCnIReminder;
+  let reminderAlerts: React.ReactNode = null;
+  if (showCombinedReminder) {
+    reminderAlerts = (
+      <Stack>
+        <StackItem>
+          <Alert
+            variant={AlertVariant.info}
+            isInline
+            title="You're using an external platform and a third-party CNI"
+          >
+            Make sure to upload the required custom and CNI manifests in this step.
+          </Alert>
+        </StackItem>
+      </Stack>
+    );
+  } else if (showExternalPlatformReminder) {
+    reminderAlerts = (
+      <Stack>
+        <StackItem>
+          <Alert variant={AlertVariant.info} isInline title="You're using an external platform">
+            Make sure to upload the required custom manifests in this step.
+          </Alert>
+        </StackItem>
+      </Stack>
+    );
+  } else if (showThirdPartyCnIReminder) {
+    reminderAlerts = (
+      <Stack>
+        <StackItem>
+          <Alert variant={AlertVariant.info} isInline title="You're using a third-party CNI">
+            Make sure to upload the required CNI manifests in this step.
+          </Alert>
+        </StackItem>
+      </Stack>
+    );
+  }
+
+  return (
+    <Grid hasGutter>
+      <Content>
+        <ClusterWizardStepHeader>Custom manifests</ClusterWizardStepHeader>
+        <Content component={ContentVariants.small}>
+          Upload additional manifests that will be applied at the install time for advanced
+          configuration of the cluster.
+        </Content>
+      </Content>
+      <FormGroup fieldId="use-custom-manifests" label="">
+        <Tooltip content={tooltipWhenDisabled} hidden={!isRequired}>
+          <span style={{ display: 'inline-block', cursor: isRequired ? 'not-allowed' : undefined }}>
+            <Switch
+              id="use-custom-manifests"
+              isChecked={useCustomManifests}
+              isDisabled={isRequired}
+              onChange={handleSwitchChange}
+              label="Use custom manifests"
+            />
+          </span>
+        </Tooltip>
+      </FormGroup>
+      {!useCustomManifests && <div style={{ minHeight: '120px' }} aria-hidden="true" />}
+      {useCustomManifests && (
+        <>
+          {reminderAlerts}
+          <Alert
+            isInline
+            variant="warning"
+            title="No validation is performed for the custom manifest contents. Only include resources that are necessary for initial setup to reduce the chance of installation failures."
+          />
+          <CustomManifests cluster={cluster} onFormStateChange={onFormStateChange} />
+        </>
+      )}
+      <DeleteCustomManifestModal
+        isOpen={isDeleteModalOpen}
+        onClose={handleCloseDeleteModal}
+        onDelete={() => void cleanCustomManifests()}
+      />
+    </Grid>
+  );
+};

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx

@@ -23,9 +23,9 @@ import {
   VirtualIPControlGroupProps,
   AdvancedNetworkFields,
 } from '../../../../common/components/clusterWizard/networkingSteps';
+import { NetworkTypeDropDown } from './NetworkTypeDropdown';
 import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { OcmCheckbox } from '../../ui/OcmFormFields';
-import { NetworkTypeControlGroup } from '../../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
 import {
   NewFeatureSupportLevelData,
   NewFeatureSupportLevelMap,
@@ -259,11 +259,13 @@ const NetworkConfiguration = ({
           />
         </StackItem>
       )}
-      {isSDNSupported && (
-        <StackItem>
-          <NetworkTypeControlGroup isDisabled={isViewerMode} isSDNSelectable={isSDNSelectable} />
-        </StackItem>
-      )}
+      <StackItem>
+        <NetworkTypeDropDown
+          isDisabled={isViewerMode}
+          isSDNSelectable={isSDNSelectable}
+          featureSupportLevelData={featureSupportLevelData}
+        />
+      </StackItem>
 
       {!(isUserManagedNetworking && !isSNOCluster) && (
         <StackItem>

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx

@@ -236,9 +236,13 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
       const isMultiNodeCluster = !isSNO(cluster);
       const isUserManagedNetworking = values.managedNetworkingType === 'userManaged';
 
+      // Only send VIPs that have a non-empty IP;
+      const apiVips = (values.apiVips || []).filter((v) => (v?.ip ?? '').trim() !== '');
+      const ingressVips = (values.ingressVips || []).filter((v) => (v?.ip ?? '').trim() !== '');
+
       const params: V2ClusterUpdateParams = {
-        apiVips: values.apiVips,
-        ingressVips: values.ingressVips,
+        apiVips,
+        ingressVips,
         sshPublicKey: values.sshPublicKey,
         vipDhcpAllocation: values.vipDhcpAllocation,
         networkType: values.networkType,
@@ -247,7 +251,6 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
         serviceNetworks: values.serviceNetworks,
         userManagedNetworking: isUserManagedNetworking,
       };
-
       if (params.userManagedNetworking) {
         params.apiVips = [];
         params.ingressVips = [];

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.tsx

@@ -0,0 +1,157 @@
+import React from 'react';
+import { useField, useFormikContext } from 'formik';
+import {
+  Alert,
+  AlertVariant,
+  Dropdown,
+  DropdownItem,
+  FormGroup,
+  MenuToggle,
+  MenuToggleElement,
+  Stack,
+  StackItem,
+  Tooltip,
+} from '@patternfly/react-core';
+import {
+  NETWORK_TYPE_CALICO,
+  NETWORK_TYPE_CILIUM,
+  NETWORK_TYPE_CISCO_ACI,
+  NETWORK_TYPE_LABELS,
+  NETWORK_TYPE_NONE,
+  NETWORK_TYPE_OVN,
+  NETWORK_TYPE_SDN,
+} from '../../../../common/config';
+import { getFieldId, ExternalLink } from '../../../../common/components/ui';
+import {
+  NewFeatureSupportLevelMap,
+  useNewFeatureSupportLevel,
+} from '../../../../common/components/newFeatureSupportLevels';
+import { TechnologyPreview } from '../../../../common/components/ui/TechnologyPreview';
+import type { NetworkConfigurationValues } from '../../../../common/types/clusters';
+import { isThirdPartyCNI } from '../../utils';
+import { RED_HAT_CNI_SUPPORT_MATRIX_LINK } from '../../../../common/config/docs_links';
+
+export interface NetworkTypeDropDownProps {
+  isDisabled?: boolean;
+  isSDNSelectable: boolean;
+  featureSupportLevelData: NewFeatureSupportLevelMap | null;
+}
+
+export const NetworkTypeDropDown = ({
+  isDisabled = false,
+  isSDNSelectable,
+  featureSupportLevelData,
+}: NetworkTypeDropDownProps) => {
+  const [field, , { setValue }] = useField<string>('networkType');
+  const [isOpen, setOpen] = React.useState(false);
+  const { values } = useFormikContext<NetworkConfigurationValues>();
+  const { getFeatureDisabledReason } = useNewFeatureSupportLevel();
+  const fieldId = getFieldId('networkType', 'input');
+  const showThirdPartyBanner = isThirdPartyCNI(values.networkType);
+
+  const sdnDisabledReason = React.useMemo(() => {
+    if (!isSDNSelectable) {
+      return 'SDN is not supported for SNO clusters or when IPv6 is detected.';
+    }
+    return getFeatureDisabledReason('SDN_NETWORK_TYPE', featureSupportLevelData ?? undefined);
+  }, [isSDNSelectable, featureSupportLevelData, getFeatureDisabledReason]);
+
+  React.useEffect(() => {
+    if (field.value === NETWORK_TYPE_SDN && sdnDisabledReason) {
+      setValue(NETWORK_TYPE_OVN);
+    }
+  }, [sdnDisabledReason, field.value, setValue]);
+
+  const currentDisplayValue = NETWORK_TYPE_LABELS[field.value];
+
+  const dropdownItems = Object.entries(NETWORK_TYPE_LABELS).map(([value, label]) => {
+    const isSDN = value === NETWORK_TYPE_SDN;
+    const disabledReason = isSDN ? sdnDisabledReason : undefined;
+    const isTechPreview = [
+      NETWORK_TYPE_CISCO_ACI,
+      NETWORK_TYPE_CILIUM,
+      NETWORK_TYPE_CALICO,
+      NETWORK_TYPE_NONE,
+    ].includes(value);
+    return (
+      <DropdownItem
+        key={value}
+        id={value}
+        value={value}
+        isAriaDisabled={disabledReason !== undefined}
+      >
+        <Tooltip hidden={!disabledReason} content={disabledReason} position="top">
+          <div>
+            {label}
+            {isTechPreview && (
+              <span onClick={(event) => event.stopPropagation()}>
+                <TechnologyPreview testId={`${value}-support-level`} />
+              </span>
+            )}
+          </div>
+        </Tooltip>
+      </DropdownItem>
+    );
+  });
+
+  const onSelect = (event?: React.MouseEvent<Element, MouseEvent>, nextValue?: string): void => {
+    if (nextValue) {
+      setValue(nextValue);
+    }
+    setOpen(false);
+  };
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      ref={toggleRef}
+      onClick={() => setOpen(!isOpen)}
+      isExpanded={isOpen}
+      isDisabled={isDisabled}
+      id={fieldId}
+      className="pf-v6-u-w-100"
+      style={{ minWidth: '100%' }}
+    >
+      {currentDisplayValue}
+    </MenuToggle>
+  );
+
+  return (
+    <Stack hasGutter>
+      <StackItem>
+        <FormGroup fieldId={fieldId} label="Network type" id={`form-control__${fieldId}`}>
+          <Dropdown
+            id={`${fieldId}-dropdown`}
+            onOpenChange={(open: boolean) => setOpen(open)}
+            onSelect={onSelect}
+            toggle={toggle}
+            isOpen={isOpen}
+          >
+            {dropdownItems}
+          </Dropdown>
+        </FormGroup>
+      </StackItem>
+      {showThirdPartyBanner && (
+        <StackItem>
+          <Alert
+            variant={AlertVariant.warning}
+            isInline
+            title="Third-party CNI (Technology Preview)"
+          >
+            <Stack hasGutter>
+              <StackItem>
+                Third-party CNIs require uploading CNI manifests. Please verify you have the
+                required manifests and that the chosen CNI is compatible with your platform and
+                OpenShift version.
+              </StackItem>
+              <StackItem>
+                <ExternalLink href={RED_HAT_CNI_SUPPORT_MATRIX_LINK}>
+                  Red Hat CNI Support Matrix
+                </ExternalLink>
+              </StackItem>
+            </Stack>
+          </Alert>
+        </StackItem>
+      )}
+    </Stack>
+  );
+};

package/lib/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.tsx

@@ -1,14 +1,17 @@
 import React from 'react';
+import { Icon } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
-import { UiIcon, SupportedPlatformType } from '../../../../common';
+import { SupportedPlatformType } from '../../../../common';
 import { ExternalPlatformLinks } from './constants';
 
 const PlatformIntegrationNote = ({ platformType }: { platformType: SupportedPlatformType }) => {
   const integrationPlatformLink = ExternalPlatformLinks[platformType];
   return (
     <p>
-      <UiIcon status="warning" icon={<ExclamationTriangleIcon />} /> You will need to modify your
-      platform configuration after cluster installation is completed.{' '}
+      <Icon status="warning">
+        <ExclamationTriangleIcon />
+      </Icon>{' '}
+      You will need to modify your platform configuration after cluster installation is completed.{' '}
       {!!integrationPlatformLink && (
         <a
           href={integrationPlatformLink || ''}

package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx

@@ -1,12 +1,8 @@
 import { Title } from '@patternfly/react-core';
 import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
 import React from 'react';
-import { genericTableRowKey, isDualStack } from '../../../../common';
-import {
-  getManagementType,
-  getStackTypeLabel,
-  getNetworkType,
-} from '../../clusterDetail/ClusterProperties';
+import { genericTableRowKey, isDualStack, NETWORK_TYPE_LABELS } from '../../../../common';
+import { getManagementType, getStackTypeLabel } from '../../clusterDetail/ClusterProperties';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 type ReviewTableRowsType = {
@@ -201,7 +197,7 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
         cells: [
           { title: 'Networking type' },
           {
-            title: getNetworkType(cluster.networkType),
+            title: cluster.networkType ? NETWORK_TYPE_LABELS[cluster.networkType] : '-',
             props: { 'data-testid': 'networking-type', colSpan: 2 },
           },
         ],

package/lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx

@@ -6,20 +6,13 @@ import {
   Grid,
   GridItem,
   gridSpans,
+  Icon,
 } from '@patternfly/react-core';
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
-import { t_global_color_status_info_100 as infoColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_info_100';
-import {
-  ClusterValidations,
-  DetailItem,
-  DetailList,
-  HostsValidations,
-  UiIcon,
-} from '../../../../common';
+import { ClusterValidations, DetailItem, DetailList, HostsValidations } from '../../../../common';
 import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';
 import { useOpenShiftVersionsContext } from '../../clusterWizard/OpenShiftVersionsContext';
 import { wizardStepNames } from '../../clusterWizard/constants';
@@ -102,13 +95,29 @@ const PreflightCheckInfo = ({
 
 const getCheckIcon = (validationStatuses: string[]) => {
   if (validationStatuses.includes('failure') || validationStatuses.includes('error')) {
-    return <UiIcon size="sm" status="danger" icon={<ExclamationCircleIcon />} />;
+    return (
+      <Icon size="sm" status="danger">
+        <ExclamationCircleIcon />
+      </Icon>
+    );
   } else if (validationStatuses.includes('warning')) {
-    return <UiIcon size="sm" status="warning" icon={<ExclamationTriangleIcon />} />;
+    return (
+      <Icon size="sm" status="warning">
+        <ExclamationTriangleIcon />
+      </Icon>
+    );
   } else if (validationStatuses.includes('pending')) {
-    return <UiIcon size="sm" status="info" icon={<InfoCircleIcon />} />;
+    return (
+      <Icon size="sm" status="info">
+        <InfoCircleIcon />
+      </Icon>
+    );
   }
-  return <UiIcon size="sm" icon={<CheckCircleIcon color={okColor.value} />} />;
+  return (
+    <Icon status="success" size="sm">
+      <CheckCircleIcon />
+    </Icon>
+  );
 };
 
 const PreflightChecksDetailCollapsed = ({ cluster }: { cluster: Cluster }) => {
@@ -122,9 +131,13 @@ const PreflightChecksDetailCollapsed = ({ cluster }: { cluster: Cluster }) => {
   );
 
   const supportLevelIcon = isFullySupported ? (
-    <UiIcon size="sm" icon={<CheckCircleIcon color={okColor.value} />} />
+    <Icon status="success" size="sm">
+      <CheckCircleIcon />
+    </Icon>
   ) : (
-    <UiIcon size="sm" icon={<InfoCircleIcon color={infoColor.value} />} />
+    <Icon status="info" size="sm">
+      <InfoCircleIcon />
+    </Icon>
   );
 
   const clusterValidations = React.useMemo(

package/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx

@@ -92,11 +92,17 @@ export const getIpAddressValidationSchema = (protocolVersion: ProtocolVersion) =
   const protocolVersionLabel = protocolVersion === ProtocolVersion.ipv4 ? 'IPv4' : 'IPv6';
   return Yup.string().test(
     protocolVersion,
-    `Value \${value} is not a valid ${protocolVersionLabel} address`,
+    (params: { value?: unknown }) =>
+      `Value "${
+        params?.value !== undefined ? String(params.value) : ''
+      }" is not a valid ${protocolVersionLabel} address`,
     (value?: string) => {
-      if (!value) {
+      if (value === undefined || value === '') {
         return true;
       }
+      if (typeof value !== 'string') {
+        return false;
+      }
       return isValidAddress(value, protocolVersion);
     },
   );

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx

@@ -96,6 +96,7 @@ const getExpandedHostComponent = (protocolType: StaticProtocolType) => {
               label={`IP address (${getProtocolVersionLabel(protocolVersion)})`}
               fieldId={getFieldId(`${fieldName}.ips.${protocolVersion}`, 'input')}
               key={protocolVersion}
+              isRequired
             >
               <OcmInputField
                 name={`${fieldName}.ips.${protocolVersion}`}

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StaticIpForm } from '../StaticIpForm';
 import { StaticIpFormProps, StaticIpViewProps } from '../propTypes';
 import { FormViewHost, FormViewNetworkWideValues } from '../../data/dataTypes';
-import { networkWideValidationSchema } from './formViewNetworkWideValidationSchema';
+import { getNetworkWideValidationSchema } from './formViewNetworkWideValidationSchema';
 import { networkWideToInfraEnvField } from '../../data/formDataToInfraEnvField';
 import { FormViewNetworkWideFields } from './FormViewNetworkWideFields';
 import { getFormData, getFormViewNetworkWideValues } from '../../data/fromInfraEnv';
@@ -22,7 +22,7 @@ export const FormViewNetworkWide: React.FC<StaticIpViewProps> = ({ infraEnv, ...
     setFormProps({
       infraEnv,
       ...props,
-      validationSchema: networkWideValidationSchema,
+      validationSchema: getNetworkWideValidationSchema(infraEnv.rendezvousIp),
       getInitialValues: (infraEnv: InfraEnv) => {
         return getFormViewNetworkWideValues(infraEnv);
       },

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.tsx

@@ -95,32 +95,71 @@ const getAddressDataValidationSchema = (protocolVersion: ProtocolVersion, ipConf
   });
 };
 
-export const networkWideValidationSchema = Yup.lazy((values: FormViewNetworkWideValues) => {
-  const ipConfigsValidationSchemas = Yup.object({
-    ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
-    ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
-      ? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
-      : Yup.object<IpConfig>(),
-  });
+/**
+ * Validates that Rendezvous IP (when set) is within the IPv4 subnet.
+ * Default gateway is already validated by getAddressDataValidationSchema (getInMachineNetworkValidationSchema).
+ */
+const getRendezvousIpCoherenceTest = (rendezvousIp: string | undefined) => {
+  return Yup.object().test(
+    'rendezvous-ip-in-subnet',
+    'Rendezvous IP must be within the IPv4 subnet.',
+    (value: unknown, context: Yup.TestContext) => {
+      const values = value as FormViewNetworkWideValues | undefined;
+      const machineNetwork = values?.ipConfigs?.ipv4?.machineNetwork;
+      if (
+        !rendezvousIp?.trim() ||
+        !machineNetwork?.ip?.trim() ||
+        machineNetwork.prefixLength === '' ||
+        typeof machineNetwork.prefixLength !== 'number'
+      ) {
+        return true;
+      }
+      const inSubnetSchema = getInMachineNetworkValidationSchema(
+        ProtocolVersion.ipv4,
+        machineNetwork,
+      );
+      if (!inSubnetSchema.isValidSync(rendezvousIp)) {
+        return context.createError({
+          path: 'ipConfigs.ipv4.machineNetwork.ip',
+          message: 'Rendezvous IP must be within the IPv4 subnet.',
+        });
+      }
+      return true;
+    },
+  );
+};
 
-  return Yup.object({
-    useVlan: Yup.boolean(),
-    vlanId: Yup.mixed().when('useVlan', {
-      is: (useVlan: boolean) => useVlan,
-      then: () =>
-        Yup.number()
-          .required(MUST_BE_A_NUMBER)
-          .min(1, `Must be more than or equal to 1`)
-          .max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
-          .test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
-          .nullable()
-          .transform(transformNumber) as Yup.NumberSchema,
-    }),
-    protocolType: Yup.string(),
-    dns: getDNSValidationSchema(values.protocolType),
-    ipConfigs: ipConfigsValidationSchemas,
+export const getNetworkWideValidationSchema = (rendezvousIp?: string) =>
+  Yup.lazy((values: FormViewNetworkWideValues) => {
+    const ipConfigsValidationSchemas = Yup.object({
+      ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
+      ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
+        ? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
+        : Yup.object<IpConfig>(),
+    });
+
+    const baseSchema = Yup.object({
+      useVlan: Yup.boolean(),
+      vlanId: Yup.mixed().when('useVlan', {
+        is: (useVlan: boolean) => useVlan,
+        then: () =>
+          Yup.number()
+            .required(MUST_BE_A_NUMBER)
+            .min(1, `Must be more than or equal to 1`)
+            .max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
+            .test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
+            .nullable()
+            .transform(transformNumber) as Yup.NumberSchema,
+      }),
+      protocolType: Yup.string(),
+      dns: getDNSValidationSchema(values.protocolType),
+      ipConfigs: ipConfigsValidationSchemas,
+    });
+
+    return baseSchema.concat(getRendezvousIpCoherenceTest(rendezvousIp));
   });
-});
+
+export const networkWideValidationSchema = getNetworkWideValidationSchema();
 
 export const validateNumber = (vlanId: FormViewNetworkWideValues['vlanId']) => {
   //We need to validate that value is a number(without letters) and is not an exponential number (ex: 1e2)