sbcli-dev 3.8.95__zip → 3.8.96__zip

{sbcli_dev-3.8.95 → sbcli_dev-3.8.96}/PKG-INFO

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

{sbcli_dev-3.8.95 → sbcli_dev-3.8.96}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=3.8.95
+SIMPLY_BLOCK_VERSION=3.8.96
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main

{sbcli_dev-3.8.95 → sbcli_dev-3.8.96}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.95 → sbcli_dev-3.8.96}/simplyblock_cli/cli.py

@@ -39,13 +39,13 @@ class CLIWrapper:
         sub_command.add_argument("cluster_id", help='UUID of the cluster to which the node will belong')
         sub_command.add_argument("node_ip", help='IP of storage node to add')
         sub_command.add_argument("ifname", help='Management interface name')
-        sub_command.add_argument("--partitions", help='Number of partitions to create per device', type=int, default=1)
+        sub_command.add_argument("--partitions", help='Number of partitions to create per device', type=int, default=0)
         sub_command.add_argument("--jm-percent", help='Number in percent to use for JM from each device',
                                  type=int, default=3, dest='jm_percent')
         sub_command.add_argument("--data-nics", help='Data interface names', nargs='+', dest='data_nics')
         sub_command.add_argument("--max-lvol", help='Max lvol per storage node', dest='max_lvol', type=int)
-        sub_command.add_argument("--max-snap", help='Max snapshot per storage node', dest='max_snap', type=int, default=500)
-        sub_command.add_argument("--max-prov", help='Maximum amount of GB to be provisioned via all storage nodes', dest='max_prov')
+        sub_command.add_argument("--max-snap", help='Max snapshot per storage node', dest='max_snap', type=int)
+        sub_command.add_argument("--max-prov", help='Max provisioning size of all storage nodes', dest='max_prov')
         sub_command.add_argument("--number-of-distribs", help='The number of distirbs to be created on the node', dest='number_of_distribs', type=int, default=4)
         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("--cpu-mask", help='SPDK app CPU mask, default is all cores found', dest='spdk_cpu_mask')
@@ -56,7 +56,7 @@ class CLIWrapper:
         sub_command.add_argument("--iobuf_small_bufsize", help='bdev_set_options param', dest='small_bufsize',  type=int, default=0)
         sub_command.add_argument("--iobuf_large_bufsize", help='bdev_set_options param', dest='large_bufsize',  type=int, default=0)
         sub_command.add_argument("--enable-test-device", help='Enable creation of test device', action='store_true')
-        sub_command.add_argument("--disable-ha-jm", help='Disable HA JM for distrib creation', action='store_false', dest='enable_ha_jm', default=True)
+        sub_command.add_argument("--enable-ha-jm", help='Enable HA JM for ditrib creation', action='store_true')
 
 
         # delete storage node
@@ -706,6 +706,8 @@ class CLIWrapper:
             elif sub_command == "add-node":
                 if not args.max_lvol:
                     self.parser.error(f"Mandatory argument '--max-lvol' not provided for {sub_command}")
+                if not args.max_snap:
+                    self.parser.error(f"Mandatory argument '--max-snap' not provided for {sub_command}")
                 if not args.max_prov:
                     self.parser.error(f"Mandatory argument '--max-prov' not provided for {sub_command}")
                 # if not args.spdk_cpu_mask:
@@ -730,11 +732,13 @@ class CLIWrapper:
 
                 max_lvol = args.max_lvol
                 max_snap = args.max_snap
-                max_prov = args.max_prov
+                max_prov = self.parse_size(args.max_prov)
                 number_of_devices = args.number_of_devices
                 enable_test_device = args.enable_test_device
                 enable_ha_jm = args.enable_ha_jm
                 number_of_distribs = args.number_of_distribs
+                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(
                     cluster_id=cluster_id,
@@ -777,7 +781,7 @@ class CLIWrapper:
 
                 max_lvol = args.max_lvol
                 max_snap = args.max_snap
-                max_prov = args.max_prov if args.max_prov else 0
+                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

{sbcli_dev-3.8.95 → sbcli_dev-3.8.96}/simplyblock_core/storage_node_ops.py

@@ -923,11 +923,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         if not number_of_devices:
             logger.error("Unsupported instance type please specify --number-of-devices.")
             return False
-    try:
-        max_prov = int(max_prov)
-        max_prov = f"{max_prov}g"
-    except Exception:
-        pass
+
     max_prov = int(utils.parse_size(max_prov))
     number_of_split = num_partitions_per_dev if num_partitions_per_dev else 1
     number_of_alceml_devices = number_of_devices * number_of_split
@@ -1439,11 +1435,6 @@ def restart_storage_node(
     if max_snap:
         snode.max_snap = max_snap
     if max_prov:
-        try:
-            max_prov = int(max_prov)
-            max_prov = f"{max_prov}g"
-        except Exception:
-            pass
         snode.max_prov = max_prov
     if spdk_image:
         snode.spdk_image = spdk_image

{sbcli_dev-3.8.95 → sbcli_dev-3.8.96}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -186,6 +186,9 @@ def storage_node_add():
     if 'max_lvol' not in req_data:
         return utils.get_response_error("missing required param: max_lvol", 400)
 
+    if 'max_snap' not in req_data:
+        return utils.get_response_error("missing required param: max_snap", 400)
+
     if 'max_prov' not in req_data:
         return utils.get_response_error("missing required param: max_prov", 400)
 
@@ -193,10 +196,9 @@ def storage_node_add():
     node_ip = req_data['node_ip']
     ifname = req_data['ifname']
     max_lvol = int(req_data['max_lvol'])
-    max_snap = int(req_data['max_snap'], 500)
+    max_snap = int(req_data['max_snap'])
     max_prov = req_data['max_prov']
     number_of_distribs = req_data.get('number_of_distribs', 4)
-    disable_ha_jm = req_data.get('disable_ha_jm', False)
 
     spdk_image = None
     if 'spdk_image' in req_data:
@@ -215,11 +217,11 @@ def storage_node_add():
     if 'namespace' in req_data:
         namespace = req_data['namespace']
 
-    jm_percent = 3
+    jm_percent = 0
     if 'jm_percent' in req_data:
         jm_percent = int(req_data['jm_percent'])
 
-    partitions = 1
+    partitions = 0
     if 'partitions' in req_data:
         partitions = int(req_data['partitions'])
 
@@ -261,8 +263,7 @@ def storage_node_add():
         "number_of_devices": number_of_devices,
         "enable_test_device": False,
         "number_of_distribs": number_of_distribs,
-        "namespace": namespace,
-        "disable_ha_jm": disable_ha_jm})
+        "namespace": namespace})
 
     return utils.get_response(True)