morpheus-cli 5.4.2 → 5.4.4

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -864,12 +864,18 @@ module Morpheus::Cli::ProvisioningHelper
     if locked_fields.include?('volumes')
       payload['volumes'] = options[:options]['volumes'] if options[:options]['volumes']
     else
-      volumes = prompt_volumes(service_plan, options, api_client, {zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
+      volumes = prompt_volumes(service_plan, provision_type, options, api_client, {zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
       if !volumes.empty?
         payload['volumes'] = volumes
       end
     end
 
+    # plan customizations
+    plan_opts = prompt_service_plan_options(service_plan, options, api_client, {zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
+    if plan_opts && !plan_opts.empty?
+      payload['servicePlanOptions'] = plan_opts
+    end
+
     # prompt networks
     if locked_fields.include?('networks')
       # payload['networkInterfaces'] = options[:options]['networkInterfaces'] if options[:options]['networkInterfaces']
@@ -906,7 +912,7 @@ module Morpheus::Cli::ProvisioningHelper
       has_security_groups = !!sg_option_type
       available_security_groups = []
       if sg_option_type && sg_option_type['type'] == 'select' && sg_option_type['optionSource']
-        sg_option_results = options_interface.options_for_source(sg_option_type['optionSource'], sg_api_params)
+        sg_option_results = options_interface.options_for_source(sg_option_type['optionSource'], sg_api_params, sg_option_type['optionSourceType'])
         available_security_groups = sg_option_results['data'].collect do |it|
           {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
         end
@@ -1033,7 +1039,7 @@ module Morpheus::Cli::ProvisioningHelper
 
   # This recreates the behavior of multi_disk.js
   # returns array of volumes based on service plan options (plan_info)
-  def prompt_volumes(plan_info, options={}, api_client=nil, api_params={})
+  def prompt_volumes(plan_info, provision_type, options={}, api_client=nil, api_params={})
     #puts "Configure Volumes:"
     # return [] if plan_info['noDisks']
 
@@ -1135,14 +1141,19 @@ module Morpheus::Cli::ProvisioningHelper
       volume['name'] = v_prompt[field_context]['name']
     end
     if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customSize']
-      if root_custom_size_options.empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
-        volume['size'] = v_prompt[field_context]['size']
-        volume['sizeId'] = nil #volume.delete('sizeId')
+      # provision_type['rootDiskSizeKnown'] == false means size cannot be changed
+      if provision_type['rootDiskSizeKnown'] == false
+        # volume['size'] = plan_size if plan_size.to_i != 0
       else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.', 'defaultValue' => volume['sizeId']}], options[:options])
-        volume['sizeId'] = v_prompt[field_context]['sizeId']
-        volume['size'] = nil #volume.delete('size')
+        if root_custom_size_options.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+          volume['size'] = v_prompt[field_context]['size']
+          volume['sizeId'] = nil #volume.delete('sizeId')
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.', 'defaultValue' => volume['sizeId']}], options[:options])
+          volume['sizeId'] = v_prompt[field_context]['sizeId']
+          volume['size'] = nil #volume.delete('size')
+        end
       end
     else
       # might need different logic here ? =o
@@ -1242,7 +1253,7 @@ module Morpheus::Cli::ProvisioningHelper
 
     # This recreates the behavior of multi_disk.js
     # returns array of volumes based on service plan options (plan_info)
-    def prompt_resize_volumes(current_volumes, plan_info, options={})
+    def prompt_resize_volumes(current_volumes, plan_info, provision_type, options={})
       #puts "Configure Volumes:"
       no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
 
@@ -1322,7 +1333,7 @@ module Morpheus::Cli::ProvisioningHelper
         'id' => current_root_volume['id'],
         'rootVolume' => true,
         'name' => current_root_volume['name'],
-        'size' => current_root_volume['size'] > plan_size ? current_root_volume['size'] : plan_size,
+        'size' => current_root_volume['size'] > (plan_size || 0) ? current_root_volume['size'] : plan_size,
         'sizeId' => nil,
         'storageType' => storage_type_id,
         'datastoreId' => current_root_volume['datastoreId']
@@ -1333,19 +1344,24 @@ module Morpheus::Cli::ProvisioningHelper
         volume['name'] = v_prompt[field_context]['name']
       end
       if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customSize']
-        if root_custom_size_options.empty?
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
-          volume['size'] = v_prompt[field_context]['size']
-          volume['sizeId'] = nil #volume.delete('sizeId')
+        # provision_type['rootDiskSizeKnown'] == false means size cannot be changed
+        if provision_type['rootDiskSizeKnown'] == false
+          # volume['size'] = plan_size if plan_size.to_i != 0
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
-          volume['sizeId'] = v_prompt[field_context]['sizeId']
-          volume['size'] = nil #volume.delete('size')
+          if root_custom_size_options.empty?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+            volume['size'] = v_prompt[field_context]['size']
+            volume['sizeId'] = nil #volume.delete('sizeId')
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
+            volume['sizeId'] = v_prompt[field_context]['sizeId']
+            volume['size'] = nil #volume.delete('size')
+          end
         end
       else
         # might need different logic here ? =o
-        volume['size'] = plan_size
-        volume['sizeId'] = nil #volume.delete('sizeId')
+        # volume['size'] = plan_size
+        # volume['sizeId'] = nil #volume.delete('sizeId')
       end
       # if !datastore_options.empty?
       #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
@@ -1373,7 +1389,7 @@ module Morpheus::Cli::ProvisioningHelper
               'id' => current_volume['id'].to_i,
               'rootVolume' => false,
               'name' => current_volume['name'],
-              'size' => current_volume['size'] > plan_size ? current_volume['size'] : plan_size,
+              'size' => current_volume['size'] > (plan_size || 0) ? current_volume['size'] : plan_size,
               'sizeId' => nil,
               'storageType' => (current_volume['type'] || current_volume['storageType']),
               'datastoreId' => current_volume['datastoreId']
@@ -1398,7 +1414,7 @@ module Morpheus::Cli::ProvisioningHelper
               'id' => current_volume['id'].to_i,
               'rootVolume' => false,
               'name' => current_volume['name'],
-              'size' => current_volume['size'] > plan_size ? current_volume['size'] : plan_size,
+              'size' => current_volume['size'] > (plan_size || 0) ? current_volume['size'] : plan_size,
               'sizeId' => nil,
               'storageType' => (current_volume['type'] || current_volume['storageType']),
               'datastoreId' => current_volume['datastoreId']
@@ -1420,8 +1436,8 @@ module Morpheus::Cli::ProvisioningHelper
               end
             else
               # might need different logic here ? =o
-              volume['size'] = plan_size
-              volume['sizeId'] = nil #volume.delete('sizeId')
+              # volume['size'] = plan_size
+              # volume['sizeId'] = nil #volume.delete('sizeId')
             end
             # if !datastore_options.empty?
             #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
@@ -1486,8 +1502,8 @@ module Morpheus::Cli::ProvisioningHelper
               end
             else
               # might need different logic here ? =o
-              volume['size'] = plan_size
-              volume['sizeId'] = nil #volume.delete('sizeId')
+              # volume['size'] = plan_size
+              # volume['sizeId'] = nil #volume.delete('sizeId')
             end
             if !datastore_options.empty?
               v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
@@ -2240,6 +2256,80 @@ module Morpheus::Cli::ProvisioningHelper
     return ports
   end
 
+  def prompt_service_plan_options(plan_info, options={}, api_client=nil, api_params={}, instance=nil)
+    plan_opts = {}
+    # provisioning with blueprint can lock fields
+    locked_fields = options[:locked_fields] || []
+    if options[:options]['servicePlanOptions']
+      plan_opts = options[:options]['servicePlanOptions']
+    end
+    default_max_cores = plan_info['maxCores'].to_i != 0 ? plan_info['maxCores'] : 1
+    default_cores_per_socket = plan_info['coresPerSocket'].to_i != 0 ? plan_info['coresPerSocket'] : 1
+    default_max_memory = plan_info['maxMemory'].to_i != 0 ? plan_info['maxMemory'] : nil
+    # use defaults from the instance/server
+    if instance
+      default_max_cores = instance["maxCores"] if instance["maxCores"]
+      default_cores_per_socket = instance["coresPerSocket"] if instance["coresPerSocket"]
+      default_max_memory = instance["maxMemory"] if instance["maxMemory"]
+    end
+    # Core Count
+    if plan_info["customCores"]
+      if locked_fields.include?('servicePlanOptions.maxCores')
+        if options[:options]['servicePlanOptions'] && options[:options]['servicePlanOptions']['maxCores']
+          plan_opts['maxCores'] = options[:options]['servicePlanOptions']['maxCores'].to_i
+        end
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'servicePlanOptions', 'fieldName' => 'maxCores', 'type' => 'number', 'fieldLabel' => "Core Count", 'required' => true, 'defaultValue' => default_max_cores, 'description' => "Customize service plan options Core Count"}], options[:options])
+        if v_prompt['servicePlanOptions'] && v_prompt['servicePlanOptions']['maxCores']
+          plan_opts['maxCores'] = v_prompt['servicePlanOptions']['maxCores'].to_i
+        end
+      end
+    end
+    # Cores Per Socket
+    if plan_info["customCoresPerSocket"]
+      if locked_fields.include?('servicePlanOptions.coresPerSocket')
+        if options[:options]['servicePlanOptions'] && options[:options]['servicePlanOptions']['coresPerSocket']
+          plan_opts['coresPerSocket'] = options[:options]['servicePlanOptions']['coresPerSocket'].to_i
+        end
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'servicePlanOptions', 'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => "Cores Per Socket", 'required' => true, 'defaultValue' => default_cores_per_socket, 'description' => "Customize service plan options Cores Per Socket"}], options[:options])
+        if v_prompt['servicePlanOptions'] && v_prompt['servicePlanOptions']['coresPerSocket']
+          plan_opts['coresPerSocket'] = v_prompt['servicePlanOptions']['coresPerSocket'].to_i
+        end
+      end
+    end
+    # Memory
+    if plan_info["customMaxMemory"]
+      if locked_fields.include?('servicePlanOptions.maxMemory')
+        if options[:options]['servicePlanOptions'] && options[:options]['servicePlanOptions']['maxMemory']
+          plan_opts['maxMemory'] = options[:options]['servicePlanOptions']['maxMemory'].to_i
+        end
+      else
+        if options[:options]['servicePlanOptions'] && options[:options]['servicePlanOptions']['maxMemory']
+          plan_opts['maxMemory'] = options[:options]['servicePlanOptions']['maxMemory'].to_i
+        else
+          # prompt for "memoryMB" field as MB or "memoryGB" in GB
+          # always convert maxMemory to bytes
+          if plan_info["memorySizeType"] == "MB" || options[:options]["memoryMB"]
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'memoryMB', 'type' => 'text', 'fieldLabel' => "Memory (MB)", 'required' => true, 'defaultValue' => default_max_memory ? (default_max_memory / (1024 * 1024)) : nil, 'description' => "Customize service plan options Memory (MB). Value is in megabytes."}], options[:options])
+            if v_prompt['memoryMB'].to_s != ""
+              plan_opts['maxMemory'] = v_prompt['memoryMB'].to_i * 1024 * 1024
+            end
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'memoryGB', 'type' => 'text', 'fieldLabel' => "Memory (GB)", 'required' => true, 'defaultValue' => default_max_memory ? (default_max_memory / (1024 * 1024 * 1024)) : nil, 'description' => "Customize service plan options Memory (GB). Value is in gigabytes."}], options[:options])
+            if v_prompt['memoryGB'].to_s != ""
+              plan_opts['maxMemory'] = v_prompt['memoryGB'].to_i * 1024 * 1024 * 1024
+            end
+          end
+          # remove transient memory field just used for prompting for MB or GB
+          plan_opts.delete("memoryMB")
+          plan_opts.delete("memoryGB")
+        end
+      end
+    end
+    return plan_opts
+  end
+
   def format_instance_status(instance, return_color=cyan)
     out = ""
     status_string = instance['status'].to_s

