sbcli-dev 19.2.30__tar.gz → 19.2.32__tar.gz

{sbcli_dev-19.2.30/sbcli_dev.egg-info → sbcli_dev-19.2.32}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.30
+Version: 19.2.32
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: foundationdb==7.3.63
 Requires-Dist: requests
 Requires-Dist: prettytable>=3.10.0
@@ -39,7 +38,6 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{sbcli_dev-19.2.30 → sbcli_dev-19.2.32}/pyproject.toml

@@ -12,4 +12,4 @@ exclude = ['simplyblock_web/test']
 
 [tool.pytest.ini_options]
 pythonpath = "."
-testpaths = ['simplyblock_core/test', 'simplyblock_web/test']
+testpaths = ['simplyblock_core/test', 'simplyblock_web/test', 'tests']

{sbcli_dev-19.2.30 → sbcli_dev-19.2.32/sbcli_dev.egg-info}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.30
+Version: 19.2.32
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: foundationdb==7.3.63
 Requires-Dist: requests
 Requires-Dist: prettytable>=3.10.0
@@ -39,7 +38,6 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{sbcli_dev-19.2.30 → sbcli_dev-19.2.32}/sbcli_dev.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE
 README.md
 pyproject.toml
 requirements.txt
@@ -27,6 +26,8 @@ simplyblock_core/shell_utils.py
 simplyblock_core/snode_client.py
 simplyblock_core/storage_node_ops.py
 simplyblock_core/controllers/__init__.py
+simplyblock_core/controllers/backup_controller.py
+simplyblock_core/controllers/backup_events.py
 simplyblock_core/controllers/cluster_events.py
 simplyblock_core/controllers/device_controller.py
 simplyblock_core/controllers/device_events.py
@@ -35,6 +36,8 @@ simplyblock_core/controllers/health_controller.py
 simplyblock_core/controllers/lvol_controller.py
 simplyblock_core/controllers/lvol_events.py
 simplyblock_core/controllers/mgmt_events.py
+simplyblock_core/controllers/migration_controller.py
+simplyblock_core/controllers/migration_events.py
 simplyblock_core/controllers/pool_controller.py
 simplyblock_core/controllers/pool_events.py
 simplyblock_core/controllers/qos_controller.py
@@ -45,12 +48,14 @@ simplyblock_core/controllers/tasks_controller.py
 simplyblock_core/controllers/tasks_events.py
 simplyblock_core/controllers/tcp_ports_events.py
 simplyblock_core/models/__init__.py
+simplyblock_core/models/backup.py
 simplyblock_core/models/base_model.py
 simplyblock_core/models/cluster.py
 simplyblock_core/models/events.py
 simplyblock_core/models/hublvol.py
 simplyblock_core/models/iface.py
 simplyblock_core/models/job_schedule.py
+simplyblock_core/models/lvol_migration.py
 simplyblock_core/models/lvol_model.py
 simplyblock_core/models/mgmt_node.py
 simplyblock_core/models/nvme_device.py
@@ -88,13 +93,6 @@ simplyblock_core/scripts/charts/values.yaml
 simplyblock_core/scripts/charts/crds/apps.foundationdb.org_foundationdbbackups.yaml
 simplyblock_core/scripts/charts/crds/apps.foundationdb.org_foundationdbclusters.yaml
 simplyblock_core/scripts/charts/crds/apps.foundationdb.org_foundationdbrestores.yaml
-simplyblock_core/scripts/charts/crds/simplyblock.simplyblock.io_simplyblockdevices.yaml
-simplyblock_core/scripts/charts/crds/simplyblock.simplyblock.io_simplyblocklvols.yaml
-simplyblock_core/scripts/charts/crds/simplyblock.simplyblock.io_simplyblockpools.yaml
-simplyblock_core/scripts/charts/crds/simplyblock.simplyblock.io_simplyblockstorageclusters.yaml
-simplyblock_core/scripts/charts/crds/simplyblock.simplyblock.io_simplyblockstoragenodes.yaml
-simplyblock_core/scripts/charts/crds/simplyblock.simplyblock.io_simplyblocktasks.yaml
-simplyblock_core/scripts/charts/templates/_helpers.tpl
 simplyblock_core/scripts/charts/templates/app_configmap.yaml
 simplyblock_core/scripts/charts/templates/app_ingress.yaml
 simplyblock_core/scripts/charts/templates/app_k8s.yaml
