Static IP form for BMC host discovery

Author: jgyselov

libs/locales/lib/en/translation.json

@@ -85,6 +85,7 @@
   "ai:An error occured": "An error occured.",
   "ai:An error occured while approving agents": "An error occured while approving agents.",
   "ai:An error occured while starting installation.": "An error occured while starting installation.",
+  "ai:An IP address to where any IP packet should be forwarded in case there is no other routing rule configured for a destination IP.": "An IP address to where any IP packet should be forwarded in case there is no other routing rule configured for a destination IP.",
   "ai:And verify that this is the output:": "And verify the following output:",
   "ai:API connectivity failure": "API connectivity failure",
   "ai:API domain name resolution": "API domain name resolution",
@@ -200,6 +201,7 @@
   "ai:Configure host inventory settings": "Configure host inventory settings",
   "ai:Configure load balancer on Amazon Web Services for me.": "Configure load balancer on Amazon Web Services for me.",
   "ai:Configure the SSH key and proxy settings after the modal appears (optional).": "Configure the SSH key and proxy settings after the modal appears (optional).",
+  "ai:Configure via": "Configure via",
   "ai:Configure your own NTP sources to sychronize the time between the hosts that will be added to this infrastructure environment.": "Configure your own NTP sources to sychronize the time between the hosts that will be added to this infrastructure environment.",
   "ai:Configure your own NTP sources to synchronize the time between the hosts that will be added to this infrastructure environment.": "Configure your own NTP sources to synchronize the time between the hosts that will be added to this infrastructure environment.",
   "ai:Configuring the host inventory settings will enable the Central Infrastructure Management.": "Configuring the host inventory settings will enable the Central Infrastructure Management.",
@@ -235,6 +237,7 @@
   "ai:Created at": "Created at",
   "ai:Currently, adding additional machines to your cluster is not supported.": "Currently, adding additional machines to your cluster is not supported.",
   "ai:Database storage": "Database storage",
+  "ai:Default gateway": "Default gateway",
   "ai:Default route to host": "Default route to host",
   "ai:Define the quantity of worker nodes and nodepools to create for your cluster. Additional worker nodes and nodepools can be added after the cluster is created.": "Define the quantity of worker nodes and nodepools to create for your cluster. Additional worker nodes and nodepools can be added after the cluster is created.",
   "ai:Deleted hosts": "Deleted hosts",
@@ -283,6 +286,7 @@
   "ai:Draft": "Draft",
   "ai:Drag a file here or browse to upload": "Drag a file here or browse to upload",
   "ai:Drive type": "Drive type",
+  "ai:Dual-stack": "Dual-stack",
   "ai:Edit BMC": "Edit BMC",
   "ai:Edit BMH": "Edit BMH",
   "ai:Edit BMH dialog": "Edit BMH dialog",
@@ -348,6 +352,7 @@
   "ai:Finalizing": "Finalizing",
   "ai:Find by hostname": "Find by hostname",
   "ai:For example: host-{{n}}": "For example: host-{{n}}",
+  "ai:Form view": "Form view",
   "ai:Format?": "Format?",
   "ai:Forwarding it could put your credentials and personal data at risk.": "Forwarding it might put your credentials and personal data at risk.",
   "ai:Full image file": "Full image file",
@@ -419,6 +424,7 @@
   "ai:If not, please start your VMs with the following configuration:": "If not, start your VMs with the following configuration:",
   "ai:If the cluster hosts are in a network with a re-encrypting (MITM) proxy or the cluster needs to trust certificates for other purposes (e.g. container image registries).": "If the cluster hosts are in a network with a re-encrypting (MITM) proxy or the cluster needs to trust certificates for other purposes (e.g. container image registries).",
   "ai:If the configuration is taking longer than 5 minutes, you might need to troubleshoot.": "If the configuration is taking longer than 5 minutes, you might need to troubleshoot.",
+  "ai:If the hosts are in a sub network, enter the VLAN ID.": "If the hosts are in a sub network, enter the VLAN ID.",
   "ai:If there are many clusters, use higher values for the storage fields.": "If there are many clusters, use higher values for the storage fields.",
   "ai:If you prefer using the CLI, follow the instructions in": "If you prefer using the CLI, follow the instructions in",
   "ai:If you used DHCP networking, verify that your DHCP server is enabled": "If you used DHCP networking, verify that your DHCP server is enabled",
