sbcli-dev 17.3.1__tar.gz → 17.3.3__tar.gz

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 17.3.1
+Version: 17.3.3
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
-Requires-Dist: foundationdb
+Requires-Dist: foundationdb==7.3.3
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: prettytable>=3.10.0

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/requirements.txt

@@ -1,4 +1,4 @@
-foundationdb
+foundationdb==7.3.3
 requests
 numpy
 prettytable>=3.10.0

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/sbcli_dev.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 17.3.1
+Version: 17.3.3
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
-Requires-Dist: foundationdb
+Requires-Dist: foundationdb==7.3.3
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: prettytable>=3.10.0

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/sbcli_dev.egg-info/SOURCES.txt

@@ -76,7 +76,7 @@ simplyblock_core/scripts/haproxy.cfg
 simplyblock_core/scripts/install_deps.sh
 simplyblock_core/scripts/objstore.yml
 simplyblock_core/scripts/prepare_fdb.sh
-simplyblock_core/scripts/prometheus.yml
+simplyblock_core/scripts/prometheus.yml.j2
 simplyblock_core/scripts/run_ssh.sh
 simplyblock_core/scripts/set_db_config.sh
 simplyblock_core/scripts/stack_deploy_wait.sh

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/sbcli_dev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-foundationdb
+foundationdb==7.3.3
 requests
 numpy
 prettytable>=3.10.0

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/simplyblock_core/cluster_ops.py

@@ -261,6 +261,17 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
         print(f"An error occurred: {e}")
     shutil.rmtree(temp_dir)
 
+    scripts_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/")
+    prometheus_file = "prometheus.yml"
+    env = Environment(loader=FileSystemLoader(scripts_folder), trim_blocks=True, lstrip_blocks=True)
+    template = env.get_template(f'{prometheus_file}.j2')
+    values = {
+        'CLUSTER_ID': c.uuid,
+        'CLUSTER_SECRET': c.secret}
+    file_path = os.path.join(scripts_folder, prometheus_file)
+    with open(file_path, 'w') as file:
+        file.write(template.render(values))
+
     logger.info("Deploying swarm stack ...")
     log_level = "DEBUG" if constants.LOG_WEB_DEBUG else "INFO"
     ret = scripts.deploy_stack(cli_pass, DEV_IP, constants.SIMPLY_BLOCK_DOCKER_IMAGE, c.secret, c.uuid,

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/simplyblock_core/controllers/lvol_controller.py

@@ -664,7 +664,7 @@ def add_lvol_on_node(lvol, snode, is_primary=True):
     else:
         min_cntlid =  1000
     logger.info("creating subsystem %s", lvol.nqn)
-    ret = rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, min_cntlid)
+    ret = rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, min_cntlid)
     logger.debug(ret)
 
     # add listeners
@@ -695,10 +695,11 @@ def add_lvol_on_node(lvol, snode, is_primary=True):
     logger.debug(spdk_mem_info_after)
 
     ret = rpc_client.get_bdevs(f"{lvol.lvs_name}/{lvol.lvol_bdev}")
-    lvol_bdev = ret[0]
-
-    return lvol_bdev, None
-
+    if ret:
+        lvol_bdev = ret[0]
+        return lvol_bdev, None
+    else:
+        return False, "Failed to get lvol bdev"
 
 def is_node_leader(snode, lvs_name):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
@@ -723,7 +724,7 @@ def recreate_lvol_on_node(lvol, snode, ha_inode_self=0, ana_state=None):
 
     min_cntlid = 1 + 1000 * ha_inode_self
     logger.info("creating subsystem %s", lvol.nqn)
-    rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, min_cntlid)
+    rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, min_cntlid)
 
     # if namespace_found is False:
     logger.info("Add BDev to subsystem")

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.3.1
+SIMPLY_BLOCK_VERSION=17.3.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/simplyblock_core/scripts/docker-compose-swarm.yml

