Skip to content

Commit d3ae806

Browse files
authored
fix: update MaaS API group constants and align modelRef with CRD (#1154)
* fix: align MaaS modelRef with CRD (drop apiGroup/group) and updated constants * apply formatting fixes from pre-commit
1 parent 4957b23 commit d3ae806

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

tests/model_serving/model_server/maas_billing/maas_subscription/conftest.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,11 @@ def maas_model_tinyllama_free(
9797
"name": maas_inference_service_tinyllama_free.name,
9898
"namespace": maas_inference_service_tinyllama_free.namespace,
9999
"kind": "LLMInferenceService",
100-
"apiGroup": "serving.kserve.io",
101-
"group": "serving.kserve.io",
102100
},
103101
teardown=True,
104102
wait_for_resource=True,
105-
) as m:
106-
yield m
103+
) as maas_model:
104+
yield maas_model
107105

108106

109107
@pytest.fixture(scope="class")
@@ -121,13 +119,11 @@ def maas_model_tinyllama_premium(
121119
"name": maas_inference_service_tinyllama_premium.name,
122120
"namespace": maas_inference_service_tinyllama_premium.namespace,
123121
"kind": "LLMInferenceService",
124-
"apiGroup": "serving.kserve.io",
125-
"group": "serving.kserve.io",
126122
},
127123
teardown=True,
128124
wait_for_resource=True,
129-
) as m:
130-
yield m
125+
) as maas_model:
126+
yield maas_model
131127

132128

133129
@pytest.fixture(scope="class")

utilities/resources/maa_s_auth_policy.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
from ocp_resources.exceptions import MissingRequiredArgumentError
77
from ocp_resources.resource import NamespacedResource
88

9+
from utilities.constants import ApiGroups
10+
911

1012
class MaaSAuthPolicy(NamespacedResource):
1113
"""
1214
MaaSAuthPolicy is the Schema for the maasauthpolicies API
1315
"""
1416

15-
api_group: str = "maas.opendatahub.io"
17+
api_group: str = ApiGroups.MAAS_IO
1618

1719
def __init__(
1820
self,

utilities/resources/maa_s_model.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
from ocp_resources.exceptions import MissingRequiredArgumentError
77
from ocp_resources.resource import NamespacedResource
88

9+
from utilities.constants import ApiGroups
10+
911

1012
class MaaSModel(NamespacedResource):
1113
"""
1214
MaaSModel is the Schema for the maasmodels API
1315
"""
1416

15-
api_group: str = "maas.opendatahub.io"
17+
api_group: str = ApiGroups.MAAS_IO
1618

1719
def __init__(
1820
self,

utilities/resources/maa_s_subscription.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
from ocp_resources.exceptions import MissingRequiredArgumentError
77
from ocp_resources.resource import NamespacedResource
88

9+
from utilities.constants import ApiGroups
10+
911

1012
class MaaSSubscription(NamespacedResource):
1113
"""
1214
MaaSSubscription is the Schema for the maassubscriptions API
1315
"""
1416

15-
api_group: str = "maas.opendatahub.io"
17+
api_group: str = ApiGroups.MAAS_IO
1618

1719
def __init__(
1820
self,

0 commit comments

Comments
 (0)