refactoring (support multiple StorageSystems per ODF)

red-hat-storage · Nov 23, 2023 · 8e17abd · 8e17abd
1 parent 5117053
commit 8e17abd
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 20 deletions.
diff --git a/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx b/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx
@@ -53,6 +53,7 @@ import './capacity-card.scss';
 
 type CapacityMetricDatum = {
   systemName: string;
+  namespace: string;
   targetKind: string;
   clusterName: string;
   totalValue: HumanizeResult;
@@ -144,12 +145,20 @@ const headerColumns = (t: TFunction) => [
 ];
 
 const getRow: GetRow = (
-  { systemName, targetKind, clusterName, totalValue, usedValue, clusterURL },
+  {
+    systemName,
+    namespace: systemNamespace,
+    targetKind,
+    clusterName,
+    totalValue,
+    usedValue,
+    clusterURL,
+  },
   index
 ) => {
   const { apiGroup, apiVersion, kind } = getGVK(targetKind);
   const systemKind = referenceForGroupVersionKind(apiGroup)(apiVersion)(kind);
-  const systemPath = getDashboardLink(systemKind, systemName);
+  const systemPath = getDashboardLink(systemKind, systemName, systemNamespace);
   const isPercentage = !!totalValue;
   const progress = isPercentage ? getPercentage(usedValue, totalValue) : 100;
   const value = isPercentage
@@ -274,13 +283,15 @@ const SystemCapacityCard: React.FC = () => {
         ? usedCapacity?.data?.result?.reduce(
             (acc: CapacityMetricDatumMap, usedMetric: PrometheusResult) => {
               const systemName = usedMetric?.metric?.storage_system;
+              const namespace = usedMetric?.metric?.namespace;
               const targetKind = usedMetric?.metric?.target_kind;
               const clusterName = usedMetric?.metric?.cluster;
               const clusterURL = ManagedClusterLink.hasOwnProperty(clusterName)
                 ? ManagedClusterLink[clusterName]
                 : undefined;
               acc[systemName + clusterName] = {
                 systemName,
+                namespace,
                 targetKind,
                 clusterName,
                 usedValue: humanizeBinaryBytes(usedMetric?.value?.[1]),

diff --git a/packages/odf/components/odf-dashboard/performance-card/performance-card.tsx b/packages/odf/components/odf-dashboard/performance-card/performance-card.tsx
@@ -40,6 +40,7 @@ import { generateDataFrames } from './utils';
 
 type RowProps = {
   systemName: string;
+  systemNamespace: string;
   managedSystemKind: string;
   managedSystemName: string;
   currentLocation: string;
@@ -57,6 +58,7 @@ type GetRow = (
 const getRow: GetRow = ({
   managedSystemKind,
   systemName,
+  systemNamespace,
   iopsData,
   throughputData,
   latencyData,
@@ -67,7 +69,7 @@ const getRow: GetRow = ({
   return [
     <ResourceLink
       key={systemName}
-      link={getDashboardLink(refKind, systemName)}
+      link={getDashboardLink(refKind, systemName, systemNamespace)}
       resourceModel={ODFStorageSystem}
       resourceName={systemName}
     />,

diff --git a/packages/odf/components/odf-dashboard/performance-card/utils.ts b/packages/odf/components/odf-dashboard/performance-card/utils.ts
@@ -10,6 +10,7 @@ import * as _ from 'lodash-es';
 
 type DataFrame = {
   systemName: string;
+  systemNamespace: string;
   managedSystemKind: string;
   managedSystemName: string;
   currentLocation: string;
@@ -51,6 +52,7 @@ export const generateDataFrames = (
       managedSystemKind: curr.spec.kind,
       managedSystemName: curr.spec.name,
       systemName: curr.metadata.name,
+      systemNamespace: curr.metadata.namespace,
       currentLocation: '/',
       iopsData: {
         data: getDatForSystem(id, curr, humanizeIOPS),

diff --git a/packages/odf/components/odf-dashboard/status-card/status-card.tsx b/packages/odf/components/odf-dashboard/status-card/status-card.tsx
@@ -79,6 +79,7 @@ export const StatusCard: React.FC = () => {
     healthData
       ? healthData?.data?.result?.reduce((acc, curr) => {
           const systemName = curr.metric.storage_system;
+          const systemNamespace = curr.metric.namespace;
           const storageSystem = systems.find(
             (system) => system.metadata.name === systemName
           );
@@ -96,6 +97,7 @@ export const StatusCard: React.FC = () => {
                   link: getVendorDashboardLinkFromMetrics(
                     systemKind,
                     systemName,
+                    systemNamespace,
                     ocsHealthStatus.errorComponent
                   ),
 
@@ -109,7 +111,8 @@ export const StatusCard: React.FC = () => {
                   healthState: healthStateMap(curr.value[1]),
                   link: getVendorDashboardLinkFromMetrics(
                     systemKind,
-                    systemName
+                    systemName,
+                    systemNamespace
                   ),
                 };
           return [...acc, systemData];

diff --git a/packages/odf/components/odf-dashboard/system-capacity-card/capacity-card.tsx b/packages/odf/components/odf-dashboard/system-capacity-card/capacity-card.tsx
@@ -104,6 +104,7 @@ const SystemCapacityCard: React.FC = () => {
           const totalMetric = getMetricForSystem(totalCapacity, system);
           const datum = {
             name: system.metadata.name,
+            namespace: system.metadata.namespace,
             managedSystemName: system.spec.name,
             managedSystemKind: referenceFor(apiGroup)(apiVersion)(kind),
             usedValue: usedMetric

diff --git a/packages/odf/components/system-list/odf-system-list.tsx b/packages/odf/components/system-list/odf-system-list.tsx
@@ -6,6 +6,7 @@ import {
 import { Kebab } from '@odf/shared/kebab/kebab';
 import { ClusterServiceVersionModel } from '@odf/shared/models';
 import { ODFStorageSystem } from '@odf/shared/models';
+import { getName, getNamespace } from '@odf/shared/selectors';
 import { Status } from '@odf/shared/status/Status';
 import {
   ClusterServiceVersionKind,
@@ -46,7 +47,7 @@ import { OperandStatus } from '../utils';
 import ODFSystemLink from './system-link';
 
 type SystemMetrics = {
-  [systeName: string]: {
+  [systeNameAndNamespace: string]: {
     rawCapacity: HumanizeResult;
     usedCapacity: HumanizeResult;
     iops: HumanizeResult;
@@ -83,7 +84,7 @@ export const normalizeMetrics: MetricNormalize = (
     return {};
   }
   return systems.reduce<SystemMetrics>((acc, curr) => {
-    acc[curr.metadata.name] = {
+    acc[getName(curr) + getNamespace(curr)] = {
       rawCapacity: humanizeBinaryBytes(
         rawCapacity.data.result.find(
           (item) => item?.metric?.managedBy === curr.spec.name
@@ -246,10 +247,12 @@ const StorageSystemRow: React.FC<RowProps<StorageSystemKind, CustomData>> = ({
   const { t } = useCustomTranslation();
   const { apiGroup, apiVersion, kind } = getGVK(obj.spec.kind);
   const systemKind = referenceForGroupVersionKind(apiGroup)(apiVersion)(kind);
-  const systemName = obj?.metadata?.name;
+  const systemName = getName(obj);
+  const systemNamespace = getNamespace(obj);
   const { normalizedMetrics } = rowData;
 
-  const metrics = normalizedMetrics?.normalizedMetrics?.[systemName];
+  const metrics =
+    normalizedMetrics?.normalizedMetrics?.[systemName + systemNamespace];
 
   const { rawCapacity, usedCapacity, iops, throughput, latency } =
     metrics || {};
@@ -260,6 +263,7 @@ const StorageSystemRow: React.FC<RowProps<StorageSystemKind, CustomData>> = ({
           kind={systemKind}
           systemName={systemName}
           providerName={systemName}
+          systemNamespace={systemNamespace}
         />
       </TableData>
       <TableData {...tableColumnInfo[1]} activeColumnIDs={activeColumnIDs}>

diff --git a/packages/odf/components/system-list/system-link.tsx b/packages/odf/components/system-list/system-link.tsx
@@ -7,14 +7,16 @@ type ODFSystemLinkProps = {
   kind: string;
   providerName: string;
   systemName: string;
+  systemNamespace: string;
 };
 
 const ODFSystemLink: React.FC<ODFSystemLinkProps> = ({
   kind,
   systemName,
   providerName,
+  systemNamespace,
 }) => {
-  const path = `/odf/system/${kind}/${providerName}/overview`;
+  const path = `/odf/system/ns/${systemNamespace}/${kind}/${providerName}/overview`;
   return (
     <span>
       <ResourceIcon resourceModel={ODFStorageSystem} />

diff --git a/packages/odf/components/utils/common.ts b/packages/odf/components/utils/common.ts
@@ -77,9 +77,10 @@ export const getAllZone = (nodes: WizardNodeState[]): Set<string> =>
 export const getVendorDashboardLinkFromMetrics = (
   systemKind: string,
   systemName: string,
+  systemNamespace: string,
   subComponent?: string
 ) =>
-  `/odf/system/${systemKind}/${systemName}/overview${
+  `/odf/system/ns/${systemNamespace}/${systemKind}/${systemName}/overview${
     subComponent ? '/' + subComponent : ''
   }`;
 

diff --git a/packages/odf/constants/common.ts b/packages/odf/constants/common.ts
@@ -93,3 +93,5 @@ export enum TimeUnits {
   HOUR = 'Hour',
   MIN = 'Min',
 }
+
+export const reduxReducerScope = 'odfConsoleRedux';
diff --git a/packages/odf/redux/provider-hooks/useODFNamespace.ts b/packages/odf/redux/provider-hooks/useODFNamespace.ts
@@ -2,14 +2,13 @@ import * as React from 'react';
 import { SubscriptionModel } from '@odf/shared/models';
 import { getNamespace } from '@odf/shared/selectors';
 import { SubscriptionKind } from '@odf/shared/types';
+import { isAbortError } from '@odf/shared/utils';
 import { k8sList } from '@openshift-console/dynamic-plugin-sdk';
 import { useODFNamespaceDispatch } from '../dispatchers';
 
 const FALLBACK_NAMESPACE = 'openshift-storage';
 const SPEC_NAME = 'odf-operator';
 
-const isAbortError = (err): boolean => err?.name === 'AbortError';
-
 const namespaceDetector = async (maxAttempt = 5): Promise<string> => {
   let attempt = 0;
   let ns = null;

diff --git a/packages/odf/redux/selectors/odf-namespace.ts b/packages/odf/redux/selectors/odf-namespace.ts
@@ -1,8 +1,8 @@
+import { reduxReducerScope } from '@odf/core/constants';
 import { useSelector } from 'react-redux';
 import { nsPayload } from '../actions';
 
 export const odfNamespaceReducerName = 'odfInstallNs';
-export const reduxReducerScope = 'odfConsoleRedux';
 
 const getODFNamespace = (state): nsPayload =>
   state.plugins?.[reduxReducerScope]?.[odfNamespaceReducerName] || {};

diff --git a/packages/shared/src/dashboards/capacity-card/capacity-card.tsx b/packages/shared/src/dashboards/capacity-card/capacity-card.tsx
@@ -24,6 +24,7 @@ import './capacity-card.scss';
 
 export type CapacityMetricDatum = {
   name: string;
+  namespace?: string;
   managedSystemName?: string;
   managedSystemKind?: string;
   totalValue?: HumanizeResult;
@@ -184,7 +185,11 @@ const CapacityCardRow: React.FC<CapacityCardRowProps> = ({
         {data?.managedSystemKind ? (
           <Tooltip content={data?.name}>
             <ResourceLink
-              link={getDashboardLink(data?.managedSystemKind, data?.name)}
+              link={getDashboardLink(
+                data?.managedSystemKind,
+                data?.name,
+                data?.namespace
+              )}
               resourceModel={resourceModel}
               resourceName={data?.name}
               className="odf-capacityCardLink--ellipsis"
@@ -317,7 +322,7 @@ const CapacityCard: React.FC<CapacityCardProps> = ({
             const isPercentage = !!item?.totalValue;
             return (
               <CapacityCardRow
-                key={item.name}
+                key={item.name + item.namespace}
                 data={item}
                 isPercentage={isPercentage}
                 isRelative={relative}

diff --git a/packages/shared/src/types/storage.ts b/packages/shared/src/types/storage.ts
@@ -113,3 +113,5 @@ export type CephClusterKind = K8sResourceCommon & {
     phase?: string;
   };
 };
+
+export type NoobaaSystemKind = K8sResourceCommon;
diff --git a/packages/shared/src/utils/common.ts b/packages/shared/src/utils/common.ts
@@ -139,3 +139,5 @@ export const isValidIP = (address) =>
   /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(
     address
   );
+
+export const isAbortError = (err): boolean => err?.name === 'AbortError';
diff --git a/packages/shared/src/utils/dashboard.ts b/packages/shared/src/utils/dashboard.ts
@@ -8,8 +8,12 @@ import { TFunction } from 'i18next';
 
 const DASH_PREFIX = '/odf/system';
 
-export const getDashboardLink = (systemKind: string, systemName: string) =>
-  `${DASH_PREFIX}/${systemKind}/${systemName}/overview`;
+export const getDashboardLink = (
+  systemKind: string,
+  systemName: string,
+  systemNamespace: string
+) =>
+  `${DASH_PREFIX}/ns/${systemNamespace}/${systemKind}/${systemName}/overview`;
 
 export const getWorstStatus = (
   componentsHealth: SubsystemHealth[],

diff --git a/plugins/odf/console-extensions.json b/plugins/odf/console-extensions.json
@@ -133,7 +133,7 @@
     "type": "console.page/route",
     "properties": {
       "exact": true,
-      "path": "/odf/system/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/create/~new",
+      "path": "/odf/system/ns/:namespace/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/create/~new",
       "component": {
         "$codeRef": "createBlockPools.default"
       }
@@ -142,7 +142,7 @@
   {
     "type": "console.page/route",
     "properties": {
-      "path": "/odf/system/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/:poolName",
+      "path": "/odf/system/ns/:namespace/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/:poolName",
       "exact": false,
       "component": {
         "$codeRef": "blockPoolDetailsPage.default"
@@ -212,7 +212,7 @@
   {
     "type": "console.page/route",
     "properties": {
-      "path": "/odf/system/ocs.openshift.io~v1~StorageCluster/:systemName",
+      "path": "/odf/system/ns/:namespace/ocs.openshift.io~v1~StorageCluster/:systemName",
       "exact": false,
       "component": {
         "$codeRef": "ocs.default"
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,3 +113,5 @@ export type CephClusterKind = K8sResourceCommon & { @@
         phase?: string;
       };
     };
+    export type NoobaaSystemKind = K8sResourceCommon;