Create, edit, and delete MaaSModelRefs from the Wizard (opendatahub-io#6936)

* Create and Delete MaaSModelRefs

* fixes

* PR comments

* adding dry runs

* lint

* pr comments 2

* Moving pre/post deploy into deploy method

* rebase and test fixes

Author: katieperry4

frontend/src/__mocks__/mockLLMInferenceServiceK8sResource.ts

@@ -21,6 +21,9 @@ type MockLLMInferenceServiceConfigType = {
   modelType?: ServingRuntimeModelType;
   isStopped?: boolean;
   baseRefs?: { name?: string }[];
+  description?: string;
+  isMaaS?: boolean;
+  secretName?: string;
 };
 
 export const mockLLMInferenceServiceK8sResource = ({
@@ -38,6 +41,9 @@ export const mockLLMInferenceServiceK8sResource = ({
   addresses,
   isStopped = false,
   baseRefs,
+  description,
+  isMaaS = false,
+  secretName,
 }: MockLLMInferenceServiceConfigType): LLMInferenceServiceKind => ({
   apiVersion: 'serving.kserve.io/v1alpha1',
   kind: 'LLMInferenceService',
@@ -48,6 +54,8 @@ export const mockLLMInferenceServiceK8sResource = ({
       'opendatahub.io/hardware-profile-namespace': 'opendatahub',
       'opendatahub.io/model-type': ServingRuntimeModelType.GENERATIVE,
       ...(isStopped ? { [ModelAnnotation.STOPPED_ANNOTATION]: 'true' } : {}),
+      ...(description && { 'openshift.io/description': description }),
+      ...(secretName && { 'opendatahub.io/connections': secretName }),
     },
     creationTimestamp,
     ...(deleted ? { deletionTimestamp: new Date().toUTCString() } : {}),
@@ -68,7 +76,11 @@ export const mockLLMInferenceServiceK8sResource = ({
     },
     replicas,
     router: {
-      gateway: {},
+      gateway: {
+        ...(isMaaS
+          ? { refs: [{ name: 'maas-default-gateway', namespace: 'openshift-ingress' }] }
+          : {}),
+      },
       route: {},
       scheduler: {},
     },

frontend/src/__mocks__/mockMaaSModelRefResource.ts

@@ -0,0 +1,18 @@
+import type { MaaSModelRef } from '@odh-dashboard/maas/types/maas-model';
+
+export const mockMaaSModelRef = ({
+  name = 'test-maas-model-ref',
+  namespace = 'test-project',
+  modelRef = {
+    name: 'test-llm-inference-service',
+    kind: 'LLMInferenceService',
+  },
+  displayName = 'Test LLM Inference Service',
+  description = 'Test LLM Inference Service Description',
+}: Partial<MaaSModelRef> = {}): MaaSModelRef => ({
+  name,
+  namespace,
+  modelRef,
+  displayName,
+  description,
+});

frontend/src/api/models/kserve.ts

@@ -27,3 +27,10 @@ export const LLMInferenceServiceConfigModel: K8sModelCommon = {
   kind: 'LLMInferenceServiceConfig',
   plural: 'llminferenceserviceconfigs',
 };
+
+export const MaaSModelRefResourceModel: K8sModelCommon = {
+  apiVersion: 'v1alpha1',
+  apiGroup: 'maas.opendatahub.io',
+  kind: 'MaaSModelRef',
+  plural: 'maasmodelrefs',
+};

packages/cypress/cypress/support/commands/odh.ts

@@ -102,6 +102,7 @@ import type {
   SubscriptionInfoResponse,
   UserSubscription,
 } from '@odh-dashboard/maas/types/subscriptions';
+import type { MaaSModelRef } from '@odh-dashboard/maas/types/maas-model';
 
 type SuccessErrorResponse = {
   success: boolean;
@@ -1164,6 +1165,20 @@ declare global {
         ((
           type: 'GET /maas/api/v1/subscriptions',
           response: { data: UserSubscription[] },
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'POST /maas/api/v1/maasmodel',
+          response: OdhResponse<MaaSModelRef>,
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'DELETE /maas/api/v1/maasmodel/:namespace/:name',
+          options: { path: { namespace: string; name: string } },
+          response: OdhResponse<{ message: string }>,
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'PUT /maas/api/v1/maasmodel/:namespace/:name',
+          options: { path: { namespace: string; name: string } },
+          response: OdhResponse<MaaSModelRef>,
         ) => Cypress.Chainable<null>);
     }
   }

packages/cypress/cypress/tests/mocked/modelServing/modelServingLlmd.cy.ts

@@ -143,6 +143,12 @@ const initIntercepts = ({
       body: mockLLMInferenceServiceK8sResource({ name: 'test-llmd-model' }),
     },
   ).as('createLLMInferenceService');
+  // MaaS is enabled so we need to intercept this for edit scenarios
+  cy.interceptOdh(
+    'DELETE /maas/api/v1/maasmodel/:namespace/:name',
+    { path: { namespace: '*', name: '*' } },
+    { message: 'Deleted successfully' },
+  ).as('deleteMaaSModelRef');
 };
 
 describe('Model Serving LLMD', () => {
@@ -774,6 +780,12 @@ describe('Model Serving LLMD', () => {
       cy.intercept('PUT', '**/llminferenceserviceconfigs/test-vllm-gpu*', (req) => {
         req.reply({ statusCode: 200, body: req.body });
       }).as('updateLLMInferenceServiceConfig');
+      // MaaS is enabled so we need to intercept this for edit scenarios
+      cy.interceptOdh(
+        'DELETE /maas/api/v1/maasmodel/:namespace/:name',
+        { path: { namespace: '*', name: '*' } },
+        { message: 'Deleted successfully' },
+      ).as('deleteMaaSModelRef');
     };
 
     it('should display serving runtime name and version, then pre-fill when editing', () => {