@@ -111,8 +109,6 @@ simplyblock_core/scripts/charts/templates/monitoring_ingress.yaml
 simplyblock_core/scripts/charts/templates/monitoring_k8s.yaml
 simplyblock_core/scripts/charts/templates/monitoring_secret.yaml
 simplyblock_core/scripts/charts/templates/monitoring_svc.yaml
-simplyblock_core/scripts/charts/templates/simplyblock-manager.yaml
-simplyblock_core/scripts/charts/templates/simplyblock_customresource.yaml
 simplyblock_core/scripts/charts/templates/storage_class.yaml
 simplyblock_core/scripts/dashboards/cluster.json
 simplyblock_core/scripts/dashboards/devices.json
@@ -141,8 +137,11 @@ simplyblock_core/services/snapshot_monitor.py
 simplyblock_core/services/spdk_http_proxy_server.py
 simplyblock_core/services/storage_node_monitor.py
 simplyblock_core/services/tasks_cluster_status.py
+simplyblock_core/services/tasks_runner_backup.py
+simplyblock_core/services/tasks_runner_backup_merge.py
 simplyblock_core/services/tasks_runner_failed_migration.py
 simplyblock_core/services/tasks_runner_jc_comp.py
+simplyblock_core/services/tasks_runner_lvol_migration.py
 simplyblock_core/services/tasks_runner_migration.py
 simplyblock_core/services/tasks_runner_new_dev_migration.py
 simplyblock_core/services/tasks_runner_node_add.py
@@ -182,10 +181,12 @@ 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/backup.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/migration.py
 simplyblock_web/api/v2/pool.py
 simplyblock_web/api/v2/snapshot.py
 simplyblock_web/api/v2/storage_node.py
@@ -201,9 +202,12 @@ simplyblock_web/static/list_deps.py
 simplyblock_web/static/openapi.json
 simplyblock_web/static/rpac.yaml
 simplyblock_web/static/tst.py
+simplyblock_web/templates/Untitled-1.j2
 simplyblock_web/templates/caching_deploy_spdk.yaml.j2
 simplyblock_web/templates/oc_storage_core_isolation.yaml.j2
+simplyblock_web/templates/oc_storage_cpu_topology.yaml.j2
 simplyblock_web/templates/storage_core_isolation.yaml.j2
+simplyblock_web/templates/storage_cpu_topology.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
@@ -211,4 +215,24 @@ 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/util.py
+tests/__init__.py
+tests/test_backup.py
+tests/test_dual_fault_tolerance.py
+tests/test_dual_ft_e2e.py
+tests/test_imports.py
+tests/test_nvmeof_security.py
+tests/test_nvmeof_security_e2e.py
+tests/test_port_allocation.py
+tests/migration/__init__.py
+tests/migration/conftest.py
+tests/migration/db_setup.py
+tests/migration/mock_rpc_server.py
+tests/migration/test_complex_tree.py
+tests/migration/test_ctl.py
+tests/migration/test_migration_flow.py
+tests/migration/test_scalability.py
+tests/migration/test_unit_controller.py
+tests/migration/test_unit_model.py
+tests/migration/test_unit_runner_helpers.py
+tests/migration/topology_loader.py

{sbcli_dev-19.2.30 → sbcli_dev-19.2.32}/sbcli_dev.egg-info/top_level.txt

@@ -1,3 +1,4 @@
 simplyblock_cli
 simplyblock_core
 simplyblock_web
+tests

{sbcli_dev-19.2.30 → sbcli_dev-19.2.32}/simplyblock_cli/cli.py

@@ -6,7 +6,7 @@ import sys
 import traceback
 
 from simplyblock_cli.clibase import CLIWrapperBase, range_type, size_type
-from simplyblock_core import utils
+from simplyblock_core import utils, constants
 
 class CLIWrapper(CLIWrapperBase):
 
@@ -78,6 +78,11 @@ class CLIWrapper(CLIWrapperBase):
         if self.developer_mode:
             self.init_storage_node__set(subparser)
         self.init_storage_node__new_device_from_failed(subparser)
+        self.init_storage_node__list_snapshots(subparser)
+        self.init_storage_node__list_lvols(subparser)
+        self.init_storage_node__repair_lvstore(subparser)
+        if self.developer_mode:
+            self.init_storage_node__lvs_dump_tree(subparser)
 
 
     def init_storage_node__deploy(self, subparser):
@@ -88,7 +93,7 @@ class CLIWrapper(CLIWrapperBase):
     def init_storage_node__configure(self, subparser):
         subcommand = self.add_sub_command(subparser, 'configure', 'Prepare a configuration file to be used when adding the storage node')
         argument = subcommand.add_argument('--max-lvol', help='Max logical volume per storage node', type=int, dest='max_lvol', required=True)