data/lib/morpheus/cli/mixins/rest_command.rb

@@ -336,11 +336,19 @@ module Morpheus::Cli::RestCommand
   end
 
   def rest_object_key
-    send("#{rest_key}_object_key")
+    if respond_to?("#{rest_key}_object_key", true)
+      send("#{rest_key}_object_key")
+    else
+      rest_name.camelcase.singularize
+    end
   end
 
   def rest_list_key
-    send("#{rest_key}_list_key")
+    if respond_to?("#{rest_key}_list_key", true)
+      send("#{rest_key}_list_key")
+    else
+      rest_name.camelcase
+    end
   end
 
   def rest_column_definitions(options)
@@ -408,11 +416,19 @@ module Morpheus::Cli::RestCommand
   end
 
   def rest_type_object_key
-    send("#{rest_type_key}_object_key")
+    if respond_to?("#{rest_type_key}_object_key", true)
+      send("#{rest_type_key}_object_key")
+    else
+      rest_type_name.camelcase.singularize
+    end
   end
 
   def rest_type_list_key
-    send("#{rest_type_key}_list_key")
+    if respond_to?("#{rest_type_key}_list_key", true)
+      send("#{rest_type_key}_list_key")
+    else
+      rest_type_name.camelcase
+    end
   end
 
   def rest_type_column_definitions(options)

