Cypress e2e Test - Admin Model Serving (Multi & Single Model) Tests

frontend/src/__tests__/cypress/cypress/fixtures/e2e/dataScienceProjects/testMultiModelAdminCreation.yaml

@@ -0,0 +1,5 @@
+# testMultiModelAdminCreation.cy.ts Test Data #
+projectMultiModelAdminDisplayName: "Cypress Multi Model Admin Test Project"
+projectMultiModelAdminResourceName: "cy-multi-model-admin-test" 
+multiModelAdminName: "cy-multi-openvino-model"
+modelOpenVinoExamplePath: "openvino-example-model"

frontend/src/__tests__/cypress/cypress/fixtures/e2e/dataScienceProjects/testSingleModelAdminCreation.yaml

@@ -0,0 +1,5 @@
+# testSingleModelAdminCreation.cy.ts Test Data #
+projectSingleModelAdminDisplayName: "Cypress Single Model Admin Test Project"
+projectSingleModelAdminResourceName: "cy-single-model-admin-test" 
+singleModelAdminName: "cy-openvino-model"
+modelOpenVinoPath: "kserve-openvino-test/openvino-example-model"

frontend/src/__tests__/cypress/cypress/pages/modelServing.ts

@@ -56,6 +56,10 @@ class ModelServingGlobal {
     return cy.findByTestId('single-serving-select-button');
   }
 