@@ -60,7 +60,6 @@ services:
         constraints: [node.role == manager]
     volumes:
       - "/etc/foundationdb:/etc/foundationdb"
-      - "/etc/simplyblock:/etc/simplyblock"
     environment:
       SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
       FLASK_DEBUG: "False"

sbcli_dev-17.3.1/simplyblock_core/scripts/prometheus.yml → sbcli_dev-17.3.3/simplyblock_core/scripts/prometheus.yml.j2

@@ -10,6 +10,9 @@ scrape_configs:
       - targets: ['HAProxy:80']
     honor_labels: true
     metrics_path: '/cluster/metrics'
+    basic_auth:
+      username: '{{ CLUSTER_ID }}'
+      password: '{{ CLUSTER_SECRET }}'
 
   - job_name: 'node'
     dns_sd_configs:

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/simplyblock_web/auth_middleware.py

@@ -12,8 +12,7 @@ def token_required(f):
     @wraps(f)
     def decorated(*args, **kwargs):
 
-        if request.method == "GET" and [request.path.startswith("/swagger") or
-                                        request.path.startswith("/cluster/metrics")]:
+        if request.method == "GET" and request.path.startswith("/swagger"):
             return f(*args, **kwargs)
 
         cluster_id = None
@@ -32,12 +31,13 @@ def token_required(f):
                 except Exception as e:
                     print(e)
 
+        headers = {"WWW-Authenticate": 'Basic realm="Login Required"'}
         if not cluster_id or not cluster_secret:
             return {
                 "message": "Authentication Token is missing!",
                 "data": None,
                 "error": "Unauthorized"
-            }, 401
+            }, 401, headers
         try:
             db_controller = DBController()
             cluster = db_controller.get_cluster_by_id(cluster_id)
@@ -46,13 +46,13 @@ def token_required(f):
                     "message": "Invalid Cluster ID",
                     "data": None,
                     "error": "Unauthorized"
-                }, 401
+                }, 401, headers
             if cluster.secret != cluster_secret:
                 return {
                     "message": "Invalid Cluster secret",
                     "data": None,
                     "error": "Unauthorized"
-                }, 401
+                }, 401, headers
         except Exception as e:
             return {
                 "message": "Something went wrong",

{sbcli_dev-17.3.1 → sbcli_dev-17.3.3}/simplyblock_web/utils.py

@@ -54,27 +54,31 @@ def get_int_value_or_default(data, key, default):
 
 
 def get_cluster_id(request):
-    au = request.headers["Authorization"]
-    if len(au.split()) == 2:
-        cluster_id = au.split()[0]
-        cluster_secret = au.split()[1]
-        if cluster_id and cluster_id == "Basic":
-            try:
-                tkn = base64.b64decode(cluster_secret).decode('utf-8')
-                if tkn:
-                    cluster_id = tkn.split(":")[0]
-                    cluster_secret = tkn.split(":")[1]
-            except Exception as e:
-                print(e)
-                return
-
-        return cluster_id
+    if "Authorization" in request.headers and request.headers["Authorization"]:
+        au = request.headers["Authorization"]
+        if len(au.split()) == 2:
+            cluster_id = au.split()[0]
+            cluster_secret = au.split()[1]
+            if cluster_id and cluster_id == "Basic":
+                try:
+                    tkn = base64.b64decode(cluster_secret).decode('utf-8')
+                    if tkn:
+                        cluster_id = tkn.split(":")[0]
+                        cluster_secret = tkn.split(":")[1]
+                except Exception as e:
+                    print(e)
+                    return
+
+            return cluster_id
 
 
 def get_aws_region():
     try:
         from ec2_metadata import ec2_metadata
-        data = ec2_metadata.instance_identity_document
+        import requests
+        session = requests.session()
+        session.timeout = 3
+        data = ec2_metadata.EC2Metadata(session=session).instance_identity_document
         return data["region"]
     except:
         pass