data/lib/morpheus/cli/mixins/storage_servers_helper.rb

@@ -90,67 +90,4 @@ module Morpheus::Cli::StorageServersHelper
     end
   end
 
-  def get_available_storage_server_types(refresh=false)
-    if !@available_storage_server_types || refresh
-      @available_storage_server_types = storage_server_types_interface.list({max:1000})[storage_server_type_list_key]
-    end
-    return @available_storage_server_types
-  end
-
-  def storage_server_type_for_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return storage_server_type_for_id(val)
-    else
-      return storage_server_type_for_name(val)
-    end
-  end
-
-  def storage_server_type_for_id(id)
-    return get_available_storage_server_types().find { |z| z['id'].to_i == id.to_i}
-  end
-
-  def storage_server_type_for_name(name)
-    return get_available_storage_server_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
-  end
-
-  def find_storage_server_type_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_storage_server_type_by_id(val)
-    else
-      return find_storage_server_type_by_name(val)
-    end
-  end
-
-  def find_storage_server_type_by_id(id)
-    begin
-      json_response = storage_server_types_interface.get(id.to_i)
-      return json_response[storage_server_type_object_key]
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Storage Server Type not found by id #{id}"
-        return nil
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_storage_server_type_by_name(name)
-    json_response = storage_server_types_interface.list({name: name.to_s})
-    storage_server_types = json_response[storage_server_type_list_key]
-    if storage_server_types.empty?
-      print_red_alert "Storage Server Type not found by name #{name}"
-      return storage_server_types
-    elsif storage_server_types.size > 1
-      print_red_alert "#{storage_server_types.size} storage server types found by name #{name}"
-      rows = storage_server_types.collect do |it|
-        {id: it['id'], name: it['name']}
-      end
-      puts as_pretty_table(rows, [:id, :name], {color:red})
-      return nil
-    else
-      return storage_server_types[0]
-    end
-  end
-
 end

