Merge branch 'main' into mcp_updates

Author: dbasunag

tests/model_serving/maas_billing/conftest.py

@@ -31,6 +31,7 @@
 from tests.model_serving.maas_billing.maas_subscription.utils import (
     MAAS_DB_NAMESPACE,
     MAAS_SUBSCRIPTION_NAMESPACE,
+    create_maas_subscription,
     get_maas_postgres_resources,
     patch_llmisvc_with_maas_router_and_tiers,
     wait_for_postgres_connection_log,
@@ -1190,3 +1191,41 @@ def maas_subscription_tinyllama_free(
     ) as maas_subscription_free:
         maas_subscription_free.wait_for_condition(condition="Ready", status="True", timeout=300)
         yield maas_subscription_free
+
+
+@pytest.fixture(scope="class")
+def minimal_subscription_for_free_user(
+    admin_client: DynamicClient,
+    maas_unprivileged_model_namespace,
+    maas_subscription_namespace,
+) -> Generator[Any, Any, Any]:
+    """Create a minimal MaaSModelRef + MaaSSubscription for system:authenticated."""
+    model_ns = maas_unprivileged_model_namespace.name
+    model_name = f"e2e-authz-model-{generate_random_name()}"
+    sub_name = f"e2e-authz-free-sub-{generate_random_name()}"
+
+    with (
+        MaaSModelRef(
+            client=admin_client,
+            name=model_name,
+            namespace=model_ns,
+            model_ref={"name": model_name, "namespace": model_ns, "kind": "LLMInferenceService"},
+            teardown=True,
+            wait_for_resource=True,
+        ) as model_ref,
+        create_maas_subscription(
+            admin_client=admin_client,
+            subscription_namespace=maas_subscription_namespace.name,
+            subscription_name=sub_name,
+            owner_group_name="system:authenticated",
+            model_name=model_ref.name,
+            model_namespace=model_ref.namespace,
+            tokens_per_minute=1000,
+            window="1m",
+            priority=0,
+            teardown=True,
+            wait_for_resource=True,
+        ) as subscription,
+    ):
+        subscription.wait_for_condition(condition="Ready", status="True", timeout=300)
+        yield subscription

tests/model_serving/maas_billing/maas_api_key/conftest.py

@@ -7,15 +7,13 @@
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.cron_job import CronJob
 from ocp_resources.deployment import Deployment
-from ocp_resources.maas_model_ref import MaaSModelRef
 from ocp_resources.network_policy import NetworkPolicy
 from ocp_resources.pod import Pod
 from ocp_resources.resource import ResourceEditor
 from pytest_testconfig import config as py_config
 
 from tests.model_serving.maas_billing.maas_api_key.utils import resolve_api_key_username
 from tests.model_serving.maas_billing.maas_subscription.utils import (
-    create_maas_subscription,
     wait_for_auth_ready,
 )
 from tests.model_serving.maas_billing.utils import (
@@ -226,49 +224,6 @@ def short_expiration_api_key_id(
     )
 
 
-@pytest.fixture(scope="class")
-def minimal_subscription_for_free_user(
-    admin_client: DynamicClient,
-    maas_unprivileged_model_namespace,
-    maas_subscription_namespace,
-) -> Generator[Any, Any, Any]:
-    """Create a minimal MaaSModelRef + MaaSSubscription for system:authenticated.
-
-    Does NOT wait for LLMInferenceService to be Ready — skips the 3-4 min model loading.
-    Used by tests that only need a subscription to exist for key creation without performing
-    model inference. Covers both free users and admin tokens.
-    """
-    model_ns = maas_unprivileged_model_namespace.name
-    model_name = f"e2e-authz-model-{generate_random_name()}"
-    sub_name = f"e2e-authz-free-sub-{generate_random_name()}"
-
-    with (
-        MaaSModelRef(
-            client=admin_client,
-            name=model_name,
-            namespace=model_ns,
-            model_ref={"name": model_name, "namespace": model_ns, "kind": "LLMInferenceService"},
-            teardown=True,
-            wait_for_resource=True,
-        ) as model_ref,
-        create_maas_subscription(
-            admin_client=admin_client,
-            subscription_namespace=maas_subscription_namespace.name,
-            subscription_name=sub_name,
-            owner_group_name="system:authenticated",
-            model_name=model_ref.name,
-            model_namespace=model_ref.namespace,
-            tokens_per_minute=1000,
-            window="1m",
-            priority=0,
-            teardown=True,
-            wait_for_resource=True,
-        ) as subscription,
-    ):
-        subscription.wait_for_condition(condition="Ready", status="True", timeout=300)
-        yield subscription
-
-
 @pytest.fixture()
 def maas_cleanup_cronjob(
     admin_client: DynamicClient,

tests/model_serving/maas_billing/maas_api_key/test_api_key_expiration.py

@@ -10,7 +10,7 @@
 
 LOGGER = structlog.get_logger(name=__name__)
 
-MAAS_API_KEY_MAX_EXPIRATION_DAYS = 30
+MAAS_API_KEY_MAX_EXPIRATION_DAYS = 90
 
 
 @pytest.mark.parametrize("ocp_token_for_actor", [{"type": "admin"}], indirect=True)

tests/model_serving/maas_billing/maas_subscription/test_multiple_auth_policies_per_model.py

@@ -22,6 +22,7 @@
     "maas_model_tinyllama_premium",
     "maas_auth_policy_tinyllama_premium",
     "maas_subscription_tinyllama_premium",
+    "minimal_subscription_for_free_user",
 )
 class TestMultipleAuthPoliciesPerModel:
     @pytest.mark.tier1

tests/model_serving/maas_billing/maas_subscription/test_subscription_without_auth_policy.py

@@ -24,6 +24,7 @@
     "maas_model_tinyllama_premium",
     "maas_auth_policy_tinyllama_premium",
     "maas_subscription_tinyllama_premium",
+    "minimal_subscription_for_free_user",
 )
 class TestSubscriptionWithoutAuthPolicy:
     """