[#310] Extend bucket testsuite

- Added tests to check correctness of bucket names according to AWS specification
- Added test to check availability of non-empty bucket after attempting to delete it

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

.devenv.hosting.yaml

@@ -1,108 +0,0 @@
-hosts:
-- address: localhost
-  attributes:
-    sudo_shell: false
-  plugin_name: docker
-  healthcheck_plugin_name: basic
-  attributes:
-    skip_readiness_check: True
-    force_transactions: True
-  services:
-  - name: frostfs-storage_01
-    attributes:
-      container_name: s01
-      config_path: /etc/frostfs/storage/config.yml
-      wallet_path: ../frostfs-dev-env/services/storage/wallet01.json
-      local_wallet_config_path: ./TemporaryDir/empty-password.yml
-      local_wallet_path: ../frostfs-dev-env/services/storage/wallet01.json
-      wallet_password: ""
-      volume_name: storage_storage_s01
-      endpoint_data0: s01.frostfs.devenv:8080
-      control_endpoint: s01.frostfs.devenv:8081
-      un_locode: "RU MOW"
-  - name: frostfs-storage_02
-    attributes:
-      container_name: s02
-      config_path: /etc/frostfs/storage/config.yml
-      wallet_path: ../frostfs-dev-env/services/storage/wallet02.json
-      local_wallet_config_path: ./TemporaryDir/empty-password.yml
-      local_wallet_path: ../frostfs-dev-env/services/storage/wallet02.json
-      wallet_password: ""
-      volume_name: storage_storage_s02
-      endpoint_data0: s02.frostfs.devenv:8080
-      control_endpoint: s02.frostfs.devenv:8081
-      un_locode: "RU LED"
-  - name: frostfs-storage_03
-    attributes:
-      container_name: s03
-      config_path: /etc/frostfs/storage/config.yml
-      wallet_path: ../frostfs-dev-env/services/storage/wallet03.json
-      local_wallet_config_path: ./TemporaryDir/empty-password.yml
-      local_wallet_path: ../frostfs-dev-env/services/storage/wallet03.json
-      wallet_password: ""
-      volume_name: storage_storage_s03
-      endpoint_data0: s03.frostfs.devenv:8080
-      control_endpoint: s03.frostfs.devenv:8081
-      un_locode: "SE STO"
-  - name: frostfs-storage_04
-    attributes:
-      container_name: s04
-      config_path: /etc/frostfs/storage/config.yml
-      wallet_path: ../frostfs-dev-env/services/storage/wallet04.json
-      local_wallet_config_path: ./TemporaryDir/empty-password.yml
-      local_wallet_path: ../frostfs-dev-env/services/storage/wallet04.json
-      wallet_password: ""
-      volume_name: storage_storage_s04
-      endpoint_data0: s04.frostfs.devenv:8080
-      control_endpoint: s04.frostfs.devenv:8081
-      un_locode: "FI HEL"
-  - name: frostfs-s3_01
-    attributes:
-      container_name: s3_gate
-      config_path: ../frostfs-dev-env/services/s3_gate/.s3.env
-      wallet_path: ../frostfs-dev-env/services/s3_gate/wallet.json
-      local_wallet_config_path: ./TemporaryDir/password-s3.yml
-      local_wallet_path: ../frostfs-dev-env/services/s3_gate/wallet.json
-      wallet_password: "s3"
-      endpoint_data0: https://s3.frostfs.devenv:8080
-  - name: frostfs-http_01
-    attributes:
-      container_name: http_gate
-      config_path: ../frostfs-dev-env/services/http_gate/.http.env
-      wallet_path: ../frostfs-dev-env/services/http_gate/wallet.json
-      local_wallet_config_path: ./TemporaryDir/password-other.yml
-      local_wallet_path: ../frostfs-dev-env/services/http_gate/wallet.json
-      wallet_password: "one"
-      endpoint_data0: http://http.frostfs.devenv
-  - name: frostfs-ir_01
-    attributes:
-      container_name: ir01
-      config_path: ../frostfs-dev-env/services/ir/.ir.env
-      wallet_path: ../frostfs-dev-env/services/ir/az.json
-      local_wallet_config_path: ./TemporaryDir/password-other.yml
-      local_wallet_path: ../frostfs-dev-env/services/ir/az.json
-      wallet_password: "one"
-  - name: neo-go_01
-    attributes:
-      container_name: morph_chain
-      config_path: ../frostfs-dev-env/services/morph_chain/protocol.privnet.yml
-      wallet_path: ../frostfs-dev-env/services/morph_chain/node-wallet.json
-      local_wallet_config_path: ./TemporaryDir/password-other.yml
-      local_wallet_path: ../frostfs-dev-env/services/morph_chain/node-wallet.json
-      wallet_password: "one"
-      endpoint_internal0: http://morph-chain.frostfs.devenv:30333
-  - name: main-chain_01
-    attributes:
-      container_name: main_chain
-      config_path: ../frostfs-dev-env/services/chain/protocol.privnet.yml
-      wallet_path: ../frostfs-dev-env/services/chain/node-wallet.json
-      local_wallet_config_path: ./TemporaryDir/password-other.yml
-      local_wallet_path: ../frostfs-dev-env/services/chain/node-wallet.json
-      wallet_password: "one"
-      endpoint_internal0: http://main-chain.frostfs.devenv:30333
-  - name: coredns_01
-    attributes:
-        container_name: coredns
-  clis:
-  - name: frostfs-cli
-    exec_path: frostfs-cli

.pre-commit-config.yaml

@@ -9,6 +9,16 @@ repos:
     hooks:
       - id: isort
         name: isort (python)
+  - repo: https://git.frostfs.info/TrueCloudLab/allure-validator
+    rev: 1.1.0
+    hooks:
+      - id: allure-validator
+        args: [
+          "pytest_tests/",
+          "--plugins",
+          "frostfs[-_]testlib*",
+        ]
+        pass_filenames: false
 
 ci:
   autofix_prs: false

pytest.ini

@@ -13,12 +13,15 @@ markers =
 #   controlling markers
     order: manual control of test order
     logs_after_session: Make the last test in session
+#   parametrizing markers
+    container: specify container details for container creation
 #   functional markers
     maintenance: tests for change mode node
     container: tests for container creation
     grpc_api: standard gRPC API tests
     grpc_control: tests related to using frostfs-cli control commands
     grpc_object_lock: gRPC lock tests
+    grpc_without_user: gRPC without user tests
     http_gate: HTTP gate contract
     http_put: HTTP gate test cases with PUT call
     s3_gate: All S3 gate tests

pytest_tests/__init__.py

@@ -0,0 +1,3 @@
+import os
+
+TESTS_BASE_PATH = os.path.dirname(os.path.relpath(__file__))

pytest_tests/helpers/container_access.py

@@ -6,7 +6,7 @@ from frostfs_testlib.storage.cluster import Cluster
 from frostfs_testlib.storage.dataclasses import ape
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 
-from pytest_tests.helpers.object_access import (
+from ..helpers.object_access import (
     can_delete_object,
     can_get_head_object,
     can_get_object,

pytest_tests/helpers/container_spec.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass
+
+from frostfs_testlib.steps.cli.container import DEFAULT_PLACEMENT_RULE
+from frostfs_testlib.storage.cluster import Cluster
+
+
+@dataclass
+class ContainerSpec:
+    rule: str = DEFAULT_PLACEMENT_RULE
+    basic_acl: str = None
+    allow_owner_via_ape: bool = False
+
+    def parsed_rule(self, cluster: Cluster):
+        if self.rule is None:
+            return None
+
+        substitutions = {"%NODE_COUNT%": str(len(cluster.cluster_nodes))}
+
+        parsed_rule = self.rule
+        for sub, replacement in substitutions.items():
+            parsed_rule = parsed_rule.replace(sub, replacement)
+
+        return parsed_rule

pytest_tests/helpers/object_access.py

@@ -43,9 +43,7 @@ def can_get_object(
                 cluster=cluster,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
         assert get_file_hash(file_name) == get_file_hash(got_file_path)
     return True
@@ -74,9 +72,7 @@ def can_put_object(
                 cluster=cluster,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
     return True
 
@@ -102,9 +98,7 @@ def can_delete_object(
                 endpoint=endpoint,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
     return True
 
@@ -132,9 +126,7 @@ def can_get_head_object(
                 timeout=timeout,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
     return True
 
@@ -163,9 +155,7 @@ def can_get_range_of_object(
                 timeout=timeout,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
     return True
 
@@ -194,9 +184,7 @@ def can_get_range_hash_of_object(
                 timeout=timeout,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
     return True
 
@@ -223,9 +211,7 @@ def can_search_object(
                 timeout=timeout,
             )
         except OPERATION_ERROR_TYPE as err:
-            assert string_utils.is_str_match_pattern(
+            assert string_utils.is_str_match_pattern(err, OBJECT_ACCESS_DENIED), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
-                err, OBJECT_ACCESS_DENIED
-            ), f"Expected {err} to match {OBJECT_ACCESS_DENIED}"
             return False
         if oid:
             return oid in oids

pytest_tests/helpers/utility.py

@@ -35,3 +35,16 @@ def wait_for_gc_pass_on_storage_nodes() -> None:
     wait_time = datetime_utils.parse_time(STORAGE_GC_TIME)
     with reporter.step(f"Wait {wait_time}s until GC completes on storage nodes"):
         time.sleep(wait_time)
+
+
+def are_numbers_similar(num1, num2, tolerance_percentage: float = 1.0):
+    """
+    if difference of numbers is less than permissible deviation than numbers are similar
+    """
+    # Calculate the permissible deviation
+    average = (num1 + num2) / 2
+    tolerance = average * (tolerance_percentage / 100)
+
+    # Calculate the real difference
+    difference = abs(num1 - num2)
+    return difference <= tolerance

pytest_tests/resources/common.py

@@ -1,6 +1,8 @@
 import os
 
+from .. import TESTS_BASE_PATH
+
 TEST_CYCLES_COUNT = int(os.getenv("TEST_CYCLES_COUNT", "1"))
 
 DEVENV_PATH = os.getenv("DEVENV_PATH", os.path.join("..", "frostfs-dev-env"))
-HOSTING_CONFIG_FILE = os.getenv("HOSTING_CONFIG_FILE", ".devenv.hosting.yaml")
+S3_POLICY_FILE_LOCATION = os.path.join(TESTS_BASE_PATH, "resources/files/policy.json")

pytest_tests/resources/files/policy.json

@@ -1,5 +1,6 @@
 {
     "rep-3": "REP 3",
     "rep-1": "REP 1",
-    "complex": "REP 1 IN X CBF 1 SELECT 1 FROM * AS X"
+    "complex": "REP 1 IN X CBF 1 SELECT 1 FROM * AS X",
+    "ec3.1": "EC 3.1 CBF 1 SELECT 4 FROM *"
 }

pytest_tests/testsuites/access/acl/test_acl.py

@@ -3,47 +3,27 @@ import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.resources.wellknown_acl import PRIVATE_ACL_F, PUBLIC_ACL_F, READONLY_ACL_F
 from frostfs_testlib.shell import Shell
-from frostfs_testlib.steps.cli.container import create_container
 from frostfs_testlib.steps.cli.object import put_object_to_random_node
 from frostfs_testlib.storage.cluster import Cluster
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 
-from pytest_tests.helpers.container_access import assert_full_access_to_container, assert_no_access_to_container, assert_read_only_container
+from ....helpers.container_access import assert_full_access_to_container, assert_no_access_to_container, assert_read_only_container
+from ....helpers.container_spec import ContainerSpec
 
 
+@pytest.mark.nightly
 @pytest.mark.sanity
-@pytest.mark.smoke
 @pytest.mark.acl
 class TestACLBasic(ClusterTestBase):
-    @pytest.fixture(scope="module")
-    def public_container(self, default_wallet: WalletInfo):
-        with reporter.step("Create public container"):
-            cid_public = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, basic_acl=PUBLIC_ACL_F)
-
-        return cid_public
-
-    @pytest.fixture(scope="module")
-    def private_container(self, default_wallet: WalletInfo):
-        with reporter.step("Create private container"):
-            cid_private = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, basic_acl=PRIVATE_ACL_F)
-
-        return cid_private
-
-    @pytest.fixture(scope="module")
-    def readonly_container(self, default_wallet: WalletInfo):
-        with reporter.step("Create public readonly container"):
-            cid_read_only = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, basic_acl=READONLY_ACL_F)
-
-        return cid_read_only
-
     @allure.title("Operations in public container available to everyone (obj_size={object_size})")
+    @pytest.mark.container(ContainerSpec(basic_acl=PUBLIC_ACL_F))
     def test_basic_acl_public(
         self,
         default_wallet: WalletInfo,
         other_wallet: WalletInfo,
         client_shell: Shell,
-        public_container: str,
+        container: str,
         file_path: str,
         cluster: Cluster,
     ):
@@ -58,7 +38,7 @@ class TestACLBasic(ClusterTestBase):
                 owner_object_oid = put_object_to_random_node(
                     default_wallet,
                     file_path,
-                    public_container,
+                    container,
                     shell=self.shell,
                     cluster=self.cluster,
                     attributes={"created": "owner"},
@@ -66,23 +46,24 @@ class TestACLBasic(ClusterTestBase):
                 other_object_oid = put_object_to_random_node(
                     other_wallet,
                     file_path,
-                    public_container,
+                    container,
                     shell=self.shell,
                     cluster=self.cluster,
                     attributes={"created": "other"},
                 )
 
             with reporter.step(f"Check {role} has full access to public container"):
-                assert_full_access_to_container(wallet, public_container, owner_object_oid, file_path, client_shell, cluster)
+                assert_full_access_to_container(wallet, container, owner_object_oid, file_path, client_shell, cluster)
-                assert_full_access_to_container(wallet, public_container, other_object_oid, file_path, client_shell, cluster)
+                assert_full_access_to_container(wallet, container, other_object_oid, file_path, client_shell, cluster)
 
     @allure.title("Operations in private container only available to owner (obj_size={object_size})")
+    @pytest.mark.container(ContainerSpec(basic_acl=PRIVATE_ACL_F))
     def test_basic_acl_private(
         self,
         default_wallet: WalletInfo,
         other_wallet: WalletInfo,
         client_shell: Shell,
-        private_container: str,
+        container: str,
         file_path: str,
         cluster: Cluster,
     ):
@@ -91,21 +72,22 @@ class TestACLBasic(ClusterTestBase):
         """
 
         with reporter.step("Put object to container"):
-            owner_object_oid = put_object_to_random_node(default_wallet, file_path, private_container, client_shell, cluster)
+            owner_object_oid = put_object_to_random_node(default_wallet, file_path, container, client_shell, cluster)
 
         with reporter.step("Check no one except owner has access to operations with container"):
-            assert_no_access_to_container(other_wallet, private_container, owner_object_oid, file_path, client_shell, cluster)
+            assert_no_access_to_container(other_wallet, container, owner_object_oid, file_path, client_shell, cluster)
 
         with reporter.step("Check owner has full access to private container"):
-            assert_full_access_to_container(default_wallet, private_container, owner_object_oid, file_path, self.shell, cluster)
+            assert_full_access_to_container(default_wallet, container, owner_object_oid, file_path, self.shell, cluster)
 
     @allure.title("Read operations in readonly container available to others (obj_size={object_size})")
+    @pytest.mark.container(ContainerSpec(basic_acl=READONLY_ACL_F))
     def test_basic_acl_readonly(
         self,
         default_wallet: WalletInfo,
         other_wallet: WalletInfo,
         client_shell: Shell,
-        readonly_container: str,
+        container: str,
         file_path: str,
         cluster: Cluster,
     ):
@@ -114,10 +96,10 @@ class TestACLBasic(ClusterTestBase):
         """
 
         with reporter.step("Put object to container"):
-            object_oid = put_object_to_random_node(default_wallet, file_path, readonly_container, client_shell, cluster)
+            object_oid = put_object_to_random_node(default_wallet, file_path, container, client_shell, cluster)
 
         with reporter.step("Check others has read-only access to operations with container"):
-            assert_read_only_container(other_wallet, readonly_container, object_oid, file_path, client_shell, cluster)
+            assert_read_only_container(other_wallet, container, object_oid, file_path, client_shell, cluster)
 
         with reporter.step("Check owner has full access to public container"):
-            assert_full_access_to_container(default_wallet, readonly_container, object_oid, file_path, client_shell, cluster)
+            assert_full_access_to_container(default_wallet, container, object_oid, file_path, client_shell, cluster)

pytest_tests/testsuites/access/ape/test_ape.py

@@ -3,7 +3,6 @@ import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.cli.frostfs_cli.cli import FrostfsCli
 from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL
-from frostfs_testlib.steps.cli.container import create_container
 from frostfs_testlib.steps.cli.object import put_object_to_random_node
 from frostfs_testlib.steps.node_management import drop_object
 from frostfs_testlib.storage.dataclasses import ape
@@ -13,74 +12,69 @@ from frostfs_testlib.utils import wallet_utils
 from frostfs_testlib.utils.failover_utils import wait_object_replication
 from frostfs_testlib.utils.file_utils import TestFile
 
-from pytest_tests.helpers.container_access import (
+from ....helpers.container_access import (
     ALL_OBJECT_OPERATIONS,
     assert_access_to_container,
     assert_full_access_to_container,
     assert_no_access_to_container,
 )
+from ....helpers.container_spec import ContainerSpec
 
 
+@pytest.fixture
+def denied_wallet(default_wallet: WalletInfo, other_wallet: WalletInfo, role: ape.Role) -> WalletInfo:
+    return other_wallet if role == ape.Role.OTHERS else default_wallet
+
+
+@pytest.fixture
+def allowed_wallet(default_wallet: WalletInfo, other_wallet: WalletInfo, role: ape.Role) -> WalletInfo:
+    return default_wallet if role == ape.Role.OTHERS else other_wallet
+
+
+@pytest.mark.nightly
 @pytest.mark.ape
 class TestApeContainer(ClusterTestBase):
-    @pytest.fixture(scope="function")
-    def full_placement_container_with_object(self, default_wallet: WalletInfo, file_path: str) -> tuple[str, str, str]:
-        storage_nodes = self.cluster.storage_nodes
-        node_count = len(storage_nodes)
-        with reporter.step("Create public container with full placement rule"):
-            full_placement_rule = f"REP {node_count} IN X CBF 1 SELECT {node_count} FROM * AS X"
-            cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, full_placement_rule, PUBLIC_ACL)
-
-        with reporter.step("Put object to container"):
-            oid = put_object_to_random_node(default_wallet, file_path, cid, shell=self.shell, cluster=self.cluster)
-            wait_object_replication(cid, oid, node_count, shell=self.shell, nodes=storage_nodes)
-
-        yield cid, oid
-
     @pytest.mark.sanity
     @allure.title("Deny operations via APE by role (role={role}, obj_size={object_size})")
     @pytest.mark.parametrize("role", [ape.Role.OWNER, ape.Role.OTHERS], indirect=True)
     def test_deny_operations_via_ape_by_role(
         self,
-        default_wallet: WalletInfo,
+        denied_wallet: WalletInfo,
-        other_wallet: WalletInfo,
+        allowed_wallet: WalletInfo,
         frostfs_cli: FrostfsCli,
-        container_with_objects: tuple[str, list[str], str],
+        container: str,
+        objects: list[str],
         role: ape.Role,
         file_path: TestFile,
+        rpc_endpoint: str,
     ):
-        denied_wallet = other_wallet if role == ape.Role.OTHERS else default_wallet
-        allowed_wallet = default_wallet if role == ape.Role.OTHERS else other_wallet
-        allowed_role = ape.Role.OWNER if role == ape.Role.OTHERS else ape.Role.OTHERS
-        cid, object_oids, file_path = container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
-        role_condition = ape.Condition.by_role(role.value)
-
         with reporter.step(f"Deny all operations for {role} via APE"):
-            deny_rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, role_condition)
+            deny_rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, ape.Condition.by_role(role.value))
-            frostfs_cli.ape_manager.add(endpoint, deny_rule.chain_id, target_name=cid, target_type="container", rule=deny_rule.as_string())
+            frostfs_cli.ape_manager.add(
+                rpc_endpoint, deny_rule.chain_id, target_name=container, target_type="container", rule=deny_rule.as_string()
+            )
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
-        with reporter.step(f"Assert {role} have no access to public container"):
+        with reporter.step(f"Assert denied role have no access to public container"):
-            assert_no_access_to_container(denied_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            # access checks will try to remove object, so we use .pop() to ensure we have object before deletion
+            assert_no_access_to_container(denied_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
-        with reporter.step(f"Assert {allowed_role} have full access to public container"):
+        with reporter.step(f"Assert allowed role have full access to public container"):
-            assert_full_access_to_container(allowed_wallet, cid, object_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(allowed_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
         with reporter.step(f"Remove deny rule from APE"):
-            frostfs_cli.ape_manager.remove(endpoint, deny_rule.chain_id, target_name=cid, target_type="container")
+            frostfs_cli.ape_manager.remove(rpc_endpoint, deny_rule.chain_id, target_name=container, target_type="container")
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
-        with reporter.step("Assert owner have full access to public container"):
+        with reporter.step("Assert allowed role have full access to public container"):
-            assert_full_access_to_container(default_wallet, cid, object_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(allowed_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
-        with reporter.step("Assert others have full access to public container"):
+        with reporter.step("Assert denied role have full access to public container"):
-            assert_full_access_to_container(other_wallet, cid, object_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(denied_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
     @allure.title("Deny operations for others via APE excluding single pubkey (obj_size={object_size})")
     def test_deny_opeartions_excluding_pubkey(
@@ -89,11 +83,11 @@ class TestApeContainer(ClusterTestBase):
         default_wallet: WalletInfo,
         other_wallet: WalletInfo,
         other_wallet_2: WalletInfo,
-        container_with_objects: tuple[str, list[str], str],
+        container: str,
+        objects: list[str],
+        rpc_endpoint: str,
+        file_path: TestFile,
     ):
-        endpoint = self.cluster.default_rpc_endpoint
-        cid, object_oids, file_path = container_with_objects
-
         with reporter.step("Add deny APE rules for others except single wallet"):
             rule_conditions = [
                 ape.Condition.by_role(ape.Role.OTHERS),
@@ -103,29 +97,36 @@ class TestApeContainer(ClusterTestBase):
                 ),
             ]
             rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, rule_conditions)
-            frostfs_cli.ape_manager.add(endpoint, rule.chain_id, target_name=cid, target_type="container", rule=rule.as_string())
+            frostfs_cli.ape_manager.add(rpc_endpoint, rule.chain_id, target_name=container, target_type="container", rule=rule.as_string())
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         with reporter.step("Assert others have no access to public container"):
-            assert_no_access_to_container(other_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            # access checks will try to remove object, so we use .pop() to ensure we have object before deletion
+            assert_no_access_to_container(other_wallet, container, objects[0], file_path, self.shell, self.cluster)
 
         with reporter.step("Assert owner have full access to public container"):
-            assert_full_access_to_container(default_wallet, cid, object_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(default_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
         with reporter.step("Assert allowed wallet have full access to public container"):
-            assert_full_access_to_container(other_wallet_2, cid, object_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(other_wallet_2, container, objects.pop(), file_path, self.shell, self.cluster)
 
     @allure.title("Replication works with APE deny rules on OWNER and OTHERS (obj_size={object_size})")
+    @pytest.mark.container(ContainerSpec(f"REP %NODE_COUNT% IN X CBF 1 SELECT %NODE_COUNT% FROM * AS X", PUBLIC_ACL))
     def test_replication_works_with_deny_rules(
         self,
+        default_wallet: WalletInfo,
         frostfs_cli: FrostfsCli,
-        full_placement_container_with_object: tuple[str, list[str], str],
+        container: str,
+        rpc_endpoint: str,
+        file_path: TestFile,
     ):
-        endpoint = self.cluster.default_rpc_endpoint
+        with reporter.step("Put object to container"):
-        cid, oid = full_placement_container_with_object
+            oid = put_object_to_random_node(default_wallet, file_path, container, self.shell, self.cluster)
-        storage_nodes = self.cluster.storage_nodes
+
+        with reporter.step("Wait for object replication after upload"):
+            wait_object_replication(container, oid, len(self.cluster.cluster_nodes), self.shell, self.cluster.storage_nodes)
 
         with reporter.step("Add deny APE rules for owner and others"):
             rule_conditions = [
@@ -134,24 +135,23 @@ class TestApeContainer(ClusterTestBase):
             ]
             for rule_condition in rule_conditions:
                 rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, rule_condition)
-                frostfs_cli.ape_manager.add(endpoint, rule.chain_id, target_name=cid, target_type="container", rule=rule.as_string())
+                frostfs_cli.ape_manager.add(
+                    rpc_endpoint, rule.chain_id, target_name=container, target_type="container", rule=rule.as_string()
+                )
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         with reporter.step("Drop object"):
-            drop_object(storage_nodes[0], cid, oid)
+            drop_object(self.cluster.storage_nodes[0], container, oid)
 
         with reporter.step("Wait for dropped object to be replicated"):
-            wait_object_replication(cid, oid, len(storage_nodes), self.shell, storage_nodes)
+            wait_object_replication(container, oid, len(self.cluster.storage_nodes), self.shell, self.cluster.storage_nodes)
 
     @allure.title("Deny operations via APE by role (role=ir, obj_size={object_size})")
     def test_deny_operations_via_ape_by_role_ir(
-        self, frostfs_cli: FrostfsCli, ir_wallet: WalletInfo, container_with_objects: tuple[str, list[str], str]
+        self, frostfs_cli: FrostfsCli, ir_wallet: WalletInfo, container: str, objects: list[str], rpc_endpoint: str, file_path: TestFile
     ):
-        cid, object_oids, file_path = container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
         default_ir_access = {
             ape.ObjectOperations.PUT: False,
             ape.ObjectOperations.GET: True,
@@ -163,36 +163,38 @@ class TestApeContainer(ClusterTestBase):
         }
 
         with reporter.step("Assert IR wallet access in default state"):
-            assert_access_to_container(default_ir_access, ir_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            assert_access_to_container(default_ir_access, ir_wallet, container, objects[0], file_path, self.shell, self.cluster)
 
         with reporter.step("Add deny APE rule with deny all operations for IR role"):
             rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, [ape.Condition.by_role(ape.Role.IR.value)])
-            frostfs_cli.ape_manager.add(endpoint, rule.chain_id, target_name=cid, target_type="container", rule=rule.as_string())
+            frostfs_cli.ape_manager.add(rpc_endpoint, rule.chain_id, target_name=container, target_type="container", rule=rule.as_string())
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         with reporter.step("Assert IR wallet ignores APE rules"):
-            assert_access_to_container(default_ir_access, ir_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            assert_access_to_container(default_ir_access, ir_wallet, container, objects[0], file_path, self.shell, self.cluster)
 
         with reporter.step("Remove APE rule"):
-            frostfs_cli.ape_manager.remove(endpoint, rule.chain_id, target_name=cid, target_type="container")
+            frostfs_cli.ape_manager.remove(rpc_endpoint, rule.chain_id, target_name=container, target_type="container")
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         with reporter.step("Assert IR wallet access is restored"):
-            assert_access_to_container(default_ir_access, ir_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            assert_access_to_container(default_ir_access, ir_wallet, container, objects[0], file_path, self.shell, self.cluster)
 
     @allure.title("Deny operations via APE by role (role=container, obj_size={object_size})")
     def test_deny_operations_via_ape_by_role_container(
-        self, frostfs_cli: FrostfsCli, storage_wallet: WalletInfo, container_with_objects: tuple[str, list[str], str]
+        self,
+        frostfs_cli: FrostfsCli,
+        container_node_wallet: WalletInfo,
+        container: str,
+        objects: list[str],
+        rpc_endpoint: str,
+        file_path: TestFile,
     ):
-
+        access_matrix = {
-        cid, object_oids, file_path = container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
-        default_container_access = {
             ape.ObjectOperations.PUT: True,
             ape.ObjectOperations.GET: True,
             ape.ObjectOperations.HEAD: True,
@@ -203,24 +205,24 @@ class TestApeContainer(ClusterTestBase):
         }
 
         with reporter.step("Assert CONTAINER wallet access in default state"):
-            assert_access_to_container(default_container_access, storage_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            assert_access_to_container(access_matrix, container_node_wallet, container, objects[0], file_path, self.shell, self.cluster)
 
         rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, ape.Condition.by_role(ape.Role.CONTAINER.value))
 
         with reporter.step(f"Add APE rule with deny all operations for CONTAINER and IR roles"):
-            frostfs_cli.ape_manager.add(endpoint, rule.chain_id, target_name=cid, target_type="container", rule=rule.as_string())
+            frostfs_cli.ape_manager.add(rpc_endpoint, rule.chain_id, target_name=container, target_type="container", rule=rule.as_string())
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         with reporter.step("Assert CONTAINER wallet ignores APE rule"):
-            assert_access_to_container(default_container_access, storage_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            assert_access_to_container(access_matrix, container_node_wallet, container, objects[0], file_path, self.shell, self.cluster)
 
-        with reporter.step("Remove APE rules"):
+        with reporter.step("Remove APE rule"):
-            frostfs_cli.ape_manager.remove(endpoint, rule.chain_id, target_name=cid, target_type="container")
+            frostfs_cli.ape_manager.remove(rpc_endpoint, rule.chain_id, target_name=container, target_type="container")
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
-        with reporter.step("Assert CONTAINER wallet access is restored"):
+        with reporter.step("Assert CONTAINER wallet access after rule was removed"):
-            assert_access_to_container(default_container_access, storage_wallet, cid, object_oids[0], file_path, self.shell, self.cluster)
+            assert_access_to_container(access_matrix, container_node_wallet, container, objects[0], file_path, self.shell, self.cluster)

pytest_tests/testsuites/access/ape/test_ape_filters.py

@@ -2,29 +2,27 @@ 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 OBJECT_ACCESS_DENIED, OBJECT_NOT_FOUND
+from frostfs_testlib.resources.error_patterns import OBJECT_ACCESS_DENIED
-from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL
-from frostfs_testlib.steps.cli.container import create_container
 from frostfs_testlib.steps.cli.object import get_object_from_random_node, head_object, put_object_to_random_node
-from frostfs_testlib.storage.cluster import Cluster
 from frostfs_testlib.storage.dataclasses import ape
 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 TestFile
 
-from pytest_tests.helpers.bearer_token import create_bearer_token
+from ....helpers.bearer_token import create_bearer_token
-from pytest_tests.helpers.container_access import (
+from ....helpers.container_access import (
     ALL_OBJECT_OPERATIONS,
     FULL_ACCESS,
     assert_access_to_container,
     assert_full_access_to_container,
     assert_no_access_to_container,
 )
-
+from ....helpers.container_spec import ContainerSpec
-OBJECT_NO_ACCESS = f"(?:{OBJECT_NOT_FOUND}|{OBJECT_ACCESS_DENIED})"
+from ....helpers.object_access import OBJECT_ACCESS_DENIED
 
 
+@pytest.mark.nightly
 @pytest.mark.ape
 class TestApeFilters(ClusterTestBase):
     #  SPEC: https://github.com/nspcc-dev/neofs-spec/blob/master/01-arch/07-acl.md
@@ -48,83 +46,53 @@ class TestApeFilters(ClusterTestBase):
         ape.ObjectOperations.PUT,
     ]
 
-    @pytest.fixture(scope="function")
+    @pytest.fixture
-    def public_container_with_objects(self, default_wallet: WalletInfo, file_path: TestFile):
+    def objects_with_attributes(self, default_wallet: WalletInfo, file_path: TestFile, container: str):
-        with reporter.step("Create public container"):
+        return [
-            cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, basic_acl=PUBLIC_ACL)
+            put_object_to_random_node(
-
+                default_wallet, file_path, container, self.shell, self.cluster, attributes={**self.ATTRIBUTES, "key": val}
-        objects_with_header, objects_with_other_header, objects_without_header = self._fill_container(default_wallet, file_path, cid)
-
-        return cid, objects_with_header, objects_with_other_header, objects_without_header, file_path
-
-    @pytest.fixture(scope="function")
-    def container_with_objects(self, default_wallet: WalletInfo, file_path: TestFile, frostfs_cli: FrostfsCli, cluster: Cluster):
-        with reporter.step("Create private container"):
-            cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, basic_acl="0")
-
-        with reporter.step("Create allow APE rule for container owner"):
-            role_condition = ape.Condition.by_role(ape.Role.OWNER)
-            deny_rule = ape.Rule(ape.Verb.ALLOW, ape.ObjectOperations.WILDCARD_ALL, role_condition)
-
-            frostfs_cli.ape_manager.add(
-                cluster.default_rpc_endpoint,
-                deny_rule.chain_id,
-                target_name=cid,
-                target_type="container",
-                rule=deny_rule.as_string(),
             )
-
-        with reporter.step("Wait for one block"):
-            self.wait_for_blocks()
-
-        objects_with_header, objects_with_other_header, objects_without_header = self._fill_container(default_wallet, file_path, cid)
-
-        return cid, objects_with_header, objects_with_other_header, objects_without_header, file_path
-
-    @reporter.step("Add objects to container")
-    def _fill_container(self, wallet: WalletInfo, test_file: TestFile, cid: str):
-        objects_with_header = [
-            put_object_to_random_node(wallet, test_file, cid, self.shell, self.cluster, attributes={**self.ATTRIBUTES, "key": val})
             for val in range(self.OBJECT_COUNT)
         ]
 
-        objects_with_other_header = [
+    @pytest.fixture
-            put_object_to_random_node(wallet, test_file, cid, self.shell, self.cluster, attributes={**self.OTHER_ATTRIBUTES, "key": val})
+    def objects_with_other_attributes(self, default_wallet: WalletInfo, file_path: TestFile, container: str):
+        return [
+            put_object_to_random_node(
+                default_wallet, file_path, container, self.shell, self.cluster, attributes={**self.OTHER_ATTRIBUTES, "key": val}
+            )
             for val in range(self.OBJECT_COUNT)
         ]
 
-        objects_without_header = [
+    @pytest.fixture
-            put_object_to_random_node(wallet, test_file, cid, self.shell, self.cluster) for _ in range(self.OBJECT_COUNT)
+    def objects_without_attributes(self, default_wallet: WalletInfo, file_path: TestFile, container: str):
-        ]
+        return [put_object_to_random_node(default_wallet, file_path, container, self.shell, self.cluster) for _ in range(self.OBJECT_COUNT)]
-
-        return objects_with_header, objects_with_other_header, objects_without_header
 
     @pytest.mark.sanity
     @allure.title("Operations with request filter (match_type={match_type}, obj_size={object_size})")
     @pytest.mark.parametrize("match_type", [ape.MatchType.EQUAL, ape.MatchType.NOT_EQUAL])
+    @pytest.mark.skip("https://git.frostfs.info/TrueCloudLab/frostfs-node/issues/1243")
     def test_ape_filters_request(
         self,
         frostfs_cli: FrostfsCli,
         temp_directory: str,
         other_wallet: WalletInfo,
-        public_container_with_objects: tuple[str, list[str], str],
+        container: str,
+        objects_with_attributes: list[str],
+        objects_with_other_attributes: list[str],
+        objects_without_attributes: list[str],
         match_type: ape.MatchType,
+        file_path: TestFile,
+        rpc_endpoint: str,
     ):
-        (
-            cid,
-            objects_with_header,
-            objects_with_other_header,
-            objects_without_header,
-            file_path,
-        ) = public_container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
         with reporter.step("Deny all operations for others via APE with request condition"):
-            request_condition = ape.Condition('"check_key"', '"check_value"', ape.ConditionType.REQUEST, match_type)
+            request_condition = ape.Condition('"frostfs:xheader/check_key"', '"check_value"', ape.ConditionType.REQUEST, match_type)
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             deny_rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS, [request_condition, role_condition])
 
-            frostfs_cli.ape_manager.add(endpoint, deny_rule.chain_id, target_name=cid, target_type="container", rule=deny_rule.as_string())
+            frostfs_cli.ape_manager.add(
+                rpc_endpoint, deny_rule.chain_id, target_name=container, target_type="container", rule=deny_rule.as_string()
+            )
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
@@ -132,7 +100,7 @@ class TestApeFilters(ClusterTestBase):
         with reporter.step("Create bearer token with everything allowed for others role"):
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             rule = ape.Rule(ape.Verb.ALLOW, ALL_OBJECT_OPERATIONS, role_condition)
-            bearer = create_bearer_token(frostfs_cli, temp_directory, cid, rule, endpoint)
+            bearer = create_bearer_token(frostfs_cli, temp_directory, container, rule, rpc_endpoint)
 
         # Filter denies requests where "check_key {match_type} ATTRIBUTE", so when match_type
         # is STRING_EQUAL, then requests with "check_key=OTHER_ATTRIBUTE" will be allowed while
@@ -142,41 +110,41 @@ class TestApeFilters(ClusterTestBase):
 
         # We test on 3 groups of objects with various headers,
         # but APE rule should ignore object headers and only work based on request headers
-        for oids in [objects_with_header, objects_with_other_header, objects_without_header]:
+        for oids in [objects_with_attributes, objects_with_other_attributes, objects_without_attributes]:
             with reporter.step("Check others has full access when sending request without headers"):
-                assert_full_access_to_container(other_wallet, cid, oids.pop(), file_path, self.shell, self.cluster)
+                assert_full_access_to_container(other_wallet, container, oids.pop(), file_path, self.shell, self.cluster)
 
             with reporter.step("Check others has full access when sending request with allowed headers"):
-                assert_full_access_to_container(other_wallet, cid, oids.pop(), file_path, self.shell, self.cluster, xhdr=allow_headers)
+                assert_full_access_to_container(
+                    other_wallet, container, oids.pop(), file_path, self.shell, self.cluster, xhdr=allow_headers
+                )
 
             with reporter.step("Check others has no access when sending request with denied headers"):
-                assert_no_access_to_container(other_wallet, cid, oids.pop(), file_path, self.shell, self.cluster, xhdr=deny_headers)
+                assert_no_access_to_container(other_wallet, container, oids.pop(), file_path, self.shell, self.cluster, xhdr=deny_headers)
 
             with reporter.step("Check others has full access when sending request with denied headers and using bearer token"):
-                assert_full_access_to_container(other_wallet, cid, oids.pop(), file_path, self.shell, self.cluster, bearer, deny_headers)
+                assert_full_access_to_container(
+                    other_wallet, container, oids.pop(), file_path, self.shell, self.cluster, bearer, deny_headers
+                )
 
     @allure.title("Operations with deny user headers filter (match_type={match_type}, obj_size={object_size})")
     @pytest.mark.parametrize("match_type", [ape.MatchType.EQUAL, ape.MatchType.NOT_EQUAL])
+    @pytest.mark.skip("https://git.frostfs.info/TrueCloudLab/frostfs-node/issues/1300")
     def test_ape_deny_filters_object(
         self,
         frostfs_cli: FrostfsCli,
         temp_directory: str,
         other_wallet: WalletInfo,
-        public_container_with_objects: tuple[str, list[str], str],
+        container: str,
+        objects_with_attributes: list[str],
+        objects_with_other_attributes: list[str],
+        objects_without_attributes: list[str],
         match_type: ape.MatchType,
+        rpc_endpoint: str,
+        file_path: TestFile,
     ):
-        # TODO: Refactor this to be fixtures, not test logic
+        allow_objects = objects_with_other_attributes if match_type == ape.MatchType.EQUAL else objects_with_attributes
-        (
+        deny_objects = objects_with_attributes if match_type == ape.MatchType.EQUAL else objects_with_other_attributes
-            cid,
-            objects_with_header,
-            objects_with_other_header,
-            objs_without_header,
-            file_path,
-        ) = public_container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
-        allow_objects = objects_with_other_header if match_type == ape.MatchType.EQUAL else objects_with_header
-        deny_objects = objects_with_header if match_type == ape.MatchType.EQUAL else objects_with_other_header
 
         # When there is no attribute on the object, it's the same as "", and "" is not equal to "<some_value>"
         # So it's the same as deny_objects
@@ -192,14 +160,27 @@ class TestApeFilters(ClusterTestBase):
                 ape.ObjectOperations.DELETE: False,  # Denied by restricted PUT
             },
         }
-        # End of refactor
+        allowed_access = {
+            ape.MatchType.EQUAL: FULL_ACCESS,
+            ape.MatchType.NOT_EQUAL: {
+                ape.ObjectOperations.PUT: False,  # because currently we are put without attributes
+                ape.ObjectOperations.GET: True,
+                ape.ObjectOperations.HEAD: True,
+                ape.ObjectOperations.GET_RANGE: True,
+                ape.ObjectOperations.GET_RANGE_HASH: True,
+                ape.ObjectOperations.SEARCH: True,
+                ape.ObjectOperations.DELETE: False,  # Because delete needs to put a tombstone without attributes
+            },
+        }
 
         with reporter.step("Deny operations for others via APE with resource condition"):
             resource_condition = ape.Condition('"check_key"', '"check_value"', ape.ConditionType.RESOURCE, match_type)
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             deny_rule = ape.Rule(ape.Verb.DENY, self.RESOURCE_OPERATIONS, [resource_condition, role_condition])
 
-            frostfs_cli.ape_manager.add(endpoint, deny_rule.chain_id, target_name=cid, target_type="container", rule=deny_rule.as_string())
+            frostfs_cli.ape_manager.add(
+                rpc_endpoint, deny_rule.chain_id, target_name=container, target_type="container", rule=deny_rule.as_string()
+            )
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
@@ -207,12 +188,12 @@ class TestApeFilters(ClusterTestBase):
         with reporter.step("Create bearer token with everything allowed for others role"):
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             rule = ape.Rule(ape.Verb.ALLOW, ALL_OBJECT_OPERATIONS, role_condition)
-            bearer = create_bearer_token(frostfs_cli, temp_directory, cid, rule, endpoint)
+            bearer = create_bearer_token(frostfs_cli, temp_directory, container, rule, rpc_endpoint)
 
         with reporter.step("Create bearer token with allowed put for others role"):
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             rule = ape.Rule(ape.Verb.ALLOW, ape.ObjectOperations.PUT, role_condition)
-            bearer_put = create_bearer_token(frostfs_cli, temp_directory, cid, rule, endpoint)
+            bearer_put = create_bearer_token(frostfs_cli, temp_directory, container, rule, rpc_endpoint)
 
         # We will attempt requests with various headers,
         # but APE rule should ignore request headers and validate only object headers
@@ -221,8 +202,8 @@ class TestApeFilters(ClusterTestBase):
                 assert_access_to_container(
                     no_attributes_access[match_type],
                     other_wallet,
-                    cid,
+                    container,
-                    objs_without_header.pop(),
+                    objects_without_attributes.pop(),
                     file_path,
                     self.shell,
                     self.cluster,
@@ -230,129 +211,188 @@ class TestApeFilters(ClusterTestBase):
                 )
 
             with reporter.step("Check others have full access to objects without deny attribute"):
-                assert_full_access_to_container(other_wallet, cid, allow_objects.pop(), file_path, self.shell, self.cluster, xhdr=xhdr)
+                assert_access_to_container(
+                    allowed_access[match_type], other_wallet, container, allow_objects.pop(), file_path, self.shell, self.cluster, xhdr=xhdr
+                )
 
             with reporter.step("Check others have no access to objects with deny attribute"):
-                with pytest.raises(Exception, match=OBJECT_NO_ACCESS):
+                with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
-                    head_object(other_wallet, cid, deny_objects[0], self.shell, endpoint, xhdr=xhdr)
+                    head_object(other_wallet, container, deny_objects[0], self.shell, rpc_endpoint, xhdr=xhdr)
 
-                with pytest.raises(Exception, match=OBJECT_NO_ACCESS):
+                with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
-                    get_object_from_random_node(other_wallet, cid, deny_objects[0], self.shell, self.cluster, xhdr=xhdr)
+                    get_object_from_random_node(other_wallet, container, deny_objects[0], self.shell, self.cluster, xhdr=xhdr)
 
             with reporter.step("Check others have access to objects with deny attribute and using bearer token"):
-                assert_full_access_to_container(other_wallet, cid, deny_objects.pop(), file_path, self.shell, self.cluster, bearer, xhdr)
+                assert_full_access_to_container(
+                    other_wallet, container, deny_objects.pop(), file_path, self.shell, self.cluster, bearer, xhdr
+                )
 
         allow_attribute = self.OTHER_HEADER if match_type == ape.MatchType.EQUAL else self.HEADER
         with reporter.step("Check others can PUT objects without denied attribute"):
-            put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, attributes=allow_attribute)
+            put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, attributes=allow_attribute)
 
         deny_attribute = self.HEADER if match_type == ape.MatchType.EQUAL else self.OTHER_HEADER
         with reporter.step("Check others can not PUT objects with denied attribute"):
             with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
-                put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, attributes=deny_attribute)
+                put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, attributes=deny_attribute)
 
         with reporter.step("Check others can PUT objects with denied attribute and using bearer token"):
-            put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, bearer_put, attributes=deny_attribute)
+            put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, bearer_put, attributes=deny_attribute)
 
     @allure.title("Operations with allow APE rule with resource filters (match_type={match_type}, obj_size={object_size})")
     @pytest.mark.parametrize("match_type", [ape.MatchType.EQUAL, ape.MatchType.NOT_EQUAL])
     @pytest.mark.parametrize("object_size", ["simple"], indirect=True)
+    @pytest.mark.container(ContainerSpec(basic_acl="0", allow_owner_via_ape=True))
     def test_ape_allow_filters_object(
         self,
         frostfs_cli: FrostfsCli,
         other_wallet: WalletInfo,
-        container_with_objects: tuple[str, list[str], str],
+        container: str,
-        temp_directory: str,
+        objects_with_attributes: list[str],
+        objects_with_other_attributes: list[str],
+        objects_without_attributes: list[str],
         match_type: ape.MatchType,
+        rpc_endpoint: str,
+        file_path: TestFile,
+        temp_directory: str,
     ):
-        # TODO: Refactor this to be fixtures, not test logic!
-        (
-            cid,
-            objects_with_header,
-            objects_with_other_header,
-            objects_without_header,
-            file_path,
-        ) = container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
         if match_type == ape.MatchType.EQUAL:
-            allow_objects = objects_with_header
+            allow_objects = objects_with_attributes
-            deny_objects = objects_with_other_header
+            deny_objects = objects_with_other_attributes
             allow_attribute = self.HEADER
             deny_attribute = self.OTHER_HEADER
+            no_attributes_match_context = pytest.raises(Exception, match=OBJECT_ACCESS_DENIED)
         else:
-            allow_objects = objects_with_other_header
+            allow_objects = objects_with_other_attributes
-            deny_objects = objects_with_header
+            deny_objects = objects_with_attributes
             allow_attribute = self.OTHER_HEADER
             deny_attribute = self.HEADER
-        # End of refactor block
+            no_attributes_match_context = expect_not_raises()
 
         with reporter.step("Allow operations for others except few operations by resource condition via APE"):
             resource_condition = ape.Condition('"check_key"', '"check_value"', ape.ConditionType.RESOURCE, match_type)
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             deny_rule = ape.Rule(ape.Verb.ALLOW, self.RESOURCE_OPERATIONS, [resource_condition, role_condition])
 
-            frostfs_cli.ape_manager.add(endpoint, deny_rule.chain_id, target_name=cid, target_type="container", rule=deny_rule.as_string())
+            frostfs_cli.ape_manager.add(
+                rpc_endpoint, deny_rule.chain_id, target_name=container, target_type="container", rule=deny_rule.as_string()
+            )
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
-        with reporter.step("Check others cannot get and put objects without attributes"):
+        with reporter.step("Check GET, PUT and HEAD operations with objects without attributes for OTHERS role"):
-            oid = objects_without_header.pop()
+            oid = objects_without_attributes.pop()
-            with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
+            with no_attributes_match_context:
-                assert head_object(other_wallet, cid, oid, self.shell, endpoint)
+                assert head_object(other_wallet, container, oid, self.shell, rpc_endpoint)
 
-            with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
+            with no_attributes_match_context:
-                assert get_object_from_random_node(other_wallet, cid, oid, self.shell, self.cluster)
+                assert get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster)
 
-            with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
+            with no_attributes_match_context:
-                assert put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster)
+                assert put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster)
 
         with reporter.step("Create bearer token with everything allowed for others role"):
             role_condition = ape.Condition.by_role(ape.Role.OTHERS)
             rule = ape.Rule(ape.Verb.ALLOW, ALL_OBJECT_OPERATIONS, role_condition)
-            bearer = create_bearer_token(frostfs_cli, temp_directory, cid, rule, endpoint)
+            bearer = create_bearer_token(frostfs_cli, temp_directory, container, rule, rpc_endpoint)
 
         with reporter.step("Check others can get and put objects without attributes and using bearer token"):
-            oid = objects_without_header[0]
+            oid = objects_without_attributes[0]
             with expect_not_raises():
-                head_object(other_wallet, cid, oid, self.shell, endpoint, bearer)
+                head_object(other_wallet, container, oid, self.shell, rpc_endpoint, bearer)
 
             with expect_not_raises():
-                get_object_from_random_node(other_wallet, cid, oid, self.shell, self.cluster, bearer)
+                get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster, bearer)
 
             with expect_not_raises():
-                put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, bearer)
+                put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, bearer)
 
         with reporter.step("Check others can get and put objects with attributes matching the filter"):
             oid = allow_objects.pop()
             with expect_not_raises():
-                head_object(other_wallet, cid, oid, self.shell, endpoint)
+                head_object(other_wallet, container, oid, self.shell, rpc_endpoint)
 
             with expect_not_raises():
-                get_object_from_random_node(other_wallet, cid, oid, self.shell, self.cluster)
+                get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster)
 
             with expect_not_raises():
-                put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, attributes=allow_attribute)
+                put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, attributes=allow_attribute)
 
         with reporter.step("Check others cannot get and put objects without attributes matching the filter"):
             oid = deny_objects[0]
             with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
-                head_object(other_wallet, cid, oid, self.shell, endpoint)
+                head_object(other_wallet, container, oid, self.shell, rpc_endpoint)
 
             with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
-                assert get_object_from_random_node(other_wallet, cid, oid, file_path, self.shell, self.cluster)
+                assert get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster)
 
             with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
