sbcli-pre 1.2.8__zip → 1.2.10__zip

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 1.2.8
+Version: 1.2.10
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.2.8
+SIMPLY_BLOCK_VERSION=1.2.10
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/sbcli_pre.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 1.2.8
+Version: 1.2.10
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/simplyblock_cli/cli.py

@@ -82,7 +82,7 @@ class CLIWrapper:
         sub_command.add_argument("--max-lvol", help='Max lvol per storage node', dest='max_lvol', type=int, default=0)
         sub_command.add_argument("--max-snap", help='Max snapshot per storage node', dest='max_snap', type=int, default=0)
         sub_command.add_argument("--max-prov", help='Max provisioning size of all storage nodes', dest='max_prov', default="")
-        sub_command.add_argument("--number-of-devices", help='Number of devices per storage node if it\'s not supported EC2 instance', dest='number_of_devices', type=int)
+        sub_command.add_argument("--number-of-devices", help='Number of devices per storage node if it\'s not supported EC2 instance', dest='number_of_devices', type=int, default=0)
 
         sub_command.add_argument("--spdk-image", help='SPDK image uri', dest='spdk_image')
         sub_command.add_argument("--spdk-debug", help='Enable spdk debug logs', dest='spdk_debug', required=False, action='store_true')
@@ -662,7 +662,7 @@ class CLIWrapper:
                 max_snap = args.max_snap
                 max_prov = self.parse_size(args.max_prov)
                 number_of_devices = args.number_of_devices
-                if max_prov < 1 * 1024 * 1024:
+                if max_prov < 1 * 1024 * 1024 * 1024:
                     return f"Max provisioning memory:{args.max_prov} must be larger than 1G"
 
                 out = storage_ops.add_node(
@@ -685,10 +685,10 @@ class CLIWrapper:
                 spdk_image = args.spdk_image
                 spdk_debug = args.spdk_debug
 
-
                 max_lvol = args.max_lvol
                 max_snap = args.max_snap
-                max_prov = self.parse_size(args.max_prov)
+                max_prov = self.parse_size(args.max_prov) if args.max_prov else 0
+                number_of_devices = args.number_of_devices
 
                 small_bufsize = args.small_bufsize
                 large_bufsize = args.large_bufsize
@@ -696,7 +696,7 @@ class CLIWrapper:
                 ret = storage_ops.restart_storage_node(
                     node_id, max_lvol, max_snap, max_prov,
                     spdk_image, spdk_debug,
-                    small_bufsize, large_bufsize)
+                    small_bufsize, large_bufsize, number_of_devices)
 
             elif sub_command == "list-devices":
                 ret = self.storage_node_list_devices(args)

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/simplyblock_core/models/storage_node.py

@@ -63,7 +63,8 @@ class StorageNode(BaseModel):
         "ctrl_secret": {"type": str, "default": ""},
         "max_lvol": {"type": int, "default": 0},
         "max_snap": {"type": int, "default": 0},
-        "max_prov": {"type": str, "default": ""},
+        "max_prov": {"type": int, "default": 0},
+        "number_of_devices": {"type": int, "default": 0},
         "cpu": {"type": int, "default": 0},
         "cpu_hz": {"type": int, "default": 0},
         "memory": {"type": int, "default": 0},

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/simplyblock_core/storage_node_ops.py

@@ -638,7 +638,8 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
                 logger.error(f"Unsupported ec2 instance-type {ec2_metadata['instanceType']} "
                              "for deployment, please specify --number-of-devices")
                 return False
-        number_of_devices = storage_devices
+        else:
+            number_of_devices = storage_devices
     else:
         logger.warning("Can not get ec2 instance type for this instance.")
         if not number_of_devices:
@@ -1010,7 +1011,7 @@ def remove_storage_node(node_id, force_remove=False, force_migrate=False):
 
 
 def restart_storage_node(
-        node_id, max_lvol=0, max_snap=0, max_prov="",
+        node_id, max_lvol=0, max_snap=0, max_prov=0,
         spdk_image=None,
         set_spdk_debug=None,
         small_bufsize=0, large_bufsize=0, number_of_devices=0):
@@ -1062,10 +1063,13 @@ def restart_storage_node(
         if not supported_type:
             logger.warning(f"Unsupported ec2 instance-type {snode.ec2_metadata['instanceType']} for deployment")
             if not number_of_devices:
-                logger.error(f"Unsupported ec2 instance-type {snode.ec2_metadata['instanceType']} "
-                             "for deployment, please specify --number-of-devices")
-                return False
-        number_of_devices = storage_devices
+                if not snode.number_of_devices:
+                    logger.error(f"Unsupported ec2 instance-type {snode.ec2_metadata['instanceType']} "
+                                 "for deployment, please specify --number-of-devices")
+                    return False
+                number_of_devices = snode.number_of_devices
+        else:
+            number_of_devices = storage_devices
     else:
         logger.warning("Can not get ec2 instance type for this instance..")
         if not number_of_devices:
@@ -1074,7 +1078,6 @@ def restart_storage_node(
             else:
                 logger.error("Unsupported instance type please specify --number-of-devices")
                 return False
-
     snode.number_of_devices = number_of_devices
 
     number_of_split = snode.num_partitions_per_dev if snode.num_partitions_per_dev else snode.num_partitions_per_dev + 1

{sbcli_pre-1.2.8 → sbcli_pre-1.2.10}/simplyblock_web/node_utils.py

@@ -149,7 +149,7 @@ def get_memory_details():
         mem_kb = mem_info['MemTotal']
         data['total'] = utils.parse_size(mem_kb.replace(" ", ""))
 
-        mem_kb = mem_info['MemFree']
+        mem_kb = mem_info['MemAvailable']
         data['free'] = utils.parse_size(mem_kb.replace(" ", ""))
 
         mem_kb = mem_info['Hugetlb']