edit test and checkInferenceServiceState

Author: katieperry4

frontend/src/__tests__/cypress/cypress/tests/e2e/dataScienceProjects/models/testModelStopStart.cy.ts

@@ -36,7 +36,7 @@ describe('A model can be stopped and started', () => {
           throw new Error('Project name is undefined or empty in the loaded fixture');
         }
         cy.log(`Loaded project name: ${projectName}`);
-        // Create a Project for pipelines
+        // Create a Project
         provisionProjectForModelServing(
           projectName,
           awsBucket,
@@ -47,7 +47,7 @@ describe('A model can be stopped and started', () => {
   });
 
   after(() => {
-    // Delete provisioned Project
+    // Delete the Project
     deleteOpenShiftProject(projectName, { wait: false, ignoreNotFound: true });
   });
 
@@ -58,7 +58,6 @@ describe('A model can be stopped and started', () => {
     },
     () => {
       cy.log('Model Name:', modelName);
-      // Authentication and navigation
       cy.step(`Log into the application with ${HTPASSWD_CLUSTER_ADMIN_USER.USERNAME}`);
       cy.visitWithLogin('/', HTPASSWD_CLUSTER_ADMIN_USER);
 
@@ -68,14 +67,13 @@ describe('A model can be stopped and started', () => {
       projectListPage.filterProjectByName(projectName);
       projectListPage.findProjectLink(projectName).click();
 
-      // Navigate to Model Serving tab and Deploy a Model
-      cy.step('Navigate to Model Serving and click to Deploy a Model Server');
+      // Navigate to Model Serving section and Deploy a Model
+      cy.step('Navigate to Model Serving and click to Deploy a Model');
       projectDetails.findSectionTab('model-server').click();
       modelServingGlobal.findSingleServingModelButton().click();
       modelServingGlobal.findDeployModelButton().click();
 
-      // Launch a Single Serving Model and select the required entries
-      cy.step('Launch a Single Serving Model using Openvino');
+      cy.step('Launch a Model');
       inferenceServiceModal.findModelNameInput().type(testData.singleModelName);
       inferenceServiceModal.findServingRuntimeTemplateSearchSelector().click();
       inferenceServiceModal.findGlobalScopedTemplateOption('OpenVINO Model Server').click();
@@ -86,18 +84,14 @@ describe('A model can be stopped and started', () => {
       inferenceServiceModal.shouldBeOpen(false);
       modelServingSection.findModelServerName(testData.singleModelName);
 
-      //Verify the model created
-      cy.step('Verify that the Model is created Successfully on the backend and frontend');
+      //Verify the model created and is running
+      cy.step('Verify that the Model is running');
       checkInferenceServiceState(testData.singleModelName, projectName, {
         checkReady: true,
         checkLatestDeploymentReady: true,
       });
-      modelServingSection.findModelServerName(testData.singleModelName);
-
-      cy.reload();
-      modelServingSection.findStatusTooltip().click({ force: true });
-      cy.contains('Loaded', { timeout: 120000 }).should('be.visible');
 
+      //Stop the model with the modal
       cy.step('Stop the model');
       const kServeRow = modelServingSection.getKServeRow(testData.singleModelName);
       kServeRow.findStateActionToggle().should('have.text', 'Stop').click();
@@ -108,17 +102,19 @@ describe('A model can be stopped and started', () => {
       kServeRow.findConfirmStopModalCheckbox().should('be.checked');
       kServeRow.findConfirmStopModalButton().click();
 
-      modelServingSection.findStatusTooltip().click({ force: true });
-      cy.contains('Unknown', { timeout: 120000 }).should('be.visible');
+      //Verify the model is stopped
       checkInferenceServiceState(testData.singleModelName, projectName, {
         checkReady: false,
         checkLatestDeploymentReady: false,
+        checkStopped: true,
+        requireLoadedState: false,
       });
 
-      cy.step('Start the model');
+      //Restart the model
+      cy.step('Restart the model');
       kServeRow.findStateActionToggle().should('have.text', 'Start').click();
-      modelServingSection.findStatusTooltip().click({ force: true });
-      cy.contains('Loaded', { timeout: 120000 }).should('be.visible');
+
+      //Verify the model is running again
       checkInferenceServiceState(testData.singleModelName, projectName, {
         checkReady: true,
         checkLatestDeploymentReady: true,

frontend/src/__tests__/cypress/cypress/utils/oc_commands/modelServing.ts

@@ -78,6 +78,8 @@ type ConditionCheck = {
 type ConditionCheckOptions = {
   checkLatestDeploymentReady?: boolean;
   checkReady?: boolean;
+  checkStopped?: boolean;
+  requireLoadedState?: boolean;
 };
 
 /**
@@ -174,6 +176,15 @@ export const checkInferenceServiceState = (
         });
       }
 
+      if (options.checkStopped) {
+        conditionChecks.push({
+          type: 'Stopped',
+          expectedStatus: 'True',
+          check: (condition) => condition.type === 'Stopped' && condition.status === 'True',
+          name: 'Service Stopped',
+        });
+      }
+
       // If no condition checks are specified, skip condition validation
       const shouldValidateConditions = conditionChecks.length > 0;
 
@@ -207,10 +218,12 @@ export const checkInferenceServiceState = (
       // If no condition checks were specified, only check model state
       const allConditionsPassed =
         !shouldValidateConditions || checkedConditions.every((check) => check.isPassed);
+      // If the user does not want to check the loaded state, then we can return true if the conditions are passed
+      const requireLoaded = options.requireLoadedState !== false;
 
-      if (isModelLoaded && allConditionsPassed) {
+      if ((!requireLoaded || isModelLoaded) && allConditionsPassed) {
         cy.log(
-          `✅ InferenceService ${serviceName} is in "Loaded" state and meets all conditions after ${attempts} attempts`,
+          `✅ InferenceService ${serviceName} meets all conditions after ${attempts} attempts`,
         );
         return cy.wrap(result);
       }