-                assert put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, attributes=deny_attribute)
+                assert put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, attributes=deny_attribute)
 
         with reporter.step("Check others can get and put objects without attributes matching the filter with bearer token"):
             oid = deny_objects.pop()
             with expect_not_raises():
-                head_object(other_wallet, cid, oid, self.shell, endpoint, bearer)
+                head_object(other_wallet, container, oid, self.shell, rpc_endpoint, bearer)
 
             with expect_not_raises():
-                get_object_from_random_node(other_wallet, cid, oid, self.shell, self.cluster, bearer)
+                get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster, bearer)
 
             with expect_not_raises():
-                put_object_to_random_node(other_wallet, file_path, cid, self.shell, self.cluster, bearer, attributes=allow_attribute)
+                put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, bearer, attributes=allow_attribute)
+
+    @allure.title("PUT and GET object using bearer with objectID in filter (obj_size={object_size}, match_type=NOT_EQUAL)")
+    @pytest.mark.container(ContainerSpec(basic_acl="0", allow_owner_via_ape=True))
+    def test_ape_filter_object_id_not_equals(
+        self,
+        frostfs_cli: FrostfsCli,
+        default_wallet: WalletInfo,
+        other_wallet: WalletInfo,
+        container: str,
+        temp_directory: str,
+        file_path: TestFile,
+    ):
+        with reporter.step("Put object to container"):
+            oid = put_object_to_random_node(default_wallet, file_path, container, self.shell, self.cluster)
+
+        with reporter.step("Create bearer token with objectID filter"):
+            role_condition = ape.Condition.by_role(ape.Role.OTHERS)
+            object_condition = ape.Condition.by_object_id(oid, ape.ConditionType.RESOURCE, ape.MatchType.NOT_EQUAL)
+            rule = ape.Rule(ape.Verb.ALLOW, ALL_OBJECT_OPERATIONS, [role_condition, object_condition])
+            bearer = create_bearer_token(frostfs_cli, temp_directory, container, rule, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Others should be able to put object using bearer token"):
+            with expect_not_raises():
+                put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, bearer)
+
+        with reporter.step("Others should not be able to get object matching the filter"):
+            with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
+                get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster, bearer)
+
+    @allure.title("PUT and GET object using bearer with objectID in filter (obj_size={object_size}, match_type=EQUAL)")
+    @pytest.mark.container(ContainerSpec(basic_acl="0", allow_owner_via_ape=True))
+    def test_ape_filter_object_id_equals(
+        self,
+        frostfs_cli: FrostfsCli,
+        default_wallet: WalletInfo,
+        other_wallet: WalletInfo,
+        container: str,
+        temp_directory: str,
+        file_path: TestFile,
+    ):
+        with reporter.step("Put object to container"):
+            oid = put_object_to_random_node(default_wallet, file_path, container, self.shell, self.cluster)
+
+        with reporter.step("Create bearer token with objectID filter"):
+            role_condition = ape.Condition.by_role(ape.Role.OTHERS)
+            object_condition = ape.Condition.by_object_id(oid, ape.ConditionType.RESOURCE, ape.MatchType.EQUAL)
+            rule = ape.Rule(ape.Verb.ALLOW, ALL_OBJECT_OPERATIONS, [role_condition, object_condition])
+            bearer = create_bearer_token(frostfs_cli, temp_directory, container, rule, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Others should not be able to put object using bearer token"):
+            with pytest.raises(Exception, match=OBJECT_ACCESS_DENIED):
+                put_object_to_random_node(other_wallet, file_path, container, self.shell, self.cluster, bearer)
+
+        with reporter.step("Others should be able to get object matching the filter"):
+            with expect_not_raises():
+                get_object_from_random_node(other_wallet, container, oid, self.shell, self.cluster, bearer)

pytest_tests/testsuites/access/ape/test_bearer.py

@@ -5,9 +5,10 @@ from frostfs_testlib.cli.frostfs_cli.cli import FrostfsCli
 from frostfs_testlib.storage.dataclasses import ape
 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
 
-from pytest_tests.helpers.bearer_token import create_bearer_token
+from ....helpers.bearer_token import create_bearer_token
-from pytest_tests.helpers.container_access import (
+from ....helpers.container_access import (
     ALL_OBJECT_OPERATIONS,
     assert_access_to_container,
     assert_full_access_to_container,
@@ -15,6 +16,7 @@ from pytest_tests.helpers.container_access import (
 )
 
 
+@pytest.mark.nightly
 @pytest.mark.sanity
 @pytest.mark.bearer
 @pytest.mark.ape
@@ -23,21 +25,21 @@ class TestApeBearer(ClusterTestBase):
     @pytest.mark.parametrize("role", [ape.Role.OWNER, ape.Role.OTHERS], indirect=True)
     def test_bearer_token_operations(
         self,
-        container_with_objects: tuple[str, list[str], str],
+        container: str,
+        objects: list[str],
         frostfs_cli: FrostfsCli,
         temp_directory: str,
         test_wallet: WalletInfo,
         role: ape.Role,
+        file_path: TestFile,
+        rpc_endpoint: str,
     ):
-        cid, objects_oids, file_path = container_with_objects
-        endpoint = self.cluster.default_rpc_endpoint
-
         with reporter.step(f"Check {role} has full access to container without bearer token"):
-            assert_full_access_to_container(test_wallet, cid, objects_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(test_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
         with reporter.step(f"Deny all operations for everyone via APE"):
             rule = ape.Rule(ape.Verb.DENY, ALL_OBJECT_OPERATIONS)
-            frostfs_cli.ape_manager.add(endpoint, rule.chain_id, target_name=cid, target_type="container", rule=rule.as_string())
+            frostfs_cli.ape_manager.add(rpc_endpoint, rule.chain_id, target_name=container, target_type="container", rule=rule.as_string())
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
@@ -46,25 +48,25 @@ class TestApeBearer(ClusterTestBase):
             bearer = create_bearer_token(
                 frostfs_cli,
                 temp_directory,
-                cid,
+                container,
                 rule=ape.Rule(ape.Verb.ALLOW, ALL_OBJECT_OPERATIONS),
-                endpoint=self.cluster.default_rpc_endpoint,
+                endpoint=rpc_endpoint,
             )
 
         with reporter.step(f"Check {role} without token has no access to all operations with container"):
-            assert_no_access_to_container(test_wallet, cid, objects_oids.pop(), file_path, self.shell, self.cluster)
+            assert_no_access_to_container(test_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
         with reporter.step(f"Check {role} with token has access to all operations with container"):
-            assert_full_access_to_container(test_wallet, cid, objects_oids.pop(), file_path, self.shell, self.cluster, bearer)
+            assert_full_access_to_container(test_wallet, container, objects.pop(), file_path, self.shell, self.cluster, bearer)
 
         with reporter.step(f"Remove deny rule from APE"):
-            frostfs_cli.ape_manager.remove(endpoint, rule.chain_id, target_name=cid, target_type="container")
+            frostfs_cli.ape_manager.remove(rpc_endpoint, rule.chain_id, target_name=container, target_type="container")
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         with reporter.step(f"Check {role} without token has access to all operations with container"):
-            assert_full_access_to_container(test_wallet, cid, objects_oids.pop(), file_path, self.shell, self.cluster)
+            assert_full_access_to_container(test_wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
     @allure.title("BearerToken for compound operations (obj_size={object_size})")
     def test_bearer_token_compound_operations(
@@ -73,16 +75,16 @@ class TestApeBearer(ClusterTestBase):
         temp_directory: str,
         default_wallet: WalletInfo,
         other_wallet: WalletInfo,
-        container_with_objects: tuple[str, list[str], str],
+        container: tuple[str, list[str], str],
+        objects: list[str],
+        rpc_endpoint: str,
+        file_path: TestFile,
     ):
         """
         Bearer Token COMPLETLY overrides chains set for the specific target.
         Thus, any restictions or permissions should be explicitly defined in BT.
         """
 
-        endpoint = self.cluster.default_rpc_endpoint
-        cid, objects_oids, file_path = container_with_objects
-
         wallets_map = {
             ape.Role.OWNER: default_wallet,
             ape.Role.OTHERS: other_wallet,
@@ -167,24 +169,26 @@ class TestApeBearer(ClusterTestBase):
         for role, operations in deny_map.items():
             with reporter.step(f"Add APE deny rule for {role}"):
                 rule = ape.Rule(ape.Verb.DENY, operations, conditions_map[role])
-                frostfs_cli.ape_manager.add(endpoint, rule.chain_id, target_name=cid, target_type="container", rule=rule.as_string())
+                frostfs_cli.ape_manager.add(
+                    rpc_endpoint, rule.chain_id, target_name=container, target_type="container", rule=rule.as_string()
+                )
 
         with reporter.step("Wait for one block"):
             self.wait_for_blocks()
 
         for role, wallet in wallets_map.items():
             with reporter.step(f"Assert access to container without bearer token for {role}"):
-                assert_access_to_container(access_map[role], wallet, cid, objects_oids.pop(), file_path, self.shell, self.cluster)
+                assert_access_to_container(access_map[role], wallet, container, objects.pop(), file_path, self.shell, self.cluster)
 
         bearer_tokens = {}
         for role in wallets_map.keys():
             with reporter.step(f"Create bearer token for {role}"):
                 rule = ape.Rule(verb_map[role], bearer_map[role], conditions_map[role])
-                bt = create_bearer_token(frostfs_cli, temp_directory, cid, rule, endpoint)
+                bt = create_bearer_token(frostfs_cli, temp_directory, container, rule, rpc_endpoint)
                 bearer_tokens[role] = bt
 
         for role, wallet in wallets_map.items():
             with reporter.step(f"Assert access to container with bearer token for {role}"):
                 assert_access_to_container(
-                    bt_access_map[role], wallet, cid, objects_oids.pop(), file_path, self.shell, self.cluster, bearer_tokens[role]
+                    bt_access_map[role], wallet, container, objects.pop(), file_path, self.shell, self.cluster, bearer_tokens[role]
                 )

pytest_tests/testsuites/access/conftest.py

@@ -1,13 +1,22 @@
+import json
+import time
+
+import allure
 import pytest
 from frostfs_testlib import reporter
+from frostfs_testlib.cli.frostfs_cli.cli import FrostfsCli
+from frostfs_testlib.resources.common import MORPH_BLOCK_TIME
 from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL
 from frostfs_testlib.shell import Shell
-from frostfs_testlib.steps.cli.container import create_container
+from frostfs_testlib.steps.cli.container import create_container, search_nodes_with_container
 from frostfs_testlib.steps.cli.object import put_object_to_random_node
-from frostfs_testlib.storage.cluster import Cluster
+from frostfs_testlib.storage.cluster import Cluster, ClusterNode
 from frostfs_testlib.storage.dataclasses import ape
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.parallel import parallel
+from frostfs_testlib.utils import datetime_utils
+
+from ...helpers.container_spec import ContainerSpec
 
 OBJECT_COUNT = 5
 
@@ -39,26 +48,108 @@ def test_wallet(default_wallet: WalletInfo, other_wallet: WalletInfo, role: ape.
     return role_to_wallet_map[role]
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
-def container_with_objects(default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, file_path: str) -> tuple[str, list[str], str]:
+def container(
+    default_wallet: WalletInfo,
+    frostfs_cli: FrostfsCli,
+    client_shell: Shell,
+    cluster: Cluster,
+    request: pytest.FixtureRequest,
+    rpc_endpoint: str,
+) -> str:
+    container_spec = _get_container_spec(request)
+    cid = _create_container_by_spec(default_wallet, client_shell, cluster, rpc_endpoint, container_spec)
+    if container_spec.allow_owner_via_ape:
+        _allow_owner_via_ape(frostfs_cli, cluster, cid)
 
-    with reporter.step("Create public container"):
+    return cid
+
+
+def _create_container_by_spec(
+    default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, rpc_endpoint: str, container_spec: ContainerSpec
+) -> str:
+    # TODO: add container spec to step message
+    with reporter.step("Create container"):
         cid = create_container(
-            default_wallet,
+            default_wallet, client_shell, rpc_endpoint, basic_acl=container_spec.basic_acl, rule=container_spec.parsed_rule(cluster)
-            shell=client_shell,
-            endpoint=cluster.default_rpc_endpoint,
-            basic_acl=PUBLIC_ACL,
         )
 
+    with reporter.step("Search nodes holding the container"):
+        container_holder_nodes = search_nodes_with_container(default_wallet, cid, client_shell, cluster.default_rpc_endpoint, cluster)
+        report_data = {node.id: node.host_ip for node in container_holder_nodes}
+
+    reporter.attach(json.dumps(report_data, indent=2), "container_nodes.json")
+
+    return cid
+
+
+def _get_container_spec(request: pytest.FixtureRequest) -> ContainerSpec:
+    container_marker = request.node.get_closest_marker("container")
+    # let default container to be public at the moment
+    container_spec = ContainerSpec(basic_acl=PUBLIC_ACL)
+
+    if container_marker:
+        if len(container_marker.args) != 1:
+            raise RuntimeError(f"Something wrong with container marker: {container_marker}")
+        container_spec = container_marker.args[0]
+
+    if "param" in request.__dict__:
+        container_spec = request.param
+
+    if not container_spec:
+        raise RuntimeError(
+            f"""Container specification is empty. 
+                            Either add @pytest.mark.container(ContainerSpec(...)) or 
+                            @pytest.mark.parametrize(\"container\", [ContainerSpec(...)], indirect=True) decorator"""
+        )
+
+    return container_spec
+
+
+def _allow_owner_via_ape(frostfs_cli: FrostfsCli, cluster: Cluster, container: str):
+    with reporter.step("Create allow APE rule for container owner"):
+        role_condition = ape.Condition.by_role(ape.Role.OWNER)
+        deny_rule = ape.Rule(ape.Verb.ALLOW, ape.ObjectOperations.WILDCARD_ALL, role_condition)
+
+        frostfs_cli.ape_manager.add(
+            cluster.default_rpc_endpoint,
+            deny_rule.chain_id,
+            target_name=container,
+            target_type="container",
+            rule=deny_rule.as_string(),
+        )
+
+    with reporter.step("Wait for one block"):
+        time.sleep(datetime_utils.parse_time(MORPH_BLOCK_TIME))
+
+
+@pytest.fixture
+def objects(container: str, default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, file_path: str):
     with reporter.step("Add test objects to container"):
         put_results = parallel(
             [put_object_to_random_node] * OBJECT_COUNT,
             wallet=default_wallet,
             path=file_path,
-            cid=cid,
+            cid=container,
             shell=client_shell,
             cluster=cluster,
         )
         objects_oids = [put_result.result() for put_result in put_results]
 
-    return cid, objects_oids, file_path
+    return objects_oids
+
+
+@pytest.fixture
+def container_nodes(default_wallet: WalletInfo, container: str, client_shell: Shell, cluster: Cluster) -> list[ClusterNode]:
+    cid = container
+    container_holder_nodes = search_nodes_with_container(default_wallet, cid, client_shell, cluster.default_rpc_endpoint, cluster)
+
+    report_data = {node.id: node.host_ip for node in container_holder_nodes}
+    reporter.attach(json.dumps(report_data, indent=2), "container_nodes.json")
+
+    return container_holder_nodes
+
+
+@pytest.fixture
+def container_node_wallet(container_nodes: list[ClusterNode]) -> WalletInfo:
+    return WalletInfo.from_node(container_nodes[0].storage_node)

pytest_tests/testsuites/conftest.py

@@ -3,45 +3,46 @@ import os
 import random
 import shutil
 from datetime import datetime, timedelta, timezone
-from importlib.metadata import entry_points
 from typing import Optional
 
 import allure
 import pytest
-import yaml
 from dateutil import parser
 from frostfs_testlib import plugins, reporter
 from frostfs_testlib.cli import FrostfsCli
 from frostfs_testlib.credentials.interfaces import CredentialsProvider, User
 from frostfs_testlib.healthcheck.interfaces import Healthcheck
 from frostfs_testlib.hosting import Hosting
-from frostfs_testlib.reporter import AllureHandler, StepsLogger
+from frostfs_testlib.resources import optionals
-from frostfs_testlib.resources.common import ASSETS_DIR, COMPLEX_OBJECT_CHUNKS_COUNT, COMPLEX_OBJECT_TAIL_SIZE, SIMPLE_OBJECT_SIZE
+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.shell import LocalShell, Shell
 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.s3 import s3_helper
-from frostfs_testlib.storage import get_service_registry
 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
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.policy import PlacementPolicy
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
+from frostfs_testlib.storage.grpc_operations.client_wrappers import CliClientWrapper
+from frostfs_testlib.storage.grpc_operations.interfaces import GrpcClientWrapper
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.testing.parallel import parallel
-from frostfs_testlib.testing.test_control import wait_for_success
+from frostfs_testlib.testing.test_control import run_optionally, wait_for_success
 from frostfs_testlib.utils import env_utils, string_utils, version_utils
 from frostfs_testlib.utils.file_utils import TestFile, generate_file
 
-from pytest_tests.resources.common import HOSTING_CONFIG_FILE, TEST_CYCLES_COUNT
+from ..resources.common import TEST_CYCLES_COUNT
 
 logger = logging.getLogger("NeoLogger")
 
 SERVICE_ACTIVE_TIME = 20
 WALLTETS_IN_POOL = 2
 
+
 # Add logs check test even if it's not fit to mark selectors
 def pytest_configure(config: pytest.Config):
     markers = config.option.markexpr
@@ -52,6 +53,8 @@ def pytest_configure(config: pytest.Config):
 number_key = pytest.StashKey[str]()
 start_time = pytest.StashKey[int]()
 test_outcome = pytest.StashKey[str]()
+
+
 # pytest hook. Do not rename
 def pytest_collection_modifyitems(items: list[pytest.Item]):
     # Change order of tests based on @pytest.mark.order(<int>) marker
@@ -109,27 +112,7 @@ def pytest_generate_tests(metafunc: pytest.Metafunc):
         return
 
     metafunc.fixturenames.append("cycle")
-    metafunc.parametrize(
+    metafunc.parametrize("cycle", range(1, TEST_CYCLES_COUNT + 1), ids=[f"cycle {cycle}" for cycle in range(1, TEST_CYCLES_COUNT + 1)])
-        "cycle",
-        range(1, TEST_CYCLES_COUNT + 1),
-        ids=[f"cycle {cycle}" for cycle in range(1, TEST_CYCLES_COUNT + 1)],
-    )
-
-
-@pytest.fixture(scope="session")
-def configure_testlib():
-    reporter.get_reporter().register_handler(AllureHandler())
-    reporter.get_reporter().register_handler(StepsLogger())
-
-    logging.getLogger("paramiko").setLevel(logging.INFO)
-
-    # Register Services for cluster
-    registry = get_service_registry()
-    services = entry_points(group="frostfs.testlib.services")
-    for svc in services:
-        registry.register_service(svc.name, svc.load())
-
-    yield
 
 
 @pytest.fixture(scope="session")
@@ -137,17 +120,6 @@ def client_shell(configure_testlib) -> Shell:
     yield LocalShell()
 
 
-@pytest.fixture(scope="session")
-def hosting(configure_testlib) -> Hosting:
-    with open(HOSTING_CONFIG_FILE, "r") as file:
-        hosting_config = yaml.full_load(file)
-
-    hosting_instance = Hosting()
-    hosting_instance.configure(hosting_config)
-
-    yield hosting_instance
-
-
 @pytest.fixture(scope="session")
 def require_multiple_hosts(hosting: Hosting):
     """Designates tests that require environment with multiple hosts.
@@ -176,11 +148,7 @@ def require_multiple_interfaces(cluster: Cluster):
 def max_object_size(cluster: Cluster, client_shell: Shell) -> int:
     storage_node = cluster.storage_nodes[0]
     wallet = WalletInfo.from_node(storage_node)
-    net_info = get_netmap_netinfo(
+    net_info = get_netmap_netinfo(wallet=wallet, endpoint=storage_node.get_rpc_endpoint(), shell=client_shell)
-        wallet=wallet,
-        endpoint=storage_node.get_rpc_endpoint(),
-        shell=client_shell,
-    )
     yield net_info["maximum_object_size"]
 
 
@@ -204,8 +172,7 @@ def complex_object_size(max_object_size: int) -> ObjectSize:
 # By default we want all tests to be executed with both object sizes
 # This can be overriden in choosen tests if needed
 @pytest.fixture(
-    scope="session",
+    scope="session", params=[pytest.param("simple", marks=pytest.mark.simple), pytest.param("complex", marks=pytest.mark.complex)]
-    params=[pytest.param("simple", marks=pytest.mark.simple), pytest.param("complex", marks=pytest.mark.complex)],
 )
 def object_size(simple_object_size: ObjectSize, complex_object_size: ObjectSize, request: pytest.FixtureRequest) -> ObjectSize:
     if request.param == "simple":
@@ -230,12 +197,15 @@ 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")
+@allure.title("Init GrpcClientWrapper with local Frostfs CLI")
+def grpc_client(frostfs_cli: FrostfsCli) -> GrpcClientWrapper:
+    return CliClientWrapper(frostfs_cli)
+
+
 # By default we want all tests to be executed with both storage policies.
 # This can be overriden in choosen tests if needed.
-@pytest.fixture(
+@pytest.fixture(scope="session", params=[pytest.param("rep", marks=pytest.mark.rep), pytest.param("ec", marks=pytest.mark.ec)])
-    scope="session",
-    params=[pytest.param("rep", marks=pytest.mark.rep), pytest.param("ec", marks=pytest.mark.ec)],
-)
 def placement_policy(
     rep_placement_policy: PlacementPolicy, ec_placement_policy: PlacementPolicy, request: pytest.FixtureRequest
 ) -> PlacementPolicy:
@@ -378,6 +348,7 @@ def two_buckets(buckets_pool: list[str], s3_client: S3ClientWrapper) -> list[str
 
 @allure.title("[Autouse/Session] Collect binary versions")
 @pytest.fixture(scope="session", autouse=True)
+@run_optionally(optionals.OPTIONAL_AUTOUSE_FIXTURES_ENABLED)
 def collect_binary_versions(hosting: Hosting, client_shell: Shell, request: pytest.FixtureRequest):
     environment_dir = request.config.getoption("--alluredir")
     if not environment_dir:
@@ -400,20 +371,6 @@ def collect_binary_versions(hosting: Hosting, client_shell: Shell, request: pyte
     env_utils.save_env_properties(file_path, all_versions)
 
 
-@reporter.step("Prepare tmp directory")
-@pytest.fixture(scope="session")
-def temp_directory(configure_testlib):
-    with reporter.step("Prepare tmp directory"):
-        full_path = os.path.join(os.getcwd(), ASSETS_DIR)
-        shutil.rmtree(full_path, ignore_errors=True)
-        os.mkdir(full_path)
-
-    yield full_path
-
-    with reporter.step("Remove tmp directory"):
-        shutil.rmtree(full_path)
-
-
 @reporter.step("[Autouse/Session] Test session start time")
 @pytest.fixture(scope="session", autouse=True)
 def session_start_time(configure_testlib):
@@ -423,11 +380,17 @@ def session_start_time(configure_testlib):
 
 @allure.title("[Autouse/Session] After deploy healthcheck")
 @pytest.fixture(scope="session", autouse=True)
+@run_optionally(optionals.OPTIONAL_AUTOUSE_FIXTURES_ENABLED)
 def after_deploy_healthcheck(cluster: Cluster):
     with reporter.step("Wait for cluster readiness after deploy"):
         parallel(readiness_on_node, cluster.cluster_nodes)
 
 
+@pytest.fixture(scope="session")
+def rpc_endpoint(cluster: Cluster):
+    return cluster.default_rpc_endpoint
+
+
 @wait_for_success(60 * SERVICE_ACTIVE_TIME * 3, 60, title="Wait for {cluster_node} readiness")
 def readiness_on_node(cluster_node: ClusterNode):
     if "skip_readiness_check" in cluster_node.host.config.attributes and cluster_node.host.config.attributes["skip_readiness_check"]:
@@ -498,3 +461,11 @@ def node_under_test(cluster: Cluster) -> ClusterNode:
     selected_node = random.choice(cluster.cluster_nodes)
     reporter.attach(f"{selected_node}", "Selected node")
     return selected_node
+
+
+@allure.title("Init bucket container resolver")
+@pytest.fixture()
+def bucket_container_resolver(node_under_test: ClusterNode) -> BucketContainerResolver:
+    resolver_cls = plugins.load_plugin("frostfs.testlib.bucket_cid_resolver", node_under_test.host.config.product)
+    resolver: BucketContainerResolver = resolver_cls()
+    return resolver

pytest_tests/testsuites/container/test_container.py

@@ -13,18 +13,17 @@ from frostfs_testlib.steps.cli.container import (
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 
-from pytest_tests.helpers.utility import placement_policy_from_container
+from ...helpers.utility import placement_policy_from_container
 
 
-@pytest.mark.container
+@pytest.mark.nightly
 @pytest.mark.sanity
+@pytest.mark.container
 class TestContainer(ClusterTestBase):
+    @allure.title("Create container (name={name})")
     @pytest.mark.parametrize("name", ["", "test-container"], ids=["No name", "Set particular name"])
     @pytest.mark.smoke
     def test_container_creation(self, default_wallet: WalletInfo, name: str):
-        scenario_title = "with name" if name else "without name"
-        allure.dynamic.title(f"Create container {scenario_title}")
-
         wallet = default_wallet
 
         placement_rule = "REP 2 IN X CBF 1 SELECT 2 FROM * AS X"
@@ -59,9 +58,7 @@ class TestContainer(ClusterTestBase):
         with reporter.step("Check container has correct information"):
             expected_policy = placement_rule.casefold()
             actual_policy = placement_policy_from_container(container_info)
-            assert (
+            assert actual_policy == expected_policy, f"Expected policy\n{expected_policy} but got policy\n{actual_policy}"
-                actual_policy == expected_policy
-            ), f"Expected policy\n{expected_policy} but got policy\n{actual_policy}"
 
             for info in info_to_check:
                 expected_info = info.casefold()
@@ -112,10 +109,6 @@ class TestContainer(ClusterTestBase):
 
             with reporter.step("Delete containers and check they were deleted"):
                 for cid in cids:
-                    delete_container(
+                    delete_container(wallet, cid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint, await_mode=True)
-                        wallet, cid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint, await_mode=True
+                    containers_list = list_containers(wallet, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint)
-                    )
-                    containers_list = list_containers(
-                        wallet, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint
-                    )
                     assert cid not in containers_list, "Container not deleted"

pytest_tests/testsuites/container/test_policy.py

@@ -16,15 +16,11 @@ from frostfs_testlib.testing.test_control import wait_for_success
 from frostfs_testlib.utils.cli_utils import parse_netmap_output
 from frostfs_testlib.utils.file_utils import generate_file
 
-from pytest_tests.helpers.utility import placement_policy_from_container
+from ...helpers.utility import placement_policy_from_container
-from pytest_tests.resources.policy_error_patterns import (
+from ...resources.policy_error_patterns import NOT_ENOUGH_TO_SELECT, NOT_FOUND_FILTER, NOT_FOUND_SELECTOR, NOT_PARSE_POLICY
-    NOT_ENOUGH_TO_SELECT,
-    NOT_FOUND_FILTER,
-    NOT_FOUND_SELECTOR,
-    NOT_PARSE_POLICY,
-)
 
 
+@pytest.mark.nightly
 @pytest.mark.container
 @pytest.mark.policy
 class TestPolicy(ClusterTestBase):
@@ -93,7 +89,9 @@ class TestPolicy(ClusterTestBase):
         """
         Negative test for placement policy: Filter not found.
         """
-        placement_rule = "REP 2 IN HALF CBF 1 SELECT 2 FROM GT15 AS HALF FILTER @NOTRU AND Price GT 15 AS GT15 FILTER CountryCode NE RU AS NOTRU"
+        placement_rule = (
+            "REP 2 IN HALF CBF 1 SELECT 2 FROM GT15 AS HALF FILTER @NOTRU AND Price GT 15 AS GT15 FILTER CountryCode NE RU AS NOTRU"
+        )
         endpoint = self.cluster.default_rpc_endpoint
         with reporter.step(f"Create container with policy {placement_rule}"):
             with pytest.raises(Exception, match=NOT_FOUND_FILTER):
@@ -137,9 +135,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -149,9 +145,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -174,9 +168,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -186,9 +178,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -212,9 +202,7 @@ class TestPolicy(ClusterTestBase):
         placement_params = {"country": "Russia"}
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -224,9 +212,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -259,9 +245,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -271,9 +255,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -309,9 +291,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -321,9 +301,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -359,9 +337,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -371,9 +347,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -406,9 +380,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -418,9 +390,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -443,9 +413,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -455,9 +423,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -482,9 +448,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -494,9 +458,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -530,9 +492,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -542,9 +502,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -580,9 +538,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -592,9 +548,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -628,9 +582,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -640,9 +592,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -665,9 +615,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -677,9 +625,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -704,9 +650,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -716,9 +660,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -746,16 +688,16 @@ class TestPolicy(ClusterTestBase):
         """
         This test checks object's copies based on container's placement policy with SELECT and Complex FILTER results with 50% of available nodes.
         """
-        placement_rule = "REP 2 IN HALF CBF 2 SELECT 2 FROM GE15 AS HALF FILTER CountryCode NE RU AS NOTRU FILTER @NOTRU AND Price GE 15 AS GE15"
+        placement_rule = (
+            "REP 2 IN HALF CBF 2 SELECT 2 FROM GE15 AS HALF FILTER CountryCode NE RU AS NOTRU FILTER @NOTRU AND Price GE 15 AS GE15"
+        )
         placement_params = {"Price": 15, "country_code": "RU"}
         file_path = generate_file(simple_object_size.value)
         expected_copies = 2
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -765,16 +707,12 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
             netmap = self.get_netmap_param(netmap)
-            with reporter.step(
+            with reporter.step(f"Check two nodes are selected not with country code '{placement_params['country_code']}'"):
-                f"Check two nodes are selected not with country code '{placement_params['country_code']}'"
-            ):
                 for node in resulting_copies:
                     node_address = node.get_rpc_endpoint().split(":")[0]
                     assert (
@@ -806,9 +744,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -818,9 +754,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -862,9 +796,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -874,9 +806,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -899,9 +829,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -911,9 +839,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -938,9 +864,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -950,9 +874,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -980,16 +902,16 @@ class TestPolicy(ClusterTestBase):
         """
         This test checks object's copies based on container's placement policy with SELECT and Complex FILTER results with 75% of available nodes.
         """
-        placement_rule = "REP 2 IN NODES75 SELECT 2 FROM LT65 AS NODES75 FILTER Continent NE America AS NOAM FILTER @NOAM AND Price LT 65 AS LT65"
+        placement_rule = (
+            "REP 2 IN NODES75 SELECT 2 FROM LT65 AS NODES75 FILTER Continent NE America AS NOAM FILTER @NOAM AND Price LT 65 AS LT65"
+        )
         placement_params = {"Price": 65, "continent": "America"}
         file_path = generate_file(simple_object_size.value)
         expected_copies = 2
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -999,9 +921,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1039,9 +959,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1051,9 +969,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1094,9 +1010,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1106,9 +1020,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -1131,9 +1043,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1143,9 +1053,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -1170,9 +1078,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1182,9 +1088,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1217,9 +1121,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1229,9 +1131,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1268,9 +1168,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1280,9 +1178,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1315,9 +1211,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1327,9 +1221,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -1352,9 +1244,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1364,9 +1254,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Delete the object from the container"):
             delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@@ -1390,9 +1278,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1402,9 +1288,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1440,9 +1324,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1452,9 +1334,7 @@ class TestPolicy(ClusterTestBase):
 
         with reporter.step(f"Check object expected copies"):
             resulting_copies = get_nodes_with_object(cid, oid, shell=self.shell, nodes=self.cluster.storage_nodes)
-            assert (
+            assert len(resulting_copies) == expected_copies, f"Expected {expected_copies} copies, got {len(resulting_copies)}"
-                len(resulting_copies) == expected_copies
-            ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
 
         with reporter.step(f"Check the object appearance"):
             netmap = parse_netmap_output(get_netmap_snapshot(node=resulting_copies[0], shell=self.shell))
@@ -1490,9 +1370,7 @@ class TestPolicy(ClusterTestBase):
         endpoint = self.cluster.default_rpc_endpoint
 
         with reporter.step(f"Create container with policy {placement_rule}"):
-            cid = create_container(
+            cid = create_container(wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint)
-                wallet=default_wallet, rule=placement_rule, basic_acl=PUBLIC_ACL, shell=self.shell, endpoint=endpoint
-            )
 
         with reporter.step(f"Check container policy"):
             self.validate_object_policy(default_wallet, placement_rule, cid, endpoint)
@@ -1528,9 +1406,7 @@ class TestPolicy(ClusterTestBase):
             delete_container(wallet=default_wallet, cid=cid, shell=self.shell, endpoint=endpoint)
 
     def validate_object_policy(self, wallet: str, placement_rule: str, cid: str, endpoint: str):
-        got_policy = placement_policy_from_container(
+        got_policy = placement_policy_from_container(get_container(wallet, cid, json_mode=False, shell=self.shell, endpoint=endpoint))
-            get_container(wallet, cid, json_mode=False, shell=self.shell, endpoint=endpoint)
-        )
         assert got_policy.replace("'", "") == placement_rule.replace(
             "'", ""
         ), f"Expected \n{placement_rule} and got policy \n{got_policy} are the same"

pytest_tests/testsuites/failovers/test_failover_server.py

@@ -1,5 +1,6 @@
 import itertools
 import logging
+import os
 import random
 
 import allure
@@ -15,7 +16,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.storage.dataclasses.storage_object_info import StorageObjectInfo
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
-from frostfs_testlib.testing.parallel import parallel
+from frostfs_testlib.testing.parallel import parallel, parallel_workers_limit
 from frostfs_testlib.testing.test_control import wait_for_success
 from frostfs_testlib.utils.file_utils import get_file_hash
 from pytest import FixtureRequest
@@ -55,8 +56,7 @@ class TestFailoverServer(ClusterTestBase):
         )
 
         containers = [
-            StorageContainer(StorageContainerInfo(result.result(), default_wallet), self.shell, self.cluster)
+            StorageContainer(StorageContainerInfo(result.result(), default_wallet), self.shell, self.cluster) for result in results
-            for result in results
         ]
 
         return containers
@@ -102,9 +102,7 @@ class TestFailoverServer(ClusterTestBase):
 
     @allure.title("[Test] Create objects and get nodes with object")
     @pytest.fixture()
-    def object_and_nodes(
+    def object_and_nodes(self, simple_object_size: ObjectSize, container: StorageContainer) -> tuple[StorageObjectInfo, list[ClusterNode]]:
-        self, simple_object_size: ObjectSize, container: StorageContainer
-    ) -> tuple[StorageObjectInfo, list[ClusterNode]]:
         object_info = container.generate_object(simple_object_size.value)
         object_nodes = get_object_nodes(self.cluster, object_info.cid, object_info.oid, self.cluster.cluster_nodes[0])
         return object_info, object_nodes
@@ -124,7 +122,9 @@ class TestFailoverServer(ClusterTestBase):
 
     @reporter.step("Verify objects")
     def verify_objects(self, nodes: list[StorageNode], storage_objects: list[StorageObjectInfo]) -> None:
-        parallel(self._verify_object, storage_objects * len(nodes), node=itertools.cycle(nodes))
+        workers_count = os.environ.get("PARALLEL_CUSTOM_LIMIT", 50)
+        with parallel_workers_limit(int(workers_count)):
+            parallel(self._verify_object, storage_objects * len(nodes), node=itertools.cycle(nodes))
 
     @allure.title("Full shutdown node")
     @pytest.mark.parametrize("containers, storage_objects", [(5, 10)], indirect=True)
@@ -200,9 +200,7 @@ class TestFailoverServer(ClusterTestBase):
         simple_file: str,
     ):
         object_info, object_nodes = object_and_nodes
-        endpoint_without_object = list(set(self.cluster.cluster_nodes) - set(object_nodes))[
+        endpoint_without_object = list(set(self.cluster.cluster_nodes) - set(object_nodes))[0].storage_node.get_rpc_endpoint()
-            0
-        ].storage_node.get_rpc_endpoint()
         endpoint_with_object = object_nodes[0].storage_node.get_rpc_endpoint()
 
         with reporter.step("Stop all nodes with object except first one"):

pytest_tests/testsuites/failovers/test_failover_storage.py

@@ -9,6 +9,7 @@ from frostfs_testlib import reporter
 from frostfs_testlib.resources.common import MORPH_BLOCK_TIME
 from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL
 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 (
@@ -33,6 +34,8 @@ from frostfs_testlib.utils.failover_utils import wait_object_replication
 from frostfs_testlib.utils.file_keeper import FileKeeper
 from frostfs_testlib.utils.file_utils import generate_file, get_file_hash
 
+from ...resources.common import S3_POLICY_FILE_LOCATION
+
 logger = logging.getLogger("NeoLogger")
 stopped_nodes: list[StorageNode] = []
 
@@ -94,9 +97,7 @@ class TestFailoverStorage(ClusterTestBase):
                 )
 
         with reporter.step("Check object data is not corrupted"):
-            got_file_path = get_object(
+            got_file_path = get_object(wallet, cid, oid, endpoint=replicated_nodes[0].get_rpc_endpoint(), shell=self.shell)
-                wallet, cid, oid, endpoint=replicated_nodes[0].get_rpc_endpoint(), shell=self.shell
-            )
             assert get_file_hash(source_file_path) == get_file_hash(got_file_path)
 
         with reporter.step("Return all hosts"):
@@ -104,12 +105,10 @@ class TestFailoverStorage(ClusterTestBase):
 
         with reporter.step("Check object data is not corrupted"):
             replicated_nodes = wait_object_replication(cid, oid, 2, shell=self.shell, nodes=self.cluster.storage_nodes)
-            got_file_path = get_object(
+            got_file_path = get_object(wallet, cid, oid, shell=self.shell, endpoint=replicated_nodes[0].get_rpc_endpoint())
-                wallet, cid, oid, shell=self.shell, endpoint=replicated_nodes[0].get_rpc_endpoint()
-            )
             assert get_file_hash(source_file_path) == get_file_hash(got_file_path)
 
-    @pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True)
+    @pytest.mark.parametrize("s3_policy", [S3_POLICY_FILE_LOCATION], indirect=True)
     @allure.title("Do not ignore unhealthy tree endpoints (s3_client={s3_client})")
     def test_unhealthy_tree(
         self,
@@ -117,6 +116,7 @@ class TestFailoverStorage(ClusterTestBase):
         default_wallet: WalletInfo,
         simple_object_size: ObjectSize,
         cluster_state_controller: ClusterStateController,
+        bucket_container_resolver: BucketContainerResolver,
     ):
         default_node = self.cluster.cluster_nodes[0]
 
@@ -149,6 +149,7 @@ class TestFailoverStorage(ClusterTestBase):
             wallet=default_wallet,
             shell=self.shell,
             endpoint=self.cluster.storage_nodes[0].get_rpc_endpoint(),
+            bucket_container_resolver=bucket_container_resolver,
         )[0]
 
         with reporter.step("Turn off all storage nodes except bucket node"):
@@ -279,9 +280,7 @@ class TestEmptyMap(ClusterTestBase):
             cluster_state_controller.stop_services_of_type(StorageNode)
 
         with reporter.step("Remove all nodes from network map"):
-            remove_nodes_from_map_morph(
+            remove_nodes_from_map_morph(shell=self.shell, cluster=self.cluster, remove_nodes=self.cluster.services(StorageNode))
-                shell=self.shell, cluster=self.cluster, remove_nodes=self.cluster.services(StorageNode)
-            )
 
         with reporter.step("Return all storage nodes to network map"):
             self.return_nodes_after_stop_with_check_empty_map(cluster_state_controller)
@@ -462,9 +461,7 @@ class TestStorageDataLoss(ClusterTestBase):
             s3_client.put_object(bucket, complex_object_path)
 
         with reporter.step("Check objects are in bucket"):
-            s3_helper.check_objects_in_bucket(
+            s3_helper.check_objects_in_bucket(s3_client, bucket, expected_objects=[simple_object_key, complex_object_key])
-                s3_client, bucket, expected_objects=[simple_object_key, complex_object_key]
-            )
 
         with reporter.step("Stop storage services on all nodes"):
             cluster_state_controller.stop_services_of_type(StorageNode)
@@ -578,17 +575,13 @@ class TestStorageDataLoss(ClusterTestBase):
                     exception_messages.append(f"Shard {shard} changed status to {status}")
 
         with reporter.step("No related errors should be in log"):
-            if node_under_test.host.is_message_in_logs(
+            if node_under_test.host.is_message_in_logs(message_regex=r"\Wno such file or directory\W", since=test_start_time):
-                message_regex=r"\Wno such file or directory\W", since=test_start_time
-            ):
                 exception_messages.append(f"Node {node_under_test} have shard errors in logs")
 
         with reporter.step("Pass test if no errors found"):
             assert not exception_messages, "\n".join(exception_messages)
 
-    @allure.title(
+    @allure.title("Loss of one node should trigger use of tree and storage service in another node (s3_client={s3_client})")
-        "Loss of one node should trigger use of tree and storage service in another node (s3_client={s3_client})"
-    )
     def test_s3_one_endpoint_loss(
         self,
         bucket,
@@ -610,7 +603,7 @@ class TestStorageDataLoss(ClusterTestBase):
             put_object = s3_client.put_object(bucket, file_path)
             s3_helper.check_objects_in_bucket(s3_client, bucket, expected_objects=[file_name])
 
-    @pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True)
+    @pytest.mark.parametrize("s3_policy", [S3_POLICY_FILE_LOCATION], indirect=True)
     @allure.title("After Pilorama.db loss on one node object is retrievable (s3_client={s3_client})")
     def test_s3_one_pilorama_loss(
         self,

pytest_tests/testsuites/failovers/test_frostfs_failover_network.py

@@ -1,5 +1,4 @@
 import logging
-import os
 import random
 from time import sleep
 
@@ -9,13 +8,7 @@ from frostfs_testlib import reporter
 from frostfs_testlib.healthcheck.interfaces import Healthcheck
 from frostfs_testlib.resources.wellknown_acl import EACL_PUBLIC_READ_WRITE, PUBLIC_ACL
 from frostfs_testlib.steps.cli.container import create_container
-from frostfs_testlib.steps.cli.object import (
+from frostfs_testlib.steps.cli.object import get_object, get_object_nodes, neo_go_query_height, put_object, put_object_to_random_node
-    get_object,
-    get_object_nodes,
-    neo_go_query_height,
-    put_object,
-    put_object_to_random_node,
-)
 from frostfs_testlib.steps.storage_object import delete_objects
 from frostfs_testlib.storage.cluster import ClusterNode
 from frostfs_testlib.storage.controllers import ClusterStateController
@@ -32,7 +25,6 @@ STORAGE_NODE_COMMUNICATION_PORT = "8080"
 STORAGE_NODE_COMMUNICATION_PORT_TLS = "8082"
 PORTS_TO_BLOCK = [STORAGE_NODE_COMMUNICATION_PORT, STORAGE_NODE_COMMUNICATION_PORT_TLS]
 blocked_nodes: list[ClusterNode] = []
-file_wait_delete = []
 
 OBJECT_ATTRIBUTES = [
     None,
@@ -63,14 +55,6 @@ class TestFailoverNetwork(ClusterTestBase):
         yield
         cluster_state_controller.restore_interfaces()
 
-    @pytest.fixture()
-    @allure.title("Delete file after test")
-    def delete_file_after_test(self) -> None:
-        yield
-        for path in file_wait_delete:
-            os.remove(path)
-        file_wait_delete.clear()
-
     @pytest.fixture()
     def storage_objects(
         self,
@@ -113,9 +97,7 @@ class TestFailoverNetwork(ClusterTestBase):
 
             storage_objects.append(storage_object)
 
-        yield storage_objects
+        return storage_objects
-
-        delete_objects(storage_objects, self.shell, self.cluster)
 
     @allure.title("Block Storage node traffic")
     def test_block_storage_node_traffic(
@@ -174,9 +156,7 @@ class TestFailoverNetwork(ClusterTestBase):
                     assert node.storage_node not in new_nodes
 
                 with reporter.step("Check object data is not corrupted"):
-                    got_file_path = get_object(
+                    got_file_path = get_object(wallet, cid, oid, endpoint=new_nodes[0].get_rpc_endpoint(), shell=self.shell)
-                        wallet, cid, oid, endpoint=new_nodes[0].get_rpc_endpoint(), shell=self.shell
-                    )
                     assert get_file_hash(source_file_path) == get_file_hash(got_file_path)
 
         with reporter.step(f"Unblock incoming traffic"):
@@ -184,9 +164,7 @@ class TestFailoverNetwork(ClusterTestBase):
                 with reporter.step(f"Unblock at host {node}"):
                     cluster_state_controller.restore_traffic(node=node)
                     block_node = [
-                        cluster_node
+                        cluster_node for cluster_node in self.cluster.cluster_nodes if cluster_node.storage_node == node.storage_node
-                        for cluster_node in self.cluster.cluster_nodes
-                        if cluster_node.storage_node == node.storage_node
                     ]
                     blocked_nodes.remove(*block_node)
                     sleep(wakeup_node_timeout)
@@ -204,7 +182,6 @@ class TestFailoverNetwork(ClusterTestBase):
         cluster_state_controller: ClusterStateController,
         default_wallet: WalletInfo,
         restore_down_interfaces: None,
-        delete_file_after_test: None,
         storage_objects: list[StorageObjectInfo],
     ):
         storage_object = storage_objects[0]
@@ -231,7 +208,7 @@ class TestFailoverNetwork(ClusterTestBase):
             self.tick_epochs(1, alive_node=nodes_without_an_object[0].storage_node, wait_block=2)
 
         with reporter.step("Get object for target nodes to data interfaces, expect false"):
-            with pytest.raises(RuntimeError, match="return code: 1"):
+            with pytest.raises(RuntimeError, match="can't create API client: can't init SDK client: gRPC dial: context deadline exceeded"):
                 get_object(
                     wallet=default_wallet,
                     cid=storage_object.cid,
@@ -248,7 +225,6 @@ class TestFailoverNetwork(ClusterTestBase):
                 shell=self.shell,
                 endpoint=nodes_without_an_object[0].storage_node.get_rpc_endpoint(),
             )
-            file_wait_delete.append(input_file)
 
         with reporter.step("Restore interface and tick 1 epoch, wait 2 block"):
             cluster_state_controller.restore_interfaces()
@@ -261,7 +237,6 @@ class TestFailoverNetwork(ClusterTestBase):
         cluster_state_controller: ClusterStateController,
         default_wallet: WalletInfo,
         restore_down_interfaces: None,
-        delete_file_after_test: None,
         storage_objects: list[StorageObjectInfo],
         simple_object_size: ObjectSize,
     ):
@@ -289,7 +264,7 @@ class TestFailoverNetwork(ClusterTestBase):
             self.tick_epochs(1, alive_node=nodes_without_an_object[0].storage_node, wait_block=2)
 
         with reporter.step("Get object others node, expect false"):
-            with pytest.raises(RuntimeError, match="return code: 1"):
+            with pytest.raises(RuntimeError, match="rpc error"):
                 get_object(
                     wallet=default_wallet,
                     cid=storage_object.cid,
@@ -299,7 +274,7 @@ class TestFailoverNetwork(ClusterTestBase):
                 )
 
         with reporter.step("Put object, others node, expect false"):
-            with pytest.raises(RuntimeError, match="return code: 1"):
+            with pytest.raises(RuntimeError, match="rpc error"):
                 put_object(
                     wallet=default_wallet,
                     path=storage_object.file_path,
@@ -316,7 +291,6 @@ class TestFailoverNetwork(ClusterTestBase):
                 shell=self.shell,
                 endpoint=nodes_with_object[0].storage_node.get_rpc_endpoint(),
             )
-            file_wait_delete.append(input_file)
 
         with reporter.step(f"Put object nodes with object, expect true"):
             temp_file_path = generate_file(simple_object_size.value)
@@ -327,7 +301,7 @@ class TestFailoverNetwork(ClusterTestBase):
                 shell=self.shell,
                 endpoint=nodes_with_object[0].storage_node.get_rpc_endpoint(),
             )
-            file_wait_delete.append(temp_file_path)
+
         with reporter.step("Restore interface and tick 1 epoch, wait 2 block"):
             cluster_state_controller.restore_interfaces()
             self.tick_epochs(1, alive_node=nodes_without_an_object[0].storage_node, wait_block=2)
@@ -345,7 +319,6 @@ class TestFailoverNetwork(ClusterTestBase):
         cluster_state_controller: ClusterStateController,
         default_wallet: WalletInfo,
         simple_object_size: ObjectSize,
-        delete_file_after_test: None,
         restore_down_interfaces: None,
         block_interface: Interfaces,
         other_interface: Interfaces,
@@ -367,7 +340,6 @@ class TestFailoverNetwork(ClusterTestBase):
 
         with reporter.step("Put object"):
             file_path = generate_file(simple_object_size.value)
-            file_wait_delete.append(file_path)
 
             oid = put_object(
                 wallet=default_wallet,
@@ -385,7 +357,6 @@ class TestFailoverNetwork(ClusterTestBase):
                 shell=self.shell,
                 endpoint=f"{cluster_nodes[0].get_data_interface(other_interface.value)[0]}:8080",
             )
-            file_wait_delete.append(file_get_path)
 
         with reporter.step("Restore interfaces all nodes"):
             cluster_state_controller.restore_interfaces()
@@ -401,7 +372,6 @@ class TestFailoverNetwork(ClusterTestBase):
         cluster_state_controller: ClusterStateController,
         default_wallet: WalletInfo,
         simple_object_size: ObjectSize,
-        delete_file_after_test: None,
         restore_down_interfaces: None,
         interface: Interfaces,
     ):
@@ -430,7 +400,6 @@ class TestFailoverNetwork(ClusterTestBase):
 
         with reporter.step(f"Put object, after down {interface}"):
             file_path = generate_file(simple_object_size.value)
-            file_wait_delete.append(file_path)
 
             oid = put_object(
                 wallet=default_wallet,
@@ -448,7 +417,6 @@ class TestFailoverNetwork(ClusterTestBase):
                 shell=self.shell,
                 endpoint=self.cluster.default_rpc_endpoint,
             )
-            file_wait_delete.append(file_get_path)
 
         now_block = {}
 

pytest_tests/testsuites/management/test_node_management.py

@@ -44,7 +44,7 @@ from frostfs_testlib.utils import string_utils
 from frostfs_testlib.utils.failover_utils import wait_object_replication
 from frostfs_testlib.utils.file_utils import generate_file
 
-from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes
+from ...helpers.utility import wait_for_gc_pass_on_storage_nodes
 
 logger = logging.getLogger("NeoLogger")
 check_nodes: list[StorageNode] = []

pytest_tests/testsuites/metrics/test_container_metrics.py

@@ -1,38 +1,61 @@
 import math
 
 import allure
+from frostfs_testlib.testing.parallel import parallel
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.steps.cli.container import create_container
+from frostfs_testlib.steps.cli.container import create_container, delete_container, search_nodes_with_container, wait_for_container_deletion
-from frostfs_testlib.steps.cli.object import delete_object, put_object_to_random_node
+from frostfs_testlib.steps.cli.object import delete_object, head_object, put_object_to_random_node
-from frostfs_testlib.steps.metrics import check_metrics_counter
+from frostfs_testlib.steps.metrics import calc_metrics_count_from_stdout, check_metrics_counter, get_metrics_value
 from frostfs_testlib.steps.storage_policy import get_nodes_with_object
-from frostfs_testlib.storage.cluster import Cluster
+from frostfs_testlib.storage.cluster import Cluster, ClusterNode
 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 ...helpers.utility import are_numbers_similar
 
+
+@pytest.mark.nightly
 @pytest.mark.container
 class TestContainerMetrics(ClusterTestBase):
-    @allure.title("Container metrics (obj_size={object_size})")
+    @reporter.step("Put object to container: {cid}")
+    def put_object_parallel(self, file_path: str, wallet: WalletInfo, cid: str):
+        oid = put_object_to_random_node(wallet, file_path, cid, self.shell, self.cluster)
+        return oid
+    
+    @reporter.step("Get metrics value from node")
+    def get_metrics_search_by_greps_parallel(self, node: ClusterNode, **greps):
+        try:
+            content_stdout = node.metrics.storage.get_metrics_search_by_greps(greps)
+            return calc_metrics_count_from_stdout(content_stdout)
+        except Exception as e:
+            return None
+
+    @allure.title("Container metrics (obj_size={object_size},policy={policy})")
+    @pytest.mark.parametrize("placement_policy, policy", [("REP 2 IN X CBF 2 SELECT 2 FROM * AS X", "REP"), ("EC 1.1 CBF 1", "EC")])
     def test_container_metrics(
-        self, object_size: ObjectSize, max_object_size: int, default_wallet: WalletInfo, cluster: Cluster
+        self,
+        object_size: ObjectSize,
+        max_object_size: int,
+        default_wallet: WalletInfo,
+        cluster: Cluster,
+        placement_policy: str,
+        policy: str,
     ):
         file_path = generate_file(object_size.value)
-        placement_policy = "REP 2 IN X CBF 2 SELECT 2 FROM * AS X"
+        copies = 2 if policy == "REP" else 1
-        copies = 2
+        object_chunks = 1
-        object_chunks = 0
-        head_object = 1
         link_object = 0
-        if object_size.value > max_object_size:
-            object_chunks = math.ceil(object_size.value / max_object_size)
-            link_object = 1
 
         with reporter.step(f"Create container with policy {placement_policy}"):
             cid = create_container(default_wallet, self.shell, cluster.default_rpc_endpoint, placement_policy)
 
+        if object_size.value > max_object_size:
+            object_chunks = math.ceil(object_size.value / max_object_size)
+            link_object = len(search_nodes_with_container(default_wallet, cid, self.shell, cluster.default_rpc_endpoint, cluster))
+
         with reporter.step("Put object to random node"):
             oid = put_object_to_random_node(
                 wallet=default_wallet,
@@ -44,44 +67,148 @@ class TestContainerMetrics(ClusterTestBase):
 
         with reporter.step("Get object nodes"):
             object_storage_nodes = get_nodes_with_object(cid, oid, self.shell, cluster.storage_nodes)
-            object_nodes = [
+            object_nodes = [cluster_node for cluster_node in cluster.cluster_nodes if cluster_node.storage_node in object_storage_nodes]
-                cluster_node
-                for cluster_node in cluster.cluster_nodes
-                if cluster_node.storage_node in object_storage_nodes
-            ]
 
         with reporter.step("Check metric appears in node where the object is located"):
-            count_metrics = (object_chunks + head_object + link_object) * copies
+            count_metrics = (object_chunks * copies) + link_object
-            check_metrics_counter(
+            if policy == "EC":
-                object_nodes, counter_exp=count_metrics, command="container_objects_total", cid=cid, type="phy"
+                count_metrics = (object_chunks * 2) + link_object
-            )
+            check_metrics_counter(object_nodes, counter_exp=count_metrics, command="container_objects_total", cid=cid, type="phy")
-            check_metrics_counter(
+            check_metrics_counter(object_nodes, counter_exp=count_metrics, command="container_objects_total", cid=cid, type="logic")
-                object_nodes, counter_exp=count_metrics, command="container_objects_total", cid=cid, type="logic"
+            check_metrics_counter(object_nodes, counter_exp=copies, command="container_objects_total", cid=cid, type="user")
-            )
-            check_metrics_counter(
-                object_nodes, counter_exp=copies, command="container_objects_total", cid=cid, type="user"
-            )
 
         with reporter.step("Delete file, wait until gc remove object"):
             delete_object(default_wallet, cid, oid, self.shell, cluster.default_rpc_endpoint)
 
         with reporter.step(f"Check container metrics 'the counter should equal {len(object_nodes)}' in object nodes"):
-            check_metrics_counter(
+            check_metrics_counter(object_nodes, counter_exp=len(object_nodes), command="container_objects_total", cid=cid, type="phy")
-                object_nodes, counter_exp=len(object_nodes), command="container_objects_total", cid=cid, type="phy"
+            check_metrics_counter(object_nodes, counter_exp=len(object_nodes), command="container_objects_total", cid=cid, type="logic")
-            )
-            check_metrics_counter(
-                object_nodes, counter_exp=len(object_nodes), command="container_objects_total", cid=cid, type="logic"
-            )
             check_metrics_counter(object_nodes, counter_exp=0, command="container_objects_total", cid=cid, type="user")
 
         with reporter.step("Check metrics(Phy, Logic, User) in each nodes"):
             # Phy and Logic metrics are 4, because in rule 'CBF 2 SELECT 2 FROM', cbf2*sel2=4
+            expect_metrics = 4 if policy == "REP" else 2
+            check_metrics_counter(cluster.cluster_nodes, counter_exp=expect_metrics, command="container_objects_total", cid=cid, type="phy")
             check_metrics_counter(
-                cluster.cluster_nodes, counter_exp=4, command="container_objects_total", cid=cid, type="phy"
+                cluster.cluster_nodes, counter_exp=expect_metrics, command="container_objects_total", cid=cid, type="logic"
             )
-            check_metrics_counter(
+            check_metrics_counter(cluster.cluster_nodes, counter_exp=0, command="container_objects_total", cid=cid, type="user")
-                cluster.cluster_nodes, counter_exp=4, command="container_objects_total", cid=cid, type="logic"
+
+    @allure.title("Container size metrics (obj_size={object_size},policy={policy})")
+    @pytest.mark.parametrize("placement_policy, policy", [("REP 2 IN X CBF 2 SELECT 2 FROM * AS X", "REP"), ("EC 1.1 CBF 1", "EC")])
+    def test_container_size_metrics(
+        self,
+        object_size: ObjectSize,
+        default_wallet: WalletInfo,
+        placement_policy: str,
+        policy: str,
+    ):
+        file_path = generate_file(object_size.value)
+
+        with reporter.step(f"Create container with policy {policy}"):
+            cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, placement_policy)
+
+        with reporter.step("Put object to random node"):
+            oid = put_object_to_random_node(
+                wallet=default_wallet,
+                path=file_path,
+                cid=cid,
+                shell=self.shell,
+                cluster=self.cluster,
             )
-            check_metrics_counter(
+
-                cluster.cluster_nodes, counter_exp=0, command="container_objects_total", cid=cid, type="user"
+        with reporter.step("Get object nodes"):
+            object_storage_nodes = get_nodes_with_object(cid, oid, self.shell, self.cluster.storage_nodes)
+            object_nodes = [
+                cluster_node for cluster_node in self.cluster.cluster_nodes if cluster_node.storage_node in object_storage_nodes
+            ]
+
+        with reporter.step("Check metric appears in all node where the object is located"):
+            act_metric = sum(
+                [get_metrics_value(node, command="frostfs_node_engine_container_size_bytes", cid=cid) for node in object_nodes]
             )
+            assert (act_metric // 2) == object_size.value
+
+        with reporter.step("Delete file, wait until gc remove object"):
+            id_tombstone = delete_object(default_wallet, cid, oid, self.shell, self.cluster.default_rpc_endpoint)
+            tombstone = head_object(default_wallet, cid, id_tombstone, self.shell, self.cluster.default_rpc_endpoint)
+
+        with reporter.step(f"Check container size metrics"):
+            act_metric = get_metrics_value(object_nodes[0], command="frostfs_node_engine_container_size_bytes", cid=cid)
+            assert act_metric == int(tombstone["header"]["payloadLength"])
+
+    @allure.title("Container size metrics put {objects_count} objects (obj_size={object_size})")
+    @pytest.mark.parametrize("objects_count", [5, 10, 20])
+    def test_container_size_metrics_more_objects(
+        self,
+        object_size: ObjectSize,
+        default_wallet: WalletInfo,
+        objects_count: int
+    ):
+        with reporter.step(f"Create container"):
+            cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint)
+
+        with reporter.step(f"Put {objects_count} objects"):
+            files_path = [generate_file(object_size.value) for _ in range(objects_count)]
+            futures = parallel(self.put_object_parallel, files_path, wallet=default_wallet, cid=cid)
+            oids = [future.result() for future in futures]
+
+        with reporter.step("Check metric appears in all nodes"):
+            metric_values = [get_metrics_value(node, command="frostfs_node_engine_container_size_bytes", cid=cid) for node in self.cluster.cluster_nodes]
+            actual_value = sum(metric_values) // 2  # for policy REP 2, value divide by 2 
+            expected_value = object_size.value * objects_count
+            assert are_numbers_similar(actual_value, expected_value, tolerance_percentage=2), "metric container size bytes value not correct"
+
+        with reporter.step("Delete file, wait until gc remove object"):
+            tombstones_size = 0
+            for oid in oids:
+                tombstone_id = delete_object(default_wallet, cid, oid, self.shell, self.cluster.default_rpc_endpoint)
+                tombstone = head_object(default_wallet, cid, tombstone_id, self.shell, self.cluster.default_rpc_endpoint)
+                tombstones_size += int(tombstone["header"]["payloadLength"])
+
+        with reporter.step(f"Check container size metrics, 'should be positive in all nodes'"):
+            futures = parallel(get_metrics_value, self.cluster.cluster_nodes, command="frostfs_node_engine_container_size_bytes", cid=cid)
+            metrics_value_nodes = [future.result() for future in futures]
+            for act_metric in metrics_value_nodes:
+                assert act_metric >= 0, "Metrics value is negative"
+            assert sum(metrics_value_nodes) // len(self.cluster.cluster_nodes) == tombstones_size, "tomstone size of objects not correct"
+
+
+    @allure.title("Container metrics (policy={policy})")
+    @pytest.mark.parametrize("placement_policy, policy", [("REP 2 IN X CBF 2 SELECT 2 FROM * AS X", "REP"), ("EC 1.1 CBF 1", "EC")])
+    def test_container_metrics_delete_complex_objects(
+        self,
+        complex_object_size: ObjectSize,
+        default_wallet: WalletInfo,
+        cluster: Cluster,
+        placement_policy: str,
+        policy: str
+    ):
+        copies = 2 if policy == "REP" else 1
+        objects_count = 2
+        metric_name = "frostfs_node_engine_container_objects_total"
+        with reporter.step(f"Create container"):
+            cid = create_container(default_wallet, self.shell, cluster.default_rpc_endpoint, rule=placement_policy)
+
+        with reporter.step(f"Put {objects_count} objects"):
+            files_path = [generate_file(complex_object_size.value) for _ in range(objects_count)]
+            futures = parallel(self.put_object_parallel, files_path, wallet=default_wallet, cid=cid)
+            oids = [future.result() for future in futures]
+
+        with reporter.step(f"Check metrics value in each nodes, should be {objects_count} for 'user'"):
+            check_metrics_counter(cluster.cluster_nodes, counter_exp=objects_count * copies, command=metric_name, cid=cid, type="user")
+
+        with reporter.step("Delete objects and container"):
+            for oid in oids:
+                delete_object(default_wallet, cid, oid, self.shell, cluster.default_rpc_endpoint)
+            
+            delete_container(default_wallet, cid, self.shell, cluster.default_rpc_endpoint)
+        
+        with reporter.step("Tick epoch and check container was deleted"):
+            self.tick_epoch()
+            wait_for_container_deletion(default_wallet, cid, shell=self.shell, endpoint=cluster.default_rpc_endpoint)
+
+        with reporter.step(f"Check metrics value in each nodes, should not be show any result"):
+            futures = parallel(self.get_metrics_search_by_greps_parallel, cluster.cluster_nodes, command=metric_name, cid=cid)
+            metrics_results = [future.result() for future in futures if future.result() is not None]
+            assert len(metrics_results) == 0, f"Metrics value is not empty in Prometheus, actual value in nodes: {metrics_results}"

pytest_tests/testsuites/metrics/test_garbage_collector_metrics.py

@@ -16,6 +16,7 @@ from frostfs_testlib.testing.test_control import wait_for_success
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 class TestGarbageCollectorMetrics(ClusterTestBase):
     @wait_for_success(interval=10)
     def check_metrics_in_node(self, cluster_node: ClusterNode, counter_exp: int, **metrics_greps: str):
@@ -33,9 +34,7 @@ class TestGarbageCollectorMetrics(ClusterTestBase):
         return sum(map(int, result))
 
     @allure.title("Garbage collector expire_at object")
-    def test_garbage_collector_metrics_expire_at_object(
+    def test_garbage_collector_metrics_expire_at_object(self, simple_object_size: ObjectSize, default_wallet: WalletInfo, cluster: Cluster):
-        self, simple_object_size: ObjectSize, default_wallet: WalletInfo, cluster: Cluster
-    ):
         file_path = generate_file(simple_object_size.value)
         placement_policy = "REP 2 IN X CBF 2 SELECT 2 FROM * AS X"
         metrics_step = 1
@@ -43,9 +42,7 @@ class TestGarbageCollectorMetrics(ClusterTestBase):
         with reporter.step("Get current garbage collector metrics for each nodes"):
             metrics_counter = {}
             for node in cluster.cluster_nodes:
-                metrics_counter[node] = get_metrics_value(
+                metrics_counter[node] = get_metrics_value(node, command="frostfs_node_garbage_collector_marked_for_removal_objects_total")
-                    node, command="frostfs_node_garbage_collector_marked_for_removal_objects_total"
-                )
 
         with reporter.step(f"Create container with policy {placement_policy}"):
             cid = create_container(default_wallet, self.shell, cluster.default_rpc_endpoint, placement_policy)
@@ -63,18 +60,12 @@ class TestGarbageCollectorMetrics(ClusterTestBase):
 
         with reporter.step("Get object nodes"):
             object_storage_nodes = get_nodes_with_object(cid, oid, self.shell, cluster.storage_nodes)
-            object_nodes = [
+            object_nodes = [cluster_node for cluster_node in cluster.cluster_nodes if cluster_node.storage_node in object_storage_nodes]
-                cluster_node
-                for cluster_node in cluster.cluster_nodes
-                if cluster_node.storage_node in object_storage_nodes
-            ]
 
         with reporter.step("Tick Epoch"):
             self.tick_epochs(epochs_to_tick=2, wait_block=2)
 
-        with reporter.step(
+        with reporter.step(f"Check garbage collector metrics 'the counter should increase by {metrics_step}' in object nodes"):
-            f"Check garbage collector metrics 'the counter should increase by {metrics_step}' in object nodes"
-        ):
             for node in object_nodes:
                 metrics_counter[node] += metrics_step
 
@@ -86,30 +77,38 @@ class TestGarbageCollectorMetrics(ClusterTestBase):
                 )
 
     @allure.title("Garbage collector delete object")
-    def test_garbage_collector_metrics_deleted_objects(
+    def test_garbage_collector_metrics_deleted_objects(self, simple_object_size: ObjectSize, default_wallet: WalletInfo, cluster: Cluster):
-        self, simple_object_size: ObjectSize, default_wallet: WalletInfo, cluster: Cluster
-    ):
         file_path = generate_file(simple_object_size.value)
         placement_policy = "REP 2 IN X CBF 2 SELECT 2 FROM * AS X"
         metrics_step = 1
 
-        with reporter.step("Select random node"):
+        with reporter.step("Get current garbage collector metrics for each nodes"):
-            node = random.choice(cluster.cluster_nodes)
+            metrics_counter = {}
-
+            for node in cluster.cluster_nodes:
-        with reporter.step("Get current garbage collector metrics for selected node"):
+                metrics_counter[node] = get_metrics_value(node, command="frostfs_node_garbage_collector_deleted_objects_total")
-            metrics_counter = get_metrics_value(node, command="frostfs_node_garbage_collector_deleted_objects_total")
 
         with reporter.step(f"Create container with policy {placement_policy}"):
             cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy)
 
-        with reporter.step("Put object to selected node"):
+        with reporter.step("Put object to random node"):
-            oid = put_object(default_wallet, file_path, cid, self.shell, node.storage_node.get_rpc_endpoint())
+            oid = put_object_to_random_node(
+                default_wallet,
+                file_path,
+                cid,
+                self.shell,
+                cluster,
+            )
+
+        with reporter.step("Get object nodes"):
+            object_storage_nodes = get_nodes_with_object(cid, oid, self.shell, cluster.storage_nodes)
+            object_nodes = [cluster_node for cluster_node in cluster.cluster_nodes if cluster_node.storage_node in object_storage_nodes]
 
         with reporter.step("Delete file, wait until gc remove object"):
             delete_object(default_wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
 
         with reporter.step(f"Check garbage collector metrics 'the counter should increase by {metrics_step}'"):
-            metrics_counter += metrics_step
+            for node in object_nodes:
-            check_metrics_counter(
+                exp_metrics_counter = metrics_counter[node] + metrics_step
-                [node], counter_exp=metrics_counter, command="frostfs_node_garbage_collector_deleted_objects_total"
+                check_metrics_counter(
-            )
+                    [node], counter_exp=exp_metrics_counter, command="frostfs_node_garbage_collector_deleted_objects_total"
+                )

pytest_tests/testsuites/metrics/test_grpc_metrics.py

@@ -18,6 +18,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 class TestGRPCMetrics(ClusterTestBase):
     @pytest.fixture
     def disable_policer(self, cluster_state_controller: ClusterStateController):
@@ -34,9 +35,7 @@ class TestGRPCMetrics(ClusterTestBase):
             node = random.choice(cluster.cluster_nodes)
 
         with reporter.step("Get current gRPC metrics for method 'Put'"):
-            metrics_counter_put = get_metrics_value(
+            metrics_counter_put = get_metrics_value(node, command="grpc_server_handled_total", service="ContainerService", method="Put")
-                node, command="grpc_server_handled_total", service="ContainerService", method="Put"
-            )
 
         with reporter.step(f"Create container with policy {placement_policy}"):
             cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy)
@@ -52,9 +51,7 @@ class TestGRPCMetrics(ClusterTestBase):
             )
 
         with reporter.step("Get current gRPC metrics for method 'Get'"):
-            metrics_counter_get = get_metrics_value(
+            metrics_counter_get = get_metrics_value(node, command="grpc_server_handled_total", service="ContainerService", method="Get")
-                node, command="grpc_server_handled_total", service="ContainerService", method="Get"
-            )
 
         with reporter.step(f"Get container"):
             get_container(default_wallet, cid, self.shell, node.storage_node.get_rpc_endpoint())
@@ -70,9 +67,7 @@ class TestGRPCMetrics(ClusterTestBase):
             )
 
         with reporter.step("Get current gRPC metrics for method 'List'"):
-            metrics_counter_list = get_metrics_value(
+            metrics_counter_list = get_metrics_value(node, command="grpc_server_handled_total", service="ContainerService", method="List")
-                node, command="grpc_server_handled_total", service="ContainerService", method="List"
-            )
 
         with reporter.step(f"Get container list"):
             list_containers(default_wallet, self.shell, node.storage_node.get_rpc_endpoint())
@@ -101,9 +96,7 @@ class TestGRPCMetrics(ClusterTestBase):
             cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy)
 
         with reporter.step("Get current gRPC metrics for method 'Put'"):
-            metrics_counter_put = get_metrics_value(
+            metrics_counter_put = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Put")
-                node, command="grpc_server_handled_total", service="ObjectService", method="Put"
-            )
 
         with reporter.step("Put object to selected node"):
             oid = put_object(default_wallet, file_path, cid, self.shell, node.storage_node.get_rpc_endpoint())
@@ -119,9 +112,7 @@ class TestGRPCMetrics(ClusterTestBase):
             )
 
         with reporter.step("Get current gRPC metrics for method 'Get'"):
-            metrics_counter_get = get_metrics_value(
+            metrics_counter_get = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Get")
-                node, command="grpc_server_handled_total", service="ObjectService", method="Get"
-            )
 
         with reporter.step(f"Get object"):
             get_object(default_wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
@@ -137,9 +128,7 @@ class TestGRPCMetrics(ClusterTestBase):
             )
 
         with reporter.step("Get current gRPC metrics for method 'Search'"):
-            metrics_counter_search = get_metrics_value(
+            metrics_counter_search = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Search")
-                node, command="grpc_server_handled_total", service="ObjectService", method="Search"
-            )
 
         with reporter.step(f"Search object"):
             search_object(default_wallet, cid, self.shell, node.storage_node.get_rpc_endpoint())
@@ -155,9 +144,7 @@ class TestGRPCMetrics(ClusterTestBase):
             )
 
         with reporter.step("Get current gRPC metrics for method 'Head'"):
-            metrics_counter_head = get_metrics_value(
+            metrics_counter_head = get_metrics_value(node, command="grpc_server_handled_total", service="ObjectService", method="Head")
-                node, command="grpc_server_handled_total", service="ObjectService", method="Head"
-            )
 
         with reporter.step(f"Head object"):
             head_object(default_wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
@@ -178,9 +165,7 @@ class TestGRPCMetrics(ClusterTestBase):
             node = random.choice(cluster.cluster_nodes)
 
         with reporter.step("Get current gRPC metrics for Healthcheck"):
-            metrics_counter = get_metrics_value(
+            metrics_counter = get_metrics_value(node, command="grpc_server_handled_total", service="TreeService", method="Healthcheck")
-                node, command="grpc_server_handled_total", service="TreeService", method="Healthcheck"
-            )
 
         with reporter.step("Query Tree healthcheck status"):
             healthcheck.tree_healthcheck(node)
@@ -206,9 +191,7 @@ class TestGRPCMetrics(ClusterTestBase):
             cid = create_container(default_wallet, self.shell, node.storage_node.get_rpc_endpoint(), placement_policy)
 
         with reporter.step("Get current gRPC metrics for Tree List"):
-            metrics_counter = get_metrics_value(
+            metrics_counter = get_metrics_value(node, command="grpc_server_handled_total", service="TreeService", method="TreeList")
-                node, command="grpc_server_handled_total", service="TreeService", method="TreeList"
-            )
 
         with reporter.step("Query Tree List"):
             get_tree_list(default_wallet, cid, self.shell, node.storage_node.get_rpc_endpoint())

pytest_tests/testsuites/metrics/test_logs_metrics.py

@@ -14,39 +14,45 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.testing.test_control import wait_for_success
 
 
+@pytest.mark.nightly
 class TestLogsMetrics(ClusterTestBase):
     @pytest.fixture
+    def revert_all(self, cluster_state_controller: ClusterStateController):
+        yield
+        cluster_state_controller.manager(ConfigStateManager).revert_all()
+
     def restart_storage_service(self, cluster_state_controller: ClusterStateController) -> datetime:
         config_manager = cluster_state_controller.manager(ConfigStateManager)
         config_manager.csc.stop_services_of_type(StorageNode)
         restart_time = datetime.now(timezone.utc)
         config_manager.csc.start_services_of_type(StorageNode)
-        yield restart_time
+        return restart_time
-
-        cluster_state_controller.manager(ConfigStateManager).revert_all()
 
     @wait_for_success(interval=10)
     def check_metrics_in_node(self, cluster_node: ClusterNode, restart_time: datetime, log_priority: str = None, **metrics_greps):
-        counter_logs = self.get_count_logs_by_level(cluster_node, metrics_greps.get("level"), restart_time, log_priority)
+        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 == 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, log_priority: str):
+    def get_count_logs_by_level(cluster_node: ClusterNode, log_level: str, after_time: datetime, until_time: datetime, log_priority: str):
         count_logs = 0
         try:
-            logs = cluster_node.host.get_filtered_logs(log_level, unit="frostfs-storage", since=after_time, priority=log_priority)
+            logs = cluster_node.host.get_filtered_logs(
-            result = re.findall(rf"\s+{log_level}\s+", logs)
+                log_level, unit="frostfs-storage", since=after_time, until=until_time, priority=log_priority
+            )
+            result = re.findall(rf":\s+{log_level}\s+", logs)
             count_logs += len(result)
         except RuntimeError as e:
             ...
         return count_logs
 
     @allure.title("Metrics for the log counter")
-    def test_log_counter_metrics(self, cluster: Cluster, restart_storage_service: datetime):
+    def test_log_counter_metrics(self, cluster_state_controller: ClusterStateController, revert_all):
-        restart_time = restart_storage_service
+        restart_time = self.restart_storage_service(cluster_state_controller)
         with reporter.step("Select random node"):
-            node = random.choice(cluster.cluster_nodes)
+            node = random.choice(self.cluster.cluster_nodes)
 
         with reporter.step(f"Check metrics count logs with level 'info'"):
             self.check_metrics_in_node(

pytest_tests/testsuites/metrics/test_object_metrics.py

@@ -16,6 +16,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 class TestObjectMetrics(ClusterTestBase):
     @allure.title("Object metrics of removed container (obj_size={object_size})")
     def test_object_metrics_removed_container(self, object_size: ObjectSize, default_wallet: WalletInfo, cluster: Cluster):

pytest_tests/testsuites/metrics/test_shard_metrics.py

@@ -19,6 +19,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 class TestShardMetrics(ClusterTestBase):
     @pytest.fixture()
     @allure.title("Get two shards for set mode")
@@ -73,9 +74,7 @@ class TestShardMetrics(ClusterTestBase):
             data_path = node.storage_node.get_data_directory()
             all_datas = node_shell.exec(f"ls -la {data_path}/data | awk '{{ print $9 }}'").stdout.strip()
             for data_dir in all_datas.replace(".", "").strip().split("\n"):
-                check_dir = node_shell.exec(
+                check_dir = node_shell.exec(f" [ -d {data_path}/data/{data_dir}/data/{oid_path} ] && echo 1 || echo 0").stdout
-                    f" [ -d {data_path}/data/{data_dir}/data/{oid_path} ] && echo 1 || echo 0"
-                ).stdout
                 if "1" in check_dir:
                     object_path = f"{data_path}/data/{data_dir}/data/{oid_path}"
                     object_name = f"{oid[4:]}.{cid}"
@@ -128,9 +127,7 @@ class TestShardMetrics(ClusterTestBase):
                 )
 
     @allure.title("Metric for error count on shard")
-    def test_shard_metrics_error_count(
+    def test_shard_metrics_error_count(self, max_object_size: int, default_wallet: WalletInfo, cluster: Cluster, revert_all_shards_mode):
-        self, max_object_size: int, default_wallet: WalletInfo, cluster: Cluster, revert_all_shards_mode
-    ):
         file_path = generate_file(round(max_object_size * 0.8))
 
         with reporter.step(f"Create container"):
@@ -147,11 +144,7 @@ class TestShardMetrics(ClusterTestBase):
 
         with reporter.step("Get object nodes"):
             object_storage_nodes = get_nodes_with_object(cid, oid, self.shell, cluster.storage_nodes)
-            object_nodes = [
+            object_nodes = [cluster_node for cluster_node in cluster.cluster_nodes if cluster_node.storage_node in object_storage_nodes]
-                cluster_node
-                for cluster_node in cluster.cluster_nodes
-                if cluster_node.storage_node in object_storage_nodes
-            ]
             node = random.choice(object_nodes)
 
         with reporter.step("Search object in system."):

pytest_tests/testsuites/object/test_object_api.py

@@ -54,9 +54,7 @@ RANGE_MAX_LEN = 500
 STATIC_RANGES = {}
 
 
-def generate_ranges(
+def generate_ranges(storage_object: StorageObjectInfo, max_object_size: int, shell: Shell, cluster: Cluster) -> list[(int, int)]:
-    storage_object: StorageObjectInfo, max_object_size: int, shell: Shell, cluster: Cluster
-) -> list[(int, int)]:
     file_range_step = storage_object.size / RANGES_COUNT
 
     file_ranges = []
@@ -101,12 +99,8 @@ def common_container(default_wallet: WalletInfo, client_shell: Shell, cluster: C
 
 
 @pytest.fixture(scope="module")
-def container_nodes(
+def container_nodes(default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, common_container: str) -> list[ClusterNode]:
-    default_wallet: WalletInfo, client_shell: Shell, cluster: Cluster, common_container: str
+    return search_nodes_with_container(default_wallet, common_container, client_shell, cluster.default_rpc_endpoint, cluster)
-) -> list[ClusterNode]:
-    return search_nodes_with_container(
-        default_wallet, common_container, client_shell, cluster.default_rpc_endpoint, cluster
-    )
 
 
 @pytest.fixture(scope="module")
@@ -127,9 +121,7 @@ def storage_objects(
 ) -> list[StorageObjectInfo]:
     wallet = default_wallet
     # Separate containers for complex/simple objects to avoid side-effects
-    cid = create_container(
+    cid = create_container(wallet, shell=client_shell, rule=placement_policy.value, endpoint=cluster.default_rpc_endpoint)
-        wallet, shell=client_shell, rule=placement_policy.value, endpoint=cluster.default_rpc_endpoint
-    )
 
     file_path = generate_file(object_size.value)
     file_hash = get_file_hash(file_path)
@@ -170,6 +162,7 @@ def expected_object_copies(placement_policy: PlacementPolicy) -> int:
     return 4
 
 
+@pytest.mark.nightly
 @pytest.mark.sanity
 @pytest.mark.grpc_api
 class TestObjectApi(ClusterTestBase):
@@ -251,9 +244,7 @@ class TestObjectApi(ClusterTestBase):
     @allure.title("Head deleted object with --raw arg (obj_size={object_size}, policy={placement_policy})")
     def test_object_head_raw(self, default_wallet: str, object_size: ObjectSize, placement_policy: PlacementPolicy):
         with reporter.step("Create container"):
-            cid = create_container(
+            cid = create_container(default_wallet, self.shell, self.cluster.default_rpc_endpoint, placement_policy.value)
-                default_wallet, self.shell, self.cluster.default_rpc_endpoint, placement_policy.value
-            )
 
         with reporter.step("Upload object"):
             file_path = generate_file(object_size.value)
@@ -356,9 +347,7 @@ class TestObjectApi(ClusterTestBase):
                     endpoint=self.cluster.default_rpc_endpoint,
                 )["header"]
                 object_type = header["objectType"]
-                assert (
+                assert object_type == "TOMBSTONE", f"Object wasn't deleted properly. Found object {tombstone_oid} with type {object_type}"
-                    object_type == "TOMBSTONE"
-                ), f"Object wasn't deleted properly. Found object {tombstone_oid} with type {object_type}"
 
     @allure.title("Get range hash by native API (obj_size={object_size}, policy={placement_policy})")
     @pytest.mark.grpc_api
@@ -419,8 +408,7 @@ class TestObjectApi(ClusterTestBase):
                         range_cut=range_cut,
                     )
                     assert (
-                        get_file_content(file_path, content_len=range_len, mode="rb", offset=range_start)
+                        get_file_content(file_path, content_len=range_len, mode="rb", offset=range_start) == range_content
-                        == range_content
                     ), f"Expected range content to match {range_cut} slice of file payload"
 
     @allure.title("[NEGATIVE] Get invalid range by native API (obj_size={object_size}, policy={placement_policy})")
@@ -438,9 +426,7 @@ class TestObjectApi(ClusterTestBase):
         oids = [storage_object.oid for storage_object in storage_objects[:2]]
         file_size = storage_objects[0].size
 
-        assert (
+        assert RANGE_MIN_LEN < file_size, f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})"
-            RANGE_MIN_LEN < file_size
-        ), f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})"
 
         file_ranges_to_test: list[tuple(int, int, str)] = [
             # Offset is bigger than the file size, the length is small.
@@ -485,9 +471,7 @@ class TestObjectApi(ClusterTestBase):
         oids = [storage_object.oid for storage_object in storage_objects[:2]]
         file_size = storage_objects[0].size
 
-        assert (
+        assert RANGE_MIN_LEN < file_size, f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})"
-            RANGE_MIN_LEN < file_size
-        ), f"Incorrect test setup. File size ({file_size}) is less than RANGE_MIN_LEN ({RANGE_MIN_LEN})"
 
         file_ranges_to_test: list[tuple(int, int, str)] = [
             # Offset is bigger than the file size, the length is small.
@@ -530,9 +514,7 @@ class TestObjectApi(ClusterTestBase):
 
         with reporter.step("Put object to container"):
             container_node = random.choice(container_nodes)
-            oid = put_object(
+            oid = put_object(default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint())
-                default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint()
-            )
 
         with reporter.step("Get range from container node endpoint"):
             get_range(
@@ -567,9 +549,7 @@ class TestObjectApi(ClusterTestBase):
 
         with reporter.step("Put object to container"):
             container_node = random.choice(container_nodes)
-            oid = put_object(
+            oid = put_object(default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint())
-                default_wallet, file_path, common_container, self.shell, container_node.storage_node.get_rpc_endpoint()
-            )
 
         with reporter.step("Get range hash from container node endpoint"):
             get_range_hash(
@@ -595,6 +575,4 @@ class TestObjectApi(ClusterTestBase):
     def check_header_is_presented(self, head_info: dict, object_header: dict) -> None:
         for key_to_check, val_to_check in object_header.items():
             assert key_to_check in head_info["header"]["attributes"], f"Key {key_to_check} is found in {head_object}"
-            assert head_info["header"]["attributes"].get(key_to_check) == str(
+            assert head_info["header"]["attributes"].get(key_to_check) == str(val_to_check), f"Value {val_to_check} is equal"
-                val_to_check
-            ), f"Value {val_to_check} is equal"

pytest_tests/testsuites/object/test_object_api_bearer.py

@@ -21,8 +21,8 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.testing.test_control import expect_not_raises
 from pytest import FixtureRequest
 
-from pytest_tests.helpers.bearer_token import create_bearer_token
+from ...helpers.bearer_token import create_bearer_token
-from pytest_tests.helpers.container_access import assert_full_access_to_container
+from ...helpers.container_access import assert_full_access_to_container
 
 
 @pytest.fixture(scope="session")
@@ -62,7 +62,7 @@ def storage_objects(
     return storage_objects
 
 
-@pytest.mark.smoke
+@pytest.mark.nightly
 @pytest.mark.bearer
 @pytest.mark.ape
 class TestObjectApiWithBearerToken(ClusterTestBase):

pytest_tests/testsuites/object/test_object_lifetime.py

@@ -12,11 +12,12 @@ 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, get_file_hash
 
-from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes
+from ...helpers.utility import wait_for_gc_pass_on_storage_nodes
 
 logger = logging.getLogger("NeoLogger")
 
 
+@pytest.mark.nightly
 @pytest.mark.sanity
 @pytest.mark.grpc_api
 class TestObjectApiLifetime(ClusterTestBase):

pytest_tests/testsuites/object/test_object_lock.py

@@ -1,6 +1,5 @@
 import logging
 import re
-from datetime import datetime
 
 import allure
 import pytest
@@ -30,9 +29,9 @@ from frostfs_testlib.storage.dataclasses.storage_object_info import LockObjectIn
 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, wait_for_success
-from frostfs_testlib.utils import datetime_utils
+from frostfs_testlib.utils import datetime_utils, string_utils
 
-from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes
+from ...helpers.utility import wait_for_gc_pass_on_storage_nodes
 
 logger = logging.getLogger("NeoLogger")
 
@@ -43,7 +42,7 @@ FIXTURE_OBJECT_LIFETIME = 10
 @pytest.fixture(scope="module")
 def user_wallet(credentials_provider: CredentialsProvider, cluster: Cluster) -> WalletInfo:
     with reporter.step("Create user wallet with container"):
-        user = User(f"user_{hex(int(datetime.now().timestamp() * 1000000))}")
+        user = User(string_utils.unique_name("user-"))
         return credentials_provider.GRPC.provide(user, cluster.cluster_nodes[0])
 
 
@@ -67,9 +66,7 @@ def locked_storage_object(
         current_epoch = ensure_fresh_epoch(client_shell, cluster)
         expiration_epoch = current_epoch + FIXTURE_LOCK_LIFETIME
 
-        storage_object = user_container.generate_object(
+        storage_object = user_container.generate_object(object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME)
-            object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME
-        )
         lock_object_id = lock_object(
             storage_object.wallet,
             storage_object.cid,
@@ -78,9 +75,7 @@ def locked_storage_object(
             cluster.default_rpc_endpoint,
             lifetime=FIXTURE_LOCK_LIFETIME,
         )
-        storage_object.locks = [
+        storage_object.locks = [LockObjectInfo(storage_object.cid, lock_object_id, FIXTURE_LOCK_LIFETIME, expiration_epoch)]
-            LockObjectInfo(storage_object.cid, lock_object_id, FIXTURE_LOCK_LIFETIME, expiration_epoch)
-        ]
 
     yield storage_object
 
@@ -131,6 +126,7 @@ def verify_object_available(wallet: WalletInfo, cid: str, oid: str, shell: Shell
         )
 
 
+@pytest.mark.nightly
 @pytest.mark.grpc_object_lock
 class TestObjectLockWithGrpc(ClusterTestBase):
     @pytest.fixture()
@@ -142,9 +138,7 @@ class TestObjectLockWithGrpc(ClusterTestBase):
         with reporter.step("Creating locked object"):
             current_epoch = self.get_epoch()
 
-            storage_object = user_container.generate_object(
+            storage_object = user_container.generate_object(object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME)
-                object_size.value, expire_at=current_epoch + FIXTURE_OBJECT_LIFETIME
-            )
             lock_object(
                 storage_object.wallet,
                 storage_object.cid,
@@ -220,9 +214,7 @@ class TestObjectLockWithGrpc(ClusterTestBase):
                 1,
             )
 
-    @allure.title(
+    @allure.title("Lock must contain valid lifetime or expire_at field: (lifetime={wrong_lifetime}, expire-at={wrong_expire_at})")
-        "Lock must contain valid lifetime or expire_at field: (lifetime={wrong_lifetime}, expire-at={wrong_expire_at})"
-    )
     # We operate with only lock object here so no complex object needed in this test
     @pytest.mark.parametrize("object_size", ["simple"], indirect=True)
     @pytest.mark.parametrize(
@@ -675,9 +667,7 @@ class TestObjectLockWithGrpc(ClusterTestBase):
 
         with reporter.step("Generate two objects"):
             for epoch_i in range(2):
-                storage_objects.append(
+                storage_objects.append(user_container.generate_object(object_size.value, expire_at=current_epoch + epoch_i + 3))
-                    user_container.generate_object(object_size.value, expire_at=current_epoch + epoch_i + 3)
-                )
 
         self.tick_epoch()
 

pytest_tests/testsuites/object/test_object_without_user.py

@@ -0,0 +1,415 @@
+import logging
+import re
+
+import allure
+import pytest
+from frostfs_testlib import reporter
+from frostfs_testlib.cli import FrostfsCli
+from frostfs_testlib.resources.cli import CLI_DEFAULT_TIMEOUT, FROSTFS_CLI_EXEC
+from frostfs_testlib.resources.error_patterns import OBJECT_IS_LOCKED
+from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL_F
+from frostfs_testlib.shell import Shell
+from frostfs_testlib.steps.cli.container import create_container
+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 TestFile, get_file_hash
+
+logger = logging.getLogger("NeoLogger")
+
+
+@pytest.mark.nightly
+@pytest.mark.grpc_without_user
+class TestObjectApiWithoutUser(ClusterTestBase):
+    def _parse_oid(self, stdout: str) -> str:
+        id_str = stdout.strip().split("\n")[-2]
+        oid = id_str.split(":")[1]
+        return oid.strip()
+
+    def _parse_tombstone_oid(self, stdout: str) -> str:
+        id_str = stdout.split("\n")[1]
+        tombstone = id_str.split(":")[1]
+        return tombstone.strip()
+
+    @pytest.fixture(scope="function")
+    def public_container(self, default_wallet: WalletInfo) -> str:
+        with reporter.step("Create public container"):
+            cid_public = create_container(
+                default_wallet,
+                self.shell,
+                self.cluster.default_rpc_endpoint,
+                basic_acl=PUBLIC_ACL_F,
+            )
+
+        return cid_public
+
+    @pytest.fixture(scope="class")
+    def frostfs_cli(self, client_shell: Shell) -> FrostfsCli:
+        return FrostfsCli(client_shell, FROSTFS_CLI_EXEC)
+
+    @allure.title("Get public container by native API with generate private key")
+    def test_get_container_with_generated_key(self, frostfs_cli: FrostfsCli, public_container: str):
+        """
+        Validate `container get` native API with flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Get container with generate key"):
+            with expect_not_raises():
+                frostfs_cli.container.get(rpc_endpoint, cid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+    @allure.title("Get list containers by native API with generate private key")
+    def test_list_containers_with_generated_key(self, frostfs_cli: FrostfsCli, default_wallet: WalletInfo, public_container: str):
+        """
+        Validate `container list` native API with flag `--generate-key`.
+        """
+
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+        owner = default_wallet.get_address_from_json(0)
+
+        with reporter.step("List containers with generate key"):
+            with expect_not_raises():
+                result = frostfs_cli.container.list(rpc_endpoint, owner=owner, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+        with reporter.step("Expect container in received containers list"):
+            containers = result.stdout.split()
+            assert public_container in containers
+
+    @allure.title("Get list of public container objects by native API with generate private key")
+    def test_list_objects_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str):
+        """
+        Validate `container list_objects` native API with flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("List objects with generate key"):
+            with expect_not_raises():
+                result = frostfs_cli.container.list_objects(rpc_endpoint, cid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+        with reporter.step("Expect empty objects list"):
+            objects = result.stdout.split()
+            assert len(objects) == 0, objects
+
+    @allure.title("Search public container nodes by native API with generate private key")
+    def test_search_nodes_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str):
+        """
+        Validate `container search_node` native API with flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Search nodes with generate key"):
+            with expect_not_raises():
+                frostfs_cli.container.search_node(rpc_endpoint, cid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+    @allure.title("Put object into public container by native API with generate private key (obj_size={object_size})")
+    def test_put_object_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object put` into container with public ACL and flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            with expect_not_raises():
+                result = frostfs_cli.object.put(
+                    rpc_endpoint,
+                    cid,
+                    file_path,
+                    generate_key=True,
+                    no_progress=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("List objects with generate key"):
+            result = frostfs_cli.container.list_objects(rpc_endpoint, cid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+        with reporter.step("Expect object in received objects list"):
+            objects = result.stdout.split()
+            assert oid in objects, objects
+
+    @allure.title("Get public container object by native API with generate private key (obj_size={object_size})")
+    def test_get_object_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object get` for container with public ACL and flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+        expected_hash = get_file_hash(file_path)
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Get object with generate key"):
+            with expect_not_raises():
+                frostfs_cli.object.get(
+                    rpc_endpoint,
+                    cid,
+                    oid,
+                    file=file_path,
+                    generate_key=True,
+                    no_progress=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                )
+
+        downloaded_hash = get_file_hash(file_path)
+
+        with reporter.step("Validate downloaded file"):
+            assert expected_hash == downloaded_hash
+
+    @allure.title("Head public container object by native API with generate private key (obj_size={object_size})")
+    def test_head_object_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object head` for container with public ACL and flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Head object with generate key"):
+            with expect_not_raises():
+                frostfs_cli.object.head(rpc_endpoint, cid, oid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+    @allure.title("Delete public container object by native API with generate private key (obj_size={object_size})")
+    def test_delete_object_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object delete` for container with public ACL and flag `--generate key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Delete object with generate key"):
+            with expect_not_raises():
+                result = frostfs_cli.object.delete(rpc_endpoint, cid, oid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+        oid = self._parse_tombstone_oid(result.stdout)
+
+        with reporter.step("Head object with generate key"):
+            result = frostfs_cli.object.head(
+                rpc_endpoint,
+                cid,
+                oid,
+                generate_key=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        with reporter.step("Expect object type TOMBSTONE"):
+            object_type = re.search(r"(?<=type: )tombstone", result.stdout, re.IGNORECASE).group()
+            assert object_type == "TOMBSTONE", object_type
+
+    @allure.title("Lock public container object by native API with generate private key (obj_size={object_size})")
+    def test_lock_object_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object lock` for container with public ACL and flag `--generate-key`.
+        Attempt to delete the locked object.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Lock object with generate key"):
+            with expect_not_raises():
+                frostfs_cli.object.lock(
+                    rpc_endpoint,
+                    cid,
+                    oid,
+                    generate_key=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                    lifetime=5,
+                )
+
+        with reporter.step("Delete locked object with generate key and expect error"):
+            with pytest.raises(Exception, match=OBJECT_IS_LOCKED):
+                frostfs_cli.object.delete(
+                    rpc_endpoint,
+                    cid,
+                    oid,
+                    generate_key=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                )
+
+    @allure.title("Search public container objects by native API with generate private key (obj_size={object_size})")
+    def test_search_object_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object search` for container with public ACL and flag `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Object search with generate key"):
+            with expect_not_raises():
+                result = frostfs_cli.object.search(rpc_endpoint, cid, generate_key=True, timeout=CLI_DEFAULT_TIMEOUT)
+
+        with reporter.step("Expect object in received objects list of container"):
+            object_ids = re.findall(r"(\w{43,44})", result.stdout)
+            assert oid in object_ids
+
+    @allure.title("Get range of public container object by native API with generate private key (obj_size={object_size})")
+    def test_range_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object range` for container with public ACL and `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Get range of object with generate key"):
+            with expect_not_raises():
+                frostfs_cli.object.range(
+                    rpc_endpoint,
+                    cid,
+                    oid,
+                    "0:10",
+                    file=file_path,
+                    generate_key=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                )
+
+    @allure.title("Get hash of public container object by native API with generate private key (obj_size={object_size})")
+    def test_hash_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object hash` for container with public ACL and `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                generate_key=True,
+                no_progress=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Get range hash of object with generate key"):
+            with expect_not_raises():
+                frostfs_cli.object.hash(
+                    rpc_endpoint,
+                    cid,
+                    oid,
+                    range="0:10",
+                    generate_key=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                )
+
+    @allure.title("Get public container object nodes by native API with generate private key (obj_size={object_size})")
+    def test_nodes_with_generate_key(self, frostfs_cli: FrostfsCli, public_container: str, file_path: TestFile):
+        """
+        Validate `object nodes` for container with public ACL and `--generate-key`.
+        """
+
+        cid = public_container
+        rpc_endpoint = self.cluster.default_rpc_endpoint
+
+        with reporter.step("Put object with generate key"):
+            result = frostfs_cli.object.put(
+                rpc_endpoint,
+                cid,
+                file_path,
+                no_progress=True,
+                generate_key=True,
+                timeout=CLI_DEFAULT_TIMEOUT,
+            )
+
+        oid = self._parse_oid(result.stdout)
+
+        with reporter.step("Configure frostfs-cli for alive remote node"):
+            alive_node = self.cluster.cluster_nodes[0]
+            node_shell = alive_node.host.get_shell()
+            rpc_endpoint = alive_node.storage_node.get_rpc_endpoint()
+            node_frostfs_cli = FrostfsCli(node_shell, FROSTFS_CLI_EXEC)
+
+        with reporter.step("Get object nodes with generate key"):
+            with expect_not_raises():
+                node_frostfs_cli.object.nodes(
+                    rpc_endpoint,
+                    cid,
+                    oid=oid,
+                    generate_key=True,
+                    timeout=CLI_DEFAULT_TIMEOUT,
+                )

pytest_tests/testsuites/replication/test_ec_replication.py

@@ -1,5 +1,5 @@
 import json
-from dataclasses import dataclass
+import time
 
 import allure
 import pytest
@@ -7,20 +7,22 @@ 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.credentials.interfaces import User
+from frostfs_testlib.resources.cli import CLI_DEFAULT_TIMEOUT, FROSTFS_ADM_CONFIG_PATH, FROSTFS_ADM_EXEC, FROSTFS_CLI_EXEC
-from frostfs_testlib.resources.cli import 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.shell import Shell
+from frostfs_testlib.s3 import AwsCliClient, S3ClientWrapper
-from frostfs_testlib.steps.cli.object import get_object, put_object
+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
 from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
-from frostfs_testlib.storage.dataclasses.storage_object_info import NodeNetmapInfo
+from frostfs_testlib.storage.dataclasses.storage_object_info import Chunk
+from frostfs_testlib.storage.grpc_operations.interfaces import GrpcClientWrapper
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
-from frostfs_testlib.utils.cli_utils import parse_netmap_output
+from frostfs_testlib.testing.test_control import wait_for_success
+from frostfs_testlib.utils import datetime_utils
 from frostfs_testlib.utils.file_utils import generate_file, get_file_hash
 
-from pytest_tests.resources.common import HOSTING_CONFIG_FILE
+from ...resources.common import S3_POLICY_FILE_LOCATION
 
 
 def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
@@ -33,32 +35,14 @@ def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
     node_count = len(hosting_config["hosts"])
 
     ec_map = {
-        4: ["EC 1.1", "EC 2.1", "EC 3.1"],
+        4: ["EC 1.1", "EC 2.1", "EC 3.1", "EC 2.2"],
-        8: ["EC 5.3", "EC 3.2", "EC 7.1", "EC 4.4"],
+        8: ["EC 5.3", "EC 3.2", "EC 7.1", "EC 4.4", "EC 3.1"],
         16: ["EC 12.4", "EC 8.4", "EC 5.3", "EC 4.4"],
         100: ["EC 12.4", "EC 8.4", "EC 5.3", "EC 4.4"],
     }
 
-    metafunc.parametrize("ec_policy, node_count", ((ec_policy, node_count) for ec_policy in ec_map[node_count]))
+    nearest_node_count = ([4] + (list(filter(lambda x: x <= node_count, ec_map.keys()))))[-1]
-
+    metafunc.parametrize("ec_policy, node_count", ((ec_policy, node_count) for ec_policy in ec_map[nearest_node_count]))
-
-@dataclass
-class Chunk:
-    def __init__(self, object_id: str, required_nodes: list, confirmed_nodes: list, ec_parent_object_id: str, ec_index: int) -> None:
-        self.object_id = object_id
-        self.required_nodes = required_nodes
-        self.confirmed_nodes = confirmed_nodes
-        self.ec_parent_object_id = ec_parent_object_id
-        self.ec_index = ec_index
-
-    def __str__(self) -> str:
-        return self.object_id
-
-
-@allure.title("Initialized local FrostfsCli")
-@pytest.fixture()
-def frostfs_local_cli(client_shell: Shell, default_user: User) -> FrostfsCli:
-    return FrostfsCli(client_shell, frostfs_cli_exec_path=FROSTFS_CLI_EXEC, config_file=default_user.wallet.config_path)
 
 
 @allure.title("Initialized remote FrostfsAdm")
@@ -69,9 +53,39 @@ def frostfs_remote_adm(cluster: Cluster) -> FrostfsAdm:
     return FrostfsAdm(shell, frostfs_adm_exec_path=FROSTFS_ADM_EXEC, config_file=FROSTFS_ADM_CONFIG_PATH)
 
 
+@pytest.mark.nightly
 @pytest.mark.replication
 @pytest.mark.ec_replication
 class TestECReplication(ClusterTestBase):
+    def get_node_cli(self, cluster_node: ClusterNode, config: str) -> FrostfsCli:
+        shell = cluster_node.host.get_shell()
+        cli = FrostfsCli(shell, frostfs_cli_exec_path=FROSTFS_CLI_EXEC, config_file=config)
+        self.cli_change_shards_mode: dict[FrostfsCli, str] = {cli: cluster_node.storage_node.get_control_endpoint()}
+        return cli
+
+    @pytest.fixture()
+    def restore_nodes_shards_mode(self):
+        yield
+
+        for cli, endpoint in self.cli_change_shards_mode.items():
+            cli.shards.set_mode(endpoint, mode="read-write", all=True)
+
+        time.sleep(datetime_utils.parse_time(MORPH_BLOCK_TIME))
+
+    @pytest.fixture()
+    def rep_count(self, object_size: ObjectSize) -> int:
+        rep_count = 3
+        if object_size.name == "complex":
+            rep_count *= int(COMPLEX_OBJECT_CHUNKS_COUNT) + 1 if COMPLEX_OBJECT_TAIL_SIZE else int(COMPLEX_OBJECT_CHUNKS_COUNT)
+        return rep_count
+
+    @wait_for_success(120, 5)
+    def wait_replication(self, total_chunks: int, client: GrpcClientWrapper, cid: str, oid: str, success: bool = True) -> None:
+        if not success:
+            assert not self.check_replication(total_chunks, client, cid, oid)
+        else:
+            assert self.check_replication(total_chunks, client, cid, oid)
+
     @allure.title("Restore chunk maximum params in network params ")
     @pytest.fixture
     def restore_network_config(self, frostfs_remote_adm: FrostfsAdm) -> None:
@@ -82,12 +96,10 @@ class TestECReplication(ClusterTestBase):
     def get_object_nodes(self, cli: FrostfsCli, cid: str, oid: str, endpoint: str = None) -> dict:
         if not endpoint:
             endpoint = self.cluster.default_rpc_endpoint
-        return json.loads(cli.object.nodes(endpoint, cid, oid=oid, json=True).stdout)
+        object_nodes = json.loads(cli.object.nodes(endpoint, cid, oid=oid, json=True, timeout=CLI_DEFAULT_TIMEOUT).stdout)
-
+        if object_nodes.get("errors"):
-    @reporter.step("Get all chunks object ")
+            raise object_nodes["errors"]
-    def get_all_chunks_object(self, cli: FrostfsCli, cid: str, oid: str, endpoint: str = None) -> list[Chunk]:
+        return object_nodes
-        chunks = self.get_object_nodes(cli, cid, oid, endpoint)
-        return [Chunk(**chunk) for chunk in chunks["data_objects"]]
 
     @reporter.step("Get parity chunk ")
     def get_parity_chunk_object(self, cli: FrostfsCli, cid: str, oid: str, endpoint: str = None) -> Chunk:
@@ -99,414 +111,477 @@ class TestECReplication(ClusterTestBase):
         chunks = self.get_object_nodes(cli, cid, oid, endpoint)["data_objects"]
         return Chunk(**chunks[0])
 
-    @reporter.step("Search node without chunks ")
-    def search_node_not_chunks(self, chunks: list[Chunk], local_cli: FrostfsCli, endpoint: str = None) -> list[ClusterNode]:
-        if not endpoint:
-            self.cluster.default_rpc_endpoint
-        netmap = parse_netmap_output(local_cli.netmap.snapshot(endpoint).stdout)
-        chunks_node_key = []
-        for chunk in chunks:
-            chunks_node_key.extend(chunk.confirmed_nodes)
-        for node_info in netmap.copy():
-            if node_info.node_id in chunks_node_key and node_info in netmap:
-                netmap.remove(node_info)
-        result = []
-        for node_info in netmap:
-            for cluster_node in self.cluster.cluster_nodes:
-                if node_info.node == cluster_node.host_ip:
-                    result.append(cluster_node)
-        return result
-
-    @reporter.step("Create container, policy={policy}")
-    def create_container(self, user_cli: FrostfsCli, endpoint: str, policy: str) -> str:
-        return user_cli.container.create(endpoint, policy=policy, await_mode=True).stdout.split(" ")[1].strip().split("\n")[0]
-
-    @reporter.step("Search node chunk {chunk}")
-    def get_chunk_node(self, frostfs_cli: FrostfsCli, chunk: Chunk) -> tuple[ClusterNode, NodeNetmapInfo]:
-        netmap = parse_netmap_output(frostfs_cli.netmap.snapshot(self.cluster.default_rpc_endpoint).stdout)
-        for node_info in netmap:
-            if node_info.node_id in chunk.confirmed_nodes:
-                for cluster_node in self.cluster.cluster_nodes:
-                    if cluster_node.host_ip == node_info.node:
-                        return (cluster_node, node_info)
-
     @reporter.step("Check replication chunks={total_chunks} chunks ")
-    def check_replication(self, total_chunks: int, local_cli: FrostfsCli, cid: str, oid: str) -> bool:
+    def check_replication(self, total_chunks: int, client: GrpcClientWrapper, cid: str, oid: str) -> bool:
-        object_nodes_info = local_cli.object.nodes(self.cluster.default_rpc_endpoint, cid, oid=oid, json=True).stdout
+        object_nodes_info = client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
-        object_nodes_info = json.loads(object_nodes_info)
+        return len(object_nodes_info) == total_chunks
-        return len(object_nodes_info["data_objects"]) == total_chunks
+
+    @pytest.fixture()
+    def include_excluded_nodes(self, cluster_state_controller: ClusterStateController):
+        yield
+
+        cluster_state_controller.include_all_excluded_nodes()
 
     @allure.title("Disable Policer on all nodes")
     @pytest.fixture()
-    def disable_policer(
+    def disable_policer(self, cluster_state_controller: ClusterStateController) -> None:
-        self,
+        with reporter.step("Disable policer for nodes"):
-        cluster_state_controller: ClusterStateController,
-    ) -> None:
-        with reporter.step(f"Disable policer for nodes"):
             cluster_state_controller.manager(ConfigStateManager).set_on_all_nodes(
                 service_type=StorageNode, values={"policer": {"unsafe_disable": True}}
             )
         yield
-        with reporter.step(f"Enable policer for nodes"):
+        with reporter.step("Enable policer for nodes"):
             cluster_state_controller.start_stopped_hosts()
             cluster_state_controller.manager(ConfigStateManager).revert_all()
 
-    @allure.title("Create container with EC policy (size={object_size.value})")
+    @wait_for_success(300, 15)
-    def test_create_container_with_ec_policy(
+    @reporter.step("Check count nodes chunks")
-        self,
+    def wait_sync_count_chunks_nodes(self, grpc_client: GrpcClientWrapper, cid: str, oid: str, count: int):
-        default_user: User,
+        all_chunks_after_include_node = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
-        frostfs_local_cli: FrostfsCli,
+        chunks_nodes = [node for chunk in all_chunks_after_include_node for node in chunk.confirmed_nodes]
-        object_size: ObjectSize,
+        assert len(chunks_nodes) == count
-    ) -> None:
+
+    @allure.title("Create container with EC policy (size={object_size})")
+    def test_create_container_with_ec_policy(self, object_size: ObjectSize, rep_count: int, grpc_client: GrpcClientWrapper) -> None:
         test_file = generate_file(object_size.value)
-        rep_count = 3
+
-        if object_size.name == "complex":
-            rep_count *= 4
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 2.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
 
         with reporter.step("Put object in container."):
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check replication chunks."):
-            assert self.check_replication(rep_count, frostfs_local_cli, cid, oid)
+            assert self.check_replication(rep_count, grpc_client, cid, oid)
 
     @allure.title("Lose node with chunk data")
     @pytest.mark.failover
     def test_lose_node_with_data_chunk(
         self,
-        frostfs_local_cli: FrostfsCli,
+        grpc_client: GrpcClientWrapper,
-        default_user: User,
         simple_object_size: ObjectSize,
         cluster_state_controller: ClusterStateController,
         disable_policer: None,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 3.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 3.1", await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(simple_object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check chunk replication on 4 nodes."):
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            assert self.check_replication(4, grpc_client, cid, oid)
 
         with reporter.step("Search node data chunk"):
-            chunk = self.get_data_chunk_object(frostfs_local_cli, cid, oid)
+            chunk = grpc_client.object.chunks.get_first_data(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            chunk_node = self.get_chunk_node(frostfs_local_cli, chunk)[0]
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, chunk)
 
         with reporter.step("Stop node with data chunk."):
-            cluster_state_controller.stop_node_host(chunk_node, "hard")
+            cluster_state_controller.stop_node_host(chunk_node[0], "hard")
 
         with reporter.step("Get object"):
-            node = list(set(self.cluster.cluster_nodes) - {chunk_node})[0]
+            node = list(set(self.cluster.cluster_nodes) - {chunk_node[0]})[0]
-            get_object(default_user.wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
+            grpc_client.object.get(cid, oid, node.storage_node.get_rpc_endpoint())
 
         with reporter.step("Start stopped node, and check replication chunks."):
-            cluster_state_controller.start_node_host(chunk_node)
+            cluster_state_controller.start_node_host(chunk_node[0])
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            self.wait_replication(4, grpc_client, cid, oid)
 
     @allure.title("Lose node with chunk parity")
     @pytest.mark.failover
     def test_lose_node_with_parity_chunk(
         self,
-        frostfs_local_cli: FrostfsCli,
+        grpc_client: GrpcClientWrapper,
-        default_user: User,
         simple_object_size: ObjectSize,
         cluster_state_controller: ClusterStateController,
         disable_policer: None,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 3.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 3.1", await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(simple_object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check chunk replication on 4 nodes."):
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            assert self.check_replication(4, grpc_client, cid, oid)
 
         with reporter.step("Search node with parity chunk"):
-            chunk = self.get_parity_chunk_object(frostfs_local_cli, cid, oid)
+            chunk = grpc_client.object.chunks.get_parity(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            chunk_node = self.get_chunk_node(frostfs_local_cli, chunk)[0]
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, chunk)[0]
 
         with reporter.step("Stop node parity chunk."):
             cluster_state_controller.stop_node_host(chunk_node, "hard")
 
         with reporter.step("Get object, expect success."):
             node = list(set(self.cluster.cluster_nodes) - {chunk_node})[0]
-            get_object(default_user.wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
+            grpc_client.object.get(cid, oid, node.storage_node.get_rpc_endpoint())
 
         with reporter.step("Start stoped node, and check replication chunks."):
             cluster_state_controller.start_node_host(chunk_node)
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            self.wait_replication(4, grpc_client, cid, oid)
 
     @allure.title("Lose nodes with chunk data and parity")
     @pytest.mark.failover
     def test_lose_nodes_data_chunk_and_parity(
         self,
-        frostfs_local_cli: FrostfsCli,
+        grpc_client: GrpcClientWrapper,
-        default_user: User,
         simple_object_size: ObjectSize,
         cluster_state_controller: ClusterStateController,
         disable_policer: None,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 3.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 3.1", await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(simple_object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check count chunks, expect 4."):
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            assert self.check_replication(4, grpc_client, cid, oid)
 
         with reporter.step("Search node data chunk and node parity chunk"):
-            data_chunk = self.get_data_chunk_object(frostfs_local_cli, cid, oid)
+            data_chunk = grpc_client.object.chunks.get_first_data(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            node_data_chunk = self.get_chunk_node(frostfs_local_cli, data_chunk)[0]
+            data_chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, data_chunk)[0]
-            parity_chunk = self.get_parity_chunk_object(frostfs_local_cli, cid, oid)
+            parity_chunk = grpc_client.object.chunks.get_parity(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            node_parity_chunk = self.get_chunk_node(frostfs_local_cli, parity_chunk)[0]
+            parity_chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, parity_chunk)[0]
 
         with reporter.step("Stop node with data chunk."):
-            cluster_state_controller.stop_node_host(node_data_chunk, "hard")
+            cluster_state_controller.stop_node_host(data_chunk_node, "hard")
 
         with reporter.step("Get object"):
-            node = list(set(self.cluster.cluster_nodes) - {node_data_chunk, node_parity_chunk})[0]
+            node = list(set(self.cluster.cluster_nodes) - {data_chunk_node, parity_chunk_node})[0]
-            get_object(default_user.wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
+            grpc_client.object.get(cid, oid, node.storage_node.get_rpc_endpoint())
 
         with reporter.step("Start stopped host and check chunks."):
-            cluster_state_controller.start_node_host(node_data_chunk)
+            cluster_state_controller.start_node_host(data_chunk_node)
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            self.wait_replication(4, grpc_client, cid, oid)
 
         with reporter.step("Stop node with parity chunk and one all node."):
-            cluster_state_controller.stop_node_host(node_data_chunk, "hard")
+            cluster_state_controller.stop_node_host(data_chunk_node, "hard")
-            cluster_state_controller.stop_node_host(node_parity_chunk, "hard")
+            cluster_state_controller.stop_node_host(parity_chunk_node, "hard")
 
         with reporter.step("Get object, expect error."):
             with pytest.raises(RuntimeError):
-                get_object(default_user.wallet, cid, oid, self.shell, node.storage_node.get_rpc_endpoint())
+                grpc_client.object.get(cid, oid, node.storage_node.get_rpc_endpoint())
 
         with reporter.step("Start stopped nodes and check replication chunk."):
             cluster_state_controller.start_stopped_hosts()
-            assert self.check_replication(4, frostfs_local_cli, cid, oid)
+            self.wait_replication(4, grpc_client, cid, oid)
 
     @allure.title("Policer work with chunk")
     @pytest.mark.failover
     def test_work_policer_with_nodes(
         self,
         simple_object_size: ObjectSize,
-        frostfs_local_cli: FrostfsCli,
+        grpc_client: GrpcClientWrapper,
-        default_user: User,
         cluster_state_controller: ClusterStateController,
+        include_excluded_nodes: None,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 2.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
 
         with reporter.step("Put object on container."):
             test_file = generate_file(simple_object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check count chunks nodes on 3."):
-            assert self.check_replication(3, frostfs_local_cli, cid, oid)
+            assert self.check_replication(3, grpc_client, cid, oid)
 
-        with reporter.step("Stop node with chunk."):
+        with reporter.step("Search node with chunk."):
-            data_chunk = self.get_data_chunk_object(frostfs_local_cli, cid, oid)
+            data_chunk = grpc_client.object.chunks.get_first_data(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            first_all_chunks = self.get_all_chunks_object(frostfs_local_cli, cid, oid)
+            node_data_chunk = grpc_client.object.chunks.get_chunk_node(self.cluster, data_chunk)[0]
-            node_data_chunk = self.get_chunk_node(frostfs_local_cli, data_chunk)[0]
+            first_all_chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
-            cluster_state_controller.stop_node_host(node_data_chunk, "hard")
 
-        with reporter.step("Check replication chunk with different node."):
+        with reporter.step("Remove chunk node from network map"):
-            alive_endpoint = list(set(self.cluster.cluster_nodes) - {node_data_chunk})[0].storage_node.get_rpc_endpoint()
+            cluster_state_controller.remove_node_from_netmap([node_data_chunk.storage_node])
-            node = self.search_node_not_chunks(first_all_chunks, frostfs_local_cli, endpoint=alive_endpoint)[0]
+
-            second_all_chunks = self.get_all_chunks_object(frostfs_local_cli, cid, oid, node.storage_node.get_rpc_endpoint())
+        with reporter.step("Tick epoch."):
+            alive_node = list(set(self.cluster.cluster_nodes) - {node_data_chunk})[0]
+            self.tick_epoch(alive_node.storage_node, 2)
+
+        with reporter.step("Wait replication chunk with different node."):
+            node = grpc_client.object.chunks.search_node_without_chunks(
+                first_all_chunks, self.cluster, alive_node.storage_node.get_rpc_endpoint()
+            )[0]
+            self.wait_replication(3, grpc_client, cid, oid)
+
+        with reporter.step("Get new chunks"):
+            second_all_chunks = grpc_client.object.chunks.get_all(node.storage_node.get_rpc_endpoint(), cid, oid)
 
         with reporter.step("Check that oid no change."):
-            oid_chunk_check = [chunk for chunk in second_all_chunks if data_chunk.object_id == chunk.object_id]
+            assert [chunk for chunk in second_all_chunks if data_chunk.object_id == chunk.object_id]
-            assert len(oid_chunk_check) > 0
 
-        with reporter.step("Start stopped host, and check delete 4 chunk."):
+        with reporter.step("Include node in netmap"):
-            cluster_state_controller.start_node_host(node_data_chunk)
+            cluster_state_controller.include_node_to_netmap(node_data_chunk.storage_node, alive_node.storage_node)
-            all_chunks_after_start_node = self.get_all_chunks_object(frostfs_local_cli, cid, oid)
-            assert len(all_chunks_after_start_node) == 3
 
-    @allure.title("EC X.Y combinations (nodes={node_count},policy={ec_policy},size={object_size.name})")
+        self.wait_sync_count_chunks_nodes(grpc_client, cid, oid, 3)
+
+    @allure.title("EC X.Y combinations (nodes={node_count},policy={ec_policy},size={object_size})")
     def test_create_container_with_difference_count_nodes(
-        self,
+        self, node_count: int, ec_policy: str, object_size: ObjectSize, grpc_client: GrpcClientWrapper
-        node_count: int,
-        ec_policy: str,
-        object_size: ObjectSize,
-        default_user: User,
-        frostfs_local_cli: FrostfsCli,
     ) -> None:
         with reporter.step("Create container."):
             expected_chunks = int(ec_policy.split(" ")[1].split(".")[0]) + int(ec_policy.split(" ")[1].split(".")[1])
             if "complex" in object_size.name:
                 expected_chunks *= 4
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, ec_policy)
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy=ec_policy, await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check count object chunks."):
-            chunks = self.get_all_chunks_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
             assert len(chunks) == expected_chunks
 
         with reporter.step("get object and check hash."):
-            file_with_node = get_object(default_user.wallet, cid, oid, self.shell, self.cluster.default_rpc_endpoint)
+            file_with_node = grpc_client.object.get(cid, oid, self.cluster.default_rpc_endpoint)
             assert get_file_hash(test_file) == get_file_hash(file_with_node)
 
     @allure.title("Request PUT with copies_number flag")
-    def test_put_object_with_copies_number(
+    def test_put_object_with_copies_number(self, grpc_client: GrpcClientWrapper, simple_object_size: ObjectSize) -> None:
-        self,
-        frostfs_local_cli: FrostfsCli,
-        default_user: User,
-        simple_object_size: ObjectSize,
-    ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 2.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
 
         with reporter.step("Put object in container with copies number = 1"):
             test_file = generate_file(simple_object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint, copies_number=1)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint, copies_number=1)
 
         with reporter.step("Check that count chunks > 1."):
-            chunks = self.get_all_chunks_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
             assert len(chunks) > 1
 
     @allure.title("Request PUT and 1 node off")
     @pytest.mark.failover
     def test_put_object_with_off_cnr_node(
-        self,
+        self, grpc_client: GrpcClientWrapper, cluster_state_controller: ClusterStateController, simple_object_size: ObjectSize
-        frostfs_local_cli: FrostfsCli,
-        cluster_state_controller: ClusterStateController,
-        default_user: User,
-        simple_object_size: ObjectSize,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 3.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 3.1", await_mode=True)
 
         with reporter.step("Stop one node in container nodes"):
             cluster_state_controller.stop_node_host(self.cluster.cluster_nodes[1], "hard")
 
-        with reporter.step("Put object in container, expect error."):
+        with reporter.step("Put object in container, expect success for EC container."):
             test_file = generate_file(simple_object_size.value)
-            with pytest.raises(RuntimeError, match="put single object on client"):
+            grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint, copies_number=1)
-                put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
 
-    @allure.title("Request DELETE (size={object_size.name})")
+    @allure.title("Request PUT (size={object_size})")
+    def test_put_object_with_ec_cnr(self, grpc_client: GrpcClientWrapper, object_size: ObjectSize) -> None:
+        with reporter.step("Create container."):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
+
+        with reporter.step("Put object in container"):
+            test_file = generate_file(object_size.value)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Get chunks object."):
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
+
+        with reporter.step("Check header chunks object"):
+            for chunk in chunks:
+                chunk_head = grpc_client.object.head(
+                    cid, chunk.object_id, self.cluster.default_rpc_endpoint, is_raw=True, json_output=False
+                ).stdout
+                assert "EC header:" in chunk_head
+
+    @allure.title("Request GET (size={object_size})")
+    def test_get_object_in_ec_cnr(self, grpc_client: GrpcClientWrapper, object_size: ObjectSize) -> None:
+        with reporter.step("Create container."):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1 CBF 1", await_mode=True)
+
+        with reporter.step("Put object in container"):
+            test_file = generate_file(object_size.value)
+            hash_origin_file = get_file_hash(test_file)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Get id all chunks."):
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
+
+        with reporter.step("Search chunk node and not chunks node."):
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, chunks[0])[0]
+            not_chunk_node = grpc_client.object.chunks.search_node_without_chunks(chunks, self.cluster, self.cluster.default_rpc_endpoint)[
+                0
+            ]
+
+        with reporter.step("GET request with chunk node, expect success"):
+            file_one = grpc_client.object.get(cid, oid, chunk_node.storage_node.get_rpc_endpoint())
+            hash_file_one = get_file_hash(file_one)
+            assert hash_file_one == hash_origin_file
+
+        with reporter.step("Get request with not chunk node"):
+            file_two = grpc_client.object.get(cid, oid, not_chunk_node.storage_node.get_rpc_endpoint())
+            hash_file_two = get_file_hash(file_two)
+            assert hash_file_two == hash_file_one == hash_origin_file
+
+    @allure.title("Request SEARCH with flags 'root' (size={object_size})")
+    def test_search_object_in_ec_cnr_root_flags(self, grpc_client: GrpcClientWrapper, object_size: ObjectSize) -> None:
+        with reporter.step("Create container."):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
+
+        with reporter.step("Put object in container"):
+            test_file = generate_file(object_size.value)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Search operation with --root flags"):
+            search_output = grpc_client.object.search(cid, self.cluster.default_rpc_endpoint, root=True)
+            assert search_output[0] == oid
+
+    @allure.title("Request SEARCH check valid chunk id (size={object_size})")
+    def test_search_object_in_ec_cnr_chunk_id(self, grpc_client: GrpcClientWrapper, object_size: ObjectSize) -> None:
+        with reporter.step("Create container."):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
+
+        with reporter.step("Put object in container"):
+            test_file = generate_file(object_size.value)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Search operation object"):
+            search_output = grpc_client.object.search(cid, self.cluster.default_rpc_endpoint)
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
+            for chunk in chunks:
+                assert chunk.object_id in search_output
+
+    @allure.title("Request SEARCH check no chunk index info (size={object_size})")
+    def test_search_object_in_ec_cnr(self, grpc_client: GrpcClientWrapper, object_size: ObjectSize) -> None:
+        with reporter.step("Create container."):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
+
+        with reporter.step("Put object in container"):
+            test_file = generate_file(object_size.value)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Search operation all chunk"):
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
+            for chunk in chunks:
+                chunk_search = grpc_client.object.search(cid, self.cluster.default_rpc_endpoint, oid=chunk.object_id)
+                assert "index" not in chunk_search
+
+    @allure.title("Request DELETE (size={object_size})")
     @pytest.mark.failover
     def test_delete_object_in_ec_cnr(
-        self,
+        self, grpc_client: GrpcClientWrapper, object_size: ObjectSize, cluster_state_controller: ClusterStateController
-        default_user: User,
-        frostfs_local_cli: FrostfsCli,
-        object_size: ObjectSize,
-        cluster_state_controller: ClusterStateController,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 2.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check object chunks nodes."):
-            chunks_object = self.get_all_chunks_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
             replication_count = 3 if object_size.name == "simple" else 3 * 4
-            assert len(chunks_object) == replication_count
+            assert len(chunks) == replication_count
 
         with reporter.step("Delete object"):
-            frostfs_local_cli.object.delete(self.cluster.default_rpc_endpoint, cid, oid)
+            grpc_client.object.delete(cid, oid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check that delete all chunks."):
-            for chunk in chunks_object:
+            for chunk in chunks:
                 with pytest.raises(RuntimeError, match="object already removed"):
-                    frostfs_local_cli.object.head(self.cluster.default_rpc_endpoint, cid, chunk.object_id)
+                    grpc_client.object.head(cid, chunk.object_id, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Put second object."):
-            oid_second = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid_second = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check second object chunks nodes."):
-            chunks_second_object = self.get_all_chunks_object(frostfs_local_cli, cid, oid_second, self.cluster.default_rpc_endpoint)
+            chunks_second_object = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid_second)
             assert len(chunks_second_object) == replication_count
 
         with reporter.step("Stop nodes with chunk."):
-            chunk_node = self.get_chunk_node(frostfs_local_cli, chunks_second_object[0])
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, chunks_second_object[0])
             cluster_state_controller.stop_node_host(chunk_node[0], "hard")
 
         with reporter.step("Delete second object"):
-            frostfs_local_cli.object.delete(self.cluster.default_rpc_endpoint, cid, oid_second)
+            cluster_nodes = list(set(self.cluster.cluster_nodes) - {chunk_node[0]})
+            grpc_client.object.delete(cid, oid_second, cluster_nodes[0].storage_node.get_rpc_endpoint())
 
         with reporter.step("Check that delete all chunk second object."):
             for chunk in chunks_second_object:
-                with pytest.raises(RuntimeError, match="object already removed"):
+                with pytest.raises(RuntimeError, match="object already removed|object not found"):
-                    frostfs_local_cli.object.head(self.cluster.default_rpc_endpoint, cid, chunk.object_id)
+                    grpc_client.object.head(cid, chunk.object_id, cluster_nodes[0].storage_node.get_rpc_endpoint())
 
-    @allure.title("Request LOCK (size={object_size.name})")
+    @allure.title("Request LOCK (size={object_size})")
     @pytest.mark.failover
     def test_lock_object_in_ec_cnr(
         self,
-        frostfs_local_cli: FrostfsCli,
+        grpc_client: GrpcClientWrapper,
+        frostfs_cli: FrostfsCli,
         object_size: ObjectSize,
-        default_user: User,
         cluster_state_controller: ClusterStateController,
+        include_excluded_nodes: None,
     ) -> None:
         with reporter.step("Create container."):
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, "EC 2.1")
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1", await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check object chunks nodes."):
-            chunks_object = self.get_all_chunks_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            chunks_object = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, oid)
             replication_count = 3 if object_size.name == "simple" else 3 * 4
             assert len(chunks_object) == replication_count
 
         with reporter.step("Put LOCK in object."):
-            epoch = frostfs_local_cli.netmap.epoch(self.cluster.default_rpc_endpoint).stdout.strip()
+            # TODO Rework for the grpc_client when the netmap methods are implemented
-            frostfs_local_cli.object.lock(self.cluster.default_rpc_endpoint, cid, oid, expire_at=int(epoch) + 5).stdout
+            epoch = frostfs_cli.netmap.epoch(self.cluster.default_rpc_endpoint, timeout=CLI_DEFAULT_TIMEOUT).stdout.strip()
+            grpc_client.object.lock(cid, oid, self.cluster.default_rpc_endpoint, expire_at=(int(epoch) + 5))
 
-        with reporter.step("Check LOCK in object"):
+        with reporter.step("Check don`t delete chunk"):
-            chunks = frostfs_local_cli.object.head(self.cluster.default_rpc_endpoint, cid, oid, raw=True).stdout.strip().split(" ")
+            for chunk in chunks_object:
-            oids_chunks = [chunk.strip() for chunk in chunks if len(chunk) > 35]
+                with pytest.raises(RuntimeError, match="Lock EC chunk failed"):
-            for chunk_id in oids_chunks:
+                    grpc_client.object.delete(cid, chunk.object_id, self.cluster.default_rpc_endpoint)
-                with pytest.raises(RuntimeError, match="could not delete objects"):
-                    frostfs_local_cli.object.delete(self.cluster.default_rpc_endpoint, cid, chunk_id)
 
-        with reporter.step("Stop chunk node."):
+        with reporter.step("Check enable LOCK object"):
-            chunk_node = self.get_chunk_node(frostfs_local_cli, chunks_object[0])
+            with pytest.raises(RuntimeError, match="object is locked"):
-            cluster_state_controller.stop_node_host(chunk_node[0], "hard")
+                grpc_client.object.delete(cid, oid, self.cluster.default_rpc_endpoint)
-            cluster_state_controller.start_node_host(chunk_node[0])
 
-        with reporter.step("Check LOCK in object."):
+        with reporter.step("Remove node in netmap."):
-            chunks = self.get_all_chunks_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, chunks_object[0])[0]
-            for chunk_id in oids_chunks:
+            alive_node = list(set(self.cluster.cluster_nodes) - {chunk_node})[0]
-                with pytest.raises(RuntimeError, match="could not delete objects"):
+            cluster_state_controller.remove_node_from_netmap([chunk_node.storage_node])
-                    frostfs_local_cli.object.delete(self.cluster.default_rpc_endpoint, cid, chunk_id)
 
-    @allure.title("Output MaxEC* params in frostfscli (type={type_shards})")
+        with reporter.step("Check don`t delete chunk."):
+            for chunk in chunks_object:
+                with pytest.raises(RuntimeError, match="Lock EC chunk failed|object not found"):
+                    grpc_client.object.delete(cid, chunk.object_id, alive_node.storage_node.get_rpc_endpoint())
+
+        with reporter.step("Check enable LOCK object"):
+            with pytest.raises(RuntimeError, match="object is locked"):
+                grpc_client.object.delete(cid, oid, alive_node.storage_node.get_rpc_endpoint())
+
+        with reporter.step("Include node in netmap"):
+            cluster_state_controller.include_node_to_netmap(chunk_node.storage_node, alive_node.storage_node)
+
+    @allure.title("Output MaxEC* params in frostf-scli (type={type_shards})")
     @pytest.mark.parametrize("type_shards", ["Maximum count of data shards", "Maximum count of parity shards"])
-    def test_maxec_info_with_output_cli(self, frostfs_local_cli: FrostfsCli, type_shards: str) -> None:
+    def test_maxec_info_with_output_cli(self, frostfs_cli: FrostfsCli, type_shards: str) -> None:
         with reporter.step("Get and check params"):
-            net_info = frostfs_local_cli.netmap.netinfo(self.cluster.default_rpc_endpoint).stdout
+            # TODO Rework for the grpc_client when the netmap methods are implemented
+            net_info = frostfs_cli.netmap.netinfo(self.cluster.default_rpc_endpoint).stdout
             assert type_shards in net_info
 
     @allure.title("Change MaxEC*Count params")
     def test_change_max_data_shards_params(
-        self,
+        self, frostfs_remote_adm: FrostfsAdm, frostfs_cli: FrostfsCli, restore_network_config: None
-        frostfs_remote_adm: FrostfsAdm,
-        frostfs_local_cli: FrostfsCli,
-        restore_network_config: None,
     ) -> None:
+        # TODO Rework for the grpc_client when the netmap methods are implemented
         with reporter.step("Get now params MaxECDataCount and MaxECParityCount"):
-            node_netinfo = NetmapParser.netinfo(frostfs_local_cli.netmap.netinfo(self.cluster.default_rpc_endpoint).stdout)
+            node_netinfo = NetmapParser.netinfo(
+                frostfs_cli.netmap.netinfo(self.cluster.default_rpc_endpoint, timeout=CLI_DEFAULT_TIMEOUT).stdout
+            )
 
         with reporter.step("Change params"):
             frostfs_remote_adm.morph.set_config(set_key_value='"MaxECDataCount=5" "MaxECParityCount=3"')
 
         with reporter.step("Get update params"):
-            update_net_info = NetmapParser.netinfo(frostfs_local_cli.netmap.netinfo(self.cluster.default_rpc_endpoint).stdout)
+            update_net_info = NetmapParser.netinfo(
+                frostfs_cli.netmap.netinfo(self.cluster.default_rpc_endpoint, timeout=CLI_DEFAULT_TIMEOUT).stdout
+            )
 
         with reporter.step("Check old and new params difference"):
             assert (
@@ -515,64 +590,163 @@ class TestECReplication(ClusterTestBase):
             )
 
     @allure.title("Check maximum count data and parity shards")
-    def test_change_over_max_parity_shards_params(
+    def test_change_over_max_parity_shards_params(self, frostfs_remote_adm: FrostfsAdm) -> None:
-        self,
-        frostfs_remote_adm: FrostfsAdm,
-    ) -> None:
         with reporter.step("Change over maximum params shards count."):
             with pytest.raises(RuntimeError, match="MaxECDataCount and MaxECParityCount must be <= 256"):
                 frostfs_remote_adm.morph.set_config(set_key_value='"MaxECDataCount=130" "MaxECParityCount=130"')
 
     @allure.title("Create container with EC policy and SELECT (SELECT={select})")
     @pytest.mark.parametrize("select", [2, 4])
-    def test_create_container_with_select(
+    def test_create_container_with_select(self, select: int, grpc_client: GrpcClientWrapper) -> None:
-        self,
-        select: int,
-        frostfs_local_cli: FrostfsCli,
-    ) -> None:
         with reporter.step("Create container"):
             policy = f"EC 1.1 CBF 1 SELECT {select} FROM *"
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, policy)
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy=policy, await_mode=True)
 
         with reporter.step("Check container nodes decomposed"):
-            container_nodes = frostfs_local_cli.container.search_node(self.cluster.default_rpc_endpoint, cid).stdout.strip().split("\n")[1:]
+            container_nodes = grpc_client.container.nodes(self.cluster.default_rpc_endpoint, cid, self.cluster)
+
             assert len(container_nodes) == select
 
     @allure.title("Create container with EC policy and CBF (CBF={cbf})")
     @pytest.mark.parametrize("cbf, expected_nodes", [(1, 2), (2, 4)])
-    def test_create_container_with_cbf(
+    def test_create_container_with_cbf(self, cbf: int, expected_nodes: int, grpc_client: GrpcClientWrapper) -> None:
-        self,
-        cbf: int,
-        expected_nodes: int,
-        frostfs_local_cli: FrostfsCli,
-    ) -> None:
         with reporter.step("Create container."):
             policy = f"EC 1.1 CBF {cbf}"
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, policy)
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy=policy, await_mode=True)
 
         with reporter.step("Check expected container nodes."):
-            container_nodes = frostfs_local_cli.container.search_node(self.cluster.default_rpc_endpoint, cid).stdout.strip().split("\n")[1:]
+            container_nodes = grpc_client.container.nodes(self.cluster.default_rpc_endpoint, cid, self.cluster)
             assert len(container_nodes) == expected_nodes
 
     @allure.title("Create container with EC policy and FILTER")
-    def test_create_container_with_filter(
+    def test_create_container_with_filter(self, grpc_client: GrpcClientWrapper, simple_object_size: ObjectSize) -> None:
-        self,
-        default_user: User,
-        frostfs_local_cli: FrostfsCli,
-        simple_object_size: ObjectSize,
-    ) -> None:
         with reporter.step("Create Container."):
             policy = "EC 1.1 IN RUS SELECT 2 FROM RU AS RUS FILTER Country EQ Russia AS RU"
-            cid = self.create_container(frostfs_local_cli, self.cluster.default_rpc_endpoint, policy)
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy=policy, await_mode=True)
 
         with reporter.step("Put object in container."):
             test_file = generate_file(simple_object_size.value)
-            oid = put_object(default_user.wallet, test_file, cid, self.shell, self.cluster.default_rpc_endpoint)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
 
         with reporter.step("Check object is decomposed exclusively on Russian nodes"):
-            data_chunk = self.get_data_chunk_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            data_chunk = grpc_client.object.chunks.get_first_data(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            parity_chunk = self.get_parity_chunk_object(frostfs_local_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            parity_chunk = grpc_client.object.chunks.get_parity(self.cluster.default_rpc_endpoint, cid, oid=oid)
-            node_data_chunk = self.get_chunk_node(frostfs_local_cli, data_chunk)
+            node_data_chunk = grpc_client.object.chunks.get_chunk_node(self.cluster, data_chunk)
-            node_parity_chunk = self.get_chunk_node(frostfs_local_cli, parity_chunk)
+            node_parity_chunk = grpc_client.object.chunks.get_chunk_node(self.cluster, parity_chunk)
+
             for node in [node_data_chunk[1], node_parity_chunk[1]]:
                 assert "Russia" in node.country
+
+    @allure.title("Evacuation shard with chunk (type={type})")
+    @pytest.mark.parametrize("type, get_chunk", [("data", get_data_chunk_object), ("parity", get_parity_chunk_object)])
+    def test_evacuation_data_shard(
+        self,
+        restore_nodes_shards_mode: None,
+        frostfs_cli: FrostfsCli,
+        grpc_client: GrpcClientWrapper,
+        max_object_size: int,
+        type: str,
+        get_chunk,
+    ) -> None:
+        with reporter.step("Create container."):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 1.1 CBF 1", await_mode=True)
+
+        with reporter.step("Put object in container."):
+            test_file = generate_file(max_object_size - 1000)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Get object chunks."):
+            chunk = get_chunk(self, frostfs_cli, cid, oid, self.cluster.default_rpc_endpoint)
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, chunk)
+            frostfs_node_cli = self.get_node_cli(chunk_node[0], config=chunk_node[0].storage_node.get_remote_wallet_config_path())
+
+        with reporter.step("Search shards chunk"):
+            time.sleep(datetime_utils.parse_time(MORPH_BLOCK_TIME) * 2)
+            shard_id = grpc_client.object.chunks.get_shard_chunk(chunk_node[0], chunk)
+
+        with reporter.step("Enable evacuation for shard"):
+            frostfs_node_cli.shards.set_mode(chunk_node[0].storage_node.get_control_endpoint(), mode="read-only", id=shard_id)
+            frostfs_node_cli.shards.evacuation_start(chunk_node[0].storage_node.get_control_endpoint(), shard_id, await_mode=True)
+
+        with reporter.step("Get object after evacuation shard"):
+            grpc_client.object.get(cid, oid, self.cluster.default_rpc_endpoint)
+
+    @allure.title("[NEGATIVE] Don`t create more 1 EC policy")
+    def test_more_one_ec_policy(self, grpc_client: GrpcClientWrapper) -> None:
+        with reporter.step("Create container with policy - 'EC 2.1 EC 1.1'"):
+            with pytest.raises(RuntimeError, match="can't parse placement policy"):
+                grpc_client.container.create(
+                    self.cluster.default_rpc_endpoint, policy="EC 2.1 EC 1.1 CBF 1 SELECT 4 FROM *", await_mode=True
+                )
+
+    @allure.title("Create bucket with EC policy (s3_client={s3_client})")
+    @pytest.mark.parametrize("s3_policy, s3_client", [(S3_POLICY_FILE_LOCATION, AwsCliClient)], indirect=True)
+    def test_create_bucket_with_ec_location(
+        self, s3_client: S3ClientWrapper, bucket_container_resolver: BucketContainerResolver, grpc_client: GrpcClientWrapper
+    ) -> None:
+        with reporter.step("Create bucket with EC location constrain"):
+            bucket = s3_client.create_bucket(location_constraint="ec3.1")
+
+        with reporter.step("Resolve container bucket"):
+            cid = bucket_container_resolver.resolve(self.cluster.cluster_nodes[0], bucket)
+
+        with reporter.step("Validate container policy"):
+            container = grpc_client.container.get(self.cluster.default_rpc_endpoint, cid, json_mode=True, timeout=CLI_DEFAULT_TIMEOUT)
+            assert container
+
+    @allure.title("Bucket object count chunks (s3_client={s3_client}, size={object_size})")
+    @pytest.mark.parametrize("s3_policy, s3_client", [(S3_POLICY_FILE_LOCATION, AwsCliClient)], indirect=True)
+    def test_count_chunks_bucket_with_ec_location(
+        self,
+        s3_client: S3ClientWrapper,
+        bucket_container_resolver: BucketContainerResolver,
+        grpc_client: GrpcClientWrapper,
+        object_size: ObjectSize,
+    ) -> None:
+        with reporter.step("Create bucket with EC location constrain"):
+            bucket = s3_client.create_bucket(location_constraint="ec3.1")
+
+        with reporter.step("Enable versioning object"):
+            s3_client.put_bucket_versioning(bucket, VersioningStatus.ENABLED)
+            bucket_status = s3_client.get_bucket_versioning_status(bucket)
+            assert bucket_status == VersioningStatus.ENABLED.value
+
+        with reporter.step("Put object in bucket"):
+            test_file = generate_file(object_size.value)
+            bucket_object = s3_client.put_object(bucket, test_file)
+
+        with reporter.step("Watch replication count chunks"):
+            cid = bucket_container_resolver.resolve(self.cluster.cluster_nodes[0], bucket)
+            chunks = grpc_client.object.chunks.get_all(self.cluster.default_rpc_endpoint, cid, bucket_object)
+            expect_chunks = 4 if object_size.name == "simple" else 16
+            assert len(chunks) == expect_chunks
+
+    @allure.title("Replication chunk after drop (size={object_size})")
+    def test_drop_chunk_and_replication(self, grpc_client: GrpcClientWrapper, object_size: ObjectSize, rep_count: int) -> None:
+        with reporter.step("Create container"):
+            cid = grpc_client.container.create(self.cluster.default_rpc_endpoint, policy="EC 2.1 CBF 1", await_mode=True)
+
+        with reporter.step("Put object"):
+            test_file = generate_file(object_size.value)
+            oid = grpc_client.object.put(test_file, cid, self.cluster.default_rpc_endpoint)
+
+        with reporter.step("Get all chunks"):
+            data_chunk = grpc_client.object.chunks.get_first_data(self.cluster.default_rpc_endpoint, cid, oid=oid)
+
+        with reporter.step("Search chunk node"):
+            chunk_node = grpc_client.object.chunks.get_chunk_node(self.cluster, data_chunk)
+            shell_chunk_node = chunk_node[0].host.get_shell()
+
+        with reporter.step("Get replication count"):
+            assert self.check_replication(rep_count, grpc_client, cid, oid)
+
+        with reporter.step("Delete chunk"):
+            frostfs_node_cli = FrostfsCli(
+                shell_chunk_node,
+                frostfs_cli_exec_path=FROSTFS_CLI_EXEC,
+                config_file=chunk_node[0].storage_node.get_remote_wallet_config_path(),
+            )
+            frostfs_node_cli.control.drop_objects(chunk_node[0].storage_node.get_control_endpoint(), f"{cid}/{data_chunk.object_id}")
+
+        with reporter.step("Wait replication count after drop one chunk"):
+            self.wait_replication(rep_count, grpc_client, cid, oid)

pytest_tests/testsuites/services/http_gate/test_http_bearer.py

@@ -15,7 +15,7 @@ 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 pytest_tests.helpers.bearer_token import create_bearer_token
+from ....helpers.bearer_token import create_bearer_token
 
 logger = logging.getLogger("NeoLogger")
 
@@ -60,6 +60,7 @@ class Test_http_bearer(ClusterTestBase):
             error_pattern="access to object operation denied",
         )
 
+    @allure.title("Put object via HTTP using bearer token (object_size={object_size})")
     def test_put_with_bearer_when_eacl_restrict(
         self,
         object_size: ObjectSize,

pytest_tests/testsuites/services/http_gate/test_http_gate.py

@@ -20,7 +20,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import generate_file, get_file_hash
 
-from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes
+from ....helpers.utility import wait_for_gc_pass_on_storage_nodes
 
 OBJECT_NOT_FOUND_ERROR = "not found"
 
@@ -31,6 +31,7 @@ OBJECT_NOT_FOUND_ERROR = "not found"
 )
 @allure.link("https://git.frostfs.info/TrueCloudLab/frostfs-http-gw#uploading", name="uploading")
 @allure.link("https://git.frostfs.info/TrueCloudLab/frostfs-http-gw#downloading", name="downloading")
+@pytest.mark.nightly
 @pytest.mark.sanity
 @pytest.mark.http_gate
 class TestHttpGate(ClusterTestBase):
@@ -133,12 +134,8 @@ class TestHttpPut(ClusterTestBase):
         file_path_large = generate_file(complex_object_size.value)
 
         with reporter.step("Put objects using HTTP"):
-            oid_simple = upload_via_http_gate(
+            oid_simple = upload_via_http_gate(cid=cid, path=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint)
-                cid=cid, path=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint
+            oid_large = upload_via_http_gate(cid=cid, path=file_path_large, endpoint=self.cluster.default_http_gate_endpoint)
-            )
-            oid_large = upload_via_http_gate(
-                cid=cid, path=file_path_large, endpoint=self.cluster.default_http_gate_endpoint
-            )
 
         for oid, file_path in ((oid_simple, file_path_simple), (oid_large, file_path_large)):
             verify_object_hash(
@@ -353,9 +350,7 @@ class TestHttpPut(ClusterTestBase):
         file_path_large = generate_file(complex_object_size.value)
 
         with reporter.step("Put objects using curl utility"):
-            oid_simple = upload_via_http_gate_curl(
+            oid_simple = upload_via_http_gate_curl(cid=cid, filepath=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint)
-                cid=cid, filepath=file_path_simple, endpoint=self.cluster.default_http_gate_endpoint
-            )
             oid_large = upload_via_http_gate_curl(
                 cid=cid,
                 filepath=file_path_large,

pytest_tests/testsuites/services/http_gate/test_http_object.py

@@ -22,6 +22,7 @@ from frostfs_testlib.utils.file_utils import generate_file
 logger = logging.getLogger("NeoLogger")
 
 
+@pytest.mark.nightly
 @pytest.mark.sanity
 @pytest.mark.http_gate
 class Test_http_object(ClusterTestBase):
@@ -125,7 +126,7 @@ class Test_http_object(ClusterTestBase):
                 http_request_path=request,
             )
 
-    @allure.title("Put over s3, Get over HTTP with bucket name and key")
+    @allure.title("Put over s3, Get over HTTP with bucket name and key (object_size={object_size})")
     @pytest.mark.parametrize("s3_client", [AwsCliClient], indirect=True)
     def test_object_put_get_bucketname_key(self, object_size: ObjectSize, s3_client: S3ClientWrapper):
         """

pytest_tests/testsuites/services/s3_gate/test_s3_ACL.py

@@ -9,6 +9,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 @pytest.mark.acl
 @pytest.mark.s3_gate
 class TestS3GateACL:

pytest_tests/testsuites/services/s3_gate/test_s3_bucket.py

@@ -1,3 +1,4 @@
+import string
 from datetime import datetime, timedelta
 
 import allure
@@ -6,9 +7,17 @@ from frostfs_testlib import reporter
 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
 
+VALID_SYMBOLS_WITHOUT_DOT = string.ascii_lowercase + string.digits + "-"
+VALID_AND_INVALID_SYMBOLS = string.ascii_letters + string.punctuation
 
+# TODO: The dot symbol is temporarily not supported.
+VALID_SYMBOLS_WITH_DOT = VALID_SYMBOLS_WITHOUT_DOT + "."
+
+
+@pytest.mark.nightly
 @pytest.mark.s3_gate
 @pytest.mark.s3_gate_bucket
 class TestS3GateBucket:
@@ -139,3 +148,87 @@ class TestS3GateBucket:
             s3_client.delete_bucket(bucket)
             with pytest.raises(Exception, match=r".*Not Found.*"):
                 s3_client.head_bucket(bucket)
+
+    @allure.title("Create bucket with valid name length (s3_client={s3_client}, length={length})")
+    @pytest.mark.parametrize("length", [3, 4, 32, 62, 63])
+    def test_s3_create_bucket_with_valid_length(self, s3_client: S3ClientWrapper, length: int):
+        bucket_name = string_utils.random_string(length, VALID_SYMBOLS_WITHOUT_DOT)
+        while not (bucket_name[0].isalnum() and bucket_name[-1].isalnum()):
+            bucket_name = string_utils.random_string(length, VALID_SYMBOLS_WITHOUT_DOT)
+
+        with reporter.step("Create bucket with valid name length"):
+            s3_client.create_bucket(bucket_name)
+
+        with reporter.step("Check bucket name in buckets"):
+            assert bucket_name in s3_client.list_buckets()
+
+    @allure.title("[NEGATIVE] Bucket with invalid name length should not be created (s3_client={s3_client}, length={length})")
+    @pytest.mark.parametrize("length", [2, 64, 254, 255, 256])
+    def test_s3_create_bucket_with_invalid_length(self, s3_client: S3ClientWrapper, length: int):
+        bucket_name = string_utils.random_string(length, VALID_SYMBOLS_WITHOUT_DOT)
+        while not (bucket_name[0].isalnum() and bucket_name[-1].isalnum()):
+            bucket_name = string_utils.random_string(length, VALID_SYMBOLS_WITHOUT_DOT)
+
+        with reporter.step("Create bucket with invalid name length and catch exception"):
+            with pytest.raises(Exception, match=".*(?:InvalidBucketName|Invalid bucket name).*"):
+                s3_client.create_bucket(bucket_name)
+
+    @allure.title("[NEGATIVE] Bucket with invalid name should not be created (s3_client={s3_client}, bucket_name={bucket_name})")
+    @pytest.mark.parametrize(
+        "bucket_name",
+        [
+            "BUCKET-1",
+            "buckeT-2",
+            # The following case for AWS CLI is not handled correctly
+            # "-bucket-3",
+            "bucket-4-",
+            ".bucket-5",
+            "bucket-6.",
+            "bucket..7",
+            "bucket+8",
+            "bucket_9",
+            "bucket 10",
+            "127.10.5.11",
+            "xn--bucket-12",
+            "bucket-13-s3alias",
+            # The following names can be used in FrostFS but are prohibited by the AWS specification.
+            # "sthree-bucket-14"
+            # "sthree-configurator-bucket-15"
+            # "amzn-s3-demo-bucket-16"
+            # "sthree-bucket-17"
+            # "bucket-18--ol-s3"
+            # "bucket-19--x-s3"
+            # "bucket-20.mrap"
+        ],
+    )
+    def test_s3_create_bucket_with_invalid_name(self, s3_client: S3ClientWrapper, bucket_name: str):
+        with reporter.step("Create bucket with invalid name and catch exception"):
+            with pytest.raises(Exception, match=".*(?:InvalidBucketName|Invalid bucket name).*"):
+                s3_client.create_bucket(bucket_name)
+
+    @allure.title("[NEGATIVE] Delete non-empty bucket (s3_client={s3_client})")
+    def test_s3_check_availability_non_empty_bucket_after_deleting(
+        self,
+        bucket: str,
+        simple_object_size: ObjectSize,
+        s3_client: S3ClientWrapper,
+    ):
+        object_path = generate_file(simple_object_size.value)
+        object_name = s3_helper.object_key_from_file_path(object_path)
+
+        with reporter.step("Put object into bucket"):
+            s3_client.put_object(bucket, object_path)
+
+        with reporter.step("Check that object appears in bucket"):
+            objects = s3_client.list_objects(bucket)
+            assert objects, f"Expected bucket with object, got empty {objects}"
+            assert object_name in objects, f"Object {object_name} not found in bucket object list {objects}"
+
+        with reporter.step("Try to delete not empty bucket and get error"):
+            with pytest.raises(Exception, match=r".*The bucket you tried to delete is not empty.*"):
+                s3_client.delete_bucket(bucket)
+
+        with reporter.step("Check bucket availability"):
+            objects = s3_client.list_objects(bucket)
+            assert objects, f"Expected bucket with object, got empty {objects}"
+            assert object_name in objects, f"Object {object_name} not found in bucket object list {objects}"

pytest_tests/testsuites/services/s3_gate/test_s3_locking.py

@@ -22,14 +22,13 @@ def bucket_no_lock(s3_client: S3ClientWrapper):
     return s3_client.create_bucket(object_lock_enabled_for_bucket=False)
 
 
+@pytest.mark.nightly
 @pytest.mark.s3_gate
 @pytest.mark.s3_gate_locking
 @pytest.mark.parametrize("version_id", [None, "second"])
 class TestS3GateLocking:
     @allure.title("Retention period and legal lock on object (version_id={version_id}, s3_client={s3_client})")
-    def test_s3_object_locking(
+    def test_s3_object_locking(self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize):
-        self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize
-    ):
         file_path = generate_file(simple_object_size.value)
         file_name = s3_helper.object_key_from_file_path(file_path)
         retention_period = 2
@@ -73,9 +72,7 @@ class TestS3GateLocking:
                 s3_client.delete_object(bucket_w_lock, file_name, version_id)
 
     @allure.title("Impossible to change retention mode COMPLIANCE (version_id={version_id}, s3_client={s3_client})")
-    def test_s3_mode_compliance(
+    def test_s3_mode_compliance(self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize):
-        self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize
-    ):
         file_path = generate_file(simple_object_size.value)
         file_name = s3_helper.object_key_from_file_path(file_path)
         retention_period = 2
@@ -105,9 +102,7 @@ class TestS3GateLocking:
                 s3_client.put_object_retention(bucket_w_lock, file_name, retention, version_id)
 
     @allure.title("Change retention mode GOVERNANCE (version_id={version_id}, s3_client={s3_client})")
-    def test_s3_mode_governance(
+    def test_s3_mode_governance(self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize):
-        self, s3_client: S3ClientWrapper, bucket_w_lock: str, version_id: str, simple_object_size: ObjectSize
-    ):
         file_path = generate_file(simple_object_size.value)
         file_name = s3_helper.object_key_from_file_path(file_path)
         retention_period = 3
@@ -155,12 +150,8 @@ class TestS3GateLocking:
             s3_client.put_object_retention(bucket_w_lock, file_name, retention, version_id, True)
             s3_helper.assert_object_lock_mode(s3_client, bucket_w_lock, file_name, "GOVERNANCE", date_obj, "OFF")
 
-    @allure.title(
+    @allure.title("[NEGATIVE] Lock object in bucket with disabled locking (version_id={version_id}, s3_client={s3_client})")
-        "[NEGATIVE] Lock object in bucket with disabled locking (version_id={version_id}, s3_client={s3_client})"
+    def test_s3_legal_hold(self, s3_client: S3ClientWrapper, bucket_no_lock: str, version_id: str, simple_object_size: ObjectSize):
-    )
-    def test_s3_legal_hold(
-        self, s3_client: S3ClientWrapper, bucket_no_lock: str, version_id: str, simple_object_size: ObjectSize
-    ):
         file_path = generate_file(simple_object_size.value)
         file_name = s3_helper.object_key_from_file_path(file_path)
 
@@ -174,6 +165,7 @@ class TestS3GateLocking:
                 s3_client.put_object_legal_hold(bucket_no_lock, file_name, "ON", version_id)
 
 
+@pytest.mark.nightly
 @pytest.mark.s3_gate
 class TestS3GateLockingBucket:
     @allure.title("Bucket Lock (s3_client={s3_client})")

pytest_tests/testsuites/services/s3_gate/test_s3_multipart.py

@@ -2,7 +2,8 @@ import allure
 import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
-from frostfs_testlib.steps.cli.container import list_objects, search_container_by_name
+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
@@ -13,6 +14,7 @@ from frostfs_testlib.utils.file_utils import generate_file, get_file_hash, split
 PART_SIZE = 5 * 1024 * 1024
 
 
+@pytest.mark.nightly
 @pytest.mark.s3_gate
 @pytest.mark.s3_gate_multipart
 class TestS3GateMultipart(ClusterTestBase):
@@ -21,7 +23,12 @@ class TestS3GateMultipart(ClusterTestBase):
     @allure.title("Object Multipart API (s3_client={s3_client}, bucket versioning = {versioning_status})")
     @pytest.mark.parametrize("versioning_status", [VersioningStatus.ENABLED, VersioningStatus.UNDEFINED], indirect=True)
     def test_s3_object_multipart(
-        self, s3_client: S3ClientWrapper, bucket: str, default_wallet: WalletInfo, versioning_status: str
+        self,
+        s3_client: S3ClientWrapper,
+        bucket: str,
+        default_wallet: WalletInfo,
+        versioning_status: str,
+        bucket_container_resolver: BucketContainerResolver,
     ):
         parts_count = 5
         file_name_large = generate_file(PART_SIZE * parts_count)  # 5Mb - min part
@@ -31,7 +38,7 @@ class TestS3GateMultipart(ClusterTestBase):
 
         with reporter.step(f"Get related container_id for bucket"):
             for cluster_node in self.cluster.cluster_nodes:
-                container_id = search_container_by_name(bucket, cluster_node)
+                container_id = bucket_container_resolver.resolve(cluster_node, bucket)
                 if container_id:
                     break
 
@@ -86,6 +93,7 @@ class TestS3GateMultipart(ClusterTestBase):
         bucket: str,
         simple_object_size: ObjectSize,
         complex_object_size: ObjectSize,
+        bucket_container_resolver: BucketContainerResolver,
     ):
         complex_file = generate_file(complex_object_size.value)
         simple_file = generate_file(simple_object_size.value)
@@ -95,7 +103,7 @@ class TestS3GateMultipart(ClusterTestBase):
 
         with reporter.step("Get related container_id for bucket"):
             for cluster_node in self.cluster.cluster_nodes:
-                container_id = search_container_by_name(bucket, cluster_node)
+                container_id = bucket_container_resolver.resolve(cluster_node, bucket)
                 if container_id:
                     break
 

pytest_tests/testsuites/services/s3_gate/test_s3_object.py

@@ -16,15 +16,10 @@ 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
-from frostfs_testlib.utils.file_utils import (
+from frostfs_testlib.utils.file_utils import TestFile, concat_files, generate_file, generate_file_with_content, get_file_hash
-    TestFile,
-    concat_files,
-    generate_file,
-    generate_file_with_content,
-    get_file_hash,
-)
 
 
+@pytest.mark.nightly
 @pytest.mark.s3_gate
 @pytest.mark.s3_gate_object
 class TestS3GateObject:
@@ -356,9 +351,7 @@ class TestS3GateObject:
         s3_helper.set_bucket_versioning(s3_client, bucket, VersioningStatus.ENABLED)
         with reporter.step("Put several versions of object into bucket"):
             version_id_1 = s3_client.put_object(bucket, file_name_simple)
-            file_name_1 = generate_file_with_content(
+            file_name_1 = generate_file_with_content(simple_object_size.value, file_path=file_name_simple, content=version_2_content)
-                simple_object_size.value, file_path=file_name_simple, content=version_2_content
-            )
             version_id_2 = s3_client.put_object(bucket, file_name_1)
 
         with reporter.step("Get first version of object"):
@@ -444,9 +437,7 @@ class TestS3GateObject:
             assert get_file_hash(con_file_1) == get_file_hash(file_name_1), "Hashes must be the same"
 
         with reporter.step("Get object"):
-            object_3_part_1 = s3_client.get_object(
+            object_3_part_1 = s3_client.get_object(bucket, file_name, object_range=[0, int(simple_object_size.value / 3)])
-                bucket, file_name, object_range=[0, int(simple_object_size.value / 3)]
-            )
             object_3_part_2 = s3_client.get_object(
                 bucket,
                 file_name,
@@ -560,9 +551,7 @@ class TestS3GateObject:
             elif list_type == "v2":
                 list_obj = s3_client.list_objects_v2(bucket)
             assert len(list_obj) == 2, "bucket should have 2 objects"
-            assert (
+            assert list_obj.sort() == [file_name, file_name_2].sort(), f"bucket should have object key {file_name, file_name_2}"
-                list_obj.sort() == [file_name, file_name_2].sort()
-            ), f"bucket should have object key {file_name, file_name_2}"
 
         with reporter.step("Delete object"):
             delete_obj = s3_client.delete_object(bucket, file_name)
@@ -695,13 +684,9 @@ class TestS3GateObject:
             with pytest.raises(Exception, match=S3_BUCKET_DOES_NOT_ALLOW_ACL):
                 s3_client.put_object(bucket, file_path, grant_full_control=f"id={second_wallet_public_key}")
 
-        with reporter.step(
+        with reporter.step("[NEGATIVE] Put object with --grant-read uri=http://acs.amazonaws.com/groups/global/AllUsers"):
-            "[NEGATIVE] Put object with --grant-read uri=http://acs.amazonaws.com/groups/global/AllUsers"
-        ):
             with pytest.raises(Exception, match=S3_BUCKET_DOES_NOT_ALLOW_ACL):
-                s3_client.put_object(
+                s3_client.put_object(bucket, file_path, grant_read="uri=http://acs.amazonaws.com/groups/global/AllUsers")
-                    bucket, file_path, grant_read="uri=http://acs.amazonaws.com/groups/global/AllUsers"
-                )
 
     @allure.title("Put object with lock-mode (s3_client={s3_client})")
     def test_s3_put_object_lock_mode(
@@ -727,9 +712,7 @@ class TestS3GateObject:
             )
             s3_helper.assert_object_lock_mode(s3_client, bucket, file_name, "GOVERNANCE", date_obj, "OFF")
 
-        with reporter.step(
+        with reporter.step("Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +3days]"):
-            "Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +3days]"
-        ):
             date_obj = datetime.utcnow() + timedelta(days=2)
             generate_file_with_content(simple_object_size.value, file_path=file_path_1)
             s3_client.put_object(
@@ -740,9 +723,7 @@ class TestS3GateObject:
             )
             s3_helper.assert_object_lock_mode(s3_client, bucket, file_name, "COMPLIANCE", date_obj, "OFF")
 
-        with reporter.step(
+        with reporter.step("Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +2days]"):
-            "Put new version of object with [--object-lock-mode COMPLIANCE] и [--object-lock-retain-until-date +2days]"
-        ):
             date_obj = datetime.utcnow() + timedelta(days=3)
             generate_file_with_content(simple_object_size.value, file_path=file_path_1)
             s3_client.put_object(
@@ -809,9 +790,7 @@ class TestS3GateObject:
 
             with reporter.step(f"Check all objects put in bucket_{i} successfully"):
                 bucket_objects = s3_client.list_objects_v2(bucket)
-                assert set(put_objects) == set(
+                assert set(put_objects) == set(bucket_objects), f"Expected all objects {put_objects} in objects list {bucket_objects}"
-                    bucket_objects
-                ), f"Expected all objects {put_objects} in objects list {bucket_objects}"
 
         with reporter.step("Delete some objects from bucket_1 one by one"):
             objects_to_delete_b1 = random.sample(put_objects, k=max_delete_objects)
@@ -871,9 +850,7 @@ class TestS3GateObject:
         with reporter.step("Check these are the same objects"):
             for obj_key in objects:
                 got_object = s3_client.get_object(bucket, obj_key)
-                assert get_file_hash(got_object) == get_file_hash(
+                assert get_file_hash(got_object) == get_file_hash(key_to_path.get(obj_key)), "Expected hashes are the same"
-                    key_to_path.get(obj_key)
-                ), "Expected hashes are the same"
                 obj_head = s3_client.head_object(bucket, obj_key)
                 assert obj_head.get("Metadata") == object_metadata, f"Metadata of object is {object_metadata}"
                 object_grants = s3_client.get_object_acl(bucket, obj_key)
@@ -890,11 +867,7 @@ class TestS3GateObject:
 
         with reporter.step("Put object"):
             test_file = generate_file(simple_object_size.value)
-            obj_key = (
+            obj_key = "/" + "/".join(["".join(random.choices(key_characters_sample, k=5)) for _ in range(10)]) + "/test_file_1"
-                "/"
-                + "/".join(["".join(random.choices(key_characters_sample, k=5)) for _ in range(10)])
-                + "/test_file_1"
-            )
             s3_client.put_object(bucket, test_file, obj_key)
 
         with reporter.step("Check object can be downloaded"):

pytest_tests/testsuites/services/s3_gate/test_s3_policy.py

@@ -1,12 +1,11 @@
 import json
-import os
 
 import allure
 import pytest
 from botocore.exceptions import ClientError
 from frostfs_testlib import reporter
 from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
-from frostfs_testlib.steps.cli.container import search_container_by_name
+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
@@ -15,13 +14,20 @@ 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 ....resources.common import S3_POLICY_FILE_LOCATION
 
+
+@pytest.mark.nightly
 @pytest.mark.s3_gate
-@pytest.mark.parametrize("s3_policy", ["pytest_tests/resources/files/policy.json"], indirect=True)
+@pytest.mark.parametrize("s3_policy", [S3_POLICY_FILE_LOCATION], indirect=True)
 class TestS3GatePolicy(ClusterTestBase):
     @allure.title("Bucket creation with retention policy applied (s3_client={s3_client})")
     def test_s3_bucket_location(
-        self, default_wallet: WalletInfo, s3_client: S3ClientWrapper, simple_object_size: ObjectSize
+        self,
+        default_wallet: WalletInfo,
+        s3_client: S3ClientWrapper,
+        simple_object_size: ObjectSize,
+        bucket_container_resolver: BucketContainerResolver,
     ):
         file_path_1 = generate_file(simple_object_size.value)
         file_name_1 = s3_helper.object_key_from_file_path(file_path_1)
@@ -34,9 +40,7 @@ class TestS3GatePolicy(ClusterTestBase):
             bucket_2 = s3_client.create_bucket(location_constraint="rep-3")
             s3_helper.set_bucket_versioning(s3_client, bucket_2, VersioningStatus.ENABLED)
             list_buckets = s3_client.list_buckets()
-            assert (
+            assert bucket_1 in list_buckets and bucket_2 in list_buckets, f"Expected two buckets {bucket_1, bucket_2}, got {list_buckets}"
-                bucket_1 in list_buckets and bucket_2 in list_buckets
-            ), f"Expected two buckets {bucket_1, bucket_2}, got {list_buckets}"
 
         with reporter.step("Check head buckets"):
             with expect_not_raises():
@@ -57,7 +61,7 @@ class TestS3GatePolicy(ClusterTestBase):
 
         with reporter.step("Check object policy"):
             for cluster_node in self.cluster.cluster_nodes:
-                cid_1 = search_container_by_name(name=bucket_1, node=cluster_node)
+                cid_1 = bucket_container_resolver.resolve(cluster_node, bucket_1)
                 if cid_1:
                     break
             copies_1 = get_simple_object_copies(
@@ -69,7 +73,7 @@ class TestS3GatePolicy(ClusterTestBase):
             )
             assert copies_1 == 1
             for cluster_node in self.cluster.cluster_nodes:
-                cid_2 = search_container_by_name(name=bucket_2, node=cluster_node)
+                cid_2 = bucket_container_resolver.resolve(cluster_node, bucket_2)
                 if cid_2:
                     break
             copies_2 = get_simple_object_copies(
@@ -97,7 +101,6 @@ class TestS3GatePolicy(ClusterTestBase):
                 s3_client.get_bucket_policy(bucket)
 
         with reporter.step("Put new policy"):
-            custom_policy = f"file://{os.getcwd()}/pytest_tests/resources/files/bucket_policy.json"
             custom_policy = {
                 "Version": "2012-10-17",
                 "Id": "aaaa-bbbb-cccc-dddd",

pytest_tests/testsuites/services/s3_gate/test_s3_tagging.py

@@ -11,6 +11,7 @@ from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 @pytest.mark.s3_gate
 @pytest.mark.s3_gate_tagging
 class TestS3GateTagging:

pytest_tests/testsuites/services/s3_gate/test_s3_versioning.py

@@ -9,6 +9,7 @@ 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.mark.nightly
 @pytest.mark.s3_gate
 @pytest.mark.s3_gate_versioning
 class TestS3GateVersioning:
@@ -77,9 +78,7 @@ class TestS3GateVersioning:
 
             file_name = s3_client.get_object(bucket, obj_key)
             got_content = get_file_content(file_name)
-            assert (
+            assert got_content == version_2_content, f"Expected object content is\n{version_2_content}\nGot\n{got_content}"
-                got_content == version_2_content
-            ), f"Expected object content is\n{version_2_content}\nGot\n{got_content}"
 
     @allure.title("Enable and disable versioning without object_lock (s3_client={s3_client})")
     def test_s3_version(self, s3_client: S3ClientWrapper, simple_object_size: ObjectSize):
@@ -97,9 +96,7 @@ class TestS3GateVersioning:
             actual_version = [version.get("VersionId") for version in object_version if version.get("Key") == file_name]
             assert actual_version == ["null"], f"Expected version is null in list-object-versions, got {object_version}"
             object_0 = s3_client.head_object(bucket, file_name)
-            assert (
+            assert object_0.get("VersionId") == "null", f"Expected version is null in head-object, got {object_0.get('VersionId')}"
-                object_0.get("VersionId") == "null"
-            ), f"Expected version is null in head-object, got {object_0.get('VersionId')}"
 
         s3_helper.set_bucket_versioning(s3_client, bucket, VersioningStatus.ENABLED)
 

pytest_tests/testsuites/session_token/conftest.py

@@ -1,10 +1,9 @@
-from datetime import datetime
-
 import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.credentials.interfaces import CredentialsProvider, User
 from frostfs_testlib.storage.cluster import Cluster
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
+from frostfs_testlib.utils import string_utils
 
 
 @pytest.fixture(scope="module")
@@ -15,12 +14,12 @@ def owner_wallet(default_wallet: WalletInfo) -> WalletInfo:
 @pytest.fixture(scope="module")
 def user_wallet(credentials_provider: CredentialsProvider, cluster: Cluster) -> WalletInfo:
     with reporter.step("Create user wallet which will use objects from owner via static session"):
-        user = User(f"user_{hex(int(datetime.now().timestamp() * 1000000))}")
+        user = User(string_utils.unique_name("user-"))
         return credentials_provider.GRPC.provide(user, cluster.cluster_nodes[0])
 
 
 @pytest.fixture(scope="module")
 def stranger_wallet(credentials_provider: CredentialsProvider, cluster: Cluster) -> WalletInfo:
     with reporter.step("Create stranger user wallet which should fail to obtain data"):
-        user = User(f"user_{hex(int(datetime.now().timestamp() * 1000000))}")
+        user = User(string_utils.unique_name("user-"))
         return credentials_provider.GRPC.provide(user, cluster.cluster_nodes[0])

pytest_tests/testsuites/session_token/test_object_session_token.py

@@ -10,10 +10,10 @@ 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 import wallet_utils
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 @pytest.mark.sanity
 @pytest.mark.session_token
 class TestDynamicObjectSession(ClusterTestBase):

pytest_tests/testsuites/session_token/test_static_object_session_token.py

@@ -3,12 +3,7 @@ import logging
 import allure
 import pytest
 from frostfs_testlib import reporter
-from frostfs_testlib.resources.error_patterns import (
+from frostfs_testlib.resources.error_patterns import EXPIRED_SESSION_TOKEN, MALFORMED_REQUEST, OBJECT_ACCESS_DENIED, OBJECT_NOT_FOUND
-    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 (
@@ -138,6 +133,7 @@ def static_sessions(
     }
 
 
+@pytest.mark.nightly
 @pytest.mark.static_session
 class TestObjectStaticSession(ClusterTestBase):
     @allure.title("Read operations with static session (method={method_under_test.__name__}, obj_size={object_size})")

pytest_tests/testsuites/session_token/test_static_session_token_container.py

@@ -1,3 +1,4 @@
+import allure
 import pytest
 from frostfs_testlib import reporter
 from frostfs_testlib.shell import Shell
@@ -7,6 +8,7 @@ from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 
 
+@pytest.mark.nightly
 @pytest.mark.static_session_container
 class TestSessionTokenContainer(ClusterTestBase):
     @pytest.fixture(scope="module")
@@ -22,6 +24,7 @@ class TestSessionTokenContainer(ClusterTestBase):
         """
         return {verb: get_container_signed_token(owner_wallet, user_wallet, verb, client_shell, temp_directory) for verb in ContainerVerb}
 
+    @allure.title("Static session with create operation")
     def test_static_session_token_container_create(
         self,
         owner_wallet: WalletInfo,
@@ -46,6 +49,7 @@ class TestSessionTokenContainer(ClusterTestBase):
         assert cid not in list_containers(user_wallet, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint)
         assert cid in list_containers(owner_wallet, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint)
 
+    @allure.title("[NEGATIVE] Static session without create operation")
     def test_static_session_token_container_create_with_other_verb(
         self,
         user_wallet: WalletInfo,
@@ -65,6 +69,7 @@ class TestSessionTokenContainer(ClusterTestBase):
                         wait_for_creation=False,
                     )
 
+    @allure.title("[NEGATIVE] Static session with create operation for other wallet")
     def test_static_session_token_container_create_with_other_wallet(
         self,
         stranger_wallet: WalletInfo,
@@ -83,6 +88,7 @@ class TestSessionTokenContainer(ClusterTestBase):
                     wait_for_creation=False,
                 )
 
+    @allure.title("Static session with delete operation")
     def test_static_session_token_container_delete(
         self,
         owner_wallet: WalletInfo,

pytest_tests/testsuites/shard/test_control_shard.py

@@ -18,6 +18,7 @@ from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
 from frostfs_testlib.utils.file_utils import generate_file
 
 
+@pytest.mark.nightly
 @pytest.mark.shard
 class TestControlShard(ClusterTestBase):
     @staticmethod
@@ -31,9 +32,7 @@ class TestControlShard(ClusterTestBase):
             data_path = node.storage_node.get_data_directory()
             all_datas = node_shell.exec(f"ls -la {data_path}/data | awk '{{ print $9 }}'").stdout.strip()
             for data_dir in all_datas.replace(".", "").strip().split("\n"):
-                check_dir = node_shell.exec(
+                check_dir = node_shell.exec(f" [ -d {data_path}/data/{data_dir}/data/{oid_path} ] && echo 1 || echo 0").stdout
-                    f" [ -d {data_path}/data/{data_dir}/data/{oid_path} ] && echo 1 || echo 0"
-                ).stdout
                 if "1" in check_dir:
                     object_path = f"{data_path}/data/{data_dir}/data/{oid_path}"
                     object_name = f"{oid[4:]}.{cid}"
@@ -66,9 +65,7 @@ class TestControlShard(ClusterTestBase):
                 basic_acl=EACL_PUBLIC_READ_WRITE,
             )
             file = generate_file(round(max_object_size * 0.8))
-            oid = put_object(
+            oid = put_object(wallet=default_wallet, path=file, cid=cid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint)
-                wallet=default_wallet, path=file, cid=cid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint
-            )
         with reporter.step("Search node with object"):
             nodes = get_object_nodes(cluster=self.cluster, cid=cid, oid=oid, alive_node=self.cluster.cluster_nodes[0])
 
@@ -76,9 +73,7 @@ class TestControlShard(ClusterTestBase):
 
         object_path, object_name = self.get_object_path_and_name_file(oid, cid, nodes[0])
         nodes[0].host.get_shell().exec(f"chmod +r {object_path}/{object_name}")
-        delete_object(
+        delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint)
-            wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint
-        )
         delete_container(wallet=default_wallet, cid=cid, shell=self.shell, endpoint=self.cluster.default_rpc_endpoint)
 
     @staticmethod
@@ -117,6 +112,7 @@ class TestControlShard(ClusterTestBase):
 
             assert set(shards_from_config) == set(shards_from_cli)
 
+    @allure.title("Shard become read-only when errors exceeds threshold")
     @pytest.mark.failover
     def test_shard_errors(
         self,

pytest_tests/testsuites/special/test_frostfs_logs.py

@@ -31,7 +31,17 @@ class TestLogs:
         if not os.path.exists(logs_dir):
             os.makedirs(logs_dir)
 
-        issues_regex = r"\bpanic\b|\boom\b|too many|insufficient funds|insufficient amount of gas|cannot assign requested address|\bunable to process\b"
+        regexes = [
+            r"\bpanic\b",
+            r"\boom\b",
+            r"too many",
+            r"insufficient funds",
+            r"insufficient amount of gas",
+            r"cannot assign requested address",
+            r"\bunable to process\b",
+            r"\bmaximum number of subscriptions is reached\b",
+        ]
+        issues_regex = "|".join(regexes)
         exclude_filter = r"too many requests"
         log_level_priority = "3"  # will include 0-3 priority logs (0: emergency 1: alerts 2: critical 3: errors)
 

requirements.txt

@@ -1,10 +1,9 @@
 allure-pytest==2.13.2
 allure-python-commons==2.13.2
 base58==2.1.0
-boto3==1.16.33
+boto3==1.35.30
 botocore==1.19.33
 configobj==5.0.6
-frostfs-testlib>=2.0.1
 neo-mamba==1.0.0
 pexpect==4.8.0
 pyyaml==6.0.1