Refactor maas billing moving dir in model_serving (#1215)

mwaykole · dbasunag · web-flow · commit 751f78b71f99 · 2026-03-13T13:09:34.000Z
Signed-off-by: Milind waykole &lt;mwaykole@redhat.com&gt;
Co-authored-by: Debarati Basu-Nag &lt;dbasunag@redhat.com&gt;
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,6 +16,6 @@ tests/model_registry/                          @dbasunag @lugi0 @fege
 tests/model_serving/                           @mwaykole @Raghul-M @brettmthompson @threcc @rpancham @SB159
 tests/model_serving/model_runtime/             @Raghul-M @brettmthompson @rpancham
 tests/model_serving/model_server/              @threcc @mwaykole
-tests/model_serving/model_server/maas_billing/ @SB159
+tests/model_serving/maas_billing/ @SB159
 tests/rag/                                     @jgarciao @jiripetrlik
 tests/workbenches                              @jstourac @andyatmiami @jiridanek @harshad16
diff --git a/tests/model_serving/maas_billing/conftest.py b/tests/model_serving/maas_billing/conftest.py
@@ -21,7 +21,7 @@
 from simple_logger.logger import get_logger
 from timeout_sampler import TimeoutSampler
 
-from tests.model_serving.model_server.maas_billing.utils import (
+from tests.model_serving.maas_billing.utils import (
     build_maas_headers,
     create_maas_group,
     detect_scheme_via_llmisvc,
diff --git a/tests/model_serving/maas_billing/maas_subscription/__init__.py b/tests/model_serving/maas_billing/maas_subscription/__init__.py
diff --git a/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_api_health.py b/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_api_health.py
diff --git a/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_controller_health.py b/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_controller_health.py
diff --git a/tests/model_serving/maas_billing/maas_subscription/conftest.py b/tests/model_serving/maas_billing/maas_subscription/conftest.py
@@ -13,12 +13,12 @@
 from pytest_testconfig import config as py_config
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.maas_subscription.utils import (
+from tests.model_serving.maas_billing.maas_subscription.utils import (
     MAAS_SUBSCRIPTION_NAMESPACE,
     create_api_key,
     patch_llmisvc_with_maas_router_and_tiers,
 )
-from tests.model_serving.model_server.maas_billing.utils import build_maas_headers
+from tests.model_serving.maas_billing.utils import build_maas_headers
 from utilities.general import generate_random_name
 from utilities.infra import create_inference_token, create_ns, login_with_user_password
 from utilities.llmd_constants import ContainerImages, ModelStorage
diff --git a/tests/model_serving/maas_billing/maas_subscription/test_maas_auth_enforcement.py b/tests/model_serving/maas_billing/maas_subscription/test_maas_auth_enforcement.py
@@ -4,11 +4,11 @@
 import requests
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.maas_subscription.utils import (
+from tests.model_serving.maas_billing.maas_subscription.utils import (
     chat_payload_for_url,
     poll_expected_status,
 )
-from tests.model_serving.model_server.maas_billing.utils import build_maas_headers
+from tests.model_serving.maas_billing.utils import build_maas_headers
 from utilities.plugins.constant import RestHeader
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_serving/maas_billing/maas_subscription/test_maas_sub_enforcement.py b/tests/model_serving/maas_billing/maas_subscription/test_maas_sub_enforcement.py
@@ -4,7 +4,7 @@
 import requests
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.maas_subscription.utils import chat_payload_for_url
+from tests.model_serving.maas_billing.maas_subscription.utils import chat_payload_for_url
 
 LOGGER = get_logger(name=__name__)
 
diff --git a/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_per_model.py b/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_per_model.py
@@ -9,12 +9,12 @@
 from ocp_resources.service_account import ServiceAccount
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.maas_subscription.utils import (
+from tests.model_serving.maas_billing.maas_subscription.utils import (
     chat_payload_for_url,
     create_maas_subscription,
     poll_expected_status,
 )
-from tests.model_serving.model_server.maas_billing.utils import build_maas_headers
+from tests.model_serving.maas_billing.utils import build_maas_headers
 from utilities.infra import create_inference_token, login_with_user_password
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_serving/maas_billing/maas_subscription/utils.py b/tests/model_serving/maas_billing/maas_subscription/utils.py
diff --git a/tests/model_serving/maas_billing/test_maas_endpoints.py b/tests/model_serving/maas_billing/test_maas_endpoints.py
@@ -2,7 +2,7 @@
 import requests
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.utils import verify_chat_completions
+from tests.model_serving.maas_billing.utils import verify_chat_completions
 
 LOGGER = get_logger(name=__name__)
 
diff --git a/tests/model_serving/maas_billing/test_maas_rbac_e2e.py b/tests/model_serving/maas_billing/test_maas_rbac_e2e.py
@@ -1,7 +1,7 @@
 import pytest
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.utils import (
+from tests.model_serving.maas_billing.utils import (
     verify_chat_completions,
 )
 from utilities.plugins.constant import OpenAIEnpoints
diff --git a/tests/model_serving/maas_billing/test_maas_request_rate_limits.py b/tests/model_serving/maas_billing/test_maas_request_rate_limits.py
@@ -1,7 +1,7 @@
 import pytest
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.utils import (
+from tests.model_serving.maas_billing.utils import (
     assert_mixed_200_and_429,
 )
 
diff --git a/tests/model_serving/maas_billing/test_maas_token_rate_limits.py b/tests/model_serving/maas_billing/test_maas_token_rate_limits.py
@@ -1,7 +1,7 @@
 import pytest
 from simple_logger.logger import get_logger
 
-from tests.model_serving.model_server.maas_billing.utils import (
+from tests.model_serving.maas_billing.utils import (
     assert_mixed_200_and_429,
 )
 
diff --git a/tests/model_serving/maas_billing/test_maas_token_revoke.py b/tests/model_serving/maas_billing/test_maas_token_revoke.py
@@ -2,7 +2,7 @@
 from simple_logger.logger import get_logger
 from timeout_sampler import TimeoutSampler
 
-from tests.model_serving.model_server.maas_billing.utils import (
+from tests.model_serving.maas_billing.utils import (
     verify_chat_completions,
 )
 
diff --git a/tests/model_serving/maas_billing/test_tokens.py b/tests/model_serving/maas_billing/test_tokens.py
@@ -1,6 +1,6 @@
 import json
 
-from tests.model_serving.model_server.maas_billing.utils import b64url_decode
+from tests.model_serving.maas_billing.utils import b64url_decode
 
 
 class TestMintedToken:
diff --git a/tests/model_serving/maas_billing/utils.py b/tests/model_serving/maas_billing/utils.py