data/lib/morpheus/cli/mixins/storage_volumes_helper.rb

@@ -54,49 +54,6 @@ module Morpheus::Cli::StorageVolumesHelper
     'Storage Volume Types'
   end
 
-  def get_available_storage_volume_types(refresh=false)
-    if !@available_storage_volume_types || refresh
-      @available_storage_volume_types = storage_volume_types_interface.list({max:1000})[storage_volume_type_list_key]
-    end
-    return @available_storage_volume_types
-  end
-
-  def storage_volume_type_for_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return storage_volume_type_for_id(val)
-    else
-      return storage_volume_type_for_name(val)
-    end
-  end
-
-  def storage_volume_type_for_id(val)
-    record = get_available_storage_volume_types().find { |z| z['id'].to_i == val.to_i}
-    label = "Storage Volume Type"
-    if record.nil?
-      print_red_alert "#{label} not found by id #{val}"
-      return nil
-    end
-    return record
-  end
-
-  def storage_volume_type_for_name(val)
-    records = get_available_storage_volume_types().select { |z| z['name'].downcase == val.downcase || z['code'].downcase == val.downcase}
-    label = "Storage Volume Type"
-    if records.empty?
-      print_red_alert "#{label} not found by name '#{val}'"
-      return nil
-    elsif records.size > 1
-      print_red_alert "More than one #{label.downcase} found by name '#{val}'"
-      print_error "\n"
-      puts_error as_pretty_table(records, [:id, :name], {color:red})
-      print_red_alert "Try using ID instead"
-      print_error reset,"\n"
-      return nil
-    else
-      return records[0]
-    end
-  end
-
   def format_storage_volume_status(record, return_color=cyan)
     out = ""
     status_string = record['status']

data/lib/morpheus/cli/option_types.rb

