CNV-60049: fix interface modal with udn

Author: upalatucci

src/utils/components/NetworkInterfaceModal/components/hooks/useNADsData.ts

@@ -2,9 +2,10 @@ import { useMemo } from 'react';
 
 import { NetworkAttachmentDefinitionModelGroupVersionKind } from '@kubevirt-ui/kubevirt-api/console';
 import useNADListPermissions from '@kubevirt-utils/components/NetworkInterfaceModal/components/hooks/useNADListPermissions';
-import { getExtraNADResources } from '@kubevirt-utils/components/NetworkInterfaceModal/components/hooks/utils';
-import { getName } from '@kubevirt-utils/resources/shared';
-import { PRIMARY_UDN_BINDING } from '@kubevirt-utils/resources/vm/utils/network/constants';
+import {
+  filterUDNNads,
+  getExtraNADResources,
+} from '@kubevirt-utils/components/NetworkInterfaceModal/components/hooks/utils';
 import { isEmpty } from '@kubevirt-utils/utils/utils';
 import { K8sResourceCommon, useK8sWatchResources } from '@openshift-console/dynamic-plugin-sdk';
 
@@ -24,9 +25,8 @@ const useNADsData: UseNADsData = (namespace) => {
   const accumulatedData = useMemo(() => {
     return (Object.values(data) || [])?.reduce(
       (acc, nads) => {
-        const nadsWithNoPrimaryUDNBinding =
-          nads?.data?.filter((nad) => getName(nad) !== PRIMARY_UDN_BINDING) || [];
-        acc.nads.push(...nadsWithNoPrimaryUDNBinding);
+        const availableNADs = filterUDNNads(nads?.data || []);
+        acc.nads.push(...availableNADs);
         acc.loaded = acc.loaded && (!isEmpty(nads?.loadError) || nads?.loaded);
         acc.loadError = isEmpty(nads?.loadError) ? acc.loadError : nads?.loadError;
         return acc;

src/utils/components/NetworkInterfaceModal/components/hooks/utils.ts

@@ -5,7 +5,10 @@ import {
   OPENSHIFT_MULTUS_NS,
   OPENSHIFT_SRIOV_NETWORK_OPERATOR_NS,
 } from '@kubevirt-utils/constants/constants';
+import { getLabel } from '@kubevirt-utils/resources/shared';
+import { UDN_LABEL } from '@kubevirt-utils/resources/udn/constants';
 import { isEmpty } from '@kubevirt-utils/utils/utils';
+import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
 
 const resources = {
   default: {
@@ -41,3 +44,6 @@ export const getExtraNADResources = (
     return newMap;
   }, {});
 };
+
+export const filterUDNNads = (nads: K8sResourceCommon[]) =>
+  nads?.filter((nad) => getLabel(nad, UDN_LABEL) === undefined);

src/utils/resources/udn/constants.ts

@@ -1,6 +1,7 @@
 export const LAYER2_TOPOLOGY = 'layer2';
 export const LAYER3_TOPOLOGY = 'layer3';
 export const LOCALNET_TOPOLOGY = 'localnet';
+export const UDN_LABEL = 'k8s.ovn.org/user-defined-network';
 
 export const PrimaryTopologies = [LAYER2_TOPOLOGY, LAYER3_TOPOLOGY];
 export const SecondaryTopologies = [LOCALNET_TOPOLOGY];

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

@@ -43,5 +43,3 @@ const labels2types: LabelMap = Object.fromEntries(
 
 export const interfaceTypesProxy = new Proxy<TypeMap>(types2labels, typeHandler);
 export const interfaceLabelsProxy = new Proxy<LabelMap>(labels2types, labelHandler);
-
-export const PRIMARY_UDN_BINDING = 'primary-udn-kubevirt-binding';