sbcli-dev 6.2.0__tar.gz → 6.2.2__tar.gz

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/PKG-INFO

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

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=6.2.0
+SIMPLY_BLOCK_VERSION=6.2.2
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/simplyblock_core/constants.py

@@ -108,4 +108,4 @@ SPDK_PROXY_MULTI_THREADING_ENABLED=True
 SPDK_PROXY_TIMEOUT=60*5
 LVOL_NVME_CONNECT_RECONNECT_DELAY=3
 LVOL_NVME_CONNECT_CTRL_LOSS_TMO=-1
-QPAIR_COUNT=10
+QPAIR_COUNT=20

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/simplyblock_core/controllers/tasks_controller.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import datetime
 import json
 import logging
 import time
@@ -122,7 +123,8 @@ def list_tasks(cluster_id, is_json=False):
             "Retry": retry,
             "Status": task.status,
             "Result": task.function_result,
-            "Updated at": time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(task.updated_at)),
+            "Updated At": datetime.datetime.strptime(task.updated_at, "%Y-%m-%d %H:%M:%S.%f").strftime(
+                "%H:%M:%S, %d/%m/%Y"),
         })
     return utils.print_table(data)
 

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/simplyblock_core/kv_store.py

@@ -6,7 +6,6 @@ import time
 
 from simplyblock_core import constants
 from simplyblock_core.models.caching_node import CachingNode
-from simplyblock_core.models.cluster import ClusterMap
 
 from simplyblock_core.models.cluster import Cluster
 from simplyblock_core.models.deployer import Deployer
@@ -81,10 +80,6 @@ class DBController:
     def clear_prefix(self, prefix):
         self.kv_store.db.clear_range_startswith(prefix)
 
-    def get_cluster_map(self):
-        cmap = ClusterMap().read_from_db(self.kv_store)
-        return cmap[0] if cmap else None
-
     def get_storage_nodes(self):
         ret = StorageNode().read_from_db(self.kv_store)
         ret = sorted(ret, key=lambda x: x.create_dt)

{sbcli_dev-6.2.0 → sbcli_dev-6.2.2}/simplyblock_core/models/base_model.py

@@ -6,23 +6,30 @@ from typing import Mapping
 
 
 class BaseModel(object):
-    def __init__(self):
-        self._attribute_map = {
-            "id": {"type": str, "default": ""},
-            "name": {"type": str, "default": self.__class__.__name__},
-            "object_type": {"type": str, "default": ""},
-            "deleted": {"type": bool, 'default': False},
-            "updated_at": {"type": str, 'default': ""},
-            "create_dt": {"type": str, 'default': ""},
-            "remove_dt": {"type": str, 'default': ""},
-        }
-        self.set_attrs({}, {})
+
+    id: str = ""
+    uuid: str = ""
+    name: str = ""
+    status: str = ""
+    deleted: bool = False
+    updated_at: str = ""
+    create_dt: str= ""
+    remove_dt: str= ""
+
+    _attribute_map = {}
+
+    def __init__(self, data=None):
+        self.name = self.__class__.__name__
+        self.set_attrs(data)
 
     def get_id(self):
-        return self.id
+        return self.uuid
 
-    def set_attrs(self, attributes, data):
-        self._attribute_map.update(attributes)
+    def set_attrs(self, data):
+        self._attribute_map = {}
+        for s in self.__dir__():
+            if not s.startswith("_"):
+                self._attribute_map[s]= {"type": getattr(self, s).__class__, "default": getattr(self, s)}
         self.from_dict(data)
 
     def from_dict(self, data):
@@ -89,7 +96,7 @@ class BaseModel(object):
     def read_from_db(self, kv_store, id="", limit=0, reverse=False):
         try:
             objects = []
-            prefix = "%s/%s/%s" % (self.object_type, self.name, id)
+            prefix = "%s/%s/%s" % (self.create_dt.replace(" ", ""), self.name, id)
             for k, v in kv_store.db.get_range_startswith(prefix.encode('utf-8'),  limit=limit, reverse=reverse):
                 objects.append(self.__class__().from_dict(json.loads(v)))
             return objects
@@ -136,3 +143,43 @@ class BaseModel(object):
         if isinstance(item, str) and item in self._attribute_map:
             return getattr(self, item)
         return False
