sbcli-dev 19.2.8__tar.gz → 19.2.10__tar.gz

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.8
+Version: 19.2.10
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -29,6 +29,9 @@ Requires-Dist: ec2-metadata
 Requires-Dist: flask-swagger-ui
 Requires-Dist: sentry-sdk[flask]
 Requires-Dist: flask-openapi3
+Requires-Dist: jsonschema
+Requires-Dist: fastapi
+Requires-Dist: uvicorn
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/pyproject.toml

@@ -4,3 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [tool.ruff]
 extend-exclude = ['simplyblock_cli/cli.py']
+
+[tool.pytest.ini_options]
+pythonpath = "."
+testpaths = ['simplyblock_core/test', 'simplyblock_web/test']

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/requirements.txt

@@ -21,3 +21,6 @@ ec2-metadata
 flask-swagger-ui
 sentry-sdk[flask]
 flask-openapi3
+jsonschema
+fastapi
+uvicorn

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.8
+Version: 19.2.10
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -29,6 +29,9 @@ Requires-Dist: ec2-metadata
 Requires-Dist: flask-swagger-ui
 Requires-Dist: sentry-sdk[flask]
 Requires-Dist: flask-openapi3
+Requires-Dist: jsonschema
+Requires-Dist: fastapi
+Requires-Dist: uvicorn
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/sbcli_dev.egg-info/SOURCES.txt

@@ -14,19 +14,16 @@ simplyblock_cli/clibase.py
 simplyblock_cli/main.py
 simplyblock_core/__init__.py
 simplyblock_core/cluster_ops.py
-simplyblock_core/cnode_client.py
 simplyblock_core/constants.py
 simplyblock_core/db_controller.py
 simplyblock_core/distr_controller.py
 simplyblock_core/env_var
 simplyblock_core/fw_api_client.py
 simplyblock_core/mgmt_node_ops.py
-simplyblock_core/pci_utils.py
 simplyblock_core/rpc_client.py
 simplyblock_core/shell_utils.py
 simplyblock_core/snode_client.py
 simplyblock_core/storage_node_ops.py
-simplyblock_core/utils.py
 simplyblock_core/controllers/__init__.py
 simplyblock_core/controllers/cluster_events.py
 simplyblock_core/controllers/device_controller.py
@@ -47,7 +44,6 @@ simplyblock_core/controllers/tcp_ports_events.py
 simplyblock_core/models/__init__.py
 simplyblock_core/models/base_model.py
 simplyblock_core/models/cluster.py
-simplyblock_core/models/deployer.py
 simplyblock_core/models/events.py
 simplyblock_core/models/hublvol.py
 simplyblock_core/models/iface.py
@@ -118,6 +114,9 @@ simplyblock_core/services/spdk/__init__.py
 simplyblock_core/services/spdk/client.py
 simplyblock_core/test/test_models.py
 simplyblock_core/test/test_utils.py
+simplyblock_core/utils/__init__.py
+simplyblock_core/utils/helpers.py
+simplyblock_core/utils/pci.py
 simplyblock_core/workers/cleanup_foundationdb.py
 simplyblock_web/README.md
 simplyblock_web/__init__.py
@@ -128,21 +127,34 @@ simplyblock_web/node_utils.py
 simplyblock_web/node_utils_k8s.py
 simplyblock_web/node_webapp.py
 simplyblock_web/utils.py
