MGMT-19389: nmstate not generated well with bonds - 2.36 (#2722)

* Solving problems with nmstate with VLAN+bonds

* Solving problems with nmstate with VLAN+bonds-followup

* Adjusting tests for static ip

Author: ammont82

Diff for: libs/ui-lib-tests/cypress/integration/static-ip/2-configure-static-ip-host-specific.cy.ts

@@ -22,13 +22,13 @@ describe(`Assisted Installer Static IP Host specific Configuration`, () => {
 
     staticIpPage.getFormViewSelect().should('be.checked');
     staticIpPage.getAddMoreHosts().should('be.disabled');
-    staticIpPage.hostSpecificMacAddress(0).type('00:00:5e:00:53:af');
+    staticIpPage.hostSpecificMacAddress(0).clear().type('00:00:5e:00:53:af');
     staticIpPage.hostSpecificIpv4Address(0).type('192.168.2.38');
 
     staticIpPage.hostSpecificMacAddress(1).should('not.exist');
     staticIpPage.getAddMoreHosts().should('be.enabled');
     staticIpPage.getAddMoreHosts().click();
-    staticIpPage.hostSpecificMacAddress(1).type('00:00:5e:00:53:ae');
+    staticIpPage.hostSpecificMacAddress(1).clear().type('00:00:5e:00:53:ae');
     staticIpPage.hostSpecificIpv4Address(1).type('192.168.2.39');
 
     commonActions.verifyNextIsEnabled();

Diff for: libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.ts

@@ -40,12 +40,9 @@ type ParsedFormViewYaml = {
   nmstate: Nmstate;
 };
 
-const findFirstRealInterface = (interfaces: NmstateInterface[]): NmstateInterface | undefined => {
-  return interfaces.find(
-    (currentInterface) => !isDummyInterface(currentInterface.name),
-  ) as unknown as NmstateInterface | undefined;
+const findAllRealInterfaces = (interfaces: NmstateInterface[]): NmstateInterface[] => {
+  return interfaces.filter((currentInterface) => !isDummyInterface(currentInterface.name));
 };
-
 const parseYaml = (yaml: string): ParsedFormViewYaml => {
   const lines = yaml.split('\n');
   const lastCommentIdx = findLastIndex(lines, (line) => line.startsWith(YAML_COMMENT_CHAR));
@@ -133,9 +130,26 @@ const getFormViewHost = (
   }
 
   const { nmstate } = parseYaml(infraEnvHost.networkYaml);
-  const realInterface = findFirstRealInterface(nmstate.interfaces);
 
-  if (!realInterface) {
+  const realInterfaces = findAllRealInterfaces(nmstate.interfaces);
+  const firstInterface = realInterfaces[0];
+  const secondInterface = realInterfaces[1]; // Puede ser undefined
+
+  let bondInterface: NmstateInterface | undefined;
+  let nonBondInterface: NmstateInterface | undefined;
+
+  if (firstInterface) {
+    if (firstInterface.type === NmstateInterfaceType.BOND) {
+      bondInterface = firstInterface;
+      nonBondInterface = secondInterface;
+    } else {
+      nonBondInterface = firstInterface;
+      bondInterface =
+        secondInterface?.type === NmstateInterfaceType.BOND ? secondInterface : undefined;
+    }
+  }
+
+  if (!realInterfaces) {
     //handle case 2
     return null;
   }
@@ -153,16 +167,20 @@ const getFormViewHost = (
     useBond: false,
   };
 
-  if (realInterface.type === NmstateInterfaceType.BOND) {
+  if (bondInterface?.type === NmstateInterfaceType.BOND) {
     ret.useBond = true;
-    ret.bondType = realInterface['link-aggregation'].mode;
+    ret.bondType = bondInterface['link-aggregation'].mode;
     ret.bondPrimaryInterface = infraEnvHost.macInterfaceMap[0].macAddress ?? '';
     ret.bondSecondaryInterface = infraEnvHost.macInterfaceMap[1].macAddress ?? '';
   }
 
   for (const protocolVersion of getShownProtocolVersions(protocolType)) {
-    ret.ips[protocolVersion] = getIpAddress(realInterface, protocolVersion);
+    const interfaceToUse = nonBondInterface || bondInterface;
+    if (interfaceToUse) {
+      ret.ips[protocolVersion] = getIpAddress(interfaceToUse, protocolVersion);
+    }
   }
+
   return ret;
 };
 

Diff for: libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts

@@ -74,6 +74,20 @@ const getNmstateObject = (
         hostIp,
         getPrefixLength(networkWide, protocolVersion),
       );
+      if (networkWide.useVlan && networkWide.vlanId) {
+        if (bondType && hasBondsConfigured) {
+          interfaces.push(
+            getInterface(
+              BOND_NIC_NAME,
+              realProtocolConfigs,
+              networkWide,
+              bondType,
+              hasBondsConfigured,
+              true,
+            ),
+          );
+        }
+      }
     } else {
       //this happens when a host was particall configured, or not configured at all
       const protocolConfigs = {
@@ -86,6 +100,20 @@ const getNmstateObject = (
       interfaces.push(
         getInterface(nicName, protocolConfigs, networkWide, bondType, hasBondsConfigured),
       );
+      if (bondType && hasBondsConfigured) {
+        interfaces.push(
+          getInterface(
+            BOND_NIC_NAME,
+            protocolConfigs,
+            networkWide,
+            bondType,
+            hasBondsConfigured,
+            true,
+          ),
+        );
+      }
+      // eslint-disable-next-line no-console
+      console.log(interfaces);
     }
 
     routeConfigs.push(

Diff for: libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts

@@ -104,8 +104,9 @@ export const getInterface = (
   networkWide: FormViewNetworkWideValues,
   bondType?: string,
   hasBondsConfigured?: boolean,
+  createBondInterface?: boolean,
 ): NmstateInterface => {
-  if (networkWide.useVlan && networkWide.vlanId) {
+  if (networkWide.useVlan && networkWide.vlanId && !createBondInterface) {
     return {
       name: getVlanNicName(nicName, networkWide.vlanId),
       type: NmstateInterfaceType.VLAN,