morpheus-cli 3.6.3 → 3.6.4

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

@@ -211,7 +211,9 @@ module Morpheus::Cli::ProvisioningHelper
   # prompts user for all the configuartion options for a particular instance
   # returns payload of data for a new instance
   def prompt_new_instance(options={})
-
+    #puts "prompt_new_instance() #{options}"
+    print reset # clear colors
+    options[:options] ||= {}
     # Group
     group_id = nil
     group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
@@ -232,8 +234,10 @@ module Morpheus::Cli::ProvisioningHelper
     else
       # print_red_alert "Cloud not specified!"
       # exit 1
-      cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => get_available_clouds(group_id), 'required' => true, 'description' => 'Select Cloud.'}],options[:options],api_client,{groupId: group_id})
+      available_clouds = get_available_clouds(group_id)
+      cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => get_available_clouds(group_id), 'required' => true, 'description' => 'Select Cloud.', 'defaultValue' => options[:default_cloud] ? options[:default_cloud] : nil}],options[:options],api_client,{groupId: group_id})
       cloud_id = cloud_prompt['cloud']
+      cloud = available_clouds.find {|it| it['id'] == cloud_id.to_i || it['name'] == cloud_id.to_s }
     end
     # Instance Type
     instance_type_code = nil
@@ -243,24 +247,28 @@ module Morpheus::Cli::ProvisioningHelper
       instance_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Type', 'optionSource' => 'instanceTypes', 'required' => true, 'description' => 'Select Instance Type.'}],options[:options],api_client,{groupId: group_id})
       instance_type_code = instance_type_prompt['type']
     end
-    instance_type = find_instance_type_by_code(instance_type_code)
+    if instance_type_code.to_s =~ /\A\d{1,}\Z/
+      instance_type = find_instance_type_by_id(instance_type_code)
+    else
+      instance_type = find_instance_type_by_code(instance_type_code)
+    end
     exit 1 if !instance_type
 
     # Instance Name
-
     instance_name = nil
     if options[:instance_name]
-      instance_name = options[:instance_name]
-    else
-      name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Instance Name', 'type' => 'text', 'required' => options[:name_required]}], options[:options])
-      instance_name = name_prompt['name'] || ''
+      options[:options]['name'] = options[:instance_name]
     end
+    name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Instance Name', 'type' => 'text', 'required' => options[:name_required]}], options[:options])
+    instance_name = name_prompt['name']
+    
 
     payload = {
       'zoneId' => cloud_id,
       # 'siteId' => siteId,
       'instance' => {
         'name' => instance_name,
+        'cloud' => cloud['name'],
         'site' => {
           'id' => group_id
         },
@@ -271,16 +279,16 @@ module Morpheus::Cli::ProvisioningHelper
       }
     }
 
-    # allow arbitrary -O values passed by the user (config and instance namespace only)
-    if options[:options] && options[:options]['config'].is_a?(Hash)
-      payload['config'] ||= {}
-      payload['config'].deep_merge!(options[:options]['config'])
-    end
-    if options[:options] && options[:options]['instance'].is_a?(Hash)
-      payload['instance'].deep_merge!(options[:options]['instance'])
+    # allow arbitrary -O values passed by the user
+    if options[:options]
+      arbitrary_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
+      payload.deep_merge!(arbitrary_options)
     end
 
     # Description
+    if options[:description]
+      options[:options]['description'] = options[:description]
+    end
     v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
     payload['instance']['description'] = v_prompt['description'] if !v_prompt['description'].empty?
 
@@ -294,8 +302,9 @@ module Morpheus::Cli::ProvisioningHelper
 
     # Version and Layout
 
-    version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
-    layout_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.'}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+    version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
+    default_layout_value = payload['instance']['layout'] ? payload['instance']['layout']['id'] : nil
+    layout_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
     layout_id = layout_prompt['layout']
     layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'] == layout_id.to_i}
     if !layout