-simplyblock_web/blueprints/__init__.py
-simplyblock_web/blueprints/node_api_basic.py
-simplyblock_web/blueprints/snode_ops.py
-simplyblock_web/blueprints/snode_ops_k8s.py
-simplyblock_web/blueprints/swagger_ui_blueprint.py
-simplyblock_web/blueprints/web_api_cluster.py
-simplyblock_web/blueprints/web_api_deployer.py
-simplyblock_web/blueprints/web_api_device.py
-simplyblock_web/blueprints/web_api_lvol.py
-simplyblock_web/blueprints/web_api_metrics.py
-simplyblock_web/blueprints/web_api_mgmt_node.py
-simplyblock_web/blueprints/web_api_pool.py
-simplyblock_web/blueprints/web_api_snapshot.py
-simplyblock_web/blueprints/web_api_storage_node.py
-simplyblock_web/static/SimplyBlock-API.postman_collection.json
+simplyblock_web/api/__init__.py
+simplyblock_web/api/internal/__init__.py
+simplyblock_web/api/internal/node_api_basic.py
+simplyblock_web/api/internal/storage_node/__init__.py
+simplyblock_web/api/internal/storage_node/docker.py
+simplyblock_web/api/internal/storage_node/kubernetes.py
+simplyblock_web/api/v1/__init__.py
+simplyblock_web/api/v1/cluster.py
+simplyblock_web/api/v1/device.py
+simplyblock_web/api/v1/lvol.py
+simplyblock_web/api/v1/metrics.py
+simplyblock_web/api/v1/mgmt_node.py
+simplyblock_web/api/v1/pool.py
+simplyblock_web/api/v1/snapshot.py
+simplyblock_web/api/v1/storage_node.py
+simplyblock_web/api/v1/swagger_ui.py
+simplyblock_web/api/v1/static/swagger.yaml
+simplyblock_web/api/v2/__init__.py
+simplyblock_web/api/v2/cluster.py
+simplyblock_web/api/v2/device.py
+simplyblock_web/api/v2/dtos.py
+simplyblock_web/api/v2/management_node.py
+simplyblock_web/api/v2/pool.py
+simplyblock_web/api/v2/snapshot.py
+simplyblock_web/api/v2/storage_node.py
+simplyblock_web/api/v2/task.py
+simplyblock_web/api/v2/util.py
+simplyblock_web/api/v2/volume.py
 simplyblock_web/static/delete.py
 simplyblock_web/static/deploy.py
 simplyblock_web/static/deploy_cnode.yaml
@@ -150,17 +162,14 @@ simplyblock_web/static/deploy_spdk.yaml
 simplyblock_web/static/is_up.py
 simplyblock_web/static/list_deps.py
 simplyblock_web/static/rpac.yaml
-simplyblock_web/static/swagger.yaml
 simplyblock_web/static/tst.py
 simplyblock_web/templates/caching_deploy_spdk.yaml.j2
 simplyblock_web/templates/storage_core_isolation.yaml.j2
 simplyblock_web/templates/storage_deploy_spdk.yaml.j2
 simplyblock_web/templates/storage_init_job.yaml.j2
+simplyblock_web/templates/ubuntu_kernel_extra.yaml.j2
+simplyblock_web/test/__init__.py
 simplyblock_web/test/conftest.py
 simplyblock_web/test/pytest.ini
 simplyblock_web/test/requirements.txt
-simplyblock_web/test/util.py
-simplyblock_web/test/api/test_lvol.py
-simplyblock_web/test/api/test_pool.py
-simplyblock_web/test/api/test_snapshot.py
-simplyblock_web/test/api/test_storage_node.py
+simplyblock_web/test/util.py

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/sbcli_dev.egg-info/requires.txt

@@ -21,3 +21,6 @@ ec2-metadata
 flask-swagger-ui
 sentry-sdk[flask]
 flask-openapi3
+jsonschema
+fastapi
+uvicorn

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/setup.py

@@ -4,6 +4,7 @@ from setuptools import setup, find_packages
 
 from setuptools.command.install import install as _install
 
+SIMPLYBLOCK_DEFAULT_CLI_CMD = "sbctl"
 
 def _post_install():
     from subprocess import getstatusoutput
@@ -74,7 +75,7 @@ def get_requirements():
         return fh.readlines()
 
 
-COMMAND_NAME = get_env_var("SIMPLY_BLOCK_COMMAND_NAME", "sbcli")
+COMMAND_NAME = get_env_var("SIMPLY_BLOCK_COMMAND_NAME", SIMPLYBLOCK_DEFAULT_CLI_CMD)
 VERSION = get_env_var("SIMPLY_BLOCK_VERSION", "1")
 
 data_files = gen_data_files("simplyblock_core","simplyblock_web")