+  findMultiModelButton() {
+    return cy.findByTestId('multi-serving-select-button');
+  }
+
   private findModelsTable() {
     // TODO be more precise
     return cy.findByTestId('inference-service-table');
@@ -121,14 +125,34 @@ class InferenceServiceModal extends Modal {
     return this.find().findByTestId('caikit-tgis-runtime');
   }
 
+  findOpenVinoServingRuntime() {
+    return this.find().findByTestId('kserve-ovms');
+  }
+
   findModelFrameworkSelect() {
     return this.find().findByTestId('inference-service-framework-selection');
   }
 
+  findOpenVinoIROpSet1() {
+    return this.find().findByTestId('openvino_ir - opset1');
+  }
+
+  findOpenVinoIROpSet13() {
+    return this.find().findByTestId('openvino_ir - opset13');
+  }
+
   findDeploymentModeSelect() {
     return this.find().findByTestId('deployment-mode-select');
   }
 
+  findDeployedModelRouteCheckbox() {
+    return this.find().findByTestId('alt-form-checkbox-route');
+  }
+
+  findTokenAuthenticationCheckbox() {
+    return this.find().findByTestId('alt-form-checkbox-auth');
+  }
+
   findExistingDataConnectionOption() {
     return this.find().findByTestId('existing-data-connection-radio');
   }
@@ -245,6 +269,10 @@ class ServingRuntimeModal extends Modal {
     return this.find().findByTestId('serving-runtime-template-selection');
   }
 
+  findOpenVinoModelServer() {
+    return this.find().findByTestId('ovms');
+  }
+
   findPredefinedArgsButton() {
     return this.find().findByTestId('view-predefined-args-button');
   }
@@ -289,10 +317,22 @@ class ServingRuntimeModal extends Modal {
     return this.find().findByTestId('service-account-form-name');
   }
 
+  findModelServerName() {
+    return this.find().findByTestId('serving-runtime-name');
+  }
+
   findModelServerSizeSelect() {
     return this.find().findByTestId('model-server-size-selection');
   }
 
+  findDeployedModelRouteCheckbox() {
+    return this.find().findByTestId('alt-form-checkbox-route');
+  }
+
+  findTokenAuthenticationCheckbox() {
+    return this.find().findByTestId('alt-form-checkbox-auth');
+  }
+
   findModelServerReplicasMinusButton() {
     return this.find()
       .findByTestId('model-server-replicas')
@@ -442,6 +482,14 @@ class ModelServingSection {
     return this.findKServeTable().find('thead').findByRole('button', { name });
   }
 
+  findInternalExternalServiceButton() {
+    return this.find().findByTestId('internal-external-service-button');
+  }
+
+  findExternalServicePopoverTable() {
+    return cy.findByTestId('external-service-popover');
+  }
+
   getKServeRow(name: string) {
     return new KServeRow(() =>
       this.findKServeTable().find('[data-label=Name]').contains(name).parents('tr'),

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

@@ -0,0 +1,134 @@
+import type { DataScienceProjectData } from '~/__tests__/cypress/cypress/types';
+import { deleteOpenShiftProject } from '~/__tests__/cypress/cypress/utils/oc_commands/project';
+import { loadDSPFixture } from '~/__tests__/cypress/cypress/utils/dataLoader';
+import { HTPASSWD_CLUSTER_ADMIN_USER } from '~/__tests__/cypress/cypress/utils/e2eUsers';
+import { projectListPage, projectDetails } from '~/__tests__/cypress/cypress/pages/projects';
+import {
+  modelServingGlobal,
+  inferenceServiceModal,
+  modelServingSection,
+  createServingRuntimeModal,
+} from '~/__tests__/cypress/cypress/pages/modelServing';
+import {
+  checkInferenceServiceState,
+  provisionProjectForModelServing,
+  modelExternalURLOpenVinoTester,
+} from '~/__tests__/cypress/cypress/utils/oc_commands/modelServing';
+
+let testData: DataScienceProjectData;
+let projectName: string;
+let modelName: string;
+let modelFilePath: string;
+const awsBucket = 'BUCKET_1' as const;
+
+describe('Verify Admin Multi Model Creation and Validation using the UI', () => {
+  before(() => {
+    Cypress.on('uncaught:exception', (err) => {
+      if (err.message.includes('Error: secrets "ds-pipeline-config" already exists')) {
+        return false;
+      }
+      return true;
+    });
+    // Setup: Load test data and ensure clean state
+    return loadDSPFixture('e2e/dataScienceProjects/testMultiModelAdminCreation.yaml').then(
+      (fixtureData: DataScienceProjectData) => {
+        testData = fixtureData;
+        projectName = testData.projectMultiModelAdminResourceName;
+        modelName = testData.multiModelAdminName;
+        modelFilePath = testData.modelOpenVinoExamplePath;
+
+        if (!projectName) {
+          throw new Error('Project name is undefined or empty in the loaded fixture');
+        }
+        cy.log(`Loaded project name: ${projectName}`);
+        // Create a Project for pipelines
+        provisionProjectForModelServing(
+          projectName,
+          awsBucket,
+          'resources/yaml/data_connection_model_serving.yaml',
+        );
+      },
+    );
+  });
+  after(() => {
+    // Delete provisioned Project - 5 min timeout to accomadate increased time to delete a project with a model
+    deleteOpenShiftProject(projectName, { timeout: 300000 });
+  });
+
+  it(
+    'Verify that an Admin can Serve, Query a Multi Model using both the UI and External links',
+    { tags: ['@Smoke', '@SmokeSet3', '@ODS-2053', '@ODS-2054', '@Dashboard', '@Modelserving'] },
+    () => {
+      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);
+
+      // Project navigation
+      cy.step(
+        `Navigate to the Project list tab and search for ${testData.projectMultiModelAdminResourceName}`,
+      );
+      projectListPage.navigate();
+      projectListPage.filterProjectByName(testData.projectMultiModelAdminResourceName);
+      projectListPage.findProjectLink(testData.projectMultiModelAdminResourceName).click();
+
+      // Navigate to Model Serving tab and Deploy a Multi Model
+      cy.step('Navigate to Model Serving and click to Deploy a Model Server');
+      projectDetails.findSectionTab('model-server').click();
+      modelServingGlobal.findMultiModelButton().click();
+      modelServingSection.findAddModelServerButton().click();
+      createServingRuntimeModal.findModelServerName().type(testData.multiModelAdminName);
+      // Check if Serving Runtime is selectable, if it is then select OpenVino Model Server
+      createServingRuntimeModal
+        .findServingRuntimeTemplateDropdown()
+        .should('be.visible')
+        .then(($element) => {
+          if ($element.is(':visible') && !$element.prop('disabled')) {
+            cy.wrap($element).click();
+            createServingRuntimeModal.findOpenVinoModelServer().click();
+          } else {
+            cy.log('Serving Runtime Template dropdown is not clickable. Skipping this step.');
+          }
+        });
+
+      // Click the deployed model route checkbox and confirm it's checked
+      cy.step('Allow Model to be accessed from an External route without Authentication');
+      createServingRuntimeModal.findDeployedModelRouteCheckbox().click();
+      createServingRuntimeModal.findDeployedModelRouteCheckbox().should('be.checked');
+      // Uncheck the token authentication checkbox and confirm it's unchecked
+      createServingRuntimeModal.findTokenAuthenticationCheckbox().click();
+      createServingRuntimeModal.findTokenAuthenticationCheckbox().should('not.be.checked');
+      createServingRuntimeModal.findSubmitButton().click();
+
+      // Verify the Model Server was created successfully
+      cy.step('Verify the Model Server created Successfully');
+      const modelMeshRow = modelServingSection.getModelMeshRow(testData.multiModelAdminName);
+      modelMeshRow.findDeployModelButton().click();
+
+      // Launch a Multi Model and select the required entries
+      cy.step('Launch a Multi Model using Openvino IR');
+      inferenceServiceModal.findModelNameInput().type(testData.multiModelAdminName);
+      inferenceServiceModal.findModelFrameworkSelect().click();
+      inferenceServiceModal.findOpenVinoIROpSet1().click();
+      inferenceServiceModal.findLocationPathInput().type(modelFilePath);
+      inferenceServiceModal.findSubmitButton().click();
+
+      //Verify the Model was created successfully
+      cy.step('Verify that the Model is created Successfully on the backend and frontend');
+      checkInferenceServiceState(testData.multiModelAdminName);
+      modelServingSection.findModelServerName(testData.multiModelAdminName);
+      modelServingSection.findStatusTooltip().click({ force: true });
+      cy.contains('Loaded', { timeout: 120000 }).should('be.visible');
+
+      //Verify the Model is accessible externally
+      cy.step('Verify the model is accessible externally');
+      modelExternalURLOpenVinoTester(modelName).then(({ url, response }) => {
+        expect(response.status).to.equal(200);
+
+        //verify the External URL Matches the Backend
+        modelServingSection.findInternalExternalServiceButton().click();
+        modelServingSection.findExternalServicePopoverTable().should('contain', url);
+      });
+    },
+  );
+});

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

@@ -0,0 +1,117 @@
+import type { DataScienceProjectData } from '~/__tests__/cypress/cypress/types';
+import { deleteOpenShiftProject } from '~/__tests__/cypress/cypress/utils/oc_commands/project';
+import { loadDSPFixture } from '~/__tests__/cypress/cypress/utils/dataLoader';
+import { HTPASSWD_CLUSTER_ADMIN_USER } from '~/__tests__/cypress/cypress/utils/e2eUsers';
+import { projectListPage, projectDetails } from '~/__tests__/cypress/cypress/pages/projects';
+import {
+  modelServingGlobal,
+  inferenceServiceModal,
+  modelServingSection,
+} from '~/__tests__/cypress/cypress/pages/modelServing';
+import {
+  checkInferenceServiceState,
+  provisionProjectForModelServing,
+  modelExternalURLOpenVinoTester,
+} from '~/__tests__/cypress/cypress/utils/oc_commands/modelServing';
+
+let testData: DataScienceProjectData;
+let projectName: string;
+let modelName: string;
+let modelFilePath: string;
+const awsBucket = 'BUCKET_1' as const;
+
+describe('Verify Admin Single Model Creation and Validation using the UI', () => {
+  before(() => {
+    Cypress.on('uncaught:exception', (err) => {
+      if (err.message.includes('Error: secrets "ds-pipeline-config" already exists')) {
+        return false;
+      }
+      return true;
+    });
+    // Setup: Load test data and ensure clean state
+    return loadDSPFixture('e2e/dataScienceProjects/testSingleModelAdminCreation.yaml').then(
+      (fixtureData: DataScienceProjectData) => {
+        testData = fixtureData;
+        projectName = testData.projectSingleModelAdminResourceName;
+        modelName = testData.singleModelAdminName;
+        modelFilePath = testData.modelOpenVinoPath;
+
+        if (!projectName) {
+          throw new Error('Project name is undefined or empty in the loaded fixture');
+        }
+        cy.log(`Loaded project name: ${projectName}`);
+        // Create a Project for pipelines
+        provisionProjectForModelServing(
+          projectName,
+          awsBucket,
+          'resources/yaml/data_connection_model_serving.yaml',
+        );
+      },
+    );
+  });
+  after(() => {
+    // Delete provisioned Project - 5 min timeout to accomadate increased time to delete a project with a model
+    deleteOpenShiftProject(projectName, { timeout: 300000 });
+  });
+
+  it(
+    'Verify that an Admin can Serve, Query a Single Model using both the UI and External links',
+    { tags: ['@Smoke', '@SmokeSet3', '@ODS-2626', '@Dashboard', '@Modelserving'] },
+    () => {
+      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);
+
+      // Project navigation
+      cy.step(
+        `Navigate to the Project list tab and search for ${testData.projectSingleModelAdminResourceName}`,
+      );
+      projectListPage.navigate();
+      projectListPage.filterProjectByName(testData.projectSingleModelAdminResourceName);
+      projectListPage.findProjectLink(testData.projectSingleModelAdminResourceName).click();
+
+      // Navigate to Model Serving tab and Deploy a Single Model
+      cy.step('Navigate to Model Serving and click to Deploy a Single 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');
+      inferenceServiceModal.findModelNameInput().type(testData.singleModelAdminName);
+      inferenceServiceModal.findServingRuntimeTemplate().click();
+      inferenceServiceModal.findOpenVinoServingRuntime().click();
+      inferenceServiceModal.findModelFrameworkSelect().click();
+      inferenceServiceModal.findOpenVinoIROpSet13().click();
+
+      // Enable Model access through an external route
+      cy.step('Allow Model to be accessed from an External route without Authentication');
+      inferenceServiceModal.findDeployedModelRouteCheckbox().click();
+      inferenceServiceModal.findDeployedModelRouteCheckbox().should('be.checked');
+      inferenceServiceModal.findTokenAuthenticationCheckbox().click();
+      inferenceServiceModal.findTokenAuthenticationCheckbox().should('not.be.checked');
+      inferenceServiceModal.findLocationPathInput().type(modelFilePath);
+      inferenceServiceModal.findSubmitButton().click();
+
+      //Verify the model created
+      cy.step('Verify that the Model is created Successfully on the backend and frontend');
+      checkInferenceServiceState(testData.singleModelAdminName);
+      modelServingSection.findModelServerName(testData.singleModelAdminName);
+      // Note reload is required as status tooltip was not found due to a stale element
+      cy.reload();
+      modelServingSection.findStatusTooltip().click({ force: true });
+      cy.contains('Loaded', { timeout: 120000 }).should('be.visible');
+
+      //Verify the Model is accessible externally
+      cy.step('Verify the model is accessible externally');
+      modelExternalURLOpenVinoTester(modelName).then(({ url, response }) => {
+        expect(response.status).to.equal(200);
+
+        //verify the External URL Matches the Backend
+        modelServingSection.findInternalExternalServiceButton().click();
+        modelServingSection.findExternalServicePopoverTable().should('contain', url);
+      });
+    },
+  );
+});

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

@@ -61,7 +61,7 @@ describe('Verify Model Creation and Validation using the UI', () => {
 
   it(
     'Verify that a Non Admin can Serve and Query a Model using the UI',
-    { tags: ['@Smoke', '@SmokeSet2', '@ODS-2552', '@Dashboard'] },
+    { tags: ['@Smoke', '@SmokeSet3', '@ODS-2552', '@Dashboard', '@Modelserving'] },
     () => {
       cy.log('Model Name:', modelName);
       // Authentication and navigation

frontend/src/__tests__/cypress/cypress/tests/e2e/dataScienceProjects/testProjectContributorPermissions.cy.ts

@@ -57,7 +57,6 @@ describe('Verify that users can provide contributor project permissions to non-a
       cy.step('Assign contributor user Project Permissions');
       permissions.findAddUserButton().click();
       permissions.getUserTable().findAddInput().type(LDAP_CONTRIBUTOR_USER.USERNAME);
-      cy.debug();
       permissions
         .getUserTable()
         .selectPermission(