Prepare for merge

Author: hamdy-simplyblock

env_var

@@ -2,7 +2,6 @@ SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
 SIMPLY_BLOCK_VERSION=3.8.3
 
 
-
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 
 DOCKER_USER=hamdysimplyblock

simplyblock_cli/cli.py

@@ -1205,7 +1205,7 @@ def cluster_add(self, args):
         distr_bs = args.distr_bs
         distr_chunk_bs = args.distr_chunk_bs
         ha_type = args.ha_type
-        
+
         return cluster_ops.add_cluster(
             blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
             distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type)

simplyblock_core/cluster_ops.py

@@ -25,8 +25,7 @@
 TOP_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
 
-
-def _create_update_user(cluster_id, grafana_url,grafana_secret,user_secret,update_secret):
+def _create_update_user(cluster_id, grafana_url, grafana_secret, user_secret, update_secret=False):
     if not grafana_url.startswith("https://"):
         if grafana_url.startswith("http://"):
             grafana_url = grafana_url.replace("http://", "https://", 1)
@@ -78,11 +77,6 @@ def _create_update_user(cluster_id, grafana_url,grafana_secret,user_secret,updat
             time.sleep(5)
 
         return response.status_code == 200
-        
-        
-    
-
-
 
 
 def _add_graylog_input(cluster_ip, password):
@@ -220,12 +214,12 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     ret = scripts.deploy_stack(cli_pass, DEV_IP, constants.SIMPLY_BLOCK_DOCKER_IMAGE, c.secret, c.uuid,
                                log_del_interval, metrics_retention_period)
     logger.info("Deploying swarm stack > Done")
-    
-    if ret != 0:
+
+    if ret == 0:
+        logger.info("deploying swarm stack succeeded")
+    else:
         logger.error("deploying swarm stack failed")
-    
-    logger.info("deploying swarm stack succeeded")    
-    
+
     logger.info("Configuring DB...")
     out = scripts.set_db_config_single()
     logger.info("Configuring DB > Done")
@@ -314,8 +308,7 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     cluster.db_connection = default_cluster.db_connection
     cluster.grafana_endpoint = default_cluster.grafana_endpoint
 
-    _create_update_user(cluster.uuid,cluster.grafana_endpoint,default_cluster.secret,cluster.secret,False)
-
+    _create_update_user(cluster.uuid, cluster.grafana_endpoint, default_cluster.secret, cluster.secret)
 
     if distr_ndcs == 0 and distr_npcs == 0:
         cluster.distr_ndcs = 4
@@ -620,12 +613,11 @@ def set_secret(cluster_id, secret):
         logger.error(f"Cluster not found {cluster_id}")
         return False
 
-    
     secret = secret.strip()
     if len(secret) < 20:
         return "Secret must be at least 20 char"
 
-    _create_update_user(cluster_id,clusters[0].grafana_endpoint,clusters[0].secret,secret,True)
+    _create_update_user(cluster_id, clusters[0].grafana_endpoint, clusters[0].secret, secret, update_secret=True)
 
     cluster.secret = secret
     cluster.write_to_db(db_controller.kv_store)

simplyblock_core/constants.py

@@ -53,7 +53,7 @@
 FDB_CHECK_INTERVAL_SEC = 60
 
 SIMPLY_BLOCK_DOCKER_IMAGE = "simplyblock/simplyblock:main"
-SIMPLY_BLOCK_CLI_NAME = "sbcli-mig"
+SIMPLY_BLOCK_CLI_NAME = "sbcli-dev"
 TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8