diff options
| author | kruall <kruall@ydb.tech> | 2023-05-16 18:26:11 +0300 |
|---|---|---|
| committer | kruall <kruall@ydb.tech> | 2023-05-16 18:26:11 +0300 |
| commit | 6273318769e6d741aaa31de686826fd8c091ebe8 (patch) | |
| tree | 23dc140e38293b44e706b2ad5dc40e91ce1c5352 | |
| parent | 70624ba41fab132764eda048605c802302d1599e (diff) | |
| download | ydb-6273318769e6d741aaa31de686826fd8c091ebe8.tar.gz | |
Add pool (create|remove),
| -rw-r--r-- | ydb/apps/dstool/lib/commands.py | 5 | ||||
| -rw-r--r-- | ydb/apps/dstool/lib/dstool_cmd_box_list.py | 5 | ||||
| -rw-r--r-- | ydb/apps/dstool/lib/dstool_cmd_pool_list.py | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/ydb/apps/dstool/lib/commands.py b/ydb/apps/dstool/lib/commands.py index 3796dc291cf..54124336d02 100644 --- a/ydb/apps/dstool/lib/commands.py +++ b/ydb/apps/dstool/lib/commands.py @@ -36,7 +36,7 @@ import ydb.apps.dstool.lib.dstool_cmd_cluster_workload_run as cluster_workload_r import sys import ydb.apps.dstool.lib.common as common -MODULE_PREFIX = 'ydb.apps.dstool.lib.dstool_cmd_' +MODULE_PREFIX = 'dstool_cmd_' modules = [ cluster_balance, cluster_get, cluster_set, cluster_list, cluster_workload_run, @@ -64,7 +64,8 @@ default_structure = [ def make_command_map_by_structure(subparsers, modules=modules, structure=default_structure): module_map = {} for module in modules: - module_map[module.__name__[len(MODULE_PREFIX):].replace('_', '-')] = module + last_name = module.__name__.split('.')[-1] + module_map[last_name[len(MODULE_PREFIX):].replace('_', '-')] = module command_map = {} diff --git a/ydb/apps/dstool/lib/dstool_cmd_box_list.py b/ydb/apps/dstool/lib/dstool_cmd_box_list.py index 742032bc13d..c7f546cb995 100644 --- a/ydb/apps/dstool/lib/dstool_cmd_box_list.py +++ b/ydb/apps/dstool/lib/dstool_cmd_box_list.py @@ -81,7 +81,10 @@ def do(args): if column not in row: row[column] = 0 - row['Usage'] = row['UsedSize'] / row['TotalSize'] if row['TotalSize'] != 0 else 0.0 + if 'UsedSize' in row and 'TotalSize' in row: + row['Usage'] = row['UsedSize'] / row['TotalSize'] if row['TotalSize'] != 0 else 0.0 + else: + row['Usage'] = 0.0 rows.append(row) table_output.dump(rows, args) diff --git a/ydb/apps/dstool/lib/dstool_cmd_pool_list.py b/ydb/apps/dstool/lib/dstool_cmd_pool_list.py index 35ddcbbecb4..a1c43166020 100644 --- a/ydb/apps/dstool/lib/dstool_cmd_pool_list.py +++ b/ydb/apps/dstool/lib/dstool_cmd_pool_list.py @@ -217,7 +217,10 @@ def do(args): row[column] = 0 # fill usage at the end - row['Usage'] = row['UsedSize'] / row['TotalSize'] if row['TotalSize'] != 0 else 0.0 + if 'UsedSize' in row and 'TotalSize' in row: + row['Usage'] = row['UsedSize'] / row['TotalSize'] if row['TotalSize'] != 0 else 0.0 + else: + row['Usage'] = 0.0 rows.append(row) |