-        argument = subcommand.add_argument('--max-size', help='Maximum amount of GB to be utilized on this storage node', type=str, dest='max_prov', required=False)
+        argument = subcommand.add_argument('--max-size', help='Maximum amount of Huge Pages to be set on the node', type=str, dest='max_prov', required=False)
         argument = subcommand.add_argument('--nodes-per-socket', help='number of each node to be added per each socket.', type=int, default=1, dest='nodes_per_socket')
         argument = subcommand.add_argument('--sockets-to-use', help='The system socket to use when adding the storage nodes', type=str, default='0', dest='sockets_to_use')
         argument = subcommand.add_argument('--cores-percentage', help='The percentage of cores to be used for spdk (0-99)', type=range_type(0, 99), default=0, dest='cores_percentage')
@@ -96,7 +101,10 @@ class CLIWrapper(CLIWrapperBase):
         argument = subcommand.add_argument('--pci-blocked', help='Comma separated list of PCI addresses of Nvme devices to not use for storage devices', type=str, default='', dest='pci_blocked', required=False)
         argument = subcommand.add_argument('--device-model', help='NVMe SSD model string, example: --model PM1628, --device-model and --size-range must be set together', type=str, default='', dest='device_model', required=False)
         argument = subcommand.add_argument('--size-range', help='NVMe SSD device size range separated by -, can be X(m,g,t) or bytes as integer, example: --size-range 50G-1T or --size-range 1232345-67823987, --device-model and --size-range must be set together', type=str, default='', dest='size_range', required=False)
+        argument = subcommand.add_argument('--nvme-names', help='Comma separated list of nvme namespace names like nvme0n1,nvme1n1...', type=str, default='', dest='nvme_names', required=False)
         argument = subcommand.add_argument('--force', help='Force format detected or passed nvme pci address to 4K and clean partitions', dest='force', action='store_true')
+        argument = subcommand.add_argument('--calculate-hp-only', help='Calculate the minimum required huge pages, it depends on the following params: --cores-percentage, --sockets-to-use, --max-lvol, --nodes-per-socket, --number-of-devices', dest='calculate_hp_only', action='store_true')
+        argument = subcommand.add_argument('--number-of-devices', help='number of devices that will be used on this host, For calculating huge pages memory only', type=int, dest='number_of_devices')
 
     def init_storage_node__configure_upgrade(self, subparser):
         subcommand = self.add_sub_command(subparser, 'configure-upgrade', 'Upgrade the automated configuration file with new changes of cpu mask or storage devices')
@@ -114,6 +122,7 @@ class CLIWrapper(CLIWrapperBase):
         subcommand.add_argument('node_addr', help='Address of storage node api to add, like <node-ip>:5000', type=str)
         subcommand.add_argument('ifname', help='Management interface name', type=str)
         argument = subcommand.add_argument('--journal-partition', help='1: auto-create small partitions for journal on nvme devices. 0: use a separate (the smallest) nvme device of the node for journal. The journal needs a maximum of 3 percent of total available raw disk space.', type=int, default=1, dest='partitions')
+        argument = subcommand.add_argument('--format-4k', help='Force format nvme devices with 4K', dest='format_4k', action='store_true')
         if self.developer_mode:
             argument = subcommand.add_argument('--jm-percent', help='Number in percent to use for JM from each device', type=int, default=3, dest='jm_percent')
         argument = subcommand.add_argument('--data-nics', help='Storage network interface names. currently one interface is supported.', type=str, dest='data_nics', nargs='+')
@@ -310,6 +319,27 @@ class CLIWrapper(CLIWrapperBase):
         subcommand = self.add_sub_command(subparser, 'new-device-from-failed', 'Adds a new device to from failed device information')
         subcommand.add_argument('device_id', help='Device id', type=str)
 
