Merge pull request #2316 from openshift-cherrypick-robot/cherry-pick-…

…2261-to-release-4.17

[release-4.17] CNV-50914: Support for ephemeral nic

locales/en/plugin__kubevirt-plugin.json

@@ -500,6 +500,7 @@
   "Enter value": "Enter value",
   "Environment": "Environment",
   "environment disk": "environment disk",
+  "Ephemeral": "Ephemeral",
   "Ephemeral disk (Container image)": "Ephemeral disk (Container image)",
   "Error": "Error",
   "Error checking for usages of this PVC.": "Error checking for usages of this PVC.",

src/utils/components/badges/EphemeralBadge/EphemeralBadge.scss

@@ -0,0 +1,3 @@
+.ephemeral-badge {
+  margin-left: var(--pf-global--spacer--sm);
+}

src/utils/components/badges/EphemeralBadge/EphemeralBadge.tsx

@@ -0,0 +1,17 @@
+import React, { FC } from 'react';
+
+import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
+import { Label } from '@patternfly/react-core';
+
+import './EphemeralBadge.scss';
+
+const EphemeralBadge: FC = () => {
+  const { t } = useKubevirtTranslation();
+  return (
+    <Label className="ephemeral-badge" color="purple">
+      {t('Ephemeral')}
+    </Label>
+  );
+};
+
+export default EphemeralBadge;

src/utils/resources/vm/utils/network/rowData.ts

@@ -20,7 +20,7 @@ export const getNetworkInterfaceRowData = (
     const network = networks?.find((net) => net.name === iface.name);
     return {
       iface,
-      metadata: { name: network.name },
+      metadata: { name: network?.name },
       network,
     };
   });

src/views/catalog/wizard/tabs/network/components/list/NetworkInterfaceRow.tsx

