sbcli-pre 1.0.2__zip → 1.0.4__zip

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/PKG-INFO

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

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/env_var

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

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/simplyblock_cli/cli.py

@@ -248,9 +248,6 @@ class CLIWrapper:
         sub_command = self.add_sub_command(subparser, 'add', 'Add new cluster')
         sub_command.add_argument("--blk_size", help='The block size in bytes', type=int, choices=[512, 4096], default=512)
         sub_command.add_argument("--page_size", help='The size of a data page in bytes', type=int, default=2097152)
-        sub_command.add_argument("--ha_type",
-                                 help='Can be "single" for single node clusters or  "HA", which requires at least 3 nodes',
-                                 choices=["single", "ha"], default='single')
         sub_command.add_argument("--cap-warn", help='Capacity warning level in percent, default=80',
                                  type=int, required=False, dest="cap_warn")
         sub_command.add_argument("--cap-crit", help='Capacity critical level in percent, default=90',
@@ -1152,14 +1149,13 @@ class CLIWrapper:
     def cluster_add(self, args):
         page_size_in_blocks = args.page_size
         blk_size = args.blk_size
-        ha_type = args.ha_type
         cap_warn = args.cap_warn
         cap_crit = args.cap_crit
         prov_cap_warn = args.prov_cap_warn
         prov_cap_crit = args.prov_cap_crit
 
         return cluster_ops.add_cluster(
-            blk_size, page_size_in_blocks, ha_type, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit)
+            blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit)
 
     def cluster_create(self, args):
         page_size_in_blocks = args.page_size

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/simplyblock_core/cluster_ops.py

@@ -376,7 +376,7 @@ def join_cluster(cluster_ip, cluster_id, role, ifname, data_nics,  spdk_cpu_mask
     logger.info("Node joined the cluster")
 
 
-def add_cluster(blk_size, page_size_in_blocks, ha_type, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit):
+def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit):
     db_controller = DBController()
     clusters = db_controller.get_clusters()
     if not clusters:
@@ -389,7 +389,7 @@ def add_cluster(blk_size, page_size_in_blocks, ha_type, cap_warn, cap_crit, prov
     cluster.uuid = str(uuid.uuid4())
     cluster.blk_size = blk_size
     cluster.page_size_in_blocks = page_size_in_blocks
-    cluster.ha_type = ha_type
+    cluster.ha_type = default_cluster.ha_type
     cluster.nqn = f"{constants.CLUSTER_NQN}:{cluster.uuid}"
     cluster.cli_pass = default_cluster.cli_pass
     cluster.secret = default_cluster.secret

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/simplyblock_core/services/distr_event_collector.py

@@ -144,8 +144,8 @@ while True:
     )
     num_of_events = constants.DISTR_EVENT_COLLECTOR_NUM_OF_EVENTS
     try:
-        # events = client.distr_status_events_get()
-        events = client.distr_status_events_discard_then_get(0, num_of_events)
+        events = client.distr_status_events_get()
+        # events = client.distr_status_events_discard_then_get(0, num_of_events)
         if not events:
             logger.error("Distr events empty")
             continue
@@ -161,8 +161,8 @@ while True:
             logger.info(f"Processing event: {eid}")
             process_event(eid)
 
-        logger.info(f"Discarding events: {num_of_events}")
-        events = client.distr_status_events_discard_then_get(num_of_events, 0)
+        # logger.info(f"Discarding events: {num_of_events}")
+        # events = client.distr_status_events_discard_then_get(num_of_events, 0)
 
     except Exception as e:
         logger.error("Failed to process distr events")

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/simplyblock_web/blueprints/web_api_cluster.py

@@ -25,7 +25,6 @@ def add_cluster():
 
     blk_size = 512
     page_size_in_blocks = 2097152
-    ha_type = "single"
     cap_warn = 0
     cap_crit = 0
     prov_cap_warn = 0
@@ -41,13 +40,7 @@ def add_cluster():
     if 'page_size_in_blocks' in cl_data:
         page_size_in_blocks = cl_data['page_size_in_blocks']
 
-    if 'ha_type' in cl_data:
-        if cl_data['ha_type'] not in ["single", "ha"]:
-            return utils.get_response_error("ha_type can be single or ha", 400)
-        ha_type = cl_data['ha_type']
-
-    ret = cluster_ops.add_cluster(blk_size, page_size_in_blocks, ha_type,
-                                  cap_warn, cap_crit, prov_cap_warn, prov_cap_crit)
+    ret = cluster_ops.add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit)
 
     return utils.get_response(ret)
 

{sbcli_pre-1.0.2 → sbcli_pre-1.0.4}/simplyblock_web/blueprints/web_api_pool.py

@@ -17,15 +17,18 @@ bp = Blueprint("pool", __name__)
 db_controller = kv_store.DBController()
 
 
-@bp.route('/pool', defaults={'uuid': None}, methods=['GET'])
-@bp.route('/pool/<string:uuid>', methods=['GET'])
-def list_pools(uuid):
+@bp.route('/pool', defaults={'uuid': None, "cluster_id": None}, methods=['GET'])
+@bp.route('/pool/<string:uuid>', defaults={"cluster_id": None}, methods=['GET'])
+@bp.route('/pool/cluster_id/<string:cluster_id>', defaults={'uuid': None,}, methods=['GET'])
+def list_pools(uuid, cluster_id):
     if uuid:
         pool = db_controller.get_pool_by_id(uuid)
         if pool:
             pools = [pool]
         else:
             return utils.get_response_error(f"Pool not found: {uuid}", 404)
+    elif cluster_id:
+        pools = db_controller.get_pools(cluster_id)
     else:
         pools = db_controller.get_pools()
     data = []