Skip to content

test(maas): switch from MaaSModel to MaaSModelRef as per dev changes #1183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbasunag merged 5 commits into from
Mar 9, 2026
Merged

test(maas): switch from MaaSModel to MaaSModelRef as per dev changes #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87bccd7
test(maas): switch from MaaSModel to MaaSModelRef as per dev changes
SB159 Mar 6, 2026
e9071eb
test(maas): remove MaaSModel wrapper after migration to MaaSModelRef
SB159 Mar 6, 2026
4750812
test(maas): use MaaSModelRef from wrapper
SB159 Mar 9, 2026
cf99db0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 9, 2026
d02b438
Merge branch 'main' into feature/maas-model-ref-update
dbasunag Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tests/model_serving/model_server/maas_billing/maas_subscription/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import requests
from kubernetes.dynamic import DynamicClient
from ocp_resources.llm_inference_service import LLMInferenceService
from ocp_resources.maas_model_ref import MaaSModelRef
from ocp_resources.namespace import Namespace
from ocp_resources.service_account import ServiceAccount
from pytest_testconfig import config as py_config
Expand All @@ -21,7 +22,6 @@
from utilities.llmd_utils import create_llmisvc
from utilities.plugins.constant import OpenAIEnpoints
from utilities.resources.maa_s_auth_policy import MaaSAuthPolicy
from utilities.resources.maa_s_model import MaaSModel
from utilities.resources.maa_s_subscription import MaaSSubscription

LOGGER = get_logger(name=__name__)
Expand Down Expand Up @@ -89,10 +89,10 @@ def maas_inference_service_tinyllama_premium(
def maas_model_tinyllama_free(
admin_client: DynamicClient,
maas_inference_service_tinyllama_free: LLMInferenceService,
) -> Generator[MaaSModel]:
) -> Generator[MaaSModelRef]:
applications_namespace = py_config["applications_namespace"]

with MaaSModel(
with MaaSModelRef(
client=admin_client,
name=maas_inference_service_tinyllama_free.name,
namespace=applications_namespace,
Expand All @@ -111,10 +111,10 @@ def maas_model_tinyllama_free(
def maas_model_tinyllama_premium(
admin_client: DynamicClient,
maas_inference_service_tinyllama_premium: LLMInferenceService,
) -> Generator[MaaSModel]:
) -> Generator[MaaSModelRef]:
applications_namespace = py_config["applications_namespace"]

with MaaSModel(
with MaaSModelRef(
client=admin_client,
name=maas_inference_service_tinyllama_premium.name,
namespace=applications_namespace,
Expand All @@ -133,7 +133,7 @@ def maas_model_tinyllama_premium(
def maas_auth_policy_tinyllama_free(
admin_client: DynamicClient,
maas_free_group: str,
maas_model_tinyllama_free: MaaSModel,
maas_model_tinyllama_free: MaaSModelRef,
) -> Generator[MaaSAuthPolicy]:
applications_namespace = py_config["applications_namespace"]

Expand All @@ -158,7 +158,7 @@ def maas_auth_policy_tinyllama_free(
def maas_auth_policy_tinyllama_premium(
admin_client: DynamicClient,
maas_premium_group: str,
maas_model_tinyllama_premium: MaaSModel,
maas_model_tinyllama_premium: MaaSModelRef,
) -> Generator[MaaSAuthPolicy]:
applications_namespace = py_config["applications_namespace"]

Expand All @@ -180,7 +180,7 @@ def maas_auth_policy_tinyllama_premium(
def maas_subscription_tinyllama_free(
admin_client: DynamicClient,
maas_free_group: str,
maas_model_tinyllama_free: MaaSModel,
maas_model_tinyllama_free: MaaSModelRef,
) -> Generator[MaaSSubscription]:
applications_namespace = py_config["applications_namespace"]

Expand Down Expand Up @@ -209,7 +209,7 @@ def maas_subscription_tinyllama_free(
def maas_subscription_tinyllama_premium(
admin_client: DynamicClient,
maas_premium_group: str,
maas_model_tinyllama_premium: MaaSModel,
maas_model_tinyllama_premium: MaaSModelRef,
) -> Generator[MaaSSubscription]:
applications_namespace = py_config["applications_namespace"]

Expand Down
46 changes: 0 additions & 46 deletions utilities/resources/maa_s_model.py
View file
Open in desktop

This file was deleted.