+
+
+class BaseNodeObject(BaseModel):
+
+    STATUS_ONLINE = 'online'
+    STATUS_OFFLINE = 'offline'
+    STATUS_SUSPENDED = 'suspended'
+    STATUS_IN_SHUTDOWN = 'in_shutdown'
+    STATUS_REMOVED = 'removed'
+    STATUS_RESTARTING = 'in_restart'
+
+    STATUS_IN_CREATION = 'in_creation'
+    STATUS_UNREACHABLE = 'unreachable'
+    STATUS_SCHEDULABLE = 'schedulable'
+
+    STATUS_CODE_MAP = {
+        STATUS_ONLINE: 0,
+        STATUS_OFFLINE: 1,
+        STATUS_SUSPENDED: 2,
+        STATUS_REMOVED: 3,
+
+        STATUS_IN_CREATION: 10,
+        STATUS_IN_SHUTDOWN: 11,
+        STATUS_RESTARTING: 12,
+
+        STATUS_UNREACHABLE: 20,
+
+        STATUS_SCHEDULABLE: 30,
+    }
+
+    def get_status_code(self):
+        if self.status in self.STATUS_CODE_MAP:
+            return self.STATUS_CODE_MAP[self.status]
+        else:
+            return -1
+
+    def get_clean_dict(self):
+        data = super(BaseNodeObject, self).get_clean_dict()
+        data['status_code'] = self.get_status_code()
+        return data

sbcli_dev-6.2.2/simplyblock_core/models/caching_node.py

@@ -0,0 +1,52 @@
+# coding=utf-8
+
+from typing import List
+
+from simplyblock_core.models.base_model import BaseModel, BaseNodeObject
+from simplyblock_core.models.iface import IFace
+from simplyblock_core.models.lvol_model import LVol
+from simplyblock_core.models.nvme_device import NVMeDevice
+
+
+class CachedLVol(BaseModel):
+
+    device_path: str = ""
+    hostname: str = ""
+    local_nqn: str = ""
+    lvol: LVol = None
+    lvol_id: str = ""
+    ocf_bdev: str = ""
+
+
+class CachingNode(BaseNodeObject):
+
+    api_endpoint: str = ""
+    baseboard_sn: str = ""
+    cache_bdev: str = ""
+    cache_size: int = 0
+    cache_split_factor: int = 0
+    cluster_id: str = ""
+    cpu: int = 0
+    cpu_hz: int = 0
+    ctrl_secret: str = ""
+    data_nics: List[IFace] = []
+    host_nqn: str = ""
+    host_secret: str = ""
+    hostname: str = ""
+    hugepages: int = 0
+    ib_devices: List[IFace] = []
+    lvols: List[CachedLVol] = []
+    memory: int = 0
+    mgmt_ip: str = ""
+    multipathing: bool = True
+    node_lvs: str = "lvs"
+    nvme_devices: List[NVMeDevice] = []
+    partitions_count: int = 0
+    remote_devices: List[NVMeDevice] = []
+    rpc_password: str = ""
+    rpc_port: int = -1
+    rpc_username: str = ""
+    sequential_number: int = 0
+    services: List[str] = []
+    subsystem: str = ""
+    system_uuid: str = ""

sbcli_dev-6.2.2/simplyblock_core/models/cluster.py

