New methods with nodes

Signed-off-by: Dmitriy Zayakin <d.zayakin@yadro.com>

src/frostfs_testlib/steps/cli/container.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import re
 from dataclasses import dataclass
 from time import sleep
 from typing import Optional, Union
@@ -10,7 +11,7 @@ from frostfs_testlib.resources.cli import CLI_DEFAULT_TIMEOUT, FROSTFS_CLI_EXEC
 from frostfs_testlib.resources.common import DEFAULT_WALLET_CONFIG
 from frostfs_testlib.shell import Shell
 from frostfs_testlib.steps.cli.object import put_object, 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.storage_object_info import StorageObjectInfo
 from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 from frostfs_testlib.utils import json_utils
@@ -357,3 +358,27 @@ def search_container_by_name(wallet: str, name: str, shell: Shell, endpoint: str
         if cont_info.get("attributes", {}).get("Name", None) == name:
             return cid
     return None
+
+
+@reporter.step_deco("Search for nodes with a container")
+def search_nodes_with_container(
+    wallet: str,
+    cid: str,
+    shell: Shell,
+    endpoint: str,
+    cluster: Cluster,
+    timeout: Optional[str] = CLI_DEFAULT_TIMEOUT,
+) -> list[ClusterNode]:
+    cli = FrostfsCli(shell, FROSTFS_CLI_EXEC, DEFAULT_WALLET_CONFIG)
+    result = cli.container.search_node(
+        rpc_endpoint=endpoint, wallet=wallet, cid=cid, timeout=timeout
+    )
+
+    pattern = r"[0-9]+(?:\.[0-9]+){3}"
+    nodes_ip = list(set(re.findall(pattern, result.stdout)))
+
+    with reporter.step(f"nodes ips = {nodes_ip}"):
+        nodes_list = cluster.get_nodes_by_ip(nodes_ip)
+
+    with reporter.step(f"Return nodes - {nodes_list}"):
+        return nodes_list

src/frostfs_testlib/steps/http/http_gate.py

@@ -28,7 +28,13 @@ ASSETS_DIR = os.getenv("ASSETS_DIR", "TemporaryDir/")
 
 
 @reporter.step_deco("Get via HTTP Gate")
-def get_via_http_gate(cid: str, oid: str, endpoint: str, request_path: Optional[str] = None):
+def get_via_http_gate(
+    cid: str,
+    oid: str,
+    endpoint: str,
+    request_path: Optional[str] = None,
+    timeout: Optional[int] = 300,
+):
     """
     This function gets given object from HTTP gate
     cid:          container id to get object from
@@ -43,7 +49,7 @@ def get_via_http_gate(cid: str, oid: str, endpoint: str, request_path: Optional[
     else:
         request = f"{endpoint}{request_path}"
 
-    resp = requests.get(request, stream=True)
+    resp = requests.get(request, stream=True, timeout=timeout)
 
     if not resp.ok:
         raise Exception(
@@ -63,7 +69,7 @@ def get_via_http_gate(cid: str, oid: str, endpoint: str, request_path: Optional[
 
 
 @reporter.step_deco("Get via Zip HTTP Gate")
-def get_via_zip_http_gate(cid: str, prefix: str, endpoint: str):
+def get_via_zip_http_gate(cid: str, prefix: str, endpoint: str, timeout: Optional[int] = 300):
     """
     This function gets given object from HTTP gate
     cid:      container id to get object from
@@ -71,7 +77,7 @@ def get_via_zip_http_gate(cid: str, prefix: str, endpoint: str):
     endpoint: http gate endpoint
     """
     request = f"{endpoint}/zip/{cid}/{prefix}"
-    resp = requests.get(request, stream=True)
+    resp = requests.get(request, stream=True, timeout=timeout)
 
     if not resp.ok:
         raise Exception(
@@ -96,7 +102,11 @@ def get_via_zip_http_gate(cid: str, prefix: str, endpoint: str):
 
 @reporter.step_deco("Get via HTTP Gate by attribute")
 def get_via_http_gate_by_attribute(
-    cid: str, attribute: dict, endpoint: str, request_path: Optional[str] = None
+    cid: str,
+    attribute: dict,
+    endpoint: str,
+    request_path: Optional[str] = None,
+    timeout: Optional[int] = 300,
 ):
     """
     This function gets given object from HTTP gate
@@ -113,7 +123,7 @@ def get_via_http_gate_by_attribute(
     else:
         request = f"{endpoint}{request_path}"
 
-    resp = requests.get(request, stream=True)
+    resp = requests.get(request, stream=True, timeout=timeout)
 
     if not resp.ok:
         raise Exception(
@@ -133,7 +143,9 @@ def get_via_http_gate_by_attribute(
 
 
 @reporter.step_deco("Upload via HTTP Gate")
-def upload_via_http_gate(cid: str, path: str, endpoint: str, headers: Optional[dict] = None) -> str:
+def upload_via_http_gate(
+    cid: str, path: str, endpoint: str, headers: Optional[dict] = None, timeout: Optional[int] = 300
+) -> str:
     """
     This function upload given object through HTTP gate
     cid:      CID to get object from
@@ -144,7 +156,7 @@ def upload_via_http_gate(cid: str, path: str, endpoint: str, headers: Optional[d
     request = f"{endpoint}/upload/{cid}"
     files = {"upload_file": open(path, "rb")}
     body = {"filename": path}
-    resp = requests.post(request, files=files, data=body, headers=headers)
+    resp = requests.post(request, files=files, data=body, headers=headers, timeout=timeout)
 
     if not resp.ok:
         raise Exception(

src/frostfs_testlib/steps/s3/s3_helper.py

@@ -12,7 +12,12 @@ from frostfs_testlib.reporter import get_reporter
 from frostfs_testlib.resources.cli import FROSTFS_AUTHMATE_EXEC
 from frostfs_testlib.resources.common import CREDENTIALS_CREATE_TIMEOUT
 from frostfs_testlib.s3 import S3ClientWrapper, VersioningStatus
-from frostfs_testlib.storage.cluster import Cluster
+from frostfs_testlib.shell import Shell
+from frostfs_testlib.steps.cli.container import (
+    search_container_by_name,
+    search_nodes_with_container,
+)
+from frostfs_testlib.storage.cluster import Cluster, ClusterNode
 from frostfs_testlib.storage.dataclasses.frostfs_services import S3Gate
 from frostfs_testlib.utils.cli_utils import _run_with_passwd
 
@@ -245,3 +250,18 @@ def delete_bucket_with_objects(s3_client: S3ClientWrapper, bucket: str):
 
     # Delete the bucket itself
     s3_client.delete_bucket(bucket)
+
+
+@reporter.step_deco("Search nodes bucket")
+def search_nodes_with_bucket(
+    cluster: Cluster,
+    bucket_name: str,
+    wallet: str,
+    shell: Shell,
+    endpoint: str,
+) -> list[ClusterNode]:
+    cid = search_container_by_name(wallet=wallet, name=bucket_name, shell=shell, endpoint=endpoint)
+    nodes_list = search_nodes_with_container(
+        wallet=wallet, cid=cid, shell=shell, endpoint=endpoint, cluster=cluster
+    )
+    return nodes_list