sbcli-pre 1.2.7__zip → 1.2.9__zip

{sbcli_pre-1.2.7 → sbcli_pre-1.2.9}/PKG-INFO

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

{sbcli_pre-1.2.7 → sbcli_pre-1.2.9}/env_var

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

{sbcli_pre-1.2.7 → sbcli_pre-1.2.9}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.2.7 → sbcli_pre-1.2.9}/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.7 → sbcli_pre-1.2.9}/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.7 → sbcli_pre-1.2.9}/simplyblock_core/scripts/install_deps.sh

@@ -15,7 +15,7 @@ sudo yum install hostname pkg-config git wget python3-pip yum-utils docker-ce do
 sudo systemctl enable docker
 sudo systemctl start docker
 
-sudo docker plugin install --grant-all-permissions rexray/efs REXRAY_PREEMPT=true
+sudo docker plugin install rexray/efs --grant-all-permissions EFS_TAG=$INSTANCE_ID REXRAY_PREEMPT=true
 
 wget https://github.com/apple/foundationdb/releases/download/7.3.3/foundationdb-clients-7.3.3-1.el7.x86_64.rpm -q
 sudo rpm -U foundationdb-clients-7.3.3-1.el7.x86_64.rpm --quiet --reinstall

{sbcli_pre-1.2.7 → sbcli_pre-1.2.9}/simplyblock_core/storage_node_ops.py

@@ -1010,7 +1010,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):