Merge pull request #2374 from upalatucci/filter-nad-primary-binding

CNV-55094: filter udn primary binding on nads
kubevirt-ui · Jan 21, 2025 · 7346b26 · 7346b26
2 parents 361dfa9 + 06dc5aa
commit 7346b26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/utils/components/NetworkInterfaceModal/components/hooks/useNADsData.ts b/src/utils/components/NetworkInterfaceModal/components/hooks/useNADsData.ts
@@ -3,6 +3,8 @@ 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 { isEmpty } from '@kubevirt-utils/utils/utils';
 import { K8sResourceCommon, useK8sWatchResources } from '@openshift-console/dynamic-plugin-sdk';
 
@@ -22,7 +24,9 @@ const useNADsData: UseNADsData = (namespace) => {
   const accumulatedData = useMemo(() => {
     return (Object.values(data) || [])?.reduce(
       (acc, nads) => {
-        acc.nads.push(...nads?.data);
+        const nadsWithNoPrimaryUDNBinding =
+          nads?.data?.filter((nad) => getName(nad) !== PRIMARY_UDN_BINDING) || [];
+        acc.nads.push(...nadsWithNoPrimaryUDNBinding);
         acc.loaded = acc.loaded && (!isEmpty(nads?.loadError) || nads?.loaded);
         acc.loadError = isEmpty(nads?.loadError) ? acc.loadError : nads?.loadError;
         return acc;

diff --git a/src/utils/resources/vm/utils/network/constants.ts b/src/utils/resources/vm/utils/network/constants.ts
@@ -22,3 +22,5 @@ const types = {
 };
 
 export const interfacesTypes = new Proxy(types, typeHandler);
+
+export const PRIMARY_UDN_BINDING = 'primary-udn-kubevirt-binding';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,5 @@ const types = {
		};

		export const interfacesTypes = new Proxy(types, typeHandler);

		export const PRIMARY_UDN_BINDING = 'primary-udn-kubevirt-binding';