@@ -42,7 +42,7 @@ module Morpheus
         end
       end
 
-      def self.prompt(option_types, options={}, api_client=nil, api_params={}, no_prompt=false, paging_enabled=false)
+      def self.prompt(option_types, options={}, api_client=nil, api_params={}, no_prompt=false, paging_enabled=false, ignore_empty=false)
         paging_enabled = false if Morpheus::Cli.windows?
         no_prompt = no_prompt || options[:no_prompt]
         results = {}
@@ -57,6 +57,10 @@ module Morpheus
           if option_type['fieldGroup'].to_s.downcase == 'options'
             option_type['fieldGroup'] = 'default'
           end
+          # apply custom templates
+          if option_type['fieldName'] == 'sshHosts'
+            option_type['type'] = 'multiText'
+          end
         end
         # puts "Options Prompt #{options}"
         # Sort options by default, group, advanced
@@ -156,7 +160,7 @@ module Morpheus
           end
 
           # build parameters for option source api request
-          option_params = (option_type['noParams'] ? {} : (api_params || {}).merge(results))
+          option_params = (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results))
           option_params.merge!(option_type['optionParams']) if option_type['optionParams']
 
           # use the value passed in the options map
@@ -169,14 +173,14 @@ module Morpheus
               end
             # these select prompts should just fall down through below, with the extra params no_prompt, use_value
             elsif option_type['type'] == 'select'
-              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, option_params, true)
+              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, option_params, true, nil, false, ignore_empty)
             elsif option_type['type'] == 'multiSelect'
               # support value as csv like "thing1, thing2"
               value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
               input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
               select_value_list = []
               value_list.each_with_index do |v, i|
-                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true)
+                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true, nil, false, ignore_empty)
               end
               value = select_value_list
             elsif option_type['type'] == 'typeahead'
@@ -213,20 +217,21 @@ module Morpheus
                 # select type is special because it supports skipSingleOption
                 # and prints the available options on error
                 if ['select', 'multiSelect'].include?(option_type['type'])
-                  value = select_prompt(option_type, api_client, option_params, true)
+                  value = select_prompt(option_type, api_client, option_params, true, nil, false, ignore_empty)
                   value_found = !!value
                 end
                 if ['typeahead', 'multiTypeahead'].include?(option_type['type'])
                   value = typeahead_prompt(option_type, api_client, option_params, true)
                   value_found = !!value
                 end
-                if !value_found
+                if !value_found && !ignore_empty
                   if option_type['required']
                     print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
                     print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{help_field_key}=] - #{option_type['description']}\n", Term::ANSIColor.reset
                     print "\n"
                     exit 1
                   else
+                    parent_context_map.reject! {|k,v| k == parent_ns && (v.nil? || (v.is_a?(Hash) && v.empty?))}
                     next
                   end
                 end
@@ -254,11 +259,11 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled)
+              value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty)
               if value && option_type['type'] == 'multiSelect'
                 value = [value]
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
-                  if addn_value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled)
+                  if addn_value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty)
                     value << addn_value
                   else
                     break
@@ -370,7 +375,7 @@ module Morpheus
         Thread.current[:_last_select]
       end
 
-      def self.select_prompt(option_type, api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false)
+      def self.select_prompt(option_type, api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false, ignore_empty=false)
         paging_enabled = false if Morpheus::Cli.windows?
         field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
         help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
@@ -406,9 +411,11 @@ module Morpheus
             select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
           end
         else
-          raise "option '#{field_key}' is type: 'select' and missing selectOptions or optionSource!"
+          raise "option '#{help_field_key}' is type: 'select' and missing selectOptions or optionSource!"
         end
 
+        return nil if (select_options.nil? || select_options.count == 0) && ignore_empty
+
         # ensure the preselected value (passed as an option) is in the dropdown
         if !use_value.nil?
           matched_option = select_options.find {|opt| opt[value_field].to_s == use_value.to_s || opt['name'].to_s == use_value.to_s }
@@ -672,6 +679,10 @@ module Morpheus
               if select_options.empty?
                 print "The value '#{input}' matched 0 options.\n"
                 # print "Please try again.\n"