@@ -462,7 +468,9 @@
   "ai:Insufficient": "Insufficient",
   "ai:IP address block from which Pod IPs are allocated This block must not overlap with existing physical networks. These IP addresses are used for the Pod network, and if you need to access the Pods from an external network, configure load balancers and routers to manage the traffic.": "IP address block from which Pod IPs are allocated. This block must not overlap with existing physical networks. These IP addresses are used for the Pod network, and if you need to access the Pods from an external network, configure load balancers and routers to manage the traffic.",
   "ai:IP allocation from the DHCP server timed out.": "IP allocation from the DHCP server timed out.",
+  "ai:IPv4": "IPv4",
   "ai:IPv4 address": "IPv4 address",
+  "ai:IPv6": "IPv6",
   "ai:IPv6 address": "IPv6 address",
   "ai:iPXE script file is ready to be downloaded": "iPXE script file is ready to be downloaded",
   "ai:iPXE script file URL": "iPXE script file URL",
@@ -562,6 +570,7 @@
   "ai:Network type": "Network type",
   "ai:Network type selection is not supported for SNO clusters or when IPv6 is detected.": "Network type selection is not supported for SNO clusters or when IPv6 is detected.",
   "ai:Networking": "Networking",
+  "ai:Networking stack type": "Networking stack type",
   "ai:Networks same address families": "Networks same address families",
   "ai:Never share your downloaded ISO with anyone else.": "Never share your downloaded ISO with anyone else.",
   "ai:New hostname": "New hostname",
@@ -889,6 +898,7 @@
   "ai:Use lowercase alphanumeric characters or hyphen (-)": "Use lowercase alphanumeric characters or hyphen (-)",
   "ai:Use lowercase alphanumeric characters, dot (.) or hyphen (-)": "Use lowercase alphanumeric characters, dot (.) or hyphen (-)",
   "ai:Use the same host discovery SSH key": "Use the same host discovery SSH key",
+  "ai:Use VLAN": "Use VLAN",
   "ai:Use when you have an iPXE server that has already been set up": "Use when you have an iPXE server that has already been set up",
   "ai:useAlerts must be used within AlertsContextProvider": "useAlerts must be used within AlertsContextProvider",
   "ai:Used to describe hosts' physical location. Helps for quicker host selection during cluster creation.": "Used to describe hosts' physical location. Helps for quicker host selection during cluster creation.",
@@ -911,6 +921,7 @@
   "ai:View host events": "View host events",
   "ai:VIP IP allocation from DHCP server has been timed out": "VIP IP allocation from DHCP server has timed out",
   "ai:Virtual machine": "Virtual machine",
+  "ai:VLAN ID": "VLAN ID",
   "ai:Vsphere disk uuid enabled": "Vsphere disk uuid enabled",
   "ai:Waiting for host...": "Waiting for host...",
   "ai:Waiting for host..._plural": "Waiting for hosts...",
@@ -929,6 +940,7 @@
   "ai:Workers: At least {{worker_cpu_cores}} CPU cores, {{worker_ram}} RAM, {{worker_disksize}} GB disk size for each worker ": "Workers: At least {{worker_cpu_cores}} CPU cores, {{worker_ram}} RAM, {{worker_disksize}} GB disk size for each worker ",
   "ai:World Wide Name (WWN) is a unique disk identifier.": "World Wide Name (WWN) is a unique disk identifier.",
   "ai:x86_64": "x86_64",
+  "ai:Yaml view": "Yaml view",
   "ai:You are approving multiple hosts. All hosts listed below will be approved to join the infrastructure environment if you continue. Make sure that you expect and recognize the hosts before approving.": "You are approving multiple hosts. All hosts listed will be approved to join the infrastructure environment, if you continue. Make sure that you expect and recognize the hosts before approving.",
   "ai:You can either wait or investigate. A common issue can be misconfigured storage. Once you fix the issue, you can delete AgentServiceConfig to try again.": "You can either wait or investigate. A common issue can be misconfigured storage. After you fix the issue, delete AgentServiceConfig and try again.",
   "ai:You can upload additional trusted certificates in PEM-encoded X.509 format if the cluster hosts are in a network with a re-encrypting (MITM) proxy or the cluster needs to trust certificates for other purposes (for example, container image registries).": "You can upload additional trusted certificates in PEM-encoded X.509 format if the cluster hosts are in a network with a re-encrypting (MITM) proxy or the cluster needs to trust certificates for other purposes (for example, container image registries).",

libs/ui-lib/lib/cim/components/Agent/BMCForm/BMCForm.tsx

