From cdc3397df5f204dcf52e94774fe0a31ff972474b Mon Sep 17 00:00:00 2001 From: Liza Date: Tue, 16 Jan 2024 16:33:11 +0300 Subject: [PATCH] [#161] Add verbose flag for frostfs-cli Signed-off-by: Liza --- src/frostfs_testlib/cli/frostfs_cli/accounting.py | 1 + src/frostfs_testlib/cli/frostfs_cli/acl.py | 2 +- src/frostfs_testlib/cli/frostfs_cli/container.py | 8 ++++++++ src/frostfs_testlib/cli/frostfs_cli/control.py | 2 ++ src/frostfs_testlib/cli/frostfs_cli/netmap.py | 4 ++++ src/frostfs_testlib/cli/frostfs_cli/object.py | 9 +++++++++ src/frostfs_testlib/cli/frostfs_cli/session.py | 1 + src/frostfs_testlib/cli/frostfs_cli/shards.py | 4 ++++ src/frostfs_testlib/cli/frostfs_cli/storagegroup.py | 4 ++++ src/frostfs_testlib/cli/frostfs_cli/tree.py | 1 + src/frostfs_testlib/cli/frostfs_cli/util.py | 2 ++ src/frostfs_testlib/cli/frostfs_cli/version.py | 2 +- 12 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/frostfs_testlib/cli/frostfs_cli/accounting.py b/src/frostfs_testlib/cli/frostfs_cli/accounting.py index 7b2b9f0..394a23d 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/accounting.py +++ b/src/frostfs_testlib/cli/frostfs_cli/accounting.py @@ -11,6 +11,7 @@ class FrostfsCliAccounting(CliCommand): rpc_endpoint: Optional[str] = None, address: Optional[str] = None, owner: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """Get internal balance of FrostFS account diff --git a/src/frostfs_testlib/cli/frostfs_cli/acl.py b/src/frostfs_testlib/cli/frostfs_cli/acl.py index 3e60582..9260613 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/acl.py +++ b/src/frostfs_testlib/cli/frostfs_cli/acl.py @@ -6,7 +6,7 @@ from frostfs_testlib.shell import CommandResult class FrostfsCliACL(CliCommand): def extended_create( - self, cid: str, out: str, file: Optional[str] = None, rule: Optional[list] = None + self, cid: str, out: str, file: Optional[str] = None, rule: Optional[list] = None, verbose: bool = True, ) -> CommandResult: """Create extended ACL from the text representation. diff --git a/src/frostfs_testlib/cli/frostfs_cli/container.py b/src/frostfs_testlib/cli/frostfs_cli/container.py index 5ea8ba8..509b3dc 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/container.py +++ b/src/frostfs_testlib/cli/frostfs_cli/container.py @@ -22,6 +22,7 @@ class FrostfsCliContainer(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True ) -> CommandResult: """ Create a new container and register it in the FrostFS. @@ -66,6 +67,7 @@ class FrostfsCliContainer(CliCommand): xhdr: Optional[dict] = None, force: bool = False, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Delete an existing container. @@ -104,6 +106,7 @@ class FrostfsCliContainer(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get container field info. @@ -140,6 +143,7 @@ class FrostfsCliContainer(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get extended ACL table of container. @@ -174,6 +178,7 @@ class FrostfsCliContainer(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, **params, ) -> CommandResult: """ @@ -205,6 +210,7 @@ class FrostfsCliContainer(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ List existing objects in container. @@ -238,6 +244,7 @@ class FrostfsCliContainer(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Set a new extended ACL table for the container. @@ -275,6 +282,7 @@ class FrostfsCliContainer(CliCommand): xhdr: Optional[dict] = None, generate_key: Optional[bool] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Show the nodes participating in the container in the current epoch. diff --git a/src/frostfs_testlib/cli/frostfs_cli/control.py b/src/frostfs_testlib/cli/frostfs_cli/control.py index bfcd6ec..c75f766 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/control.py +++ b/src/frostfs_testlib/cli/frostfs_cli/control.py @@ -13,6 +13,7 @@ class FrostfsCliControl(CliCommand): force: Optional[bool] = None, address: Optional[str] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """Set status of the storage node in FrostFS network map @@ -38,6 +39,7 @@ class FrostfsCliControl(CliCommand): wallet: Optional[str] = None, address: Optional[str] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """Set status of the storage node in FrostFS network map diff --git a/src/frostfs_testlib/cli/frostfs_cli/netmap.py b/src/frostfs_testlib/cli/frostfs_cli/netmap.py index 8920893..3942f00 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/netmap.py +++ b/src/frostfs_testlib/cli/frostfs_cli/netmap.py @@ -14,6 +14,7 @@ class FrostfsCliNetmap(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get current epoch number. @@ -44,6 +45,7 @@ class FrostfsCliNetmap(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get information about FrostFS network. @@ -75,6 +77,7 @@ class FrostfsCliNetmap(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get target node info. @@ -106,6 +109,7 @@ class FrostfsCliNetmap(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Request current local snapshot of the network map. diff --git a/src/frostfs_testlib/cli/frostfs_cli/object.py b/src/frostfs_testlib/cli/frostfs_cli/object.py index 476af68..fd3ec89 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/object.py +++ b/src/frostfs_testlib/cli/frostfs_cli/object.py @@ -17,6 +17,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Delete object from FrostFS. @@ -57,6 +58,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get object from FrostFS. @@ -100,6 +102,7 @@ class FrostfsCliObject(CliCommand): hash_type: Optional[str] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get object hash. @@ -146,6 +149,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get object header. @@ -189,6 +193,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Lock object in container. @@ -234,6 +239,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Put object to FrostFS. @@ -282,6 +288,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get payload range data of an object. @@ -325,6 +332,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Search object. @@ -367,6 +375,7 @@ class FrostfsCliObject(CliCommand): ttl: Optional[int] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Search object nodes. diff --git a/src/frostfs_testlib/cli/frostfs_cli/session.py b/src/frostfs_testlib/cli/frostfs_cli/session.py index e21cc23..02dbcc1 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/session.py +++ b/src/frostfs_testlib/cli/frostfs_cli/session.py @@ -14,6 +14,7 @@ class FrostfsCliSession(CliCommand): lifetime: Optional[int] = None, address: Optional[str] = None, json: Optional[bool] = False, + verbose: bool = True, ) -> CommandResult: """ Create session token. diff --git a/src/frostfs_testlib/cli/frostfs_cli/shards.py b/src/frostfs_testlib/cli/frostfs_cli/shards.py index 1727249..5b6d05f 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/shards.py +++ b/src/frostfs_testlib/cli/frostfs_cli/shards.py @@ -14,6 +14,7 @@ class FrostfsCliShards(CliCommand): address: Optional[str] = None, all: bool = False, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Flush objects from the write-cache to the main storage. @@ -47,6 +48,7 @@ class FrostfsCliShards(CliCommand): all: bool = False, clear_errors: bool = False, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Set work mode of the shard. @@ -81,6 +83,7 @@ class FrostfsCliShards(CliCommand): address: Optional[str] = None, no_errors: bool = False, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Dump objects from shard to a file. @@ -112,6 +115,7 @@ class FrostfsCliShards(CliCommand): address: Optional[str] = None, json_mode: bool = False, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ List shards of the storage node. diff --git a/src/frostfs_testlib/cli/frostfs_cli/storagegroup.py b/src/frostfs_testlib/cli/frostfs_cli/storagegroup.py index 8fb22ce..ef4d7fd 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/storagegroup.py +++ b/src/frostfs_testlib/cli/frostfs_cli/storagegroup.py @@ -17,6 +17,7 @@ class FrostfsCliStorageGroup(CliCommand): address: Optional[str] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Put storage group to FrostFS. @@ -55,6 +56,7 @@ class FrostfsCliStorageGroup(CliCommand): address: Optional[str] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Get storage group from FrostFS. @@ -92,6 +94,7 @@ class FrostfsCliStorageGroup(CliCommand): address: Optional[str] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ List storage groups in FrostFS container. @@ -129,6 +132,7 @@ class FrostfsCliStorageGroup(CliCommand): address: Optional[str] = None, xhdr: Optional[dict] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Delete storage group from FrostFS. diff --git a/src/frostfs_testlib/cli/frostfs_cli/tree.py b/src/frostfs_testlib/cli/frostfs_cli/tree.py index af330fe..ea1b3b3 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/tree.py +++ b/src/frostfs_testlib/cli/frostfs_cli/tree.py @@ -10,6 +10,7 @@ class FrostfsCliTree(CliCommand): wallet: Optional[str] = None, rpc_endpoint: Optional[str] = None, timeout: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """Get internal balance of FrostFS account diff --git a/src/frostfs_testlib/cli/frostfs_cli/util.py b/src/frostfs_testlib/cli/frostfs_cli/util.py index 99acd0a..b461242 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/util.py +++ b/src/frostfs_testlib/cli/frostfs_cli/util.py @@ -12,6 +12,7 @@ class FrostfsCliUtil(CliCommand): to_file: str, address: Optional[str] = None, json: Optional[bool] = False, + verbose: bool = True, ) -> CommandResult: """ Sign bearer token to use it in requests. @@ -37,6 +38,7 @@ class FrostfsCliUtil(CliCommand): from_file: str, to_file: str, address: Optional[str] = None, + verbose: bool = True, ) -> CommandResult: """ Sign session token to use it in requests. diff --git a/src/frostfs_testlib/cli/frostfs_cli/version.py b/src/frostfs_testlib/cli/frostfs_cli/version.py index 9d22859..82cc9e5 100644 --- a/src/frostfs_testlib/cli/frostfs_cli/version.py +++ b/src/frostfs_testlib/cli/frostfs_cli/version.py @@ -10,4 +10,4 @@ class FrostfsCliVersion(CliCommand): Returns: Command's result. """ - return self._execute("", version=True) + return self._execute("", version=True, verbose=True)