@@ -307,15 +316,24 @@ module Morpheus::Cli::ProvisioningHelper
     # prompt for service plan
     service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, layoutId: layout_id, siteId: group_id})
     service_plans = service_plans_json["plans"]
-    service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
-    plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
+    service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"], 'code' => sp['code']} } # already sorted
+    default_plan = nil
+    if payload['plan']
+      default_plan = payload['plan']
+    elsif payload['instance'] && payload['instance']['plan']
+      default_plan = payload['instance']['plan']
+    end
+    default_plan_value = default_plan.is_a?(Hash) ? default_plan['id'] : default_plan
+    plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance', 'defaultValue' => default_plan_value}],options[:options])
     plan_id = plan_prompt['servicePlan']
     service_plan = service_plans.find {|sp| sp["id"] == plan_id.to_i }
     if !service_plan
       print_red_alert "Plan not found by id #{plan_id}"
       exit 1
     end
-    payload['instance']['plan'] = {'id' => service_plan["id"]}
+    #todo: consolidate these, instances api looks for instance.plan.id and apps looks for plan.id
+    payload['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
+    payload['instance']['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
 
     # prompt for resource pool
     has_zone_pools = layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasZonePools"]
@@ -328,23 +346,27 @@ module Morpheus::Cli::ProvisioningHelper
     end
 
     # prompt for volumes
-    volumes = prompt_volumes(service_plan, options, api_client, {})
-    if !volumes.empty?
-      payload['volumes'] = volumes
-    end
-
-    if layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasNetworks"]
-      # prompt for network interfaces (if supported)
-      begin
-        network_interfaces = prompt_network_interfaces(cloud_id, layout["provisionType"]["id"], options)
-        if !network_interfaces.empty?
-          payload['networkInterfaces'] = network_interfaces
+    # if payload['volumes'].nil?
+      volumes = prompt_volumes(service_plan, options, api_client, {})
+      if !volumes.empty?
+        payload['volumes'] = volumes
+      end
+    # end
+
+    # if payload['networkInterfaces'].nil?
+      if layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasNetworks"]
+        # prompt for network interfaces (if supported)
+        begin
+          network_interfaces = prompt_network_interfaces(cloud_id, layout["provisionType"]["id"], options)
+          if !network_interfaces.empty?
+            payload['networkInterfaces'] = network_interfaces
+          end
+        rescue RestClient::Exception => e
+          print yellow,"Unable to load network options. Proceeding...",reset,"\n"
+          print_rest_exception(e, options) if Morpheus::Logging.debug?
         end
-      rescue RestClient::Exception => e
-        print yellow,"Unable to load network options. Proceeding...",reset,"\n"
-        print_rest_exception(e, options) if Morpheus::Logging.debug?
       end
-    end
+    # end
 
     # build option types
     option_type_list = []
@@ -447,6 +469,20 @@ module Morpheus::Cli::ProvisioningHelper
 
     field_context = "rootVolume"
 
+    volume_label = 'root'
+    volume = {
+      'id' => -1,
+      'rootVolume' => true,
+      'name' => volume_label,
+      'size' => plan_size,
+      'sizeId' => nil,
+      'storageType' => nil,
+      'datastoreId' => nil
+    }
+    if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][0]
+      volume = options[:options]['volumes'][0]
+    end
+
     if root_storage_types.empty?
       # this means there's no configuration, just send a single root volume to the server
       storage_type_id = nil
@@ -456,6 +492,7 @@ module Morpheus::Cli::ProvisioningHelper
       storage_type_id = v_prompt[field_context]['storageType']
       storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
     end
+    volume['storageType'] = storage_type_id
 
     # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
     root_custom_size_options = []
@@ -467,38 +504,27 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
-    volume_label = 'root'
-    volume = {
-      'id' => -1,
-      'rootVolume' => true,
-      'name' => volume_label,
-      'size' => plan_size,
-      'sizeId' => nil,
-      'storageType' => storage_type_id,
-      'datastoreId' => nil
-    }
-
     if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customLabel']
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Root Volume Label', 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume_label}], options[:options])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Root Volume Label', 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
       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' => plan_size}], options[:options])
+        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])
+        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
     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])