@@ -0,0 +1,96 @@
+# coding=utf-8
+
+from typing import List
+
+from simplyblock_core.models.base_model import BaseModel
+
+
+class Cluster(BaseModel):
+
+    STATUS_ACTIVE = "active"
+    STATUS_READONLY = 'read_only'
+    STATUS_INACTIVE = "inactive"
+    STATUS_SUSPENDED = "suspended"
+    STATUS_DEGRADED = "degraded"
+    STATUS_UNREADY = "unready"
+    STATUS_IN_ACTIVATION = "in_activation"
+
+    STATUS_CODE_MAP = {
+        STATUS_ACTIVE: 1,
+        STATUS_INACTIVE: 2,
+        STATUS_READONLY: 3,
+
+        STATUS_SUSPENDED: 10,
+        STATUS_DEGRADED: 11,
+
+    }
+
+    auth_hosts_only: bool = False
+    blk_size: int = 0
+    cap_crit: int = 90
+    cap_warn: int = 80
+    cli_pass: str = ""
+    cluster_max_devices: int = 0
+    cluster_max_nodes: int = 0
+    cluster_max_size: int = 0
+    db_connection: str = ""
+    dhchap: str = ""
+    distr_bs: int = 0
+    distr_chunk_bs: int = 0
+    distr_ndcs: int = 0
+    distr_npcs: int = 0
+    enable_node_affinity: bool = False
+    enable_qos: bool = False
+    grafana_endpoint: str = ""
+    grafana_secret: str = ""
+    ha_type: str = "single"
+    inflight_io_threshold: int = 4
+    iscsi: str = ""
+    max_queue_size: int = 128
+    model_ids: List[str] = []
+    nqn: str = ""
+    page_size_in_blocks: int = 2097152
+    prov_cap_crit: int = 190
+    prov_cap_warn: int = 180
+    qpair_count: int = 6
+    secret: str = ""
+    status: str = ""
+    strict_node_anti_affinity: bool = False
+    tls: bool = False
+    updated_at: str = ""
+    uuid: str = ""
+
+    def __init__(self, data=None):
+        super(Cluster, self).__init__(data=data)
+
+    def get_status_code(self):
+        if self.status in self.STATUS_CODE_MAP:
+            return self.STATUS_CODE_MAP[self.status]
+        else:
+            return -1
+
+    def get_clean_dict(self):
+        data = super(Cluster, self).get_clean_dict()
+        data['status_code'] = self.get_status_code()
+        return data
+
+
+
+
+lst = []
+for k, v in Cluster().attributes.items():
+    if hasattr(v['type'], "__origin__"):
+        if hasattr(v['type'], "__args__"):
+            lst.append(f"{k}: {v['type']._name}[{v['type'].__args__[0].__name__}] = {v['default']} ")
+        else:
+            lst.append(f"{k}: {v['type']._name} = {v['default']} ")
+        # print(v['type'].__dict__)
+    elif v['type'] == str:
+        lst.append(f"{k}: {v['type'].__name__} = \"{v['default']}\"")
+
+    else:
+        lst.append(f"{k}: {v['type'].__name__} = {v['default']}")
+
+lst.sort()
+for l in lst:
+    print(l)

sbcli_dev-6.2.2/simplyblock_core/models/events.py

@@ -0,0 +1,45 @@
+# coding=utf-8
+from datetime import datetime
+
+from simplyblock_core.models.base_model import BaseModel
+
+
+class EventObj(BaseModel):
+    LEVEL_DEBUG = "Debug"
+    LEVEL_INFO = "Info"
+    LEVEL_WARN = "Warning"
+    LEVEL_CRITICAL = "Critical"
+    LEVEL_ERROR = "Error"
+
+    """
+    uuid:
+    cluster_uuid: 1234
+    event: STATUS_CHANGE
+    domain: Cluster, Management, Storage
+    object_name: cluster,
+    object_dict:
+    caused_by: CLI, API, MONITOR
+    message:
+    meta_data:
+    date:
+    """
+    caused_by: str = ""
+    cluster_uuid: str = ""
+    count: int = 1
+    date: int = 0
+    domain: str = ""
+    event: str = ""
+    event_level: str = "Info"
+    message: str = ""
+    meta_data: str = ""
+    node_id: str = ""
+    object_dict: dict = {}
+    object_name: str = ""
+    storage_id: int = -1
+    vuid: int = -1
+
+    def get_date_string(self):
+        if self.date > 1e10:
+            return str(datetime.fromtimestamp(self.date/1000))[:23]
+        else:
+            return str(datetime.fromtimestamp(self.date))[:23]

sbcli_dev-6.2.2/simplyblock_core/models/iface.py

@@ -0,0 +1,20 @@
+# coding=utf-8
+
+from simplyblock_core.models.base_model import BaseModel
+
+
+class IFace(BaseModel):
+
+    if_name: str = ""
+    ip4_address: str = ""
+    net_type: str = ""
+    port_number: int = -1
+    status: str = ""
+    uuid: str = ""
+
+    def get_transport_type(self):
+        if self.net_type == 'ether':
+            return "TCP"
+        if self.net_type == 'ib':
+            return "RDMA"
+        return "TCP"

sbcli_dev-6.2.2/simplyblock_core/models/job_schedule.py

