[#338] Automation of PATCH method in S3

Signed-off-by: Kirill Sosnovskikh <k.sosnovskikh@yadro.com>

pytest_tests/helpers/container_creation.py

@@ -63,15 +63,7 @@ def _create_container_by_spec(
     cluster: Cluster,
     endpoint: str,
 ) -> str:
-    return create_container(
-        wallet,
-        shell,
-        endpoint,
-        container_request.parsed_rule(cluster),
-        wait_for_creation=False,
-        nns_zone=container_request.ns_zone,
-        nns_name=container_request.ns_name,
-    )
+    return create_container(wallet, shell, endpoint, container_request.parsed_rule(cluster), wait_for_creation=False)
 
 
 def _apply_ape_rules(cid: str, frostfs_cli: FrostfsCli, endpoint: str, ape_rules: list[ape.Rule]):

pytest_tests/helpers/container_request.py

@@ -21,9 +21,6 @@ class ContainerRequest:
 
     short_name: str | None = None
 
-    ns_name: str | None = None
-    ns_zone: str | None = None
-
     def __post_init__(self):
         if self.ape_rules is None:
             self.ape_rules = []

pytest_tests/testsuites/access/ape/test_bearer.py

@@ -20,7 +20,6 @@ from ....helpers.container_access import (
 @pytest.mark.sanity
 @pytest.mark.bearer
 @pytest.mark.ape
-@pytest.mark.parametrize("user_tag", ["ApeBearer"], indirect=True)  # provide dedicated user with no APE side-policies
 class TestApeBearer(ClusterTestBase):
     @allure.title("Operations with BearerToken (role={role}, obj_size={object_size})")
     @pytest.mark.parametrize("role", [ape.Role.OWNER, ape.Role.OTHERS], indirect=True)

pytest_tests/testsuites/ape/test_ape_local_object_allow.py

@@ -20,7 +20,6 @@ REP1_MSK = ContainerRequest("REP 1 IN MOW CBF 1 SELECT 1 FROM MSK AS MOW FILTER
 @pytest.mark.ape_object
 @pytest.mark.ape_allow
 @pytest.mark.parametrize("container_request", [REP1_MSK], indirect=True)
-@pytest.mark.parametrize("user_tag", ["ApeLocalOverrideAllow"], indirect=True)  # provide dedicated user with no APE side-policies
 class TestApeLocalOverrideAllow(ClusterTestBase):
     @allure.title("LocalOverride: Allow to GetObject in root tenant")
     def test_local_override_allow_to_get_object_root(

pytest_tests/testsuites/conftest.py

@@ -8,18 +8,19 @@ import pytest
 from dateutil import parser
 from frostfs_testlib import plugins, reporter
 from frostfs_testlib.cli import FrostfsCli
-from frostfs_testlib.clients import AwsCliClient, Boto3ClientWrapper, S3ClientWrapper, S3HttpClient
-from frostfs_testlib.clients.s3 import BucketContainerResolver, VersioningStatus
 from frostfs_testlib.credentials.interfaces import CredentialsProvider, User
 from frostfs_testlib.healthcheck.interfaces import Healthcheck
 from frostfs_testlib.hosting import Hosting
 from frostfs_testlib.resources import optionals
 from frostfs_testlib.resources.common import COMPLEX_OBJECT_CHUNKS_COUNT, COMPLEX_OBJECT_TAIL_SIZE, SIMPLE_OBJECT_SIZE
+from frostfs_testlib.s3 import AwsCliClient, Boto3ClientWrapper, S3ClientWrapper, VersioningStatus
+from frostfs_testlib.s3.interfaces import BucketContainerResolver
+from frostfs_testlib.s3.s3_http_client import S3HttpClient
 from frostfs_testlib.shell import LocalShell, Shell
-from frostfs_testlib.steps import s3_helper
 from frostfs_testlib.steps.cli.container import DEFAULT_EC_PLACEMENT_RULE, DEFAULT_PLACEMENT_RULE, FROSTFS_CLI_EXEC
 from frostfs_testlib.steps.cli.object import get_netmap_netinfo
 from frostfs_testlib.steps.epoch import ensure_fresh_epoch
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.cluster import Cluster, ClusterNode
 from frostfs_testlib.storage.controllers.cluster_state_controller import ClusterStateController
 from frostfs_testlib.storage.dataclasses.frostfs_services import StorageNode
@@ -206,8 +207,8 @@ def ec_placement_policy() -> PlacementPolicy:
 
 @pytest.fixture(scope="session")
 @allure.title("Init Frostfs CLI")
-def frostfs_cli(client_shell: Shell, wallet: WalletInfo) -> FrostfsCli:
-    return FrostfsCli(client_shell, FROSTFS_CLI_EXEC, wallet.config_path)
+def frostfs_cli(client_shell: Shell, default_wallet: WalletInfo) -> FrostfsCli:
+    return FrostfsCli(client_shell, FROSTFS_CLI_EXEC, default_wallet.config_path)
 
 
 @pytest.fixture(scope="session")
@@ -287,17 +288,17 @@ def credentials_provider(cluster: Cluster) -> CredentialsProvider:
     ],
 )
 def s3_client(
-    user: User,
+    default_user: User,
     s3_policy: Optional[str],
     cluster: Cluster,
     request: pytest.FixtureRequest,
     credentials_provider: CredentialsProvider,
 ) -> S3ClientWrapper:
     node = cluster.cluster_nodes[0]
-    credentials_provider.S3.provide(user, node, s3_policy)
+    credentials_provider.S3.provide(default_user, node, s3_policy)
 
     s3_client_cls = request.param
-    client = s3_client_cls(user.s3_credentials.access_key, user.s3_credentials.secret_key, cluster.default_s3_gate_endpoint)
+    client = s3_client_cls(default_user.s3_credentials.access_key, default_user.s3_credentials.secret_key, cluster.default_s3_gate_endpoint)
     return client
 
 
@@ -465,36 +466,10 @@ def users_pool(credentials_provider: CredentialsProvider, cluster: Cluster) -> l
     return users
 
 
-@pytest.fixture(scope="session")
-def user_tag(request: pytest.FixtureRequest) -> str:
-    tag = "default"
-    if "param" in request.__dict__:
-        tag = request.param
-
-    return tag
-
-
-@pytest.fixture(scope="session")
-@cached_fixture(optionals.OPTIONAL_CACHE_FIXTURES)
-@reporter.step("Create {user_tag} user")
-def user(user_tag: str) -> User:
-    user = User(string_utils.unique_name("user-"))
-    user.attributes["tag"] = user_tag
-
-    return user
-
-
-@pytest.fixture(scope="session")
-def wallet(user: User, credentials_provider: CredentialsProvider, cluster: Cluster) -> WalletInfo:
-    credentials_provider.GRPC.provide(user, cluster.cluster_nodes[0])
-    return user.wallet
-
-
-# TODO: Migrate tests to fixture wallet above
 @reporter.step("Get wallet for default user")
 @pytest.fixture(scope="session")
-def default_wallet(wallet: WalletInfo) -> WalletInfo:
-    return wallet
+def default_wallet(default_user: User) -> WalletInfo:
+    return default_user.wallet
 
 
 @pytest.fixture(scope="session")
@@ -569,26 +544,26 @@ def multiple_containers_request(request: pytest.FixtureRequest) -> ContainerRequ
 
 @pytest.fixture
 def container(
-    wallet: WalletInfo,
+    default_wallet: WalletInfo,
     frostfs_cli: FrostfsCli,
     client_shell: Shell,
     cluster: Cluster,
     rpc_endpoint: str,
     container_request: ContainerRequest,
 ) -> str:
-    return create_container_with_ape(container_request, frostfs_cli, wallet, client_shell, cluster, rpc_endpoint)
+    return create_container_with_ape(container_request, frostfs_cli, default_wallet, client_shell, cluster, rpc_endpoint)
 
 
 @pytest.fixture
 def containers(
-    wallet: WalletInfo,
+    default_wallet: WalletInfo,
     frostfs_cli: FrostfsCli,
     client_shell: Shell,
     cluster: Cluster,
     rpc_endpoint: str,
     multiple_containers_request: MultipleContainersRequest,
 ) -> list[str]:
-    return create_containers_with_ape(frostfs_cli, wallet, client_shell, cluster, rpc_endpoint, multiple_containers_request)
+    return create_containers_with_ape(frostfs_cli, default_wallet, client_shell, cluster, rpc_endpoint, multiple_containers_request)
 
 
 @pytest.fixture()

pytest_tests/testsuites/failovers/test_failover_storage.py

@@ -6,9 +6,9 @@ from time import sleep
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients.s3 import BucketContainerResolver, S3ClientWrapper, VersioningStatus
 from frostfs_testlib.resources.common import MORPH_BLOCK_TIME
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
+from frostfs_testlib.s3.interfaces import BucketContainerResolver
 from frostfs_testlib.steps.cli.container import StorageContainer, StorageContainerInfo, create_container
 from frostfs_testlib.steps.cli.object import get_object, put_object_to_random_node
 from frostfs_testlib.steps.node_management import (
@@ -19,6 +19,8 @@ from frostfs_testlib.steps.node_management import (
     remove_nodes_from_map_morph,
     wait_for_node_to_be_ready,
 )
+from frostfs_testlib.steps.s3 import s3_helper
+from frostfs_testlib.steps.s3.s3_helper import search_nodes_with_bucket
 from frostfs_testlib.storage.cluster import Cluster, ClusterNode, S3Gate, StorageNode
 from frostfs_testlib.storage.controllers import ClusterStateController, ShardsWatcher
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
@@ -135,7 +137,7 @@ class TestFailoverStorage(ClusterTestBase):
             put_object = s3_client.put_object(bucket, file_path)
             s3_helper.check_objects_in_bucket(s3_client, bucket, expected_objects=[file_name])
 
-        node_bucket = s3_helper.search_nodes_with_bucket(
+        node_bucket = search_nodes_with_bucket(
             cluster=self.cluster,
             bucket_name=bucket,
             wallet=default_wallet,

pytest_tests/testsuites/metrics/test_container_metrics.py

@@ -14,7 +14,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.testing.parallel import parallel
 from frostfs_testlib.utils.file_utils import TestFile, generate_file
 
-from ...helpers.container_request import PUBLIC_WITH_POLICY, REP_2_1_4_PUBLIC, ContainerRequest, requires_container
+from ...helpers.container_request import PUBLIC_WITH_POLICY, ContainerRequest, requires_container
 from ...helpers.utility import are_numbers_similar
 
 
@@ -133,7 +133,7 @@ class TestContainerMetrics(ClusterTestBase):
 
     @allure.title("Container size metrics put {objects_count} objects (obj_size={object_size})")
     @pytest.mark.parametrize("objects_count", [5, 10, 20])
-    @requires_container(REP_2_1_4_PUBLIC)
+    @requires_container
     def test_container_size_metrics_more_objects(
         self, object_size: ObjectSize, default_wallet: WalletInfo, objects_count: int, container: str
     ):
@@ -161,22 +161,13 @@ class TestContainerMetrics(ClusterTestBase):
                 tombstones_size += int(tombstone["header"]["payloadLength"])
 
         with reporter.step(f"Check container size metrics, 'should be positive in all nodes'"):
-            with reporter.step("Search container nodes"):
-                container_nodes = search_nodes_with_container(
-                    wallet=default_wallet,
-                    cid=container,
-                    shell=self.shell,
-                    endpoint=self.cluster.default_rpc_endpoint,
-                    cluster=self.cluster,
-                )
-            with reporter.step(f"Get metrics value from container nodes"):
-                futures = parallel(get_metrics_value, container_nodes, command="frostfs_node_engine_container_size_bytes", cid=container)
+            futures = parallel(
+                get_metrics_value, self.cluster.cluster_nodes, command="frostfs_node_engine_container_size_bytes", cid=container
+            )
             metrics_value_nodes = [future.result() for future in futures]
             for act_metric in metrics_value_nodes:
                 assert act_metric >= 0, "Metrics value is negative"
-
-        with reporter.step(f"Check container size metrics for tombstone"):
-            assert sum(metrics_value_nodes) // len(container_nodes) == tombstones_size, "tomstone size of objects not correct"
+            assert sum(metrics_value_nodes) // len(self.cluster.cluster_nodes) == tombstones_size, "tomstone size of objects not correct"
 
     @allure.title("Container metrics (policy={container_request})")
     @pytest.mark.parametrize(

pytest_tests/testsuites/metrics/test_logs_metrics.py

@@ -34,9 +34,7 @@ class TestLogsMetrics(ClusterTestBase):
         current_time = datetime.now(timezone.utc)
         counter_metrics = get_metrics_value(cluster_node, **metrics_greps)
         counter_logs = self.get_count_logs_by_level(cluster_node, metrics_greps.get("level"), restart_time, current_time, log_priority)
-        assert counter_logs == pytest.approx(
-            counter_metrics, rel=0.02
-        ), f"counter_logs: {counter_logs}, counter_metrics: {counter_metrics} in node: {cluster_node}"
+        assert counter_logs == counter_metrics, f"counter_logs: {counter_logs}, counter_metrics: {counter_metrics} in node: {cluster_node}"
 
     @staticmethod
     def get_count_logs_by_level(cluster_node: ClusterNode, log_level: str, after_time: datetime, until_time: datetime, log_priority: str):

pytest_tests/testsuites/replication/test_ec_replication.py

@@ -7,10 +7,10 @@ import yaml
 from frostfs_testlib import reporter
 from frostfs_testlib.cli import FrostfsAdm, FrostfsCli
 from frostfs_testlib.cli.netmap_parser import NetmapParser
-from frostfs_testlib.clients import AwsCliClient, S3ClientWrapper
-from frostfs_testlib.clients.s3 import BucketContainerResolver, VersioningStatus
 from frostfs_testlib.resources.cli import CLI_DEFAULT_TIMEOUT, FROSTFS_ADM_CONFIG_PATH, FROSTFS_ADM_EXEC, FROSTFS_CLI_EXEC
 from frostfs_testlib.resources.common import COMPLEX_OBJECT_CHUNKS_COUNT, COMPLEX_OBJECT_TAIL_SIZE, HOSTING_CONFIG_FILE, MORPH_BLOCK_TIME
+from frostfs_testlib.s3 import AwsCliClient, S3ClientWrapper
+from frostfs_testlib.s3.interfaces import BucketContainerResolver, VersioningStatus
 from frostfs_testlib.storage.cluster import Cluster, ClusterNode, StorageNode
 from frostfs_testlib.storage.controllers import ClusterStateController
 from frostfs_testlib.storage.controllers.state_managers.config_state_manager import ConfigStateManager

pytest_tests/testsuites/services/http_gate/test_http_bearer.py

@@ -5,7 +5,7 @@ import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.cli.frostfs_cli.cli import FrostfsCli
 from frostfs_testlib.steps.acl import bearer_token_base64_from_file
-from frostfs_testlib.steps.http_gate import upload_via_http_gate_curl, verify_object_hash
+from frostfs_testlib.steps.http.http_gate import upload_via_http_gate_curl, verify_object_hash
 from frostfs_testlib.storage.cluster import Cluster
 from frostfs_testlib.storage.dataclasses import ape
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize

pytest_tests/testsuites/services/http_gate/test_http_gate.py

@@ -3,7 +3,7 @@ import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.steps.cli.object import put_object_to_random_node
 from frostfs_testlib.steps.epoch import get_epoch
-from frostfs_testlib.steps.http_gate import (
+from frostfs_testlib.steps.http.http_gate import (
     attr_into_header,
     get_object_by_attr_and_verify_hashes,
     get_via_http_curl,

pytest_tests/testsuites/services/http_gate/test_http_headers.py

@@ -6,7 +6,7 @@ import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.steps.cli.container import delete_container, list_containers, wait_for_container_deletion
 from frostfs_testlib.steps.cli.object import delete_object
-from frostfs_testlib.steps.http_gate import (
+from frostfs_testlib.steps.http.http_gate import (
     attr_into_str_header_curl,
     get_object_by_attr_and_verify_hashes,
     try_to_get_object_and_expect_error,

pytest_tests/testsuites/services/http_gate/test_http_object.py

@@ -3,16 +3,16 @@ import logging
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients import AwsCliClient, S3ClientWrapper
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import AwsCliClient, S3ClientWrapper
 from frostfs_testlib.steps.cli.object import put_object_to_random_node
-from frostfs_testlib.steps.http_gate import (
+from frostfs_testlib.steps.http.http_gate import (
     assert_hashes_are_equal,
     get_object_by_attr_and_verify_hashes,
     get_via_http_gate,
     try_to_get_object_via_passed_request_and_expect_error,
     verify_object_hash,
 )
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import TestFile

pytest_tests/testsuites/services/http_gate/test_http_streaming.py

@@ -3,7 +3,7 @@ import logging
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.steps.http_gate import upload_via_http_gate_curl, verify_object_hash
+from frostfs_testlib.steps.http.http_gate import upload_via_http_gate_curl, verify_object_hash
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase

pytest_tests/testsuites/services/http_gate/test_http_system_header.py

@@ -9,7 +9,7 @@ from frostfs_testlib import reporter
 from frostfs_testlib.resources.error_patterns import OBJECT_NOT_FOUND
 from frostfs_testlib.steps.cli.object import get_netmap_netinfo, get_object_from_random_node, head_object
 from frostfs_testlib.steps.epoch import get_epoch, wait_for_epochs_align
-from frostfs_testlib.steps.http_gate import (
+from frostfs_testlib.steps.http.http_gate import (
     attr_into_str_header_curl,
     try_to_get_object_and_expect_error,
     upload_via_http_gate_curl,

pytest_tests/testsuites/services/s3_gate/test_s3_ACL.py

@@ -1,10 +1,10 @@
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients import S3ClientWrapper
 from frostfs_testlib.resources.error_patterns import S3_BUCKET_DOES_NOT_ALLOW_ACL
 from frostfs_testlib.resources.s3_acl_grants import PRIVATE_GRANTS, PUBLIC_READ_GRANTS, PUBLIC_READ_WRITE_GRANTS
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils.file_utils import generate_file
 

pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py

@@ -4,8 +4,8 @@ from datetime import datetime, timedelta
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients.s3 import S3ClientWrapper, VersioningStatus
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils import string_utils
 from frostfs_testlib.utils.file_utils import generate_file

pytest_tests/testsuites/services/s3_gate/test_s3_http_object.py

@@ -7,12 +7,13 @@ import allure
 import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.cli.generic_cli import GenericCli
-from frostfs_testlib.clients import Boto3ClientWrapper, S3ClientWrapper, S3HttpClient
-from frostfs_testlib.clients.s3 import VersioningStatus
 from frostfs_testlib.credentials.interfaces import CredentialsProvider, User
+from frostfs_testlib.s3.boto3_client import Boto3ClientWrapper
+from frostfs_testlib.s3.interfaces import S3ClientWrapper, VersioningStatus
+from frostfs_testlib.s3.s3_http_client import S3HttpClient
 from frostfs_testlib.shell.interfaces import CommandOptions
 from frostfs_testlib.shell.local_shell import LocalShell
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.cluster import Cluster, ClusterNode
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.policy import PlacementPolicy

pytest_tests/testsuites/services/s3_gate/test_s3_locking.py

@@ -4,8 +4,8 @@ from datetime import datetime, timedelta
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients import S3ClientWrapper
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils.file_utils import generate_file, generate_file_with_content
 

pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py

@@ -1,9 +1,10 @@
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients.s3 import BucketContainerResolver, S3ClientWrapper, VersioningStatus
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
+from frostfs_testlib.s3.interfaces import BucketContainerResolver
 from frostfs_testlib.steps.cli.container import list_objects
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase

pytest_tests/testsuites/services/s3_gate/test_s3_object.py

@@ -8,12 +8,11 @@ from typing import Literal
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients import AwsCliClient, S3ClientWrapper
-from frostfs_testlib.clients.s3 import VersioningStatus
 from frostfs_testlib.resources.common import ASSETS_DIR, DEFAULT_WALLET_PASS
 from frostfs_testlib.resources.error_patterns import S3_BUCKET_DOES_NOT_ALLOW_ACL, S3_MALFORMED_XML_REQUEST
 from frostfs_testlib.resources.s3_acl_grants import PRIVATE_GRANTS
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import AwsCliClient, S3ClientWrapper, VersioningStatus
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.testing.test_control import expect_not_raises
 from frostfs_testlib.utils import wallet_utils

pytest_tests/testsuites/services/s3_gate/test_s3_policy.py

@@ -4,8 +4,9 @@ import allure
 import pytest
 from botocore.exceptions import ClientError
 from frostfs_testlib import reporter
-from frostfs_testlib.clients.s3 import BucketContainerResolver, S3ClientWrapper, VersioningStatus
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
+from frostfs_testlib.s3.interfaces import BucketContainerResolver
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.steps.storage_policy import get_simple_object_copies
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo

pytest_tests/testsuites/services/s3_gate/test_s3_tagging.py

@@ -5,8 +5,8 @@ from typing import Tuple
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients import S3ClientWrapper
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils.file_utils import generate_file
 

pytest_tests/testsuites/services/s3_gate/test_s3_versioning.py

@@ -3,8 +3,8 @@ import os
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.clients.s3 import S3ClientWrapper, VersioningStatus
-from frostfs_testlib.steps import s3_helper
+from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
+from frostfs_testlib.steps.s3 import s3_helper
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils.file_utils import generate_file, generate_file_with_content, get_file_content
 

pytest_tests/testsuites/session_token/conftest.py

@@ -7,8 +7,8 @@ from frostfs_testlib.utils import string_utils
 
 
 @pytest.fixture(scope="module")
-def owner_wallet(wallet: WalletInfo) -> WalletInfo:
-    return wallet
+def owner_wallet(default_wallet: WalletInfo) -> WalletInfo:
+    return default_wallet
 
 
 @pytest.fixture(scope="module")

pytest_tests/testsuites/session_token/test_object_session_token.py

@@ -3,16 +3,14 @@ import random
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.cli.frostfs_cli.cli import FrostfsCli
 from frostfs_testlib.resources.error_patterns import SESSION_NOT_FOUND
+from frostfs_testlib.steps.cli.container import create_container
 from frostfs_testlib.steps.cli.object import delete_object, put_object, put_object_to_random_node
 from frostfs_testlib.steps.session_token import create_session_token
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import generate_file
-from workspace.frostfs_testcases.pytest_tests.helpers.container_creation import create_container_with_ape
-from workspace.frostfs_testcases.pytest_tests.helpers.container_request import APE_OWNER_ALLOW_ALL, ContainerRequest
 
 
 @pytest.mark.nightly
@@ -20,8 +18,7 @@ from workspace.frostfs_testcases.pytest_tests.helpers.container_request import A
 @pytest.mark.session_token
 class TestDynamicObjectSession(ClusterTestBase):
     @allure.title("Object Operations with Session Token (obj_size={object_size})")
-    @pytest.mark.parametrize("user_tag", ["TestDynamicObjectSession"], indirect=True)  # provide dedicated user with no APE side-policies
-    def test_object_session_token(self, wallet: WalletInfo, frostfs_cli: FrostfsCli, object_size: ObjectSize):
+    def test_object_session_token(self, default_wallet: WalletInfo, object_size: ObjectSize):
         """
         Test how operations over objects are executed with a session token
 
@@ -35,14 +32,17 @@ class TestDynamicObjectSession(ClusterTestBase):
             with a session token
         """
 
+        with reporter.step("Init wallet"):
+            wallet = default_wallet
+
         with reporter.step("Nodes Settlements"):
             session_token_node, container_node, non_container_node = random.sample(self.cluster.storage_nodes, 3)
 
         with reporter.step("Create Session Token"):
             session_token = create_session_token(
                 shell=self.shell,
-                owner=wallet.get_address(),
-                wallet=wallet,
+                owner=default_wallet.get_address(),
+                wallet=default_wallet,
                 rpc_endpoint=session_token_node.get_rpc_endpoint(),
             )
 
@@ -54,13 +54,11 @@ class TestDynamicObjectSession(ClusterTestBase):
                 f'AS LOC_{locode}_PLACE FILTER "UN-LOCODE" '
                 f'EQ "{un_locode}" AS LOC_{locode}'
             )
-            cid = create_container_with_ape(
-                ContainerRequest(placement_policy, APE_OWNER_ALLOW_ALL),
-                frostfs_cli,
+            cid = create_container(
                 wallet,
-                self.shell,
-                self.cluster,
-                self.cluster.default_rpc_endpoint,
+                shell=self.shell,
+                endpoint=self.cluster.default_rpc_endpoint,
+                rule=placement_policy,
             )
 
         with reporter.step("Put Objects"):

pytest_tests/testsuites/session_token/test_static_object_session_token.py

@@ -3,9 +3,9 @@ import logging
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.cli.frostfs_cli.cli import FrostfsCli
 from frostfs_testlib.resources.error_patterns import EXPIRED_SESSION_TOKEN, MALFORMED_REQUEST, OBJECT_ACCESS_DENIED, OBJECT_NOT_FOUND
 from frostfs_testlib.shell import Shell
+from frostfs_testlib.steps.cli.container import create_container
 from frostfs_testlib.steps.cli.object import (
     delete_object,
     get_object,
@@ -37,8 +37,6 @@ from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.testing.test_control import expect_not_raises
 from frostfs_testlib.utils.file_utils import generate_file
-from workspace.frostfs_testcases.pytest_tests.helpers.container_creation import create_containers_with_ape
-from workspace.frostfs_testcases.pytest_tests.helpers.container_request import OWNER_ALLOW_ALL, MultipleContainersRequest
 
 logger = logging.getLogger("NeoLogger")
 
@@ -46,15 +44,10 @@ RANGE_OFFSET_FOR_COMPLEX_OBJECT = 200
 
 
 @pytest.fixture(scope="module")
-def storage_containers(owner_wallet: WalletInfo, frostfs_cli: FrostfsCli, client_shell: Shell, cluster: Cluster) -> list[str]:
-    return create_containers_with_ape(
-        frostfs_cli,
-        owner_wallet,
-        client_shell,
-        cluster,
-        cluster.default_rpc_endpoint,
-        MultipleContainersRequest([OWNER_ALLOW_ALL, OWNER_ALLOW_ALL]),
-    )
+def storage_containers(owner_wallet: WalletInfo, client_shell: Shell, cluster: Cluster) -> list[str]:
+    cid = create_container(owner_wallet, shell=client_shell, endpoint=cluster.default_rpc_endpoint)
+    other_cid = create_container(owner_wallet, shell=client_shell, endpoint=cluster.default_rpc_endpoint)
+    yield [cid, other_cid]
 
 
 @pytest.fixture(
@@ -142,7 +135,6 @@ def static_sessions(
 
 @pytest.mark.nightly
 @pytest.mark.static_session
-@pytest.mark.parametrize("user_tag", ["TestObjectStaticSession"], indirect=True)  # provide dedicated user with no APE side-policies
 class TestObjectStaticSession(ClusterTestBase):
     @allure.title("Read operations with static session (method={method_under_test.__name__}, obj_size={object_size})")
     @pytest.mark.parametrize(