+      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.', 'defaultValue' => volume['datastoreId']}], options[:options])
       volume['datastoreId'] = v_prompt[field_context]['datastoreId']
     end
 
@@ -506,15 +532,30 @@ module Morpheus::Cli::ProvisioningHelper
 
     if plan_info['addVolumes']
       volume_index = 1
-      has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
+      has_another_volume = (options[:options] && options[:options]["dataVolume#{volume_index}"]) || (options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index])
       add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => false}))
       while add_another_volume do
           #puts "Configure Data #{volume_index} Volume"
 
           field_context = "dataVolume#{volume_index}"
 
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+          volume_label = (volume_index == 1 ? 'data' : "data #{volume_index}")
+          volume = {
+            #'id' => -1,
+            'rootVolume' => false,
+            'name' => volume_label,
+            'size' => plan_size,
+            'sizeId' => nil,
+            'storageType' => nil,
+            'datastoreId' => nil
+          }
+          if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index]
+            volume = options[:options]['volumes'][volume_index]
+          end
+
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => volume['storageType']}], options[:options])
           storage_type_id = v_prompt[field_context]['storageType']
+          volume['storageType'] = storage_type_id
           storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
 
           # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
@@ -527,28 +568,17 @@ module Morpheus::Cli::ProvisioningHelper
             end
           end
 
-          volume_label = (volume_index == 1 ? 'data' : "data #{volume_index}")
-          volume = {
-            'id' => -1,
-            'rootVolume' => false,
-            'name' => volume_label,
-            'size' => plan_size,
-            'sizeId' => nil,
-            'storageType' => storage_type_id,
-            'datastoreId' => nil
-          }
-
           if plan_info['customizeVolume'] && storage_type['customLabel']
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume_label}], options[:options])
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
             volume['name'] = v_prompt[field_context]['name']
           end
           if plan_info['customizeVolume'] && storage_type['customSize']
             if custom_size_options.empty?
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Disk #{volume_index} Volume Size (GB)", 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => plan_size}], options[:options])
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Disk #{volume_index} 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' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => 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
@@ -558,17 +588,19 @@ module Morpheus::Cli::ProvisioningHelper
             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])
+            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.', 'defaultValue' => volume['datastoreId']}], options[:options])
             volume['datastoreId'] = v_prompt[field_context]['datastoreId']
           end
 
           volumes << volume
 
-          # todo: should maxDisk check consider the root volume too?
-          if plan_info['maxDisk'] && volume_index >= plan_info['maxDisk']
+          volume_index += 1
+          if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index]
+            add_another_volume = true
+          elsif plan_info['maxDisk'] && volume_index >= plan_info['maxDisk']
+            # todo: should maxDisk check consider the root volume too?
             add_another_volume = false
           else
-            volume_index += 1
             has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
             add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another data volume?", {:default => false}))
           end
@@ -904,20 +936,22 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
-
-    interface_index = 1
+    interface_index = 0
     add_another_interface = true
     while add_another_interface do
       # if !no_prompt
-      #   if interface_index == 1
+      #   if interface_index == 0
       #     puts "Configure Network Interface"
       #   else
-      #     puts "Configure Network Interface #{interface_index}"
+      #     puts "Configure Network Interface #{interface_index+1}"
       #   end
       # end
 
-      field_context = interface_index == 1 ? "networkInterface" : "networkInterface#{interface_index}"
+      field_context = interface_index == 0 ? "networkInterface" : "networkInterface#{interface_index+1}"
       network_interface = {}
+      if options[:options] && options[:options]['networkInterfaces'] && options[:options]['networkInterfaces'][interface_index]
+        network_interface = options[:options]['networkInterfaces'][interface_index]
+      end
 
       # choose network
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkId', 'type' => 'select', 'fieldLabel' => "Network", 'selectOptions' => network_options, 'required' => true, 'skipSingleOption' => false, 'description' => 'Choose a network for this interface.', 'defaultValue' => network_interface['networkId']}], options[:options])
@@ -955,10 +989,12 @@ module Morpheus::Cli::ProvisioningHelper
 
       network_interfaces << network_interface
       interface_index += 1