@@ -0,0 +1,35 @@
+# coding=utf-8
+import datetime
+import time
+
+from simplyblock_core.models.base_model import BaseModel
+
+
+class JobSchedule(BaseModel):
+
+    STATUS_NEW = 'new'
+    STATUS_RUNNING = 'running'
+    STATUS_SUSPENDED = 'suspended'
+    STATUS_DONE = 'done'
+
+    FN_DEV_RESTART = "device_restart"
+    FN_NODE_RESTART = "node_restart"
+    FN_DEV_MIG = "device_migration"
+    FN_FAILED_DEV_MIG = "failed_device_migration"
+    FN_NEW_DEV_MIG = "new_device_migration"
+    FN_NODE_ADD = "node_add"
+
+    canceled: bool = False
+    cluster_id: str = ""
+    date: int = 0
+    device_id: str = ""
+    function_name: str = ""
+    function_params: dict = {}
+    function_result: str = ""
+    max_retry: int = -1
+    node_id: str = ""
+    retry: int = 0
+
+    def write_to_db(self, kv_store=None):
+        self.updated_at = str(datetime.datetime.now())
+        self.write_to_db(kv_store)

sbcli_dev-6.2.2/simplyblock_core/models/lvol_model.py

@@ -0,0 +1,63 @@
+# coding=utf-8
+
+from typing import List
+
+from simplyblock_core.models.base_model import BaseModel
+from simplyblock_core.models.nvme_device import NVMeDevice
+
+
+class LVol(BaseModel):
+
+    STATUS_ONLINE = 'online'
+    STATUS_OFFLINE = 'offline'
+    STATUS_IN_DELETION = 'in_deletion'
+
+    STATUS_CODE_MAP = {
+        STATUS_ONLINE: 1,
+        STATUS_OFFLINE: 2,
+        STATUS_IN_DELETION: 3,
+    }
+
+    base_bdev: str = ""
+    bdev_stack: List = []
+    blobid: int = 0
+    cloned_from_snap: str = ""
+    cluster_size: int = 0
+    comp_bdev: str = ""
+    crypto_bdev: str = ""
+    crypto_key1: str = ""
+    crypto_key2: str = ""
+    crypto_key_name: str = ""
+    deletion_status: str = ""
+    distr_bs: int = 0
+    distr_chunk_bs: int = 0
+    distr_page_size: int = 0
+    guid: str = ""
+    ha_type: str = ""
+    health_check: bool = True
+    hostname: str = ""
+    io_error: bool = False
+    lvol_bdev: str = ""
+    lvol_name: str = ""
+    lvol_priority_class: int = 0
+    lvol_type: str = "lvol"
+    lvol_uuid: str = ""
+    lvs_name: str = ""
+    max_size: int = 0
+    mem_diff: dict = {}
+    mode: str = "read-write"
+    ndcs: int = 0
+    node_id: str = ""
+    nodes: List[str] = []
+    npcs: int = 0
+    nqn: str = ""
+    nvme_dev: NVMeDevice = None
+    pool_uuid: str = ""
+    r_mbytes_per_sec: int = 0
+    rw_ios_per_sec: int = 0
+    rw_mbytes_per_sec: int = 0
+    size: int = 0
+    snapshot_name: str = ""
+    top_bdev: str = ""
+    vuid: int = 0
+    w_mbytes_per_sec: int = 0

sbcli_dev-6.2.2/simplyblock_core/models/mgmt_node.py

@@ -0,0 +1,14 @@
+# coding=utf-8
+
+from datetime import datetime
+
+from simplyblock_core.models.base_model import BaseNodeObject
+
+
+class MgmtNode(BaseNodeObject):
+
+    baseboard_sn: str = ""
+    cluster_id: str = ""
+    docker_ip_port: str = ""
+    hostname: str = ""
+    mgmt_ip: str = ""

sbcli_dev-6.2.2/simplyblock_core/models/nvme_device.py

