mkadilov
/
frostfs-testcases
forked from TrueCloudLab/frostfs-testcases
1
0
Fork 0
Code Pull Requests Activity

[#145] Refactoring old functions for FrostfsCli 

Refactoring old functions for FrostfsCli

Signed-off-by: Mikhail Kadilov m.kadilov@yadro.com
Mikhail Kadilov 2024-02-09 13:12:45 +03:00
parent e453614381
commit e5058d38ca
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pytest_tests/testsuites/management/test_node_management.py
View File

@ -7,6 +7,7 @@ from typing import Optional, Tuple
import allure
import pytest
from frostfs_testlib import reporter
from frostfs_testlib.hosting import Host
from frostfs_testlib.cli import FrostfsCli
from frostfs_testlib.cli.netmap_parser import NetmapParser
from frostfs_testlib.resources.cli import FROSTFS_CLI_EXEC
@ -49,6 +50,7 @@ from pytest_tests.helpers.utility import wait_for_gc_pass_on_storage_nodes
logger = logging.getLogger("NeoLogger")
check_nodes: list[StorageNode] = []
check_nodes_cluster_node_hosts: list[Host] = []
@allure.title("Add one node to cluster")
@ -122,8 +124,10 @@ class TestNodeManagement(ClusterTestBase):
sleep(datetime_utils.parse_time(MORPH_BLOCK_TIME))
with reporter.step(f"Move node {node} to online state"):
storage_node_set_status(node, status="online", retries=2)
node_cluster_node_host = check_nodes_cluster_node_hosts[check_nodes.index(node)]
storage_node_set_status(node, node_cluster_node_host, status="online", retries=2)
check_nodes_cluster_node_hosts.pop(check_nodes.index(node))
check_nodes.remove(node)
sleep(datetime_utils.parse_time(MORPH_BLOCK_TIME))
self.tick_epoch_with_retries(3, wait_block=2)
@ -145,16 +149,25 @@ class TestNodeManagement(ClusterTestBase):
placement_rule_4 = "REP 4 IN X CBF 1 SELECT 4 FROM * AS X"
source_file_path = generate_file(simple_object_size.value)
storage_nodes = self.cluster.storage_nodes
random_node = random.choice(storage_nodes[1:])
storage_nodes = []
corresponding_cluster_node_hosts = []
for cluster_node in self.cluster.cluster_nodes:
storage_nodes.append(cluster_node.storage_node)
corresponding_cluster_node_hosts.append(cluster_node.host)
random_node_index = random.randint(1, len(storage_nodes) - 1)
random_node = storage_nodes[random_node_index]
random_node_host = corresponding_cluster_node_hosts[random_node_index]
alive_node = random.choice(
[storage_node for storage_node in storage_nodes if storage_node.id != random_node.id]
)
check_node_in_map(random_node, shell=self.shell, alive_node=alive_node)
# Add node to recovery list before messing with it
check_nodes.append(random_node)
check_nodes_cluster_node_hosts.append(random_node_host)
exclude_node_from_network_map(random_node, alive_node, shell=self.shell, cluster=self.cluster)
delete_node_data(random_node)
@ -180,6 +193,7 @@ class TestNodeManagement(ClusterTestBase):
random_node = random.choice(list(set(storage_nodes) - {random_node, alive_node}))
# Add node to recovery list before messing with it
check_nodes.append(random_node)
check_nodes_cluster_node_hosts.append(random_node_host)
exclude_node_from_network_map(random_node, alive_node, shell=self.shell, cluster=self.cluster)
wait_object_replication(
@ -290,8 +304,22 @@ class TestNodeManagement(ClusterTestBase):
wallet = default_wallet
placement_rule = "REP 3 IN X SELECT 4 FROM * AS X"
source_file_path = generate_file(simple_object_size.value)
storage_nodes = self.cluster.storage_nodes
random_node = random.choice(storage_nodes[1:])
# storage_nodes = self.cluster.storage_nodes
# random_node = random.choice(storage_nodes[1:])
# alive_node = random.choice(
# [storage_node for storage_node in storage_nodes if storage_node.id != random_node.id]
# )
storage_nodes = []
corresponding_cluster_node_hosts = []
for cluster_node in self.cluster.cluster_nodes:
storage_nodes.append(cluster_node.storage_node)
corresponding_cluster_node_hosts.append(cluster_node.host)
random_node_index = random.randint(1, len(storage_nodes) - 1)
random_node = storage_nodes[random_node_index]
random_node_host = corresponding_cluster_node_hosts[random_node_index]
alive_node = random.choice(
[storage_node for storage_node in storage_nodes if storage_node.id != random_node.id]
)
@ -305,6 +333,7 @@ class TestNodeManagement(ClusterTestBase):
)
with reporter.step("Stop the random node"):
check_nodes.append(random_node)
check_nodes_cluster_node_hosts.append(random_node_host)
random_node.stop_service()
with reporter.step("Try to put an object and expect success"):
put_object(