Update simple check the object appearance

This commit is contained in:
Ekaterina Chernitsyna 2023-10-20 13:59:15 +03:00 committed by Andrey Berezin
parent b72f6daeb7
commit cbbbc686f4

View file

@ -3,9 +3,13 @@ import pytest
from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL from frostfs_testlib.resources.wellknown_acl import PUBLIC_ACL
from frostfs_testlib.steps.cli.container import create_container, delete_container, get_container from frostfs_testlib.steps.cli.container import create_container, delete_container, get_container
from frostfs_testlib.steps.cli.object import delete_object, put_object_to_random_node from frostfs_testlib.steps.cli.object import delete_object, put_object_to_random_node
from frostfs_testlib.steps.node_management import get_netmap_snapshot
from frostfs_testlib.steps.storage_policy import get_nodes_with_object, get_nodes_without_object from frostfs_testlib.steps.storage_policy import get_nodes_with_object, get_nodes_without_object
from frostfs_testlib.storage.dataclasses.frostfs_services import StorageNode
from frostfs_testlib.storage.dataclasses.object_size import ObjectSize from frostfs_testlib.storage.dataclasses.object_size import ObjectSize
from frostfs_testlib.storage.dataclasses.storage_object_info import NodeNetmapInfo
from frostfs_testlib.testing.cluster_test_base import ClusterTestBase from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
from frostfs_testlib.utils.cli_utils import parse_netmap_output
from frostfs_testlib.utils.file_utils import generate_file from frostfs_testlib.utils.file_utils import generate_file
from pytest_tests.helpers.utility import placement_policy_from_container from pytest_tests.helpers.utility import placement_policy_from_container
@ -124,11 +128,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -167,11 +166,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -210,11 +204,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -340,9 +329,7 @@ class TestPolicy(ClusterTestBase):
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"): with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object( self.check_for_the_uniqueness_of_the_nodes(resulting_copies)
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the container"): with allure.step(f"Delete the container"):
delete_container(wallet=default_wallet, cid=cid, shell=self.shell, endpoint=endpoint) delete_container(wallet=default_wallet, cid=cid, shell=self.shell, endpoint=endpoint)
@ -382,11 +369,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -425,11 +407,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -598,11 +575,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -641,11 +613,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -813,11 +780,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -856,11 +818,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -1028,11 +985,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -1071,11 +1023,6 @@ class TestPolicy(ClusterTestBase):
len(resulting_copies) == expected_copies len(resulting_copies) == expected_copies
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -1245,9 +1192,7 @@ class TestPolicy(ClusterTestBase):
self.check_for_the_uniqueness_of_the_nodes(resulting_copies) self.check_for_the_uniqueness_of_the_nodes(resulting_copies)
with allure.step(f"Check the object appearance"): with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object( self.check_for_the_uniqueness_of_the_nodes(resulting_copies)
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint) delete_object(wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, endpoint=endpoint)
@ -1288,9 +1233,6 @@ class TestPolicy(ClusterTestBase):
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"): with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
self.check_for_the_uniqueness_of_the_nodes(resulting_copies) self.check_for_the_uniqueness_of_the_nodes(resulting_copies)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
@ -1332,9 +1274,6 @@ class TestPolicy(ClusterTestBase):
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"): with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
self.check_for_the_uniqueness_of_the_nodes(resulting_copies) self.check_for_the_uniqueness_of_the_nodes(resulting_copies)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):
@ -1376,9 +1315,6 @@ class TestPolicy(ClusterTestBase):
), f"Expected {expected_copies} copies, got {len(resulting_copies)}" ), f"Expected {expected_copies} copies, got {len(resulting_copies)}"
with allure.step(f"Check the object appearance"): with allure.step(f"Check the object appearance"):
nodes_without_object = get_nodes_without_object(
wallet=default_wallet, cid=cid, oid=oid, shell=self.shell, nodes=self.cluster.storage_nodes
)
self.check_for_the_uniqueness_of_the_nodes(resulting_copies) self.check_for_the_uniqueness_of_the_nodes(resulting_copies)
with allure.step(f"Delete the object from the container"): with allure.step(f"Delete the object from the container"):