@@ -0,0 +1,82 @@
+# coding=utf-8
+from typing import List
+
+from simplyblock_core.models.base_model import BaseModel
+
+
+class NVMeDevice(BaseModel):
+
+    STATUS_JM = "JM_DEV"
+
+    STATUS_NEW = "new"
+    STATUS_ONLINE = 'online'
+    STATUS_UNAVAILABLE = 'unavailable'
+    STATUS_REMOVED = 'removed'
+    STATUS_FAILED = 'failed'
+    STATUS_FAILED_AND_MIGRATED = 'failed_and_migrated'
+    STATUS_READONLY = 'read_only'
+
+    STATUS_CODE_MAP = {
+        STATUS_ONLINE: 1,
+        STATUS_NEW: 2,
+        STATUS_UNAVAILABLE: 3,
+        STATUS_REMOVED: 4,
+        STATUS_FAILED: 5,
+        STATUS_READONLY: 6,
+        STATUS_JM: 7
+
+    }
+
+    alceml_bdev: str = ""
+    alceml_name: str = ""
+    bdev_stack: List = []
+    capacity: int = -1
+    cluster_device_order: int = 0
+    cluster_id: str = ""
+    device_name: str = ""
+    health_check: bool = True
+    io_error: bool = False
+    is_partition: bool = False
+    model_id: str = ""
+    node_id: str = ""
+    nvme_bdev: str = ""
+    nvme_controller: str = ""
+    nvmf_ip: str = ""
+    nvmf_nqn: str = ""
+    nvmf_port: int = 0
+    overload_percentage: int = 0
+    partition_jm_bdev: str = ""
+    partition_jm_size: int = 0
+    partition_main_bdev: str = ""
+    partition_main_size: int = 0
+    partitions_count: int = 0
+    pcie_address: str = ""
+    physical_label: int = 0
+    pt_bdev: str = ""
+    qos_bdev: str = ""
+    remote_bdev: str = ""
+    retries_exhausted: bool = False
+    sequential_number: int = 0
+    serial_number: str = ""
+    size: int = -1
+    testing_bdev: str = ""
+
+    def get_status_code(self):
+        if self.status in self.STATUS_CODE_MAP:
+            return self.STATUS_CODE_MAP[self.status]
+        else:
+            return -1
+
+    def get_clean_dict(self):
+        data = super(NVMeDevice, self).get_clean_dict()
+        data['status_code'] = self.get_status_code()
+        return data
+
+
+class JMDevice(NVMeDevice):
+
+    device_data_dict: dict = {}
+    jm_bdev: str = ""
+    jm_nvme_bdev_list: List[str] = []
+    raid_bdev: str = ""
+

sbcli_dev-6.2.2/simplyblock_core/models/pool.py

@@ -0,0 +1,47 @@
+# coding=utf-8
+
+from typing import List
+
+from simplyblock_core import utils
+from simplyblock_core.models.base_model import BaseModel
+
+
+class Pool(BaseModel):
+
+    STATUS_ACTIVE = "active"
+    STATUS_INACTIVE = "inactive"
+
+    STATUS_CODE_MAP = {
+        STATUS_ACTIVE: 1,
+        STATUS_INACTIVE: 2,
+    }
+
+    cluster_id: str = ""
+    groups: List[str] = []
+    lvol_max_size: int = 0
+    lvols: List[str] = []
+    max_r_mbytes_per_sec: int = 0
+    max_rw_ios_per_sec: int = 0
+    max_rw_mbytes_per_sec: int = 0
+    max_w_mbytes_per_sec: int = 0
+    pool_max_size: int = 0
+    pool_name: str = ""
+    secret: str = ""
+    users: List[str] = []
+
+
+    def get_clean_dict(self):
+        data = super(Pool, self).get_clean_dict()
+        data['pool_max_size'] = utils.humanbytes(data['pool_max_size'])
+        data['lvol_max_size'] = utils.humanbytes(data['lvol_max_size'])
+        data['status_code'] = self.get_status_code()
+        return data
+
+    def has_qos(self):
+        return 0 < (self.max_rw_ios_per_sec + self.max_rw_mbytes_per_sec + self.max_r_mbytes_per_sec + self.max_w_mbytes_per_sec)
+
+    def get_status_code(self):
+        if self.status in self.STATUS_CODE_MAP:
+            return self.STATUS_CODE_MAP[self.status]
+        else:
+            return -1

sbcli_dev-6.2.2/simplyblock_core/models/snapshot.py

@@ -0,0 +1,19 @@
+# coding=utf-8
+
+from simplyblock_core.models.base_model import BaseModel
+from simplyblock_core.models.lvol_model import LVol
+
+
+class SnapShot(BaseModel):
+
+    base_bdev: str = ""
+    cluster_id: str = ""
+    created_at: int = 0
+    health_check: bool = True
+    lvol: LVol = None
+    mem_diff: dict = {}
+    pool_uuid: str = ""
+    ref_count: int = 0
+    snap_bdev: str = ""
+    snap_name: str = ""
+    snap_ref_id: str = ""