diff --git a/testsuite/gateway/envoy/route.py b/testsuite/gateway/envoy/route.py index fa700614..707e4dbe 100644 --- a/testsuite/gateway/envoy/route.py +++ b/testsuite/gateway/envoy/route.py @@ -7,7 +7,7 @@ if typing.TYPE_CHECKING: from testsuite.kubernetes.client import KubernetesClient from testsuite.backend import Backend - from testsuite.policy.authorization.auth_config import AuthConfig + from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig class EnvoyVirtualRoute(GatewayRoute): diff --git a/testsuite/gateway/exposers.py b/testsuite/gateway/exposers.py index f571b904..e362d76f 100644 --- a/testsuite/gateway/exposers.py +++ b/testsuite/gateway/exposers.py @@ -3,7 +3,7 @@ from testsuite.certificates import Certificate from testsuite.gateway import Exposer, Gateway, Hostname from testsuite.httpx import KuadrantClient, ForceSNIClient -from testsuite.kubernetes.route import OpenshiftRoute +from testsuite.kubernetes.openshift.route import OpenshiftRoute class OpenShiftExposer(Exposer): diff --git a/testsuite/gateway/gateway_api/gateway.py b/testsuite/gateway/gateway_api/gateway.py index 649898b2..d81c2675 100644 --- a/testsuite/gateway/gateway_api/gateway.py +++ b/testsuite/gateway/gateway_api/gateway.py @@ -8,7 +8,7 @@ from testsuite.gateway import Gateway from testsuite.kubernetes.client import KubernetesClient from testsuite.kubernetes import KubernetesObject -from testsuite.policy import Policy +from testsuite.kuadrant.policy import Policy from testsuite.utils import check_condition diff --git a/testsuite/gateway/gateway_api/route.py b/testsuite/gateway/gateway_api/route.py index 8ce155dd..29e6f928 100644 --- a/testsuite/gateway/gateway_api/route.py +++ b/testsuite/gateway/gateway_api/route.py @@ -8,7 +8,7 @@ from testsuite.gateway import Gateway, GatewayRoute, PathMatch, MatchType, RouteMatch from testsuite.kubernetes.client import KubernetesClient from testsuite.kubernetes import KubernetesObject, modify -from testsuite.policy import Policy +from testsuite.kuadrant.policy import Policy from testsuite.utils import asdict, check_condition if typing.TYPE_CHECKING: diff --git a/testsuite/kubernetes/kuadrant.py b/testsuite/kuadrant/__init__.py similarity index 98% rename from testsuite/kubernetes/kuadrant.py rename to testsuite/kuadrant/__init__.py index f992a784..d2c482f5 100644 --- a/testsuite/kubernetes/kuadrant.py +++ b/testsuite/kuadrant/__init__.py @@ -1,4 +1,4 @@ -"""Kuadrant CR object""" +"""Kuadrant CR""" import dataclasses diff --git a/testsuite/kubernetes/authorino.py b/testsuite/kuadrant/authorino.py similarity index 100% rename from testsuite/kubernetes/authorino.py rename to testsuite/kuadrant/authorino.py diff --git a/testsuite/kubernetes/limitador.py b/testsuite/kuadrant/limitador.py similarity index 100% rename from testsuite/kubernetes/limitador.py rename to testsuite/kuadrant/limitador.py diff --git a/testsuite/policy/__init__.py b/testsuite/kuadrant/policy/__init__.py similarity index 100% rename from testsuite/policy/__init__.py rename to testsuite/kuadrant/policy/__init__.py diff --git a/testsuite/policy/authorization/__init__.py b/testsuite/kuadrant/policy/authorization/__init__.py similarity index 100% rename from testsuite/policy/authorization/__init__.py rename to testsuite/kuadrant/policy/authorization/__init__.py diff --git a/testsuite/policy/authorization/auth_config.py b/testsuite/kuadrant/policy/authorization/auth_config.py similarity index 100% rename from testsuite/policy/authorization/auth_config.py rename to testsuite/kuadrant/policy/authorization/auth_config.py diff --git a/testsuite/policy/authorization/auth_policy.py b/testsuite/kuadrant/policy/authorization/auth_policy.py similarity index 100% rename from testsuite/policy/authorization/auth_policy.py rename to testsuite/kuadrant/policy/authorization/auth_policy.py diff --git a/testsuite/policy/authorization/sections.py b/testsuite/kuadrant/policy/authorization/sections.py similarity index 99% rename from testsuite/policy/authorization/sections.py rename to testsuite/kuadrant/policy/authorization/sections.py index 930f8e64..7f158ff0 100644 --- a/testsuite/policy/authorization/sections.py +++ b/testsuite/kuadrant/policy/authorization/sections.py @@ -2,7 +2,7 @@ from typing import Literal, Iterable, TYPE_CHECKING, Union -from testsuite.policy.authorization import ( +from testsuite.kuadrant.policy.authorization import ( Credentials, Rule, Pattern, diff --git a/testsuite/policy/dns_policy.py b/testsuite/kuadrant/policy/dns.py similarity index 94% rename from testsuite/policy/dns_policy.py rename to testsuite/kuadrant/policy/dns.py index d150bf48..221fb2ee 100644 --- a/testsuite/policy/dns_policy.py +++ b/testsuite/kuadrant/policy/dns.py @@ -2,7 +2,7 @@ from testsuite.gateway import Referencable from testsuite.kubernetes.client import KubernetesClient -from testsuite.policy import Policy +from testsuite.kuadrant.policy import Policy class DNSPolicy(Policy): diff --git a/testsuite/policy/rate_limit_policy.py b/testsuite/kuadrant/policy/rate_limit.py similarity index 96% rename from testsuite/policy/rate_limit_policy.py rename to testsuite/kuadrant/policy/rate_limit.py index 90574a2e..48f6d0c3 100644 --- a/testsuite/policy/rate_limit_policy.py +++ b/testsuite/kuadrant/policy/rate_limit.py @@ -7,8 +7,8 @@ from testsuite.gateway import Referencable, RouteMatch from testsuite.kubernetes import modify from testsuite.kubernetes.client import KubernetesClient -from testsuite.policy import Policy -from testsuite.policy.authorization import Rule +from testsuite.kuadrant.policy import Policy +from testsuite.kuadrant.policy.authorization import Rule from testsuite.utils import asdict diff --git a/testsuite/policy/tls_policy.py b/testsuite/kuadrant/policy/tls.py similarity index 96% rename from testsuite/policy/tls_policy.py rename to testsuite/kuadrant/policy/tls.py index cdd45a4e..2a381c70 100644 --- a/testsuite/policy/tls_policy.py +++ b/testsuite/kuadrant/policy/tls.py @@ -2,7 +2,7 @@ from testsuite.gateway import Referencable from testsuite.kubernetes.client import KubernetesClient -from testsuite.policy import Policy, has_condition +from testsuite.kuadrant.policy import Policy, has_condition class TLSPolicy(Policy): diff --git a/testsuite/kubernetes/client.py b/testsuite/kubernetes/client.py index fb5fd678..b12de46a 100644 --- a/testsuite/kubernetes/client.py +++ b/testsuite/kubernetes/client.py @@ -6,7 +6,7 @@ import openshift_client as oc from openshift_client import Context, OpenShiftPythonException -from .route import OpenshiftRoute +from testsuite.kubernetes.openshift.route import OpenshiftRoute from .secret import Secret diff --git a/testsuite/kubernetes/metrics/__init__.py b/testsuite/kubernetes/metrics/__init__.py deleted file mode 100644 index 7cef4ebf..00000000 --- a/testsuite/kubernetes/metrics/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -"""Package implements objects to work with metrics from Prometheus client for Kubernetes""" - -from .prometheus import Prometheus, Metrics -from .service_monitor import ServiceMonitor, MetricsEndpoint - -__all__ = ["Prometheus", "Metrics", "ServiceMonitor", "MetricsEndpoint"] diff --git a/testsuite/kubernetes/openshift/__init__.py b/testsuite/kubernetes/openshift/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/testsuite/kubernetes/route.py b/testsuite/kubernetes/openshift/route.py similarity index 97% rename from testsuite/kubernetes/route.py rename to testsuite/kubernetes/openshift/route.py index 9c19f958..ec6d52f0 100644 --- a/testsuite/kubernetes/route.py +++ b/testsuite/kubernetes/openshift/route.py @@ -1,4 +1,4 @@ -"""Module containing Route related stuff""" +"""Module containing OpenShift Route""" from functools import cached_property diff --git a/testsuite/kubernetes/metrics/service_monitor.py b/testsuite/kubernetes/service_monitor.py similarity index 100% rename from testsuite/kubernetes/metrics/service_monitor.py rename to testsuite/kubernetes/service_monitor.py diff --git a/testsuite/kubernetes/metrics/prometheus.py b/testsuite/prometheus.py similarity index 98% rename from testsuite/kubernetes/metrics/prometheus.py rename to testsuite/prometheus.py index 9e044dbc..b9ad602e 100644 --- a/testsuite/kubernetes/metrics/prometheus.py +++ b/testsuite/prometheus.py @@ -7,7 +7,7 @@ from apyproxy import ApyProxy from httpx import Client -from .service_monitor import ServiceMonitor +from testsuite.kubernetes.service_monitor import ServiceMonitor def _params(key: str = "", labels: dict[str, str] = None) -> dict[str, str]: diff --git a/testsuite/tests/kuadrantctl/cli/test_simple_auth.py b/testsuite/tests/kuadrantctl/cli/test_simple_auth.py index f8338dab..a81be439 100644 --- a/testsuite/tests/kuadrantctl/cli/test_simple_auth.py +++ b/testsuite/tests/kuadrantctl/cli/test_simple_auth.py @@ -4,7 +4,7 @@ from testsuite.httpx.auth import HttpxOidcClientAuth from testsuite.oas import as_tmp_file -from testsuite.policy.authorization.auth_policy import AuthPolicy +from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy @pytest.fixture(scope="module") diff --git a/testsuite/tests/kuadrantctl/cli/test_simple_limit.py b/testsuite/tests/kuadrantctl/cli/test_simple_limit.py index dc60fdc6..fa630ce9 100644 --- a/testsuite/tests/kuadrantctl/cli/test_simple_limit.py +++ b/testsuite/tests/kuadrantctl/cli/test_simple_limit.py @@ -6,7 +6,7 @@ import pytest from testsuite.oas import as_tmp_file -from testsuite.policy.rate_limit_policy import Limit, RateLimitPolicy +from testsuite.kuadrant.policy.rate_limit import Limit, RateLimitPolicy from testsuite.utils import asdict diff --git a/testsuite/tests/multicluster/conftest.py b/testsuite/tests/multicluster/conftest.py index 062bd748..7c2bed52 100644 --- a/testsuite/tests/multicluster/conftest.py +++ b/testsuite/tests/multicluster/conftest.py @@ -13,9 +13,9 @@ from testsuite.gateway.gateway_api.hostname import DNSPolicyExposer from testsuite.gateway.gateway_api.route import HTTPRoute from testsuite.kubernetes.client import KubernetesClient -from testsuite.policy import Policy -from testsuite.policy.dns_policy import DNSPolicy -from testsuite.policy.tls_policy import TLSPolicy +from testsuite.kuadrant.policy import Policy +from testsuite.kuadrant.policy.dns import DNSPolicy +from testsuite.kuadrant.policy.tls import TLSPolicy AnyPolicy = TypeVar("AnyPolicy", bound=Policy) diff --git a/testsuite/tests/singlecluster/authorino/authorization/opa/test_authorization_services.py b/testsuite/tests/singlecluster/authorino/authorization/opa/test_authorization_services.py index 99e049fb..8b639dca 100644 --- a/testsuite/tests/singlecluster/authorino/authorization/opa/test_authorization_services.py +++ b/testsuite/tests/singlecluster/authorino/authorization/opa/test_authorization_services.py @@ -14,7 +14,7 @@ from keycloak import KeycloakOpenIDConnection, KeycloakUMA from testsuite.httpx.auth import HttpxOidcClientAuth -from testsuite.policy.authorization import JsonResponse, ValueFrom, Pattern +from testsuite.kuadrant.policy.authorization import JsonResponse, ValueFrom, Pattern pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/caching/metadata/test_caching.py b/testsuite/tests/singlecluster/authorino/caching/metadata/test_caching.py index 7825deaf..fef7fc8c 100644 --- a/testsuite/tests/singlecluster/authorino/caching/metadata/test_caching.py +++ b/testsuite/tests/singlecluster/authorino/caching/metadata/test_caching.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import ValueFrom, Cache +from testsuite.kuadrant.policy.authorization import ValueFrom, Cache from testsuite.utils import extract_response pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/caching/metadata/test_ttl.py b/testsuite/tests/singlecluster/authorino/caching/metadata/test_ttl.py index abd7f631..46db349a 100644 --- a/testsuite/tests/singlecluster/authorino/caching/metadata/test_ttl.py +++ b/testsuite/tests/singlecluster/authorino/caching/metadata/test_ttl.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization import ValueFrom, Cache +from testsuite.kuadrant.policy.authorization import ValueFrom, Cache from testsuite.utils import extract_response pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_authorization_condition.py b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_authorization_condition.py index 8cc745e7..6150012e 100644 --- a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_authorization_condition.py +++ b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_authorization_condition.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_identity_condition.py b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_identity_condition.py index f0fc79d8..6b9cac5c 100644 --- a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_identity_condition.py +++ b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_identity_condition.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern from testsuite.httpx.auth import HeaderApiKeyAuth pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_metadata_condition.py b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_metadata_condition.py index 2927bacf..6f49ebcb 100644 --- a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_metadata_condition.py +++ b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_metadata_condition.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_response_condition.py b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_response_condition.py index c65e88f5..d8afeb8a 100644 --- a/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_response_condition.py +++ b/testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_response_condition.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern, Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Pattern, Value, JsonResponse from testsuite.utils import extract_response pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conditions/test_patternref_expressions.py b/testsuite/tests/singlecluster/authorino/conditions/test_patternref_expressions.py index 0d4b487e..5c47d5e0 100644 --- a/testsuite/tests/singlecluster/authorino/conditions/test_patternref_expressions.py +++ b/testsuite/tests/singlecluster/authorino/conditions/test_patternref_expressions.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern, PatternRef, AnyPattern, AllPattern +from testsuite.kuadrant.policy.authorization import Pattern, PatternRef, AnyPattern, AllPattern pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conditions/test_top_level_condition.py b/testsuite/tests/singlecluster/authorino/conditions/test_top_level_condition.py index 491c9b40..a02f927d 100644 --- a/testsuite/tests/singlecluster/authorino/conditions/test_top_level_condition.py +++ b/testsuite/tests/singlecluster/authorino/conditions/test_top_level_condition.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/conftest.py b/testsuite/tests/singlecluster/authorino/conftest.py index c68c5917..8152da97 100644 --- a/testsuite/tests/singlecluster/authorino/conftest.py +++ b/testsuite/tests/singlecluster/authorino/conftest.py @@ -5,8 +5,8 @@ from testsuite.httpx.auth import HttpxOidcClientAuth from testsuite.kubernetes.client import KubernetesClient from testsuite.kubernetes.api_key import APIKey -from testsuite.policy.authorization.auth_config import AuthConfig -from testsuite.kubernetes.authorino import AuthorinoCR, Authorino, PreexistingAuthorino +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.authorino import AuthorinoCR, Authorino, PreexistingAuthorino @pytest.fixture(scope="session") diff --git a/testsuite/tests/singlecluster/authorino/dinosaur/conftest.py b/testsuite/tests/singlecluster/authorino/dinosaur/conftest.py index f9d3ae0c..dfe46de3 100644 --- a/testsuite/tests/singlecluster/authorino/dinosaur/conftest.py +++ b/testsuite/tests/singlecluster/authorino/dinosaur/conftest.py @@ -8,7 +8,7 @@ from testsuite.httpx.auth import HttpxOidcClientAuth from testsuite.oidc.keycloak import Keycloak from testsuite.utils import ContentType -from testsuite.policy.authorization import Pattern, PatternRef, Value, ValueFrom, DenyResponse +from testsuite.kuadrant.policy.authorization import Pattern, PatternRef, Value, ValueFrom, DenyResponse @pytest.fixture(scope="session") diff --git a/testsuite/tests/singlecluster/authorino/identity/api_key/test_auth_credentials.py b/testsuite/tests/singlecluster/authorino/identity/api_key/test_auth_credentials.py index cd3c740e..992176f3 100644 --- a/testsuite/tests/singlecluster/authorino/identity/api_key/test_auth_credentials.py +++ b/testsuite/tests/singlecluster/authorino/identity/api_key/test_auth_credentials.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Credentials +from testsuite.kuadrant.policy.authorization import Credentials pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_extended_properties.py b/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_extended_properties.py index ca768c97..3c9151a7 100644 --- a/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_extended_properties.py +++ b/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_extended_properties.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Value, ValueFrom +from testsuite.kuadrant.policy.authorization import Value, ValueFrom from testsuite.utils import extract_response pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_overwriting.py b/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_overwriting.py index 037f48b6..fa8e78c5 100644 --- a/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_overwriting.py +++ b/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_overwriting.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Value +from testsuite.kuadrant.policy.authorization import Value from testsuite.utils import extract_response pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_token_normalization.py b/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_token_normalization.py index 1c4dba3d..ec2e9d0d 100644 --- a/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_token_normalization.py +++ b/testsuite/tests/singlecluster/authorino/identity/extended_properties/test_token_normalization.py @@ -1,7 +1,7 @@ """https://github.com/Kuadrant/authorino/blob/main/docs/user-guides/token-normalization.md""" import pytest -from testsuite.policy.authorization import Pattern, Value, ValueFrom +from testsuite.kuadrant.policy.authorization import Pattern, Value, ValueFrom from testsuite.httpx.auth import HeaderApiKeyAuth, HttpxOidcClientAuth pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/identity/keycloak/test_auth_credentials.py b/testsuite/tests/singlecluster/authorino/identity/keycloak/test_auth_credentials.py index fdb3e58c..89e28051 100644 --- a/testsuite/tests/singlecluster/authorino/identity/keycloak/test_auth_credentials.py +++ b/testsuite/tests/singlecluster/authorino/identity/keycloak/test_auth_credentials.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Credentials +from testsuite.kuadrant.policy.authorization import Credentials pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/identity/keycloak/test_keycloak_context.py b/testsuite/tests/singlecluster/authorino/identity/keycloak/test_keycloak_context.py index 8533fb28..f0c41b73 100644 --- a/testsuite/tests/singlecluster/authorino/identity/keycloak/test_keycloak_context.py +++ b/testsuite/tests/singlecluster/authorino/identity/keycloak/test_keycloak_context.py @@ -5,7 +5,7 @@ import pytest -from testsuite.policy.authorization import ValueFrom, JsonResponse +from testsuite.kuadrant.policy.authorization import ValueFrom, JsonResponse pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/metadata/test_user_info.py b/testsuite/tests/singlecluster/authorino/metadata/test_user_info.py index 4039746e..de523a99 100644 --- a/testsuite/tests/singlecluster/authorino/metadata/test_user_info.py +++ b/testsuite/tests/singlecluster/authorino/metadata/test_user_info.py @@ -6,7 +6,7 @@ import pytest from testsuite.httpx.auth import HttpxOidcClientAuth -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/metrics/conftest.py b/testsuite/tests/singlecluster/authorino/metrics/conftest.py index d56dacaa..c506166b 100644 --- a/testsuite/tests/singlecluster/authorino/metrics/conftest.py +++ b/testsuite/tests/singlecluster/authorino/metrics/conftest.py @@ -8,7 +8,8 @@ from testsuite.gateway.envoy import Envoy from testsuite.httpx import KuadrantClient from testsuite.kubernetes.config_map import ConfigMap -from testsuite.kubernetes.metrics import ServiceMonitor, MetricsEndpoint, Prometheus +from testsuite.kubernetes.service_monitor import ServiceMonitor, MetricsEndpoint +from testsuite.prometheus import Prometheus @pytest.fixture(scope="module") diff --git a/testsuite/tests/singlecluster/authorino/metrics/test_deep_metrics.py b/testsuite/tests/singlecluster/authorino/metrics/test_deep_metrics.py index 19d79ad7..72bcab49 100644 --- a/testsuite/tests/singlecluster/authorino/metrics/test_deep_metrics.py +++ b/testsuite/tests/singlecluster/authorino/metrics/test_deep_metrics.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Value, JsonResponse pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only] diff --git a/testsuite/tests/singlecluster/authorino/operator/clusterwide/conftest.py b/testsuite/tests/singlecluster/authorino/operator/clusterwide/conftest.py index 4a8c97b2..24d6fc57 100644 --- a/testsuite/tests/singlecluster/authorino/operator/clusterwide/conftest.py +++ b/testsuite/tests/singlecluster/authorino/operator/clusterwide/conftest.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway.envoy.route import EnvoyVirtualRoute -from testsuite.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig @pytest.fixture(scope="module") diff --git a/testsuite/tests/singlecluster/authorino/operator/clusterwide/test_wildcard_collision.py b/testsuite/tests/singlecluster/authorino/operator/clusterwide/test_wildcard_collision.py index 90e0e649..301241ea 100644 --- a/testsuite/tests/singlecluster/authorino/operator/clusterwide/test_wildcard_collision.py +++ b/testsuite/tests/singlecluster/authorino/operator/clusterwide/test_wildcard_collision.py @@ -4,8 +4,8 @@ import pytest -from testsuite.policy.authorization import Value, JsonResponse -from testsuite.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only] diff --git a/testsuite/tests/singlecluster/authorino/operator/conftest.py b/testsuite/tests/singlecluster/authorino/operator/conftest.py index f277d9f7..3575b7a8 100644 --- a/testsuite/tests/singlecluster/authorino/operator/conftest.py +++ b/testsuite/tests/singlecluster/authorino/operator/conftest.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway.envoy import Envoy -from testsuite.kubernetes.authorino import AuthorinoCR, Authorino +from testsuite.kuadrant.authorino import AuthorinoCR, Authorino @pytest.fixture(scope="module") diff --git a/testsuite/tests/singlecluster/authorino/operator/raw_http/conftest.py b/testsuite/tests/singlecluster/authorino/operator/raw_http/conftest.py index ef0a4280..8b59c767 100644 --- a/testsuite/tests/singlecluster/authorino/operator/raw_http/conftest.py +++ b/testsuite/tests/singlecluster/authorino/operator/raw_http/conftest.py @@ -3,10 +3,10 @@ import pytest from testsuite.gateway.exposers import LoadBalancerServiceExposer -from testsuite.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Value, JsonResponse from testsuite.httpx import KuadrantClient -from testsuite.policy.authorization.auth_config import AuthConfig -from testsuite.kubernetes.route import OpenshiftRoute +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig +from testsuite.kubernetes.openshift.route import OpenshiftRoute @pytest.fixture(scope="module") diff --git a/testsuite/tests/singlecluster/authorino/operator/sharding/conftest.py b/testsuite/tests/singlecluster/authorino/operator/sharding/conftest.py index da1e7dee..5209e298 100644 --- a/testsuite/tests/singlecluster/authorino/operator/sharding/conftest.py +++ b/testsuite/tests/singlecluster/authorino/operator/sharding/conftest.py @@ -2,9 +2,9 @@ import pytest -from testsuite.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Value, JsonResponse from testsuite.gateway.envoy import Envoy -from testsuite.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig from testsuite.gateway.envoy.route import EnvoyVirtualRoute diff --git a/testsuite/tests/singlecluster/authorino/operator/sharding/test_preexisting_auth.py b/testsuite/tests/singlecluster/authorino/operator/sharding/test_preexisting_auth.py index ea5a001e..6ac28d47 100644 --- a/testsuite/tests/singlecluster/authorino/operator/sharding/test_preexisting_auth.py +++ b/testsuite/tests/singlecluster/authorino/operator/sharding/test_preexisting_auth.py @@ -3,7 +3,7 @@ import pytest from weakget import weakget -from testsuite.kubernetes.authorino import AuthorinoCR +from testsuite.kuadrant.authorino import AuthorinoCR pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only] diff --git a/testsuite/tests/singlecluster/authorino/operator/test_wildcard.py b/testsuite/tests/singlecluster/authorino/operator/test_wildcard.py index 4bc03e1d..7885ceb3 100644 --- a/testsuite/tests/singlecluster/authorino/operator/test_wildcard.py +++ b/testsuite/tests/singlecluster/authorino/operator/test_wildcard.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only] diff --git a/testsuite/tests/singlecluster/authorino/operator/tls/mtls/conftest.py b/testsuite/tests/singlecluster/authorino/operator/tls/mtls/conftest.py index d15824d7..f2e7a785 100644 --- a/testsuite/tests/singlecluster/authorino/operator/tls/mtls/conftest.py +++ b/testsuite/tests/singlecluster/authorino/operator/tls/mtls/conftest.py @@ -4,7 +4,7 @@ from testsuite.certificates import CertInfo from testsuite.utils import cert_builder -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern @pytest.fixture(scope="module", autouse=True) diff --git a/testsuite/tests/singlecluster/authorino/operator/tls/mtls/test_mtls_attributes.py b/testsuite/tests/singlecluster/authorino/operator/tls/mtls/test_mtls_attributes.py index cf908c7a..a81b50a7 100644 --- a/testsuite/tests/singlecluster/authorino/operator/tls/mtls/test_mtls_attributes.py +++ b/testsuite/tests/singlecluster/authorino/operator/tls/mtls/test_mtls_attributes.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Pattern +from testsuite.kuadrant.policy.authorization import Pattern pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only] diff --git a/testsuite/tests/singlecluster/authorino/operator/tls/test_webhook.py b/testsuite/tests/singlecluster/authorino/operator/tls/test_webhook.py index f89052a0..df77f610 100644 --- a/testsuite/tests/singlecluster/authorino/operator/tls/test_webhook.py +++ b/testsuite/tests/singlecluster/authorino/operator/tls/test_webhook.py @@ -10,8 +10,8 @@ from testsuite.certificates import CertInfo from testsuite.kubernetes.ingress import Ingress -from testsuite.policy.authorization import Pattern, ValueFrom -from testsuite.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.policy.authorization import ValueFrom, Pattern +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig from testsuite.utils import cert_builder pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only] diff --git a/testsuite/tests/singlecluster/authorino/operator/tracing/conftest.py b/testsuite/tests/singlecluster/authorino/operator/tracing/conftest.py index a58a5ec0..ae565a40 100644 --- a/testsuite/tests/singlecluster/authorino/operator/tracing/conftest.py +++ b/testsuite/tests/singlecluster/authorino/operator/tracing/conftest.py @@ -2,7 +2,7 @@ import pytest -from testsuite.kubernetes.authorino import TracingOptions +from testsuite.kuadrant.authorino import TracingOptions @pytest.fixture(scope="module") diff --git a/testsuite/tests/singlecluster/authorino/priority/test_sequence_api_key.py b/testsuite/tests/singlecluster/authorino/priority/test_sequence_api_key.py index cacc2e59..5ccd814c 100644 --- a/testsuite/tests/singlecluster/authorino/priority/test_sequence_api_key.py +++ b/testsuite/tests/singlecluster/authorino/priority/test_sequence_api_key.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.authorization import Credentials +from testsuite.kuadrant.policy.authorization import Credentials from testsuite.utils import extract_response pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/response/test_auth_json.py b/testsuite/tests/singlecluster/authorino/response/test_auth_json.py index 954016bf..423f9b9f 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_auth_json.py +++ b/testsuite/tests/singlecluster/authorino/response/test_auth_json.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization import ValueFrom, JsonResponse +from testsuite.kuadrant.policy.authorization import ValueFrom, JsonResponse pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/response/test_base64.py b/testsuite/tests/singlecluster/authorino/response/test_base64.py index 232a9d8a..01d8bdfe 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_base64.py +++ b/testsuite/tests/singlecluster/authorino/response/test_base64.py @@ -7,7 +7,7 @@ import pytest -from testsuite.policy.authorization import ValueFrom, JsonResponse +from testsuite.kuadrant.policy.authorization import ValueFrom, JsonResponse pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/response/test_deny_with.py b/testsuite/tests/singlecluster/authorino/response/test_deny_with.py index 173f8a33..58beebb9 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_deny_with.py +++ b/testsuite/tests/singlecluster/authorino/response/test_deny_with.py @@ -3,7 +3,7 @@ from json import loads import pytest -from testsuite.policy.authorization import Pattern, Value, ValueFrom, DenyResponse +from testsuite.kuadrant.policy.authorization import Pattern, Value, ValueFrom, DenyResponse HEADERS = { "x-string-header": Value("abc"), diff --git a/testsuite/tests/singlecluster/authorino/response/test_headers.py b/testsuite/tests/singlecluster/authorino/response/test_headers.py index 8fae54f7..18bf6f7e 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_headers.py +++ b/testsuite/tests/singlecluster/authorino/response/test_headers.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Value, JsonResponse pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/response/test_multiple_responses.py b/testsuite/tests/singlecluster/authorino/response/test_multiple_responses.py index 1806cdae..68ed95de 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_multiple_responses.py +++ b/testsuite/tests/singlecluster/authorino/response/test_multiple_responses.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Value, JsonResponse pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/response/test_redirect.py b/testsuite/tests/singlecluster/authorino/response/test_redirect.py index 35bf5e35..5c5276b0 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_redirect.py +++ b/testsuite/tests/singlecluster/authorino/response/test_redirect.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization import ValueFrom, DenyResponse +from testsuite.kuadrant.policy.authorization import ValueFrom, DenyResponse STATUS_CODE = 302 REDIRECT_URL = "http://anything.inavlid?redirect_to=" diff --git a/testsuite/tests/singlecluster/authorino/response/test_simple_response.py b/testsuite/tests/singlecluster/authorino/response/test_simple_response.py index 5f9302eb..4b5edb20 100644 --- a/testsuite/tests/singlecluster/authorino/response/test_simple_response.py +++ b/testsuite/tests/singlecluster/authorino/response/test_simple_response.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.authorization import Value, JsonResponse +from testsuite.kuadrant.policy.authorization import Value, JsonResponse pytestmark = [pytest.mark.authorino] diff --git a/testsuite/tests/singlecluster/authorino/wristband/conftest.py b/testsuite/tests/singlecluster/authorino/wristband/conftest.py index a7a81e24..05dad979 100644 --- a/testsuite/tests/singlecluster/authorino/wristband/conftest.py +++ b/testsuite/tests/singlecluster/authorino/wristband/conftest.py @@ -3,8 +3,8 @@ import pytest from testsuite.certificates import CertInfo -from testsuite.policy.authorization import WristbandSigningKeyRef, WristbandResponse -from testsuite.policy.authorization.auth_config import AuthConfig +from testsuite.kuadrant.policy.authorization import WristbandSigningKeyRef, WristbandResponse +from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig from testsuite.gateway.envoy.route import EnvoyVirtualRoute from testsuite.gateway.envoy.wristband import WristbandEnvoy from testsuite.kubernetes.secret import TLSSecret diff --git a/testsuite/tests/singlecluster/conftest.py b/testsuite/tests/singlecluster/conftest.py index 8bc6fa85..b3656d43 100644 --- a/testsuite/tests/singlecluster/conftest.py +++ b/testsuite/tests/singlecluster/conftest.py @@ -10,9 +10,9 @@ from testsuite.gateway.envoy.route import EnvoyVirtualRoute from testsuite.gateway.gateway_api.gateway import KuadrantGateway from testsuite.gateway.gateway_api.route import HTTPRoute -from testsuite.kubernetes.kuadrant import KuadrantCR -from testsuite.policy.authorization.auth_policy import AuthPolicy -from testsuite.policy.rate_limit_policy import RateLimitPolicy +from testsuite.kuadrant import KuadrantCR +from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy +from testsuite.kuadrant.policy.rate_limit import RateLimitPolicy @pytest.fixture(scope="session") diff --git a/testsuite/tests/singlecluster/gateway/conftest.py b/testsuite/tests/singlecluster/gateway/conftest.py index 71cdddc2..396ee805 100644 --- a/testsuite/tests/singlecluster/gateway/conftest.py +++ b/testsuite/tests/singlecluster/gateway/conftest.py @@ -6,8 +6,8 @@ from testsuite.gateway.gateway_api.gateway import KuadrantGateway from testsuite.gateway.gateway_api.hostname import DNSPolicyExposer from testsuite.httpx.auth import HttpxOidcClientAuth -from testsuite.policy.dns_policy import DNSPolicy -from testsuite.policy.tls_policy import TLSPolicy +from testsuite.kuadrant.policy.dns import DNSPolicy +from testsuite.kuadrant.policy.tls import TLSPolicy @pytest.fixture(scope="module") diff --git a/testsuite/tests/singlecluster/gateway/reconciliation/__init__.py b/testsuite/tests/singlecluster/gateway/reconciliation/__init__.py index 91878fe9..90517190 100644 --- a/testsuite/tests/singlecluster/gateway/reconciliation/__init__.py +++ b/testsuite/tests/singlecluster/gateway/reconciliation/__init__.py @@ -1,6 +1,6 @@ """Module containing tests for Reconciliation of MGC policies""" -from testsuite.policy.dns_policy import DNSPolicy +from testsuite.kuadrant.policy.dns import DNSPolicy def dns_policy(cluster, name, parent, issuer, labels: dict[str, str] = None): # pylint: disable=unused-argument diff --git a/testsuite/tests/singlecluster/gateway/reconciliation/test_affected_by.py b/testsuite/tests/singlecluster/gateway/reconciliation/test_affected_by.py index 49c67db3..fef3e5a5 100644 --- a/testsuite/tests/singlecluster/gateway/reconciliation/test_affected_by.py +++ b/testsuite/tests/singlecluster/gateway/reconciliation/test_affected_by.py @@ -2,7 +2,7 @@ import pytest -from testsuite.policy.rate_limit_policy import RateLimitPolicy, Limit +from testsuite.kuadrant.policy.rate_limit import RateLimitPolicy, Limit pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/gateway/reconciliation/test_gw_doesnt_exist.py b/testsuite/tests/singlecluster/gateway/reconciliation/test_gw_doesnt_exist.py index 2c9720f4..2aa80470 100644 --- a/testsuite/tests/singlecluster/gateway/reconciliation/test_gw_doesnt_exist.py +++ b/testsuite/tests/singlecluster/gateway/reconciliation/test_gw_doesnt_exist.py @@ -3,8 +3,8 @@ import pytest from testsuite.gateway import CustomReference -from testsuite.policy.tls_policy import TLSPolicy -from testsuite.policy import has_condition +from testsuite.kuadrant.policy.tls import TLSPolicy +from testsuite.kuadrant.policy import has_condition from . import dns_policy pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/gateway/reconciliation/test_invalid_issuer_reference.py b/testsuite/tests/singlecluster/gateway/reconciliation/test_invalid_issuer_reference.py index bd2a2e2b..56cf91b5 100644 --- a/testsuite/tests/singlecluster/gateway/reconciliation/test_invalid_issuer_reference.py +++ b/testsuite/tests/singlecluster/gateway/reconciliation/test_invalid_issuer_reference.py @@ -3,8 +3,8 @@ import pytest from testsuite.gateway import CustomReference -from testsuite.policy.tls_policy import TLSPolicy -from testsuite.policy import has_condition +from testsuite.kuadrant.policy.tls import TLSPolicy +from testsuite.kuadrant.policy import has_condition pytestmark = [pytest.mark.kuadrant_only, pytest.mark.tlspolicy] diff --git a/testsuite/tests/singlecluster/gateway/reconciliation/test_same_target.py b/testsuite/tests/singlecluster/gateway/reconciliation/test_same_target.py index 3aa1956e..708c1336 100644 --- a/testsuite/tests/singlecluster/gateway/reconciliation/test_same_target.py +++ b/testsuite/tests/singlecluster/gateway/reconciliation/test_same_target.py @@ -2,8 +2,8 @@ import pytest -from testsuite.policy.tls_policy import TLSPolicy -from testsuite.policy import has_condition +from testsuite.kuadrant.policy.tls import TLSPolicy +from testsuite.kuadrant.policy import has_condition from . import dns_policy pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route.py b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route.py index 275ba78d..68035245 100644 --- a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route.py +++ b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route.py @@ -6,7 +6,7 @@ import pytest -from testsuite.policy.authorization.auth_policy import AuthPolicy +from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route_desired.py b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route_desired.py index 4093cb82..cbda1bd8 100644 --- a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route_desired.py +++ b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_gw_and_route_desired.py @@ -7,7 +7,7 @@ import pytest -from testsuite.policy.authorization.auth_policy import AuthPolicy +from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_routes.py b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_routes.py index 1d8b35ef..739ba511 100644 --- a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_routes.py +++ b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_auth_on_routes.py @@ -6,8 +6,8 @@ import pytest -from testsuite.policy import has_condition -from testsuite.policy.authorization.auth_policy import AuthPolicy +from testsuite.kuadrant.policy import has_condition +from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_on_routes_desired.py b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_on_routes_desired.py index 0bcc4f8a..d75bbfd7 100644 --- a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_on_routes_desired.py +++ b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_on_routes_desired.py @@ -9,8 +9,8 @@ import pytest -from testsuite.policy.authorization.auth_policy import AuthPolicy -from testsuite.policy.rate_limit_policy import Limit, RateLimitPolicy +from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy +from testsuite.kuadrant.policy.rate_limit import Limit, RateLimitPolicy pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_gw_and_route.py b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_gw_and_route.py index a2f6934d..e4d5ca79 100644 --- a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_gw_and_route.py +++ b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_gw_and_route.py @@ -6,7 +6,7 @@ import pytest -from testsuite.policy.rate_limit_policy import RateLimitPolicy, Limit +from testsuite.kuadrant.policy.rate_limit import RateLimitPolicy, Limit pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_routes.py b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_routes.py index e0d6ab3e..d6dadd86 100644 --- a/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_routes.py +++ b/testsuite/tests/singlecluster/identical_hostnames/test_identical_hostnames_rlp_on_routes.py @@ -6,7 +6,7 @@ import pytest -from testsuite.policy.rate_limit_policy import RateLimitPolicy, Limit +from testsuite.kuadrant.policy.rate_limit import RateLimitPolicy, Limit pytestmark = [pytest.mark.kuadrant_only] diff --git a/testsuite/tests/singlecluster/limitador/method/test_route_subset_method.py b/testsuite/tests/singlecluster/limitador/method/test_route_subset_method.py index 5d39218b..7141b197 100644 --- a/testsuite/tests/singlecluster/limitador/method/test_route_subset_method.py +++ b/testsuite/tests/singlecluster/limitador/method/test_route_subset_method.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway import RouteMatch, PathMatch, MatchType, HTTPMethod -from testsuite.policy.rate_limit_policy import Limit, RouteSelector +from testsuite.kuadrant.policy.rate_limit import Limit, RouteSelector pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/limitador/route/test_limit_targeting_two_rules.py b/testsuite/tests/singlecluster/limitador/route/test_limit_targeting_two_rules.py index d945c70c..468f595e 100644 --- a/testsuite/tests/singlecluster/limitador/route/test_limit_targeting_two_rules.py +++ b/testsuite/tests/singlecluster/limitador/route/test_limit_targeting_two_rules.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway import RouteMatch, PathMatch, MatchType -from testsuite.policy.rate_limit_policy import RouteSelector, Limit +from testsuite.kuadrant.policy.rate_limit import RouteSelector, Limit pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/limitador/route/test_multiple_same_rule.py b/testsuite/tests/singlecluster/limitador/route/test_multiple_same_rule.py index c70847fe..0b711d93 100644 --- a/testsuite/tests/singlecluster/limitador/route/test_multiple_same_rule.py +++ b/testsuite/tests/singlecluster/limitador/route/test_multiple_same_rule.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway import RouteMatch, PathMatch, MatchType -from testsuite.policy.rate_limit_policy import RouteSelector, Limit +from testsuite.kuadrant.policy.rate_limit import RouteSelector, Limit pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/limitador/route/test_route_rule.py b/testsuite/tests/singlecluster/limitador/route/test_route_rule.py index 51bd2d0a..148a7e7a 100644 --- a/testsuite/tests/singlecluster/limitador/route/test_route_rule.py +++ b/testsuite/tests/singlecluster/limitador/route/test_route_rule.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway import RouteMatch, PathMatch, MatchType -from testsuite.policy.rate_limit_policy import Limit, RouteSelector +from testsuite.kuadrant.policy.rate_limit import Limit, RouteSelector pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/limitador/test_basic_limit.py b/testsuite/tests/singlecluster/limitador/test_basic_limit.py index e7eb284e..c26e17a7 100644 --- a/testsuite/tests/singlecluster/limitador/test_basic_limit.py +++ b/testsuite/tests/singlecluster/limitador/test_basic_limit.py @@ -4,7 +4,7 @@ import pytest -from testsuite.policy.rate_limit_policy import Limit +from testsuite.kuadrant.policy.rate_limit import Limit pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/limitador/test_multiple_iterations.py b/testsuite/tests/singlecluster/limitador/test_multiple_iterations.py index 62e9fd96..513a2c59 100644 --- a/testsuite/tests/singlecluster/limitador/test_multiple_iterations.py +++ b/testsuite/tests/singlecluster/limitador/test_multiple_iterations.py @@ -6,7 +6,7 @@ import pytest -from testsuite.policy.rate_limit_policy import Limit +from testsuite.kuadrant.policy.rate_limit import Limit pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/limitador/test_route_rule_invalid.py b/testsuite/tests/singlecluster/limitador/test_route_rule_invalid.py index 696e7beb..1968b269 100644 --- a/testsuite/tests/singlecluster/limitador/test_route_rule_invalid.py +++ b/testsuite/tests/singlecluster/limitador/test_route_rule_invalid.py @@ -3,7 +3,7 @@ import pytest from testsuite.gateway import RouteMatch, PathMatch, MatchType, HTTPMethod -from testsuite.policy.rate_limit_policy import Limit, RouteSelector +from testsuite.kuadrant.policy.rate_limit import Limit, RouteSelector pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/test_rate_limit_anonymous.py b/testsuite/tests/singlecluster/test_rate_limit_anonymous.py index 5b732756..f321a8f5 100644 --- a/testsuite/tests/singlecluster/test_rate_limit_anonymous.py +++ b/testsuite/tests/singlecluster/test_rate_limit_anonymous.py @@ -3,8 +3,8 @@ import pytest from testsuite.httpx.auth import HttpxOidcClientAuth -from testsuite.policy.authorization import Pattern, JsonResponse, ValueFrom -from testsuite.policy.rate_limit_policy import Limit +from testsuite.kuadrant.policy.authorization import Pattern, JsonResponse, ValueFrom +from testsuite.kuadrant.policy.rate_limit import Limit pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador] diff --git a/testsuite/tests/singlecluster/test_rate_limit_authz.py b/testsuite/tests/singlecluster/test_rate_limit_authz.py index b875ff4e..2160bf3b 100644 --- a/testsuite/tests/singlecluster/test_rate_limit_authz.py +++ b/testsuite/tests/singlecluster/test_rate_limit_authz.py @@ -3,8 +3,8 @@ import pytest from testsuite.httpx.auth import HttpxOidcClientAuth -from testsuite.policy.authorization import ValueFrom, JsonResponse -from testsuite.policy.rate_limit_policy import Limit +from testsuite.kuadrant.policy.authorization import ValueFrom, JsonResponse +from testsuite.kuadrant.policy.rate_limit import Limit pytestmark = [pytest.mark.kuadrant_only, pytest.mark.limitador]