@@ -82,6 +83,14 @@ data_files.append(('', ["requirements.txt"]))
 # data_files.append(('/etc/simplyblock', ["requirements.txt"]))
 
 
+console_scripts = [
+    f'{COMMAND_NAME}=simplyblock_cli.cli:main',
+    f'{SIMPLYBLOCK_DEFAULT_CLI_CMD}=simplyblock_cli.cli:main'
+]
+
+# to remove duplicates if COMMAND_NAME is same as SIMPLYBLOCK_DEFAULT_CLI_CMD
+console_scripts = list(set(console_scripts))
+
 setup(
     name=COMMAND_NAME,
     version=VERSION,
@@ -95,10 +104,7 @@ setup(
     long_description_content_type="text/markdown",
     install_requires=get_requirements(),
     entry_points={
-        'console_scripts': [
-            f'{COMMAND_NAME}=simplyblock_cli.cli:main',
-            'sbctl=simplyblock_cli.cli:main',
-        ]
+        'console_scripts': console_scripts
     },
     include_package_data=True,
     data_files=data_files,
@@ -106,5 +112,4 @@ setup(
         '': ["/etc/simplyblock/requirements.txt"],
         '/etc/simplyblock': ["requirements.txt"]
     },
-    # cmdclass={'install': install},
 )

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/simplyblock_cli/cli.py

@@ -362,6 +362,7 @@ class CLIWrapper(CLIWrapperBase):
         if self.developer_mode:
             argument = subcommand.add_argument('--disable-monitoring', help='Disable monitoring stack, false by default', dest='disable_monitoring', action='store_true')
         argument = subcommand.add_argument('--strict-node-anti-affinity', help='Enable strict node anti affinity for storage nodes. Never more than one chunk is placed on a node. This requires a minimum of _data-chunks-in-stripe + parity-chunks-in-stripe + 1_ nodes in the cluster.', dest='strict_node_anti_affinity', action='store_true')
+        argument = subcommand.add_argument('--name', '-n', help='Assigns a name to the newly created cluster.', type=str, dest='name')
 
     def init_cluster__add(self, subparser):
         subcommand = self.add_sub_command(subparser, 'add', 'Adds a new cluster')
@@ -387,6 +388,7 @@ class CLIWrapper(CLIWrapperBase):
         if self.developer_mode:
             argument = subcommand.add_argument('--enable-qos', help='Enable qos bdev for storage nodes, default: true', type=bool, default=False, dest='enable_qos')
         argument = subcommand.add_argument('--strict-node-anti-affinity', help='Enable strict node anti affinity for storage nodes. Never more than one chunk is placed on a node. This requires a minimum of _data-chunks-in-stripe + parity-chunks-in-stripe + 1_ nodes in the cluster."', dest='strict_node_anti_affinity', action='store_true')
+        argument = subcommand.add_argument('--name', '-n', help='Assigns a name to the newly created cluster.', type=str, dest='name')
 
     def init_cluster__activate(self, subparser):
         subcommand = self.add_sub_command(subparser, 'activate', 'Activates a cluster.')
@@ -737,7 +739,7 @@ class CLIWrapper(CLIWrapperBase):
 
         logging.getLogger("urllib3.connectionpool").setLevel(logging.WARNING)
 
-        ret = ""
+        ret = False
         args_dict = args.__dict__
 
         try:
@@ -1046,11 +1048,10 @@ class CLIWrapper(CLIWrapperBase):
             else:
                 self.parser.print_help()
 
-        except Exception as e:
+        except Exception as exc:
+            print('Operation failed: ', exc)
             if args.debug:
-                traceback.print_exc()
-            else:
-                print('Operation failed: ', e)
+                traceback.print_exception(None, exc, exc.__traceback__)
             exit(1)
 
         if not ret:

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/simplyblock_cli/clibase.py

@@ -593,12 +593,6 @@ class CLIWrapperBase:
     def storage_pool__disable(self, sub_command, args):
         return pool_controller.set_status(args.pool_id, Pool.STATUS_INACTIVE)
 
-    def storage_pool__get_secret(self, sub_command, args):
-        return pool_controller.get_secret(args.pool_id)
-
-    def storage_pool__update_secret(self, sub_command, args):
-        return pool_controller.set_secret(args.pool_id, args.secret)
-
     def storage_pool__get_capacity(self, sub_command, args):
         return pool_controller.get_capacity(args.pool_id)
 
@@ -639,6 +633,7 @@ class CLIWrapperBase:
         distr_bs = args.distr_bs
         distr_chunk_bs = args.distr_chunk_bs
         ha_type = args.ha_type
+        name = args.name
 
         enable_node_affinity = args.enable_node_affinity
         qpair_count = args.qpair_count
@@ -650,7 +645,7 @@ class CLIWrapperBase:
         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, enable_node_affinity,
-            qpair_count, max_queue_size, inflight_io_threshold, enable_qos, strict_node_anti_affinity)
+            qpair_count, max_queue_size, inflight_io_threshold, enable_qos, strict_node_anti_affinity, name)
 
     def cluster_create(self, args):
         page_size_in_blocks = args.page_size
