Added default values of private fields when not in developer mode

Author: noctarius

scripts/cli-wrapper.jinja2

@@ -104,6 +104,16 @@ class CLIWrapper(CLIWrapperBase):
 {%- if argument.dest is defined and argument.dest != argument.name %}
                 args.{{ argument.dest }} = args.{{ argument.name }}
 {%- endif -%}
+{%- endfor %}
+{%- set ns = namespace(if_opened = False) %}
+{%- for parameter in subcommand.parameters -%}
+{%- if parameter.private is defined and parameter.private and parameter.default is defined %}
+{%- if not ns.if_opened %}
+                if not self.developer_mode:
+{%- set ns.if_opened = True %}
+{%- endif %}
+                    args.{{ parameter.dest }} = {{ parameter | default_value }}
+{%- endif -%}
 {%- endfor -%}
 {%- if subcommand.private %}
                 if not self.developer_mode:

simplyblock_cli/cli.py

@@ -873,6 +873,14 @@ def run(self):
             elif sub_command in ['deploy-cleaner']:
                 ret = self.storage_node__deploy_cleaner(sub_command, args)
             elif sub_command in ['add-node']:
+                if not self.developer_mode:
+                    args.jm_percent = '3'
+                    args.number_of_distribs = 4
+                    args.small_bufsize = '0'
+                    args.large_bufsize = '0'
+                    args.enable_ha_jm = False
+                    args.ha_jm_count = '3'
+                    args.id_device_by_nqn = False
                 ret = self.storage_node__add_node(sub_command, args)
             elif sub_command in ['delete']:
                 ret = self.storage_node__delete(sub_command, args)
@@ -883,6 +891,12 @@ def run(self):
             elif sub_command in ['get']:
                 ret = self.storage_node__get(sub_command, args)
             elif sub_command in ['restart']:
+                if not self.developer_mode:
+                    args.max_snap = '0'
+                    args.max_prov = ''
+                    args.number_of_devices = '0'
+                    args.small_bufsize = '0'
+                    args.large_bufsize = '0'
                 ret = self.storage_node__restart(sub_command, args)
             elif sub_command in ['shutdown']:
                 ret = self.storage_node__shutdown(sub_command, args)
@@ -972,10 +986,50 @@ def run(self):
         elif args.command in ['cluster']:
             sub_command = args_dict['cluster']
             if sub_command in ['deploy']:
+                if not self.developer_mode:
+                    args.ha_jm_count = '3'
+                    args.blk_size = '512'
+                    args.page_size = '2097152'
+                    args.grafana_endpoint = ''
+                    args.distr_bs = '4096'
+                    args.max_queue_size = '128'
+                    args.inflight_io_threshold = '4'
+                    args.jm_percent = '3'
+                    args.max_snap = '500'
+                    args.number_of_distribs = '4'
+                    args.small_bufsize = '0'
+                    args.large_bufsize = '0'
+                    args.enable_ha_jm = False
+                    args.lvol_name = 'lvol01'
+                    args.lvol_size = '10G'
+                    args.pool_name = 'pool01'
+                    args.pool_max = '25G'
+                    args.snapshot = False
+                    args.max_size = '1000G'
+                    args.encrypt = False
+                    args.distr_vuid = '0'
+                    args.lvol_ha_type = 'default'
+                    args.fstype = 'xfs'
                 ret = self.cluster__deploy(sub_command, args)
             elif sub_command in ['create']:
+                if not self.developer_mode:
+                    args.page_size = '2097152'
+                    args.distr_bs = '4096'
+                    args.distr_chunk_bs = '4096'
+                    args.ha_type = 'single'
+                    args.max_queue_size = '128'
+                    args.inflight_io_threshold = '4'
+                    args.enable_qos = False
                 ret = self.cluster__create(sub_command, args)
             elif sub_command in ['add']:
+                if not self.developer_mode:
+                    args.page_size = '2097152'
+                    args.distr_bs = '4096'
+                    args.distr_chunk_bs = '4096'
+                    args.ha_type = 'single'
+                    args.max_queue_size = '128'
+                    args.inflight_io_threshold = '4'
+                    args.enable_qos = False
                 ret = self.cluster__add(sub_command, args)
             elif sub_command in ['activate']:
                 ret = self.cluster__activate(sub_command, args)
@@ -1025,6 +1079,9 @@ def run(self):
         elif args.command in ['volume', 'lvol']:
             sub_command = args_dict['volume']
             if sub_command in ['add']:
+                if not self.developer_mode:
+                    args.distr_vuid = '0'
+                    args.ha_type = 'default'
                 ret = self.volume__add(sub_command, args)
             elif sub_command in ['qos-set']:
                 ret = self.volume__qos_set(sub_command, args)

simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=14.0.11
+SIMPLY_BLOCK_VERSION=14.0.12
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 DOCKER_USER=hamdysimplyblock