+    def init_storage_node__list_snapshots(self, subparser):
+        subcommand = self.add_sub_command(subparser, 'list-snapshots', 'List snapshots on a storage node')
+        subcommand.add_argument('node_id', help='Node id', type=str)
+        argument = subcommand.add_argument('--json', help='Print json output', dest='json', action='store_true')
+
+    def init_storage_node__list_lvols(self, subparser):
+        subcommand = self.add_sub_command(subparser, 'list-lvols', 'List lvols on a storage node')
+        subcommand.add_argument('node_id', help='Node id', type=str)
+        argument = subcommand.add_argument('--json', help='Print json output', dest='json', action='store_true')
+
+    def init_storage_node__repair_lvstore(self, subparser):
+        subcommand = self.add_sub_command(subparser, 'repair-lvstore', 'Try repair any inconsistencies in lvstore on a storage node')
+        subcommand.add_argument('node_id', help='Node id', type=str)
+        argument = subcommand.add_argument('--validate-only', help='Validate only, do not perform any repair actions', dest='validate_only', action='store_true')
+        argument = subcommand.add_argument('--force-remove-inconsistent', help='Force remove any inconsistent lvols or snapshots', dest='force_remove_inconsistent', action='store_true')
+        argument = subcommand.add_argument('--force_remove_wrong_ref', help='Force remove lvols or snapshots with wrong reference count', dest='force_remove_wrong_ref', action='store_true')
+
+    def init_storage_node__lvs_dump_tree(self, subparser):
+        subcommand = self.add_sub_command(subparser, 'lvs-dump-tree', 'dump lvstore tree for debugging')
+        subcommand.add_argument('node_id', help='Node id', type=str)
+
 
     def init_cluster(self):
         subparser = self.add_command('cluster', 'Cluster commands')
@@ -384,6 +414,7 @@ class CLIWrapper(CLIWrapperBase):
         argument = subcommand.add_argument('--name', '-n', help='Assigns a name to the newly created cluster.', type=str, dest='name')
         argument = subcommand.add_argument('--qpair-count', help='NVMe/TCP transport qpair count per logical volume', type=range_type(0, 128), default=32, dest='qpair_count')
         argument = subcommand.add_argument('--client-qpair-count', help='default NVMe/TCP transport qpair count per logical volume for client', type=range_type(0, 128), default=3, dest='client_qpair_count')
+        argument = subcommand.add_argument('--client-data-nic', help='Network interface name from client to use for LVol connection.', type=str, dest='client_data_nic')
 
     def init_cluster__add(self, subparser):
         subcommand = self.add_sub_command(subparser, 'add', 'Adds a new cluster')
@@ -411,6 +442,7 @@ class CLIWrapper(CLIWrapperBase):
             argument = subcommand.add_argument('--inflight-io-threshold', help='The number of inflight IOs allowed before the IO queuing starts', type=int, default=4, dest='inflight_io_threshold')
         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')
+        argument = subcommand.add_argument('--client-data-nic', help='Network interface name from client to use for LVol connection.', type=str, dest='client_data_nic')
 
     def init_cluster__activate(self, subparser):
         subcommand = self.add_sub_command(subparser, 'activate', 'Activates a cluster.')
@@ -482,7 +514,6 @@ class CLIWrapper(CLIWrapperBase):
         subcommand = self.add_sub_command(subparser, 'update', 'Updates a cluster to new version')
         subcommand.add_argument('cluster_id', help='Cluster id', type=str).completer = self._completer_get_cluster_list
         argument = subcommand.add_argument('--cp-only', help='Update the control plane only', type=bool, default=False, dest='mgmt_only')
-        argument = subcommand.add_argument('--restart', help='Restart the management services', type=bool, default=False, dest='restart')
         argument = subcommand.add_argument('--spdk-image', help='Restart the storage nodes using the provided image', type=str, dest='spdk_image')
         argument = subcommand.add_argument('--mgmt-image', help='Restart the management services using the provided image', type=str, dest='mgmt_image')
 
@@ -804,6 +835,10 @@ class CLIWrapper(CLIWrapperBase):
         else:
             self.logger.setLevel(logging.INFO)
 
+        if args.version:
+            print(f"simplyblock version: {constants.SIMPLY_BLOCK_VERSION}")
+            return True
+
         logging.getLogger("urllib3.connectionpool").setLevel(logging.WARNING)
 
         ret = False
@@ -937,6 +972,18 @@ class CLIWrapper(CLIWrapperBase):
                         ret = self.storage_node__set(sub_command, args)
                 elif sub_command in ['new-device-from-failed']:
                     ret = self.storage_node__new_device_from_failed(sub_command, args)
+                elif sub_command in ['list-snapshots']:
+                    ret = self.storage_node__list_snapshots(sub_command, args)
+                elif sub_command in ['list-lvols']:
+                    ret = self.storage_node__list_lvols(sub_command, args)
+                elif sub_command in ['repair-lvstore']:
+                    ret = self.storage_node__repair_lvstore(sub_command, args)
+                elif sub_command in ['lvs-dump-tree']:
+                    if not self.developer_mode:
+                        print("This command is private.")
+                        ret = False
+                    else:
+                        ret = self.storage_node__lvs_dump_tree(sub_command, args)
                 else:
                     self.parser.print_help()