@@ -677,13 +672,15 @@ class CLIWrapperBase:
         enable_qos = args.enable_qos
         disable_monitoring = args.disable_monitoring
         strict_node_anti_affinity = args.strict_node_anti_affinity
+        name = args.name
 
         return cluster_ops.create_cluster(
             blk_size, page_size_in_blocks,
             CLI_PASS, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
             ifname, log_del_interval, metrics_retention_period, contact_point, grafana_endpoint,
             distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, enable_node_affinity,
-            qpair_count, max_queue_size, inflight_io_threshold, enable_qos, disable_monitoring, strict_node_anti_affinity)
+            qpair_count, max_queue_size, inflight_io_threshold, enable_qos, disable_monitoring,
+            strict_node_anti_affinity, name)
 
     def query_yes_no(self, question, default="yes"):
         """Ask a yes/no question via raw_input() and return their answer.

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/simplyblock_core/cluster_ops.py

@@ -124,7 +124,8 @@ def _set_max_result_window(cluster_ip, max_window=100000):
 def create_cluster(blk_size, page_size_in_blocks, cli_pass,
                    cap_warn, cap_crit, prov_cap_warn, prov_cap_crit, ifname, log_del_interval, metrics_retention_period,
                    contact_point, grafana_endpoint, distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type,
-                   enable_node_affinity, qpair_count, max_queue_size, inflight_io_threshold, enable_qos, disable_monitoring, strict_node_anti_affinity) -> str:
+                   enable_node_affinity, qpair_count, max_queue_size, inflight_io_threshold, enable_qos, disable_monitoring,
+                   strict_node_anti_affinity, name) -> str:
 
     if distr_ndcs == 0 and distr_npcs == 0:
         raise ValueError("both distr_ndcs and distr_npcs cannot be 0")
@@ -181,6 +182,7 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     logger.info("Adding new cluster object")
     cluster = Cluster()
     cluster.uuid = str(uuid.uuid4())
+    cluster.cluster_name = name
     cluster.blk_size = blk_size
     cluster.page_size_in_blocks = page_size_in_blocks
     cluster.nqn = f"{constants.CLUSTER_NQN}:{cluster.uuid}"
@@ -304,7 +306,7 @@ def _run_fio(mount_point) -> None:
 
 def 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, enable_node_affinity, qpair_count,
-                max_queue_size, inflight_io_threshold, enable_qos, strict_node_anti_affinity) -> str:
+                max_queue_size, inflight_io_threshold, enable_qos, strict_node_anti_affinity, name) -> str:
     db_controller = DBController()
     clusters = db_controller.get_clusters()
     if not clusters:
@@ -316,6 +318,7 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     logger.info("Adding new cluster")
     cluster = Cluster()
     cluster.uuid = str(uuid.uuid4())
+    cluster.cluster_name = name
     cluster.blk_size = blk_size
     cluster.page_size_in_blocks = page_size_in_blocks
     cluster.nqn = f"{constants.CLUSTER_NQN}:{cluster.uuid}"
@@ -618,6 +621,7 @@ def list() -> t.List[dict]:
             status = f"{status} - ReBalancing"
         data.append({
             "UUID": cl.get_id(),
+            "Name": cl.cluster_name if cl.cluster_name is not None else "-",
             "NQN": cl.nqn,
             "ha_type": cl.ha_type,
             "#mgmt": len(mt),

{sbcli_dev-19.2.8 → sbcli_dev-19.2.10}/simplyblock_core/controllers/device_controller.py

@@ -12,6 +12,17 @@ from simplyblock_core.rpc_client import RPCClient
 logger = logging.getLogger()
 
 
+def get_storage_node_by_jm_device(db_controller: DBController, id) -> StorageNode:
+    try:
+        return next(
+            node
+            for node in db_controller.get_storage_nodes()
+            if node.jm_device.get_id() == id
+        )
+    except StopIteration:
+        raise KeyError(f'No storage node with JM device {id}')
+
+
 def device_set_state(device_id, state):
     db_controller = DBController()
     try:
@@ -69,24 +80,16 @@ def device_set_io_error(device_id, is_error):
     db_controller = DBController()
     try:
         dev = db_controller.get_storage_device_by_id(device_id)
-    except KeyError:
-        logger.error("device not found")
-        return False
-
-    snode = db_controller.get_storage_node_by_id(dev.node_id)
-    if not snode:
-        logger.error("node not found")
+        snode = db_controller.get_storage_node_by_id(dev.node_id)
+    except KeyError as e:
+        logger.error(e)
         return False
 
-    device = None
     for dev in snode.nvme_devices:
         if dev.get_id() == device_id:
             device = dev
             break
 
-    if not device:
-        logger.error("device not found")
-
     if device.io_error == is_error:
         return True
 
@@ -284,14 +287,11 @@ def set_device_testing_mode(device_id, mode):
     db_controller = DBController()
     try:
         device = db_controller.get_storage_device_by_id(device_id)
-    except KeyError:
-        logger.error("device not found")
+        snode = db_controller.get_storage_node_by_id(device.node_id)
+    except KeyError as e:
+        logger.error(e)
         return False
 
-    snode = db_controller.get_storage_node_by_id(device.node_id)
-    if not snode:
-        logger.error("node not found")
-        return False
     if not snode.enable_test_device:
         logger.error("Test device is disabled on this storage node")
         return False
@@ -332,14 +332,9 @@ def device_remove(device_id, force=True):
     db_controller = DBController()
     try:
         dev = db_controller.get_storage_device_by_id(device_id)
-    except KeyError:
-        logger.error("device not found")
-        return False
-
-    try:
         snode = db_controller.get_storage_node_by_id(dev.node_id)
-    except KeyError:
-        logger.exception("node not found")
+    except KeyError as e:
+        logger.error(e)
         return False
 
     for dev in snode.nvme_devices:
@@ -525,14 +520,9 @@ def reset_storage_device(dev_id):
     db_controller = DBController()
     try:
         device = db_controller.get_storage_device_by_id(dev_id)
-    except KeyError:
-        logger.error("device not found")
-        return False
-
-    try:
         snode = db_controller.get_storage_node_by_id(device.node_id)
-    except KeyError:
-        logger.exception("node not found")
+    except KeyError as e:
+        logger.error(e)
         return False
 
     if device.status in [NVMeDevice.STATUS_REMOVED, NVMeDevice.STATUS_FAILED, NVMeDevice.STATUS_FAILED_AND_MIGRATED]:
@@ -579,19 +569,11 @@ def device_set_retries_exhausted(device_id, retries_exhausted):
     db_controller = DBController()
     try:
         dev = db_controller.get_storage_device_by_id(device_id)
-    except KeyError:
-        logger.error("device not found")
-        return False
-
-    try:
         snode = db_controller.get_storage_node_by_id(dev.node_id)
-    except KeyError:
-        logger.exception("node not found")
+    except KeyError as e:
+        logger.error(e)
         return False
 
-    if not dev:
-        logger.error("device not found")
-
     if dev.retries_exhausted == retries_exhausted:
         return True
 
@@ -604,14 +586,9 @@ def device_set_failed(device_id):
     db_controller = DBController()
     try:
         dev = db_controller.get_storage_device_by_id(device_id)
-    except KeyError:
-        logger.error("device not found")
-        return False
-
-    try:
         snode = db_controller.get_storage_node_by_id(dev.node_id)
-    except KeyError:
-        logger.exception("node not found")
+    except KeyError as e:
+        logger.error(e)
         return False
 
     task_id = tasks_controller.get_active_dev_restart_task(snode.cluster_id, device_id)
@@ -637,21 +614,15 @@ def add_device(device_id):
     db_controller = DBController()
     try:
         dev = db_controller.get_storage_device_by_id(device_id)
-    except KeyError:
-        logger.error("device not found")
+        snode = db_controller.get_storage_node_by_id(dev.node_id)
+    except KeyError as e:
+        logger.error(e)
         return False
 
     if dev.status != NVMeDevice.STATUS_NEW:
         logger.error("Device must be in new state")
         return False
 
-    try:
-        snode = db_controller.get_storage_node_by_id(dev.node_id)
-    except KeyError:
-        logger.exception("node not found")
-        return False
-
-    device_obj = None
     for dev in snode.nvme_devices:
         if dev.get_id() == device_id:
             device_obj = dev
@@ -675,7 +646,7 @@ def add_device(device_id):
     for node in snodes:
         if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
             continue
-        node.remote_devices = storage_node_ops._connect_to_remote_devs(node, force_conect_restarting_nodes=True)
+        node.remote_devices = storage_node_ops._connect_to_remote_devs(node, force_connect_restarting_nodes=True)
         node.write_to_db()
 
     snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
@@ -775,17 +746,15 @@ def device_set_failed_and_migrated(device_id):
 
 def set_jm_device_state(device_id, state):
     db_controller = DBController()
-    jm_device = None
-    snode = None
-    for node in db_controller.get_storage_nodes():
-        if node.jm_device.get_id() == device_id:
-            jm_device = node.jm_device
-            snode = node
-            break
-    if not jm_device:
-        logger.error("device not found")
+
+    try:
+        snode = get_storage_node_by_jm_device(db_controller, device_id)
+    except KeyError as e:
+        logger.error(e)
         return False
 
+    jm_device = snode.jm_device
+
     if jm_device.status != state:
         jm_device.status = state
         snode.write_to_db(db_controller.kv_store)
@@ -816,15 +785,11 @@ def set_jm_device_state(device_id, state):
 
 def remove_jm_device(device_id, force=False):
     db_controller = DBController()
-    jm_device = None
-    snode = None
-    for node in db_controller.get_storage_nodes():
-        if node.jm_device.get_id() == device_id:
-            jm_device = node.jm_device
-            snode = node
-            break
-    if not jm_device:
-        logger.error("device not found")
+
+    try:
+        snode = get_storage_node_by_jm_device(db_controller, device_id)
+    except KeyError as e:
+        logger.error(e)
         return False
 
     set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_UNAVAILABLE)
@@ -859,17 +824,15 @@ def remove_jm_device(device_id, force=False):
 
 def restart_jm_device(device_id, force=False, format_alceml=False):
     db_controller = DBController()
-    jm_device = None
-    snode = None
-    for node in db_controller.get_storage_nodes():
-        if node.jm_device.get_id() == device_id:
-            jm_device = node.jm_device
-            snode = node
-            break
-    if not jm_device:
-        logger.error("device not found")
+
+    try:
+        snode = get_storage_node_by_jm_device(db_controller, device_id)
+    except KeyError as e:
+        logger.error(e)
         return False
 
+    jm_device = snode.jm_device
+
     if jm_device.status == JMDevice.STATUS_ONLINE:
         logger.warning("device is online")
         if not force: