From 84e83487f9896cc1e95c64680bf7664724a4c59c Mon Sep 17 00:00:00 2001
From: Dmitriy Zayakin <d.zayakin@yadro.com>
Date: Tue, 10 Sep 2024 13:54:51 +0300
Subject: [PATCH] [#288] Update object and chunks Clients

Signed-off-by: Dmitriy Zayakin <d.zayakin@yadro.com>
---
 src/frostfs_testlib/cli/frostfs_cli/object.py |  2 +-
 .../grpc_operations/implementations/chunks.py | 63 +++++++++++++++----
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/frostfs_testlib/cli/frostfs_cli/object.py b/src/frostfs_testlib/cli/frostfs_cli/object.py
index 070def0..1857987 100644
--- a/src/frostfs_testlib/cli/frostfs_cli/object.py
+++ b/src/frostfs_testlib/cli/frostfs_cli/object.py
@@ -370,11 +370,11 @@ class FrostfsCliObject(CliCommand):
         self,
         rpc_endpoint: str,
         cid: str,
+        oid: Optional[str] = None,
         wallet: Optional[str] = None,
         address: Optional[str] = None,
         bearer: Optional[str] = None,
         generate_key: Optional[bool] = None,
-        oid: Optional[str] = None,
         trace: bool = False,
         root: bool = False,
         verify_presence_all: bool = False,
diff --git a/src/frostfs_testlib/storage/grpc_operations/implementations/chunks.py b/src/frostfs_testlib/storage/grpc_operations/implementations/chunks.py
index b0f196e..d1bba9f 100644
--- a/src/frostfs_testlib/storage/grpc_operations/implementations/chunks.py
+++ b/src/frostfs_testlib/storage/grpc_operations/implementations/chunks.py
@@ -60,7 +60,6 @@ class ChunksOperations(interfaces.ChunksInterface):
         rpc_endpoint: str,
         cid: str,
         oid: str,
-        wallet: Optional[str] = None,
         address: Optional[str] = None,
         bearer: Optional[str] = None,
         generate_key: Optional[bool] = None,
@@ -72,15 +71,28 @@ class ChunksOperations(interfaces.ChunksInterface):
         xhdr: Optional[dict] = None,
         timeout: Optional[str] = None,
     ) -> list[Chunk]:
-        object_nodes = self.cli.object.nodes(**{param: value for param, value in locals().items() if param not in ["self"]})
-        return self._parse_object_nodes(object_nodes.stdout)
+        object_nodes = self.cli.object.nodes(
+            rpc_endpoint=rpc_endpoint,
+            cid=cid,
+            address=address,
+            bearer=bearer,
+            generate_key=generate_key,
+            oid=oid,
+            trace=trace,
+            root=root,
+            verify_presence_all=verify_presence_all,
+            json=json,
+            ttl=ttl,
+            xhdr=xhdr,
+            timeout=timeout,
+        )
+        return self._parse_object_nodes(object_nodes.stdout.split("\n")[0])[0]
 
     @reporter.step("Get last parity chunk")
     def get_parity(
         self,
         rpc_endpoint: str,
         cid: str,
-        wallet: Optional[str] = None,
         address: Optional[str] = None,
         bearer: Optional[str] = None,
         generate_key: Optional[bool] = None,
@@ -93,29 +105,56 @@ class ChunksOperations(interfaces.ChunksInterface):
         xhdr: Optional[dict] = None,
         timeout: Optional[str] = None,
     ) -> Chunk:
-        object_nodes = self.cli.object.nodes(**{param: value for param, value in locals().items() if param not in ["self"]})
-        return self._parse_object_nodes(object_nodes.stdout)[-1]
+        object_nodes = self.cli.object.nodes(
+            rpc_endpoint=rpc_endpoint,
+            cid=cid,
+            address=address,
+            bearer=bearer,
+            generate_key=generate_key,
+            oid=oid,
+            trace=trace,
+            root=root,
+            verify_presence_all=verify_presence_all,
+            json=json,
+            ttl=ttl,
+            xhdr=xhdr,
+            timeout=timeout,
+        )
+        return self._parse_object_nodes(object_nodes.stdout.split("\n")[0])[0]
 
     @reporter.step("Get first data chunk")
     def get_first_data(
         self,
         rpc_endpoint: str,
         cid: str,
-        wallet: Optional[str] = None,
+        oid: Optional[str] = None,
         address: Optional[str] = None,
         bearer: Optional[str] = None,
         generate_key: Optional[bool] = None,
-        oid: Optional[str] = None,
-        trace: bool = False,
+        trace: bool = True,
         root: bool = False,
         verify_presence_all: bool = False,
         json: bool = True,
         ttl: Optional[int] = None,
         xhdr: Optional[dict] = None,
-        timeout: Optional[str] = None,
+        timeout: Optional[str] = CLI_DEFAULT_TIMEOUT,
     ) -> Chunk:
-        object_nodes = self.cli.object.nodes(**{param: value for param, value in locals().items() if param not in ["self"]})
-        return self._parse_object_nodes(object_nodes.stdout)[0]
+        object_nodes = self.cli.object.nodes(
+            rpc_endpoint=rpc_endpoint,
+            cid=cid,
+            address=address,
+            bearer=bearer,
+            generate_key=generate_key,
+            oid=oid,
+            trace=trace,
+            root=root,
+            verify_presence_all=verify_presence_all,
+            json=json,
+            ttl=ttl,
+            xhdr=xhdr,
+            timeout=timeout,
+        )
+        return self._parse_object_nodes(object_nodes.stdout.split("\n")[0])[0]
 
     def _parse_object_nodes(self, object_nodes: str) -> list[Chunk]:
         parse_result = json.loads(object_nodes)