-      if max_networks && network_interfaces.size >= max_networks
+      if options[:options] && options[:options]['networkInterfaces'] && options[:options]['networkInterfaces'][interface_index]
+        add_another_interface = true
+      elsif max_networks && network_interfaces.size >= max_networks
         add_another_interface = false
       else
-        has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]
+        has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index+1}"]
         add_another_interface = has_another_interface || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another network interface?", {:default => false}))
       end
 

data/lib/morpheus/cli/monitoring_checks_command.rb

@@ -299,7 +299,7 @@ class Morpheus::Cli::MonitoringChecksCommand
   end
 
   def add(args)
-    options = {}
+    options = {:skip_booleanize => true}
     params = {'inUptime' => true, 'severity' => 'critical'}
     check_type = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -376,7 +376,7 @@ class Morpheus::Cli::MonitoringChecksCommand
   end
 
   def update(args)
-    options = {}
+    options = {:skip_booleanize => true}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")

data/lib/morpheus/cli/option_types.rb

@@ -44,6 +44,18 @@ module Morpheus
           context_map = results
           value = nil
           value_found=false
+
+         
+          # How about this instead?
+          # option_type = option_type.clone
+          # field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+          # if field_key != ''
+          #   value = get_object_value(options, field_key)
+          #   if value != nil && options[:always_prompt] != true
+          #     value_found = true
+          #   end
+          # end
+
           if option_type['fieldContext']
             cur_namespace = options
             namespaces = option_type['fieldContext'].split(".")
@@ -63,7 +75,9 @@ module Morpheus
                 # this should just fall down through below, with the extra params no_prompt, use_value
                 value = select_prompt(option_type, api_client, api_params, true, value)
               end
-              value_found = true
+              if options[:always_prompt] != true
+                value_found = true
+              end
             end
           else
             # no fieldContext
@@ -72,9 +86,19 @@ module Morpheus
               if option_type['type'] == 'number'
                 value = value.to_s.include?('.') ? value.to_f : value.to_i
               end
-              value_found = true
+             # still prompt
+             if options[:always_prompt] != true
+                value_found = true
+              end
             end
           end
+          
+          # set the value that has been passed to the option type default value: options[fieldContext.fieldName]
+          if value != nil # && value != ''
+            option_type = option_type.clone  
+            option_type['defaultValue'] = value
+          end
+          
 
           # no_prompt means skip prompting and instead
           # use default value or error if a required option is not present
@@ -254,7 +278,10 @@ module Morpheus
 
         if no_prompt
           if !value_found
-            if option_type['required']
+            if !select_options.nil? && select_options.count > 1 && option_type['autoPickOption'] == true
+              value_found = true
+              value = select_options[0]['value']
+            elsif option_type['required']
               print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
               print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
               if select_options && select_options.size > 10

data/lib/morpheus/cli/remote.rb

@@ -274,15 +274,19 @@ EOT
     options = {}
     checkall = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = <<-EOT
+#{subcommand_usage("[name]")}
+    [name] is required. This is the name of the remote. Use 'current' to check the active appliance."
+EOT
+      #opts.banner = "#{opts.banner}\n" + "    " + "[name] is required. This is the name of the remote. Use 'current' to check the active appliance."
       opts.on("-a",'--all', "Refresh all appliances") do
         checkall = true
       end
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-This can be used to refresh a remote appliance status.
-It makes an api request to the configured appliance url, and stores the status 
-of the server and other info, e.g. version, in the local morpheus cli configuration.
+This can be used to refresh a remote appliance.
+It makes an api request to the configured appliance url to check the status and version.
+[name] is required. This is the name of the remote. Use 'current' to check the active appliance."
 EOT
     end
     optparse.parse!(args)