Testing infra for metalkubed

frontend/integration-tests/protractor.conf.ts

@@ -8,11 +8,6 @@ import * as ConsoleReporter from 'jasmine-console-reporter';
 import * as failFast from 'protractor-fail-fast';
 import { createWriteStream, writeFileSync } from 'fs';
 import { format } from 'util';
-import {
-  resolvePluginPackages,
-  reducePluginTestSuites,
-  mergeTestSuites,
-} from '@console/plugin-sdk/src/codegen';
 
 const tap = !!process.env.TAP;
 
@@ -194,10 +189,103 @@ export const config: Config = {
     failFast.clean();
     return new Promise((resolve) => htmlReporter.afterLaunch(resolve.bind(this, exitCode)));
   },
-  suites: mergeTestSuites(
-    testSuites,
-    reducePluginTestSuites(resolvePluginPackages(), __dirname, suite),
-  ),
+  suites: {
+    dashboardsTests: ['tests/dashboards/dashboard.scenario.ts'],
+    dashboardsBareMetalHosts: [
+      '../packages/metal3-plugin/integration-tests/tests/dashboards/dashboard.scenario.ts',
+    ],
+    filter: suite(['tests/filter.scenario.ts']),
+    annotation: suite(['tests/modal-annotations.scenario.ts']),
+    environment: suite(['tests/environment.scenario.ts']),
+    secrets: suite(['tests/secrets.scenario.ts']),
+    storage: suite(['tests/storage.scenario.ts']),
+    crud: suite([
+      'tests/crud.scenario.ts',
+      'tests/secrets.scenario.ts',
+      'tests/filter.scenario.ts',
+      'tests/modal-annotations.scenario.ts',
+      'tests/environment.scenario.ts',
+    ]),
+    monitoring: suite(['tests/monitoring.scenario.ts']),
+    newApp: suite(['tests/overview/overview.scenario.ts', 'tests/deploy-image.scenario.ts']),
+    olmFull: suite([
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/descriptors.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/operator-hub.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/global-installmode.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/single-installmode.scenario.ts',
+    ]),
+    performance: suite(['tests/performance.scenario.ts']),
+    serviceCatalog: suite([
+      'tests/service-catalog/service-catalog.scenario.ts',
+      'tests/service-catalog/service-broker.scenario.ts',
+      'tests/service-catalog/service-class.scenario.ts',
+      'tests/service-catalog/service-binding.scenario.ts',
+      'tests/developer-catalog.scenario.ts',
+    ]),
+    overview: suite(['tests/overview/overview.scenario.ts']),
+    crdExtensions: suite(['tests/crd-extensions.scenario.ts']),
+    e2e: suite([
+      'tests/crud.scenario.ts',
+      'tests/secrets.scenario.ts',
+      'tests/storage.scenario.ts',
+      'tests/filter.scenario.ts',
+      'tests/modal-annotations.scenario.ts',
+      'tests/environment.scenario.ts',
+      'tests/overview/overview.scenario.ts',
+      'tests/deploy-image.scenario.ts',
+      'tests/performance.scenario.ts',
+      'tests/monitoring.scenario.ts',
+      'tests/crd-extensions.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/descriptors.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/operator-hub.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/global-installmode.scenario.ts',
+      '../packages/operator-lifecycle-manager/integration-tests/scenarios/single-installmode.scenario.ts',
+    ]),
+    release: suite([
+      'tests/crud.scenario.ts',
+      'tests/secrets.scenario.ts',
+      'tests/filter.scenario.ts',
+      'tests/environment.scenario.ts',
+      'tests/overview/overview.scenario.ts',
+      'tests/deploy-image.scenario.ts',
+      'tests/performance.scenario.ts',
+      'tests/monitoring.scenario.ts',
+      'tests/crd-extensions.scenario.ts',
+    ]),
+    'kubevirt-plugin': suite([
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.wizard.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.yaml.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.actions.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.migration.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.resources.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.clone.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.detail.flavor.scenario.ts',
+      '../packages/kubevirt-plugin/integration-tests/tests/vm.template.wizard.scenario.ts',
+    ]),
+    all: suite([
+      'tests/crud.scenario.ts',
+      'tests/overview/overview.scenareio.ts',
+      'tests/secrets.scenario.ts',
+      'tests/storage.scenario.ts',
+      'tests/olm/**/*.scenario.ts',
+      'tests/service-catalog/**/*.scenario.ts',
+      'tests/filter.scenario.ts',
+      'tests/modal-annotations.scenario.ts',
+      'tests/deploy-image.scenario.ts',
+      'tests/operator-hub/operator-hub.scenario.ts',
+      'tests/developer-catalog.scenario.ts',
+      'tests/monitoring.scenario.ts',
+      'tests/devconsole/dev-perspective.scenario.ts',
+      'tests/devconsole/git-import-flow.scenario.ts',
+      'tests/crd-extensions.scenario.ts',
+    ]),
+    clusterSettings: suite(['tests/cluster-settings.scenario.ts']),
+    login: ['tests/login.scenario.ts'],
+    devconsole: [
+      'tests/devconsole/dev-perspective.scenario.ts',
+      'tests/devconsole/git-import-flow.scenario.ts',
+    ],
+  },
   params: {
     // Set to 'true' to enable OpenShift resources in the crud scenario.
     // Use a string rather than boolean so it can be specified on the command line:

frontend/integration-tests/tests/dashboards/dashboard.scenario.ts

@@ -0,0 +1,26 @@
+import { browser, ExpectedConditions as until } from 'protractor';
+const execSync = require('child_process').execSync;
+
+import { appHost } from '../../protractor.conf';
+import * as dashboardView from '../../views/dashboards/dashboards.view';
+
+describe('Inventory card', () => {
+  beforeAll(async () => {
+    await browser.get(`${appHost}/dashboards`);
+    await dashboardView.isLoaded();
+    // wait until the counters in the inventory card show up
+    await browser.wait(
+      until.textToBePresentInElement(dashboardView.inventoryNodesItemLabel, ' Nodes'),
+      10000,
+    );
+  });
+
+  it('Node count is displayed', async () => {
+    // get the number of ready and not ready nodes from the CLI
+    const output = execSync('oc get nodes -o json', { encoding: 'utf-8' });
+    const nodes = JSON.parse(output);
+    const displayedLabel = await dashboardView.inventoryNodesItemLabel.getText();
+    // comparing if the dashboards are displaying ${nodes.items.length} nodes total
+    expect(displayedLabel).toEqual(`${nodes.items.length} Nodes`);
+  });
+});

frontend/integration-tests/views/dashboards/dashboards.view.ts

@@ -0,0 +1,38 @@
+import { browser, $, $$ } from 'protractor';
+import { waitForNone } from '../../protractor.conf';
+
+export const untilNoLoadersPresent = waitForNone($$('.co-m-loader'));
+export const isLoaded = () => browser.wait(untilNoLoadersPresent).then(() => browser.sleep(2000));
+
+export const inventoryNodesItemLabel = $('[data-test-id="console-dashboard-inventory-node"]')
+  .$('.co-inventory-card__item-title')
+  .$('a');
+export const inventoryNodesDownCounter = $('[data-test-id="console-dashboard-inventory-node"]').$(
+  '[data-test-id="console-dashboard-inventory-count-notready"]',
+);
+
+export const inventoryPodsItemLabel = $('[data-test-id="console-dashboard-inventory-pod"]')
+  .$('.co-inventory-card__item-title')
+  .$('a');
+export const inventoryPodsDownCounter = $('[data-test-id="console-dashboard-inventory-pod"]').$(
+  '[data-test-id="console-dashboard-inventory-count-crashloopbackoff-failed"]',
+);
+
+export const inventoryHostsItemLabel = $(
+  '[data-test-id="console-dashboard-inventory-baremetalhost"]',
+)
+  .$('.co-inventory-card__item-title')
+  .$('a');
+export const inventoryHostsDownCounter = $(
+  '[data-test-id="console-dashboard-inventory-baremetalhost"]',
+).$('[data-test-id="console-dashboard-inventory-count-notready"]');
+
+// Utility function: getTextIfPresent
+export async function getTextIfPresent(elem, textIfNotPresent = '') {
+  if (await elem.isPresent()) {
+    return elem.getText();
+  }
+  return new Promise((resolve) => {
+    resolve(textIfNotPresent);
+  });
+}

frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx

@@ -69,6 +69,7 @@ const InventoryItem: React.FC<InventoryItemProps> = React.memo(
     error = false,
     TitleComponent,
     ExpandedComponent,
+    ...props
   }) => {
     const [expanded, setExpanded] = React.useState(false);
     const onClick = React.useCallback(() => setExpanded(!expanded), [expanded]);
@@ -86,7 +87,7 @@ const InventoryItem: React.FC<InventoryItemProps> = React.memo(
             id={title}
             className="co-inventory-card__accordion-toggle"
           >
-            <div className="co-inventory-card__item">
+            <div className="co-inventory-card__item" data-test-id={props['data-test-id']}>
               <div className="co-inventory-card__item-title">
                 {isLoading && !error && <div className="skeleton-inventory" />}
                 {TitleComponent ? <TitleComponent>{titleMessage}</TitleComponent> : titleMessage}
@@ -108,7 +109,10 @@ const InventoryItem: React.FC<InventoryItemProps> = React.memo(
         </AccordionItem>
       </Accordion>
     ) : (
-      <div className="co-inventory-card__item">
+      <div
+        className="co-inventory-card__item"
+        data-test-id={props['data-test-id']}
+      >
         <div className="co-inventory-card__item-title">
           {isLoading && !error && <div className="skeleton-inventory" />}
           {TitleComponent ? <TitleComponent>{titleMessage}</TitleComponent> : titleMessage}
@@ -152,6 +156,7 @@ const StatusLink = connectToFlags<StatusLinkProps>(
   const statusItems = encodeURIComponent(statusIDs.join(','));
   const namespacePath = namespace ? `ns/${namespace}` : 'all-namespaces';
   const path = basePath || `/k8s/${namespacePath}/${kind.plural}`;
+  const cleanStatusItems = statusIDs.join('-').toLowerCase();
   const to =
     filterType && statusItems.length > 0 ? `${path}?rowFilter-${filterType}=${statusItems}` : path;
   const statusGroupIcons = getStatusGroupIcons(flags);
@@ -160,7 +165,12 @@ const StatusLink = connectToFlags<StatusLinkProps>(
     <div className="co-inventory-card__status">
       <Link to={to} style={{ textDecoration: 'none' }}>
         <span className="co-dashboard-icon">{groupIcon}</span>
-        <span className="co-inventory-card__status-text">{count}</span>
+        <span
+          className="co-inventory-card__status-text"
+          data-test-id={`console-dashboard-inventory-count-${cleanStatusItems}`}
+        >
+          {count}
+        </span>
       </Link>
     </div>
   );
@@ -189,6 +199,7 @@ export const ResourceInventoryItem = connectToFlags<ResourceInventoryItemProps>(
     flags = {},
     ExpandedComponent,
     basePath,
+    ...rest
   }) => {
     const TitleComponent = React.useCallback(
       (props) => (
@@ -211,6 +222,7 @@ export const ResourceInventoryItem = connectToFlags<ResourceInventoryItemProps>(
         error={error}
         TitleComponent={showLink ? TitleComponent : null}
         ExpandedComponent={ExpandedComponent}
+        data-test-id={rest['data-test-id']}
       >
         {top3Groups.map((key) =>
           showLink ? (
@@ -257,6 +269,7 @@ type InventoryItemProps = {
   error?: boolean;
   TitleComponent?: React.ComponentType<{}>;
   ExpandedComponent?: React.ComponentType<{}>;
+  'data-test-id'?: string;
 };
 
 type StatusProps = WithFlagsProps & {
@@ -295,4 +308,5 @@ type ResourceTitleComponentComponent = {
   kind: K8sKind;
   namespace: string;
   basePath?: string;
+  'data-test-id'?: string;
 };

frontend/packages/metal3-plugin/integration-tests/tests/dashboards/dashboard.scenario.ts

@@ -0,0 +1,27 @@
+import { execSync } from 'child_process';
+import { browser, ExpectedConditions as until } from 'protractor';
+import { appHost } from '../../../../../integration-tests/protractor.conf.ts';
+import * as dashboardView from '../../../../../integration-tests/views/dashboards/dashboards.view';
+
+describe('Inventory card', () => {
+  beforeAll(async () => {
+    await browser.get(`${appHost}/dashboards`);
+    await dashboardView.isLoaded();
+    // wait until the counters in the inventory card show up
+    await browser.wait(
+      until.textToBePresentInElement(dashboardView.inventoryHostsItemLabel, ' Bare Metal Hosts'),
+      10000,
+    );
+  });
+
+  it('Host count is displayed', async () => {
+    // get the hosts and their statuses from the CLI
+    const output = execSync('oc get baremetalhosts -n openshift-machine-api -o json', {
+      encoding: 'utf-8',
+    });
+    const hosts = JSON.parse(output);
+    const displayedLabel = await dashboardView.inventoryHostsItemLabel.getText();
+    // comparing if the dashboards are displaying ${hosts.items.length} hosts total
+    expect(displayedLabel).toEqual(`${hosts.items.length} Bare Metal Hosts`);
+  });
+});

frontend/packages/metal3-plugin/package.json

@@ -8,6 +8,11 @@
     "@console/shared": "0.0.0-fixed"
   },
   "consolePlugin": {
-    "entry": "src/plugin.ts"
+    "entry": "src/plugin.ts",
+    "integrationTests": {
+      "dashboardsBareMetalHosts": [
+        "integration-tests/tests/dashboards/dashboard.scenario.ts"
+      ]
+    }
   }
 }

frontend/packages/metal3-plugin/src/components/baremetal-hosts/dashboard/InventoryCard.tsx

@@ -97,10 +97,18 @@ const InventoryCard: React.FC = () => {
           TitleComponent={DiskTitleComponent}
         />
         <InventoryItem
+<<<<<<< HEAD
           title="NIC"
           isLoading={!obj}
           count={getHostNICs(obj).length}
           TitleComponent={NICTitleComponent}
+=======
+          isLoading={!podData}
+          title="Pod"
+          count={podCount}
+          error={podQueryError || podError || !podStats.length}
+          data-test-id="console-dashboard-inventory-pod"
+>>>>>>> 2657874c6... Testing infra for the system dashboards
         />
         <InventoryItem title="CPU" isLoading={!obj} count={getHostCPU(obj).count} />
       </DashboardCardBody>

frontend/public/components/dashboard/dashboards-page/overview-dashboard/inventory-card.tsx

@@ -49,6 +49,7 @@ const ClusterInventoryItem = withDashboardResources(
       useAbbr,
       additionalResources,
       expandedComponent,
+      ...props
     }: ClusterInventoryItemProps) => {
       React.useEffect(() => {
         const resource = getFirehoseResource(model);
@@ -104,6 +105,7 @@ const ClusterInventoryItem = withDashboardResources(
           useAbbr={useAbbr}
           additionalResources={additionalResourcesData}
           ExpandedComponent={expandedComponent ? ExpandedComponent : null}
+          data-test-id={props['data-test-id']}
         />
       );
     },
@@ -120,14 +122,26 @@ export const InventoryCard = connectToFlags(
         <DashboardCardTitle>Cluster Inventory</DashboardCardTitle>
       </DashboardCardHeader>
       <DashboardCardBody>
-        <ClusterInventoryItem model={NodeModel} mapper={getNodeStatusGroups} />
-        <ClusterInventoryItem model={PodModel} mapper={getPodStatusGroups} />
-        <ClusterInventoryItem model={StorageClassModel} />
+        <ClusterInventoryItem
+          model={NodeModel}
+          mapper={getNodeStatusGroups}
+          data-test-id="console-dashboard-inventory-node"
+        />
+        <ClusterInventoryItem
+          model={PodModel}
+          mapper={getPodStatusGroups}
+          data-test-id="console-dashboard-inventory-pod"
+        />
+        <ClusterInventoryItem
+          model={StorageClassModel}
+          data-test-id="console-dashboard-inventory-pvc"
+        />
         <ClusterInventoryItem
           model={PersistentVolumeClaimModel}
           mapper={getPVCStatusGroups}
           useAbbr
-        />
+          data-test-id="console-dashboard-inventory-pvcm"
+        />        
         {items.map((item) => (
           <ClusterInventoryItem
             key={item.properties.model.kind}
@@ -136,6 +150,7 @@ export const InventoryCard = connectToFlags(
             additionalResources={item.properties.additionalResources}
             useAbbr={item.properties.useAbbr}
             expandedComponent={item.properties.expandedComponent}
+            data-test-id={`console-dashboard-inventory-${item.properties.model.id}`}
           />
         ))}
       </DashboardCardBody>
@@ -149,4 +164,5 @@ type ClusterInventoryItemProps = DashboardItemProps & {
   useAbbr?: boolean;
   additionalResources?: FirehoseResource[];
   expandedComponent?: LazyLoader;
+  'data-test-id'?: string;
 };