+              elsif select_options.size() == 1
+                print "The value '#{input}' matched 1 option.\n"
+                print "Perhaps you meant '#{select_options[0]['name']}' instead?"
+                # print "Please try again.\n"
               else
                 print "The value '#{input}' matched #{select_options.size()} options.\n"
                 print "Perhaps you meant one of these? #{ored_list(select_options.collect {|i|i['name']}, 3)}\n"
@@ -686,6 +697,9 @@ module Morpheus
               if select_options.empty?
                 print "The value '#{input}' matched 0 options.\n"
                 print "Please try again.\n"
+              elsif select_options.size() == 1
+                print "The value '#{input}' matched 1 option.\n"
+                print "Perhaps you meant '#{select_options[0]['name']}' instead?"
               else
                 print "The value '#{input}' matched #{select_options.size()} options.\n"
                 print "Perhaps you meant one of these? #{ored_list(select_options.collect {|i|i['name']}, 3)}\n"
@@ -958,6 +972,8 @@ module Morpheus
       end
 
       def self.load_options(option_type, api_client, api_params, query_value=nil)
+        field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+        help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
         select_options = []
         # local array of options
         if option_type['selectOptions']
@@ -989,7 +1005,7 @@ module Morpheus
             select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
           end
         else
-          raise "option '#{field_key}' is type: 'typeahead' and missing selectOptions or optionSource!"
+          raise "option '#{help_field_key}' is type: 'typeahead' and missing selectOptions or optionSource!"
         end
 
         return select_options

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.4.2"
+    VERSION = "5.4.4"
   end
 end

data/lib/morpheus/routes.rb

@@ -87,9 +87,19 @@ module Morpheus::Routes
         :'data-stores' => {}, # ugh, should be datastores
         servers: {}, # Storage Servers
       },
-      # :'keys-and-certs' => {},
-      :'key-pairs' => {},
-      certificates: {},
+      trust: [
+        "#!credentials",
+        "#!certificates",
+        "#!keypairs",
+        "#!services",
+      ],
+      boot: [
+        "#!mappings",
+        "#!boot-menus",
+        "#!answerfiles",
+        "#!boot-images",
+        "#!macs",
+      ],
     },
     backups: {
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.4
 platform: ruby
 authors:
 - David Estes
 - Bob Whiton
 - Jeremy Michael Crosbie
 - James Dickson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,6 +200,8 @@ files:
 - lib/morpheus/api/clouds_interface.rb
 - lib/morpheus/api/clusters_interface.rb
 - lib/morpheus/api/containers_interface.rb
+- lib/morpheus/api/credential_types_interface.rb
+- lib/morpheus/api/credentials_interface.rb
 - lib/morpheus/api/custom_instance_types_interface.rb
 - lib/morpheus/api/cypher_interface.rb
 - lib/morpheus/api/dashboard_interface.rb
@@ -300,6 +302,7 @@ files:
 - lib/morpheus/api/service_catalog_interface.rb
 - lib/morpheus/api/service_plans_interface.rb
 - lib/morpheus/api/setup_interface.rb
+- lib/morpheus/api/snapshots_interface.rb
 - lib/morpheus/api/storage_providers_interface.rb
 - lib/morpheus/api/storage_server_types_interface.rb
 - lib/morpheus/api/storage_servers_interface.rb
@@ -355,6 +358,8 @@ files:
 - lib/morpheus/cli/commands/clusters.rb
 - lib/morpheus/cli/commands/coloring_command.rb
 - lib/morpheus/cli/commands/containers_command.rb
+- lib/morpheus/cli/commands/credential_types_command.rb
+- lib/morpheus/cli/commands/credentials_command.rb
 - lib/morpheus/cli/commands/curl_command.rb
 - lib/morpheus/cli/commands/cypher_command.rb
 - lib/morpheus/cli/commands/dashboard_command.rb
@@ -455,6 +460,7 @@ files:
 - lib/morpheus/cli/commands/setup.rb
 - lib/morpheus/cli/commands/shell.rb
 - lib/morpheus/cli/commands/sleep_command.rb
+- lib/morpheus/cli/commands/snapshots.rb
 - lib/morpheus/cli/commands/source_command.rb
 - lib/morpheus/cli/commands/ssl_verification_command.rb
 - lib/morpheus/cli/commands/storage_providers_command.rb
@@ -524,11 +530,11 @@ files:
 - lib/morpheus/terminal.rb
 - lib/morpheus/util.rb
 - morpheus-cli.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -543,9 +549,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance
 test_files: []