Added disks count to inventory

kubevirt · Apr 9, 2019 · 7f8e9dd · 7f8e9dd
1 parent 5c9a1a2
commit 7f8e9dd
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 6 deletions.
diff --git a/src/components/Dashboard/Inventory/utils.js b/src/components/Dashboard/Inventory/utils.js
@@ -6,10 +6,10 @@ import { getHostStatus, HOST_STATUS_ALL_ERROR, HOST_STATUS_ALL_WARN } from '../.
 import { getPvStatus, PV_STATUS_ALL_ERROR, PV_STATUS_ALL_PROGRESS } from '../../../utils/status/pv';
 
 // same as InventoryItemStatus props
-const STATUS_RESULT_OK = 'ok';
-const STATUS_RESULT_WARN = 'warn';
-const STATUS_RESULT_ERROR = 'error';
-const STATUS_RESULT_IN_PROGRESS = 'inProgress';
+export const STATUS_RESULT_OK = 'ok';
+export const STATUS_RESULT_WARN = 'warn';
+export const STATUS_RESULT_ERROR = 'error';
+export const STATUS_RESULT_IN_PROGRESS = 'inProgress';
 
 const mapStatuses = (entities, mapEntityToStatusResult) => {
   const result = {

diff --git a/src/components/StorageOverview/Inventory/Inventory.js b/src/components/StorageOverview/Inventory/Inventory.js
@@ -10,24 +10,28 @@ import {
 } from '../../Dashboard/DashboardCard';
 import { StorageOverviewContext } from '../StorageOverviewContext';
 import { mapNodesToProps, mapPvcsToProps, mapPvsToProps } from '../../Dashboard/Inventory/utils';
+import diskStatsToProps from './diskInventoryUtils';
 import { InventoryRow } from '../../Dashboard/Inventory/InventoryRow';
 
-const InventoryBody = ({ nodes, pvs, pvcs }) => (
+const InventoryBody = ({ nodes, pvs, pvcs, diskStats }) => (
   <React.Fragment>
     <InventoryRow title="Nodes" {...mapNodesToProps(nodes)} />
+    <InventoryRow title="Disks" {...diskStatsToProps(diskStats)} />
     <InventoryRow title="PVs" {...mapPvsToProps(pvs)} />
     <InventoryRow title="PVCs" {...mapPvcsToProps(pvcs)} />
   </React.Fragment>
 );
 
 InventoryBody.defaultProps = {
   nodes: undefined,
+  diskStats: undefined,
   pvs: undefined,
   pvcs: undefined,
 };
 
 InventoryBody.propTypes = {
   nodes: PropTypes.array,
+  diskStats: PropTypes.object,
   pvs: PropTypes.array,
   pvcs: PropTypes.array,
 };

diff --git a/src/components/StorageOverview/Inventory/diskInventoryUtils.js b/src/components/StorageOverview/Inventory/diskInventoryUtils.js
@@ -0,0 +1,24 @@
+import { get } from 'lodash';
+
+import { getCapacityStats } from '../../../selectors';
+import { STATUS_RESULT_OK, STATUS_RESULT_ERROR } from '../../Dashboard/Inventory/utils';
+
+const diskStatsToProps = disks => {
+  const result = {
+    [STATUS_RESULT_OK]: 0,
+    [STATUS_RESULT_ERROR]: 0,
+    count: null,
+  };
+
+  const cephOsdUpCount = getCapacityStats(get(disks, 'cephOsdUp'));
+  const cephOsdDownCount = getCapacityStats(get(disks, 'cephOsdDown'));
+
+  if (cephOsdUpCount || cephOsdDownCount) {
+    result[STATUS_RESULT_OK] = cephOsdUpCount;
+    result[STATUS_RESULT_ERROR] = cephOsdDownCount;
+    result.count = cephOsdUpCount + cephOsdDownCount;
+  }
+  return result;
+};
+
+export default diskStatsToProps;
diff --git a/src/components/StorageOverview/Inventory/fixtures/Inventory.fixture.js b/src/components/StorageOverview/Inventory/fixtures/Inventory.fixture.js
@@ -1,5 +1,5 @@
 import { Inventory } from '../Inventory';
-import { nodes, pvcs, pvs } from '../../fixtures/StorageOverview.fixture';
+import { nodes, pvcs, pvs, diskStats } from '../../fixtures/StorageOverview.fixture';
 
 export default [
   {
@@ -8,6 +8,7 @@ export default [
       nodes,
       pvcs,
       pvs,
+      diskStats,
     },
   },
   {

diff --git a/src/components/StorageOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap b/src/components/StorageOverview/Inventory/tests/__snapshots__/Inventory.test.js.snap
@@ -52,6 +52,46 @@ exports[`<Inventory /> renders correctly 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="kubevirt-inventory__row"
+      id="inventory-disks"
+    >
+      <div
+        class="kubevirt-inventory__row-title"
+      >
+        7 Disks
+      </div>
+      <div
+        class="kubevirt-inventory__row-status"
+      >
+        <div
+          class="kubevirt-inventory__row-status-item"
+        >
+          <span
+            aria-hidden="true"
+            class="fa fa-exclamation-circle fa-2x kubevirt-inventory__row-status-item-icon--error"
+          />
+          <span
+            class="kubevirt-inventory__row-status-item-text"
+          >
+            2
+          </span>
+        </div>
+        <div
+          class="kubevirt-inventory__row-status-item"
+        >
+          <span
+            aria-hidden="true"
+            class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+          />
+          <span
+            class="kubevirt-inventory__row-status-item-text"
+          >
+            5
+          </span>
+        </div>
+      </div>
+    </div>
     <div
       class="kubevirt-inventory__row"
       id="inventory-pvs"

diff --git a/src/components/StorageOverview/fixtures/StorageOverview.fixture.js b/src/components/StorageOverview/fixtures/StorageOverview.fixture.js
@@ -9,10 +9,12 @@ import { StorageOverviewContext } from '../StorageOverviewContext';
 import { localhostNode } from '../../../tests/mocks/node';
 import { persistentVolumeClaims } from '../../../tests/mocks/persistentVolumeClaim';
 import { persistentVolumes } from '../../../tests/mocks/persistentVolume';
+import { osdDisksCount } from '../../../tests/mocks/disks';
 
 export const nodes = [localhostNode];
 export const pvcs = persistentVolumeClaims;
 export const pvs = persistentVolumes;
+export const diskStats = osdDisksCount;
 
 const StorageOverview = props => (
   <StorageOverviewContext.Provider value={props}>
@@ -29,6 +31,7 @@ export default [
       nodes,
       pvcs,
       pvs,
+      diskStats,
     },
   },
 ];
diff --git a/src/components/StorageOverview/tests/__snapshots__/StorageOverview.test.js.snap b/src/components/StorageOverview/tests/__snapshots__/StorageOverview.test.js.snap
@@ -132,6 +132,46 @@ exports[`<StorageOverview /> renders correctly with Provider 1`] = `
                     </div>
                   </div>
                 </div>
+                <div
+                  class="kubevirt-inventory__row"
+                  id="inventory-disks"
+                >
+                  <div
+                    class="kubevirt-inventory__row-title"
+                  >
+                    7 Disks
+                  </div>
+                  <div
+                    class="kubevirt-inventory__row-status"
+                  >
+                    <div
+                      class="kubevirt-inventory__row-status-item"
+                    >
+                      <span
+                        aria-hidden="true"
+                        class="fa fa-exclamation-circle fa-2x kubevirt-inventory__row-status-item-icon--error"
+                      />
+                      <span
+                        class="kubevirt-inventory__row-status-item-text"
+                      >
+                        2
+                      </span>
+                    </div>
+                    <div
+                      class="kubevirt-inventory__row-status-item"
+                    >
+                      <span
+                        aria-hidden="true"
+                        class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
+                      />
+                      <span
+                        class="kubevirt-inventory__row-status-item-text"
+                      >
+                        5
+                      </span>
+                    </div>
+                  </div>
+                </div>
                 <div
                   class="kubevirt-inventory__row"
                   id="inventory-pvs"

diff --git a/src/tests/mocks/disks/index.js b/src/tests/mocks/disks/index.js
@@ -0,0 +1,26 @@
+export const osdDisksCount = {
+  cephOsdUp: {
+    status: 'success',
+    data: {
+      resultType: 'vector',
+      result: [
+        {
+          metric: {},
+          value: [123, '5'],
+        },
+      ],
+    },
+  },
+  cephOsdDown: {
+    status: 'success',
+    data: {
+      resultType: 'vector',
+      result: [
+        {
+          metric: {},
+          value: [123, '2'],
+        },
+      ],
+    },
+  },
+};