@@ -20,13 +20,13 @@ const NetworkInterfaceRow: FC<
   return (
     <>
       <TableData activeColumnIDs={activeColumnIDs} id="name">
-        {network.name}
+        {network?.name || NO_DATA_DASH}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="model">
         {iface.model || NO_DATA_DASH}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="network">
-        {network.pod ? t('Pod networking') : network.multus?.networkName || NO_DATA_DASH}
+        {network?.pod ? t('Pod networking') : network?.multus?.networkName || NO_DATA_DASH}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="type">
         {getPrintableNetworkInterfaceType(iface)}
@@ -40,7 +40,7 @@ const NetworkInterfaceRow: FC<
         id=""
       >
         <NetworkInterfaceActions
-          nicName={network.name}
+          nicName={network?.name}
           nicPresentation={{ iface, network }}
           onUpdateVM={onUpdateVM}
         />

src/views/virtualmachines/details/tabs/configuration/network/components/list/NetworkInterfaceList.tsx

@@ -17,7 +17,7 @@ import {
 
 import useNetworkColumns from '../../hooks/useNetworkColumns';
 import useNetworkRowFilters from '../../hooks/useNetworkRowFilters';
-import { isPendingHotPlugNIC, isPendingRemoval } from '../../utils/utils';
+import { isInterfaceEphemeral, isPendingHotPlugNIC, isPendingRemoval } from '../../utils/utils';
 
 import AutoAttachedNetworkEmptyState from './AutoAttachedNetworkEmptyState';
 import NetworkInterfaceRow from './NetworkInterfaceRow';
@@ -54,7 +54,7 @@ const NetworkInterfaceList: FC<NetworkInterfaceTableProps> = ({ vm, vmi }) => {
         loaded={!isEmpty(vm)}
         loadError={false}
         Row={NetworkInterfaceRow}
-        rowData={{ isPending, vm }}
+        rowData={{ isInterfaceEphemeral, isPending, vm }}
         unfilteredData={data}
       />
     </>

src/views/virtualmachines/details/tabs/configuration/network/components/list/NetworkInterfaceRow.tsx

@@ -1,13 +1,20 @@
 import React, { FC } from 'react';
 
-import { V1Network, V1VirtualMachine } from '@kubevirt-ui/kubevirt-api/kubevirt';
+import {
+  V1Network,
+  V1VirtualMachine,
+  V1VirtualMachineInstanceNetworkInterface,
+} from '@kubevirt-ui/kubevirt-api/kubevirt';
+import EphemeralBadge from '@kubevirt-utils/components/badges/EphemeralBadge/EphemeralBadge';
 import PendingBadge from '@kubevirt-utils/components/badges/PendingBadge/PendingBadge';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { NO_DATA_DASH } from '@kubevirt-utils/resources/vm/utils/constants';
 import { NetworkPresentation } from '@kubevirt-utils/resources/vm/utils/network/constants';
 import { getPrintableNetworkInterfaceType } from '@kubevirt-utils/resources/vm/utils/network/selectors';
 import { RowProps, TableData } from '@openshift-console/dynamic-plugin-sdk';
 
+import { isInterfaceEphemeral } from '../../utils/utils';
+
 import NetworkInterfaceActions from './NetworkInterfaceActions';
 
 export type NetworkInterfaceRowProps = {
@@ -17,36 +24,45 @@ export type NetworkInterfaceRowProps = {
 const NetworkInterfaceRow: FC<
   RowProps<
     NetworkPresentation,
-    { isPending: (network: V1Network) => boolean; vm: V1VirtualMachine }
+    {
+      isInterfaceEphemeral: (
+        network: V1Network,
+        iface: V1VirtualMachineInstanceNetworkInterface,
+      ) => undefined | V1VirtualMachineInstanceNetworkInterface;
+      isPending: (network: V1Network) => boolean;
+      vm: V1VirtualMachine;
+    }
   >
 > = ({ activeColumnIDs, obj: { iface, network }, rowData: { isPending, vm } }) => {
   const { t } = useKubevirtTranslation();
+  const ephemeralNic = isInterfaceEphemeral(network, iface);
 
   return (
     <>
       <TableData activeColumnIDs={activeColumnIDs} id="name">
-        {network.name}
-        {isPending(network) && <PendingBadge />}
+        {network?.name || ephemeralNic?.interfaceName || NO_DATA_DASH}
+        {isPending(network) && !ephemeralNic && <PendingBadge />}
+        {ephemeralNic && <EphemeralBadge />}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="model">
         {iface.model || NO_DATA_DASH}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="network">
-        {network.pod ? t('Pod networking') : network.multus?.networkName || NO_DATA_DASH}
+        {network?.pod ? t('Pod networking') : network?.multus?.networkName || NO_DATA_DASH}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="type">
         {getPrintableNetworkInterfaceType(iface)}
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="macAddress">
-        {iface.macAddress || NO_DATA_DASH}
+        {iface?.macAddress || ephemeralNic?.mac || NO_DATA_DASH}
       </TableData>
       <TableData
         activeColumnIDs={activeColumnIDs}
         className="dropdown-kebab-pf pf-v5-c-table__action"
         id=""
       >
         <NetworkInterfaceActions
-          nicName={network.name}
+          nicName={network?.name}
           nicPresentation={{ iface, network }}
           vm={vm}
         />

src/views/virtualmachines/details/tabs/configuration/network/utils/utils.ts

@@ -1,4 +1,10 @@
-import { V1VirtualMachine, V1VirtualMachineInstance } from '@kubevirt-ui/kubevirt-api/kubevirt';
+import {
+  V1Interface,
+  V1Network,
+  V1VirtualMachine,
+  V1VirtualMachineInstance,
+  V1VirtualMachineInstanceNetworkInterface,
+} from '@kubevirt-ui/kubevirt-api/kubevirt';
 import { getAutoAttachPodInterface, getInterfaces } from '@kubevirt-utils/resources/vm';
 import { DEFAULT_NETWORK_INTERFACE } from '@kubevirt-utils/resources/vm/utils/constants';
 import { getVMIInterfaces, getVMIStatusInterfaces } from '@kubevirt-utils/resources/vmi';
@@ -31,6 +37,14 @@ export const isPendingHotPlugNIC = (
 export const interfaceNotFound = (vm: V1VirtualMachine, nicName: string) =>
   !Boolean(getInterfaces(vm)?.find((iface) => iface?.name === nicName));
 
+//special case - when u add ephemeral nic from vm console terminal
+export const isInterfaceEphemeral = (network: V1Network, iface: V1Interface) => {
+  const ifaceVMIStatus = iface as V1VirtualMachineInstanceNetworkInterface;
+  const ifaceVMI = !network && ifaceVMIStatus.infoSource === 'guest-agent' && ifaceVMIStatus;
+
+  return ifaceVMI;
+};
+
 export const isPendingRemoval = (
   vm: V1VirtualMachine,
   vmi: V1VirtualMachineInstance,