@@ -15,23 +15,82 @@ import { Formik, FormikProps, FormikConfig } from 'formik';
 
 import {
   InputField,
-  CodeField,
   getRichTextValidation,
   RichInputField,
   BMCValidationMessages,
+  StaticIpView,
 } from '../../../../common';
-import { Language } from '@patternfly/react-code-editor';
 import { InfraEnvK8sResource, NMStateK8sResource } from '../../../types';
 import { AddBmcValues, BMCFormProps } from '../types';
 import { AGENT_BMH_NAME_LABEL_KEY, INFRAENV_AGENTINSTALL_LABEL_KEY } from '../../common';
 import { getErrorMessage } from '../../../../common/utils';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { MacMapping } from './MacMapping';
 import { getInitValues, getValidationSchema } from './validationSchemas';
 import ProvisioningConfigErrorAlert from '../../modals/ProvisioningConfigErrorAlert';
+import { NMStateConfig } from './NMstateConfig';
 
 const getNMState = (values: AddBmcValues, infraEnv: InfraEnvK8sResource): NMStateK8sResource => {
-  const config = yaml.load(values.nmState);
+  let config;
+  if (values.staticIPView === StaticIpView.YAML) {
+    config = yaml.load(values.nmState);
+  } else {
+    config = {
+      interfaces: [
+        {
+          name: values.macMapping[0].name,
+          type: values.useVlan ? 'vlan' : 'ethernet',
+          state: 'up',
+          vlan: values.useVlan
+            ? {
+                'base-iface': 'eth0',
+                id: values.vlanId,
+              }
+            : undefined,
+          ipv4: {
+            address: [
+              {
+                ip: values.ipConfigs.ipv4.machineNetwork.ip,
+                'prefix-length': values.ipConfigs.ipv4.machineNetwork.prefixLength,
+              },
+            ],
+            enabled: true,
+            dhcp: false,
+          },
+          ipv6:
+            values.protocolType === 'dualStack'
+              ? {
+                  address: [
+                    {
+                      ip: values.ipConfigs.ipv6.machineNetwork.ip,
+                      'prefix-length': values.ipConfigs.ipv6.machineNetwork.prefixLength,
+                    },
+                  ],
+                  enabled: true,
+                  dhcp: false,
+                }
+              : undefined,
+        },
+      ],
+      'dns-resolver': { config: { server: [values.dns] } },
+      routes: {
+        config: [
+          {
+            destination: '0.0.0.0/0',
+            'next-hop-address': values.ipConfigs.ipv4.gateway,
+            'next-hop-interface':
+              values.useVlan && values.vlanId ? `eth0.${values.vlanId}` : 'eth0',
+          },
+          values.protocolType === 'dualStack' && {
+            destination: '::/0',
+            'next-hop-address': values.ipConfigs.ipv6.gateway,
+            'next-hop-interface':
+              values.useVlan && values.vlanId ? `eth0.${values.vlanId}` : 'eth0',
+          },
+        ].filter(Boolean),
+      },
+    };
+  }
+
   const nmState = {
     apiVersion: 'agent-install.openshift.io/v1beta1',
     kind: 'NMStateConfig',
@@ -41,15 +100,16 @@ const getNMState = (values: AddBmcValues, infraEnv: InfraEnvK8sResource): NMStat
       labels: {
         [AGENT_BMH_NAME_LABEL_KEY]: values.name,
         [INFRAENV_AGENTINSTALL_LABEL_KEY]: infraEnv?.metadata?.name || '',
+        'configured-via': values.staticIPView,
       },
     },
     spec: {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       config,
       interfaces: values.macMapping.filter((m) => m.macAddress.length && m.name.length),
     },
   };
-  return nmState;
+
+  return nmState as NMStateK8sResource;
 };
 
 const BMCForm: React.FC<BMCFormProps> = ({
@@ -144,19 +204,7 @@ const BMCForm: React.FC<BMCFormProps> = ({
                 placeholder={t('ai:Enter a password for the BMC')}
                 isRequired
               />
-              {!hasDHCP && (
-                <>
-                  <CodeField
-                    label={t('ai:NMState')}
-                    name="nmState"
-                    language={Language.yaml}
-                    description={t(
-                      'ai:Upload a YAML file in NMstate format (not the entire NMstate config CR) that includes your network configuration (static IPs, bonds, etc.).',
-                    )}
-                  />
-                  <MacMapping />
-                </>
-              )}
+              {!hasDHCP && <NMStateConfig />}
             </Form>
             {error && (
               <Alert

libs/ui-lib/lib/cim/components/Agent/BMCForm/MacMapping.tsx

@@ -4,10 +4,11 @@ import { getFieldId, InputField, useTranslation } from '../../../../common';
 import { Button, FormGroup, Grid, GridItem, Text, TextVariants } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import MinusCircleIcon from '@patternfly/react-icons/dist/js/icons/minus-circle-icon';
+import { AddBmcValues } from '../types';
 
 type MacMappingFieldProps = { macAddress: string; name: string }[];
 
-const getFieldError = (errors: FormikErrors<MacMappingFieldProps>, fieldName: string): string => {
+const getFieldError = (errors: FormikErrors<AddBmcValues>, fieldName: string): string => {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
@@ -18,7 +19,7 @@ export const MacMapping = () => {
   const [field] = useField<MacMappingFieldProps>({
     name: 'macMapping',
   });
-  const { errors } = useFormikContext<MacMappingFieldProps>();
+  const { errors } = useFormikContext<AddBmcValues>();
   const fieldId = getFieldId('macMapping', 'input');
   const { t } = useTranslation();
 

libs/ui-lib/lib/cim/components/Agent/BMCForm/NMstateConfig.tsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { useFormikContext } from 'formik';
+import { Language } from '@patternfly/react-code-editor';
+import { FormGroup } from '@patternfly/react-core';
+
+import {
+  CheckboxField,
+  CodeField,
+  InputField,
+  IpConfigFields,
+  MAX_VLAN_ID,
+  MIN_VLAN_ID,
+  PopoverIcon,
+  ProtocolVersion,
+  RadioField,
+  StaticIpView,
+  useTranslation,
+} from '../../../../common';
+import { AddBmcValues } from '../types';
+import { MacMapping } from './MacMapping';
+
+export const NMStateConfig = () => {
+  const { t } = useTranslation();
+  const { values, setFieldValue } = useFormikContext<AddBmcValues>();
+
+  return (
+    <>
+      <FormGroup label={t('ai:Configure via')} name="staticIPView" isInline isRequired>
+        <RadioField name={'staticIPView'} value={StaticIpView.FORM} label={t('ai:Form view')} />
+        <RadioField name={'staticIPView'} value={StaticIpView.YAML} label={t('ai:Yaml view')} />
+      </FormGroup>
+
+      {values.staticIPView === StaticIpView.FORM ? (
+        <>
+          <FormGroup label={t('ai:Networking stack type')} isInline isRequired>
+            <RadioField name={'protocolType'} value={'ipv4'} label={t('ai:IPv4')} />
+            <RadioField name={'protocolType'} value={'dualStack'} label={t('ai:Dual-stack')} />
+          </FormGroup>
+
+          <CheckboxField
+            name={'useVlan'}
+            label={
+              <>
+                {t('ai:Use VLAN')}{' '}
+                <PopoverIcon
+                  bodyContent={t('ai:If the hosts are in a sub network, enter the VLAN ID.')}
+                  noVerticalAlign
+                />
+              </>
+            }
+            onChange={() => setFieldValue('vlanId', '')}
+          />
+
+          {values.useVlan === true && (
+            <div className="pf-v5-u-ml-md">
+              <InputField
+                name={'vlanId'}
+                label={t('ai:VLAN ID')}
+                min={MIN_VLAN_ID}
+                max={MAX_VLAN_ID}
+              />
+            </div>
+          )}
+
+          <InputField name={'dns'} label={t('ai:DNS')} />
+
+          {values.protocolType === 'ipv4' ? (
+            <IpConfigFields
+              fieldName={`ipConfigs.${ProtocolVersion.ipv4}`}
+              protocolVersion={ProtocolVersion.ipv4}
+            />
+          ) : (
+            <>
+              <IpConfigFields
+                fieldName={`ipConfigs.${ProtocolVersion.ipv4}`}
+                protocolVersion={ProtocolVersion.ipv4}
+              />
+              <IpConfigFields
+                fieldName={`ipConfigs.${ProtocolVersion.ipv6}`}
+                protocolVersion={ProtocolVersion.ipv6}
+              />
+            </>
+          )}
+        </>
+      ) : (
+        <CodeField
+          label={t('ai:NMState')}
+          name="nmState"
+          language={Language.yaml}
+          description={t(
+            'ai:Upload a YAML file in NMstate format (not the entire NMstate config CR) that includes your network configuration (static IPs, bonds, etc.).',
+          )}
+        />
+      )}
+      <MacMapping />
+    </>
+  );
+};