morpheus-cli 6.0.0 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7f59f72f0bc788526827effe2023844d0a99eb3485b27f276b296d604b00e0
-  data.tar.gz: f10d8bd99db70dc0399475e5df17d93eab19b6ed45748a6edefcfb9fd5f5b945
+  metadata.gz: eb39926e3f31b77cdca9175335ca0260b720641e469a240618fc98816b2b98ee
+  data.tar.gz: ef40d39ffa3f4a6d51139524fee83dd990b082c326b528ad66a6a8e6629c43e0
 SHA512:
-  metadata.gz: fd82a4e9ff23ba92dd577667e28258b4cf04d1ee147210b6553cbda7e56c1aea5313a8f2c25a4703f7e67d3dfdeefcb3ca811fd9cd9037c6980062f8ee40475e
-  data.tar.gz: c0ffcee9b0a774ffcb0df995b1fbd5247ea6fcc4dad3f1d2fa7ab3ceff6e9a4e89faf29e87a65c335a3eab6db2bce1368b60ef0453ed8fbe1e18f77186767154
+  metadata.gz: 32d58f65d940360fdfb48ff00f88d7f2221dbe4ad1d50adbd441ee68ae79cf7fb5e1314b7d1644808a8795fa362b0e0698e0d89ef8f57187442880fc1a0fec40
+  data.tar.gz: 19f7a173551371d306edbbbde91ad910f96c5c77fe8c70ef09200ba85e50885e4533cfb36c1f6c26b3cacacb629d7459aabb569f03e71d07e0a5720e3134fc9c

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 6.0.0
+RUN gem install morpheus-cli -v 6.0.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/jobs_interface.rb

@@ -43,10 +43,10 @@ class Morpheus::JobsInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
-  def execute_job(id, params={})
+  def execute_job(id, payload={}, params={})
     url = "#{base_path}/#{id}/execute"
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :put, url: url, headers: headers)
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
 =begin

data/lib/morpheus/api/network_services_interface.rb

@@ -23,6 +23,22 @@ class Morpheus::NetworkServicesInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
+  def get_server(server_id)
+    execute(method: :get, url: "#{@base_url}/api/networks/servers/#{server_id}", params: {}, headers: {})
+  end
+
+  def list_servers()
+    execute(method: :get, url: "#{@base_url}/api/networks/servers", params: {}, headers: {})
+  end
+
+  def refresh(server_id)
+    url = "#{@base_url}/api/networks/servers/#{server_id}/refresh"
+
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers}
+    execute(opts)
+  end
+
   # def create(payload)
   #   url = "#{@base_url}/api/networks/services"
   #   headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/cli/commands/apps.rb

@@ -1020,7 +1020,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 10
+    default_refresh_interval = 5
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app] [options]")

data/lib/morpheus/cli/commands/catalog_item_types_command.rb

@@ -716,6 +716,7 @@ EOT
       # "Content" => lambda {|it| it['content'] },
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Featured" => lambda {|it| format_boolean(it['featured']) },
+      "Allow Quantity" => lambda {|it| format_boolean(it['allowQuantity']) },
       #"Config" => lambda {|it| it['config'] },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
@@ -757,19 +758,20 @@ EOT
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 4},
       {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true, 'displayOrder' => 5},
       {'fieldName' => 'featured', 'fieldLabel' => 'Featured', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 6},
-      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true, 'displayOrder' => 7},
-      {'fieldName' => 'layoutCode', 'fieldLabel' => 'Layout Code', 'type' => 'text', 'required' => false, 'displayOrder' => 8},
-      {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList', 'displayOrder' => 9},
+      {'fieldName' => 'allowQuantity', 'fieldLabel' => 'Allow Quantity', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true, 'displayOrder' => 8},
+      {'fieldName' => 'layoutCode', 'fieldLabel' => 'Layout Code', 'type' => 'text', 'required' => false, 'displayOrder' => 9},
+      {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList', 'displayOrder' => 10},
       #{'fieldName' => 'optionTypes', 'fieldLabel' => 'Option Types', 'type' => 'text', 'description' => 'Option Types to include, comma separated list of names or IDs.', 'displayOrder' => 8},
-      {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true, 'displayOrder' => 10},
-      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflowConfig', 'fieldLabel' => 'Config', 'type' => 'textarea', 'description' => 'Enter configuration for the Workflow', 'required' => false, 'noParse' => true, 'displayOrder' => 10},
-      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true, 'displayOrder' => 11},
-      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'appSpec', 'fieldLabel' => 'App Spec', 'type' => 'code-editor', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'displayOrder' => 12},
-      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'optionSource' => 'operationWorkflows', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'noParams' => true, 'displayOrder' => 13},
+      {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true, 'displayOrder' => 11},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflowConfig', 'fieldLabel' => 'Config', 'type' => 'textarea', 'description' => 'Enter configuration for the Workflow', 'required' => false, 'noParse' => true, 'displayOrder' => 11},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true, 'displayOrder' => 12},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'appSpec', 'fieldLabel' => 'App Spec', 'type' => 'code-editor', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'displayOrder' => 13},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'optionSource' => 'operationWorkflows', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'noParams' => true, 'displayOrder' => 14},
       {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'context', 'fieldLabel' => 'Context Type', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
         [{'name' => "Select", 'value' => ""}, {'name' => "None", 'value' => "appliance"}, {'name' => "Instance", 'value' => "instance"}, {'name' => "Server", 'value' => "server"}]
         }, 'description' => 'Context for operational workflow, determines target type', 'defaultValue' => 'Select', 'required' => false},
-      {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'code-editor', 'description' => 'Wiki Page Content describing the catalog item', 'displayOrder' => 14}
+      {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'code-editor', 'description' => 'Wiki Page Content describing the catalog item', 'displayOrder' => 15}
     ]
   end
 

data/lib/morpheus/cli/commands/curl_command.rb

@@ -27,7 +27,11 @@ class Morpheus::Cli::CurlCommand
         curl_method = "DELETE"
       end
       opts.on( '--data DATA', String, "HTTP request body for use with POST and PUT, typically JSON." ) do |val|
-        curl_data = val
+        begin
+          options[:payload] = JSON.parse(val.to_s)
+        rescue => ex
+          raise ::OptionParser::InvalidOption.new("Failed to parse payload as JSON. Error: #{ex.message}")
+        end
       end
       opts.on('--absolute', "Absolute path, value can be used to prevent automatic using the automatic /api/ path prefix to the path by default.") do
         options[:absolute_path] = true

data/lib/morpheus/cli/commands/instances.rb

@@ -4946,7 +4946,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 10
+    default_refresh_interval = 5
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance] [options]")

data/lib/morpheus/cli/commands/invoices_command.rb

@@ -350,7 +350,7 @@ class Morpheus::Cli::InvoicesCommand
             if cost_rows.sum { |it| it[:extra].to_f } == 0
               cost_columns.delete("Extra".upcase)
             end
-            print as_pretty_table(cost_rows, cost_columns, options)
+            print as_pretty_table(cost_rows, cost_columns, options.merge(include_fields: nil))
           else
             print "\n"
             print yellow, "No invoice totals data", reset, "\n"

data/lib/morpheus/cli/commands/jobs_command.rb

@@ -280,17 +280,37 @@ class Morpheus::Cli::JobsCommand
         end
         options[:type] = 'morpheus.securityScan'
       end
-      opts.on('--context-type [TYPE]', String, "Context type (instance|server|none). Default is none") do |val|
+      opts.on('--context-type [TYPE]', String, "Context type (instance|instance-label|server|server-label|none). Default is none") do |val|
+        val = val.to_s.downcase
         params['targetType'] = (val == 'none' ? 'appliance' : val)
       end
+      opts.on('--target-type [TYPE]', String, "alias for --context-type") do |val|
+        val = val.to_s.downcase
+        params['targetType'] = (val == 'none' ? 'appliance' : val)
+      end
+      opts.add_hidden_option('--target-type')
       opts.on('--instances [LIST]', Array, "Context instances(s), comma separated list of instance IDs. Incompatible with --servers") do |list|
         params['targetType'] = 'instance'
         params['targets'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--instance-label LABEL', String, "Instance Label") do |val|
+        if params['targetType'] && params['targetType'] != 'instance-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'instance-label'
+        params['instanceLabel'] = val
+      end
       opts.on('--servers [LIST]', Array, "Context server(s), comma separated list of server IDs. Incompatible with --instances") do |list|
         params['targetType'] = 'server'
         params['targets'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--server-label LABEL', String, "Server Label") do |val|
+        if params['targetType'] && params['targetType'] != 'server-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'server-label'
+        params['serverLabel'] = val
+      end
       opts.on('-S', '--schedule [SCHEDULE]', String, "Job execution schedule type name or ID") do |val|
         options[:schedule] = val
       end
@@ -465,8 +485,15 @@ class Morpheus::Cli::JobsCommand
           end
         end
         params['targets'] = targets.collect {|it| {'refId' => it}}
+      elsif params['targetType'] == 'instance-label'
+        if params['instanceLabel'].nil?
+          params['instanceLabel'] = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'instance-label', 'fieldName' => 'instanceLabel', 'fieldLabel' => 'Instance Label', 'type' => 'text', 'required' => true, 'description' => 'Instance Label'}], options[:options], @api_client)['instanceLabel']
+        end
+      elsif params['targetType'] == 'server-label'
+        if params['serverLabel'].nil?
+          params['serverLabel'] = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'server-label', 'fieldName' => 'serverLabel', 'fieldLabel' => 'Server Label', 'type' => 'text', 'required' => true, 'description' => 'Server Label'}], options[:options], @api_client)['serverLabel']
+        end
       end
-
       # schedule
       if options[:schedule].nil?
         options[:schedule] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scheduleMode', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['scheduleMode']
@@ -554,17 +581,37 @@ class Morpheus::Cli::JobsCommand
           options[:security_package] = val
         end
       end
-      opts.on('--context-type [TYPE]', String, "Context type (instance|server|none). Default is none") do |val|
+      opts.on('--context-type [TYPE]', String, "Context type (instance|instance-label|server|server-label|none). Default is none") do |val|
+        val = val.to_s.downcase
+        params['targetType'] = (val == 'none' ? 'appliance' : val)
+      end
+      opts.on('--target-type [TYPE]', String, "alias for --context-type") do |val|
+        val = val.to_s.downcase
         params['targetType'] = (val == 'none' ? 'appliance' : val)
       end
+      opts.add_hidden_option('--target-type')
       opts.on('--instances [LIST]', Array, "Context instances(s), comma separated list of instance IDs. Incompatible with --servers") do |list|
         params['targetType'] = 'instance'
         options[:targets] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip.to_i }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--instance-label LABEL', String, "Instance Label") do |val|
+        if params['targetType'] && params['targetType'] != 'instance-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'instance-label'
+        params['instanceLabel'] = val
+      end
       opts.on('--servers [LIST]', Array, "Context server(s), comma separated list of server IDs. Incompatible with --instances") do |list|
         params['targetType'] = 'server'
         options[:targets] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip.to_i }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--server-label LABEL', String, "Server Label") do |val|
+        if params['targetType'] && params['targetType'] != 'server-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'server-label'
+        params['serverLabel'] = val
+      end
       opts.on('--schedule [SCHEDULE]', String, "Job execution schedule type name or ID") do |val|
         options[:schedule] = val
       end

data/lib/morpheus/cli/commands/load_balancers.rb

@@ -24,6 +24,9 @@ class Morpheus::Cli::LoadBalancers
     render_response(json_response, options, rest_object_key) do
       record = json_response[rest_object_key]
       options[:exclude_username] = record['username'].nil?
+      options[:exclude_owner] = record['owner'].nil?
+      options[:exclude_tenants] = record['tenants'].nil? || record['tenants'].empty?
+      options[:exclude_permissions] = record['resourcePermission'].nil?
       print_h1 rest_label, [], options
       print cyan
       print_description_list(rest_column_definitions(options), record, options)
@@ -125,6 +128,8 @@ EOT
       "Provider ID" => 'externalId'
     }
     columns.merge!({"Username" => 'username'}) if !options[:exclude_username]
+    columns.merge!({"Owner" => lambda { |it| it['owner']['name'] rescue '' }}) if !options[:exclude_owner]
+    columns.merge!({"Tenants" => lambda { |it| it['tenants'].collect {|tenant| tenant['name']}.join(', ') rescue '' }}) if !options[:exclude_tenants]
     columns.merge({
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }

data/lib/morpheus/cli/commands/network_services_command.rb

@@ -7,7 +7,7 @@ class Morpheus::Cli::NetworkServicesCommand
   set_command_name :'network-services'
 
   # register_subcommands :list, :get, :add, :update, :remove
-  register_subcommands :list
+  register_subcommands :list, :refresh
   
   # set_default_subcommand :list
   
@@ -90,6 +90,43 @@ class Morpheus::Cli::NetworkServicesCommand
       exit 1
     end
   end
+
+  def refresh(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Refresh a network integration/server.\n" +
+                    "[name] is required. This is the name or id of a network server/integration."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      server = find_network_server_by_name_or_id(args[0])
+      if !server
+        exit 1
+      end
+     @network_services_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_services_interface.dry.refresh(server['id'])
+        return
+      end
+      json_response = @network_services_interface.refresh(server['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        print_green_success "Refreshing #{server["name"]}"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
   
 
   private
@@ -136,4 +173,26 @@ class Morpheus::Cli::NetworkServicesCommand
     end
   end
 
+  def find_network_server_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_server_by_id(val)
+    else
+      return find_network_service_by_name(val)
+    end
+  end
+
+  def find_network_server_by_id(id)
+    begin
+      json_response = @network_services_interface.get_server(id.to_i)
+      return json_response['networkServer']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Service not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
 end

data/lib/morpheus/cli/commands/service_catalog_command.rb

@@ -594,11 +594,15 @@ EOT
     type_id = nil
     workflow_context = nil
     workflow_target = nil
+    quantity = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type] [options]")
       opts.on('-t', '--type TYPE', String, "Catalog Item Type Name or ID") do |val|
         type_id = val.to_s
       end
+      opts.on('--quantity QUANTITY', String, "Quantity for this catalog item. Will be overridden to 1 if quantity not allowed.") do |val|
+        quantity = val.to_s
+      end
       opts.on('--validate','--validate', "Validate Only. Validates the configuration and skips adding the item.") do
         options[:validate_only] = true
       end
@@ -648,6 +652,16 @@ EOT
       payload[add_item_object_key]['type'] = {'name' => catalog_item_type['name']}
       #payload[add_item_object_key]['type'] = {'id' => catalog_item_type['id']}
 
+      if quantity 
+        payload[add_item_object_key].deep_merge!({'quantity' => quantity})
+      else 
+        if catalog_item_type['allowQuantity']
+          quantity_option_type = {'fieldName' => 'quantity', 'fieldLabel' => 'Quantity', 'type' => 'number', 'defaultValue' => 1, 'required' => true, 'displayOrder' => 1}
+          quantity_prompt = Morpheus::Cli::OptionTypes.prompt( [quantity_option_type], options[:options], @api_client, options[:params])['quantity']
+          payload[add_item_object_key].deep_merge!({'quantity' => quantity_prompt})
+        end
+      end
+
       # this is silly, need to load by id to get optionTypes
       # maybe do ?name=foo&includeOptionTypes=true 
       if catalog_item_type['optionTypes'].nil?
@@ -926,11 +940,15 @@ EOT
     type_id = nil
     workflow_context = nil
     workflow_target = nil
+    quantity = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type] [options]")
       opts.on('-t', '--type TYPE', String, "Catalog Item Type Name or ID") do |val|
         type_id = val.to_s
       end
+      opts.on('--quantity QUANTITY', String, "Quantity for this catalog item. Will be overridden to 1 if quantity not allowed.") do |val|
+        quantity = val.to_s
+      end
       opts.on('--validate','--validate', "Validate Only. Validates the configuration and skips creating the order.") do
         options[:validate_only] = true
       end
@@ -991,6 +1009,17 @@ EOT
         item_payload['type'] = {'name' => catalog_item_type['name']}
         #payload[add_item_object_key]['type'] = {'id' => catalog_item_type['id']}
 
+        if quantity 
+          item_payload.deep_merge!({'quantity' => quantity})
+        else 
+          if catalog_item_type['allowQuantity']
+            quantity_option_type = {'fieldName' => 'quantity', 'fieldLabel' => 'Quantity', 'type' => 'number', 'defaultValue' => 1, 'required' => true, 'displayOrder' => 1}
+            quantity_prompt = Morpheus::Cli::OptionTypes.prompt( [quantity_option_type], options[:options], @api_client, options[:params])['quantity']
+            item_payload.deep_merge!({'quantity' => quantity_prompt})
+          end
+        end
+        
+
         # this is silly, need to load by id to get optionTypes
         # maybe do ?name=foo&includeOptionTypes=true 
         if catalog_item_type['optionTypes'].nil?
@@ -1200,6 +1229,7 @@ EOT
       # "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : nil },
       # "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Featured" => lambda {|it| format_boolean(it['featured']) },
+      "Allow Quantity" => lambda {|it| format_boolean(it['allowQuantity']) },
       #"Config" => lambda {|it| it['config'] },
       # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
@@ -1408,7 +1438,7 @@ EOT
             {"ID" => lambda {|it| it['id'] } },
             #{"NAME" => lambda {|it| it['name'] } },
             {"Type" => lambda {|it| it['type']['name'] rescue '' } },
-            #{"Qty" => lambda {|it| it['quantity'] } },
+            {"Qty" => lambda {|it| it['quantity'] } },
             {"Price" => lambda {|it| it['price'] ? format_money(it['price'] , it['currency'], {sigdig:options[:sigdig] || default_sigdig}) : "No pricing configured" } },
             {"Status" => lambda {|it| 
               status_string = format_catalog_item_status(it)
@@ -1438,7 +1468,7 @@ EOT
           {"ID" => lambda {|it| it['id'] } },
           #{"NAME" => lambda {|it| it['name'] } },
           {"TYPE" => lambda {|it| it['type']['name'] rescue '' } },
-          #{"QTY" => lambda {|it| it['quantity'] } },
+          {"QTY" => lambda {|it| it['quantity'] } },
           {"PRICE" => lambda {|it| it['price'] ? format_money(it['price'] , it['currency'], {sigdig:options[:sigdig] || default_sigdig}) : "No pricing configured" } },
           {"STATUS" => lambda {|it| 
             status_string = format_catalog_item_status(it)

data/lib/morpheus/cli/commands/service_plans_command.rb

@@ -171,13 +171,21 @@ class Morpheus::Cli::ServicePlanCommand
       ranges = (service_plan['config'] ? service_plan['config']['ranges'] : nil) || {}
 
       if (ranges['minStorage'] && ranges['minStorage'] != '') || (ranges['maxStorage'] && ranges['maxStorage'] != '')
-        description_cols['Custom Storage Range'] = lambda {|it|
+        description_cols['Custom Total Storage Range'] = lambda {|it|
           get_range(
               ranges['minStorage'] && ranges['minStorage'] != '' ? "#{ranges['minStorage']} #{(it['config'] && it['config']['storageSizeType'] ? it['config']['storageSizeType'] : 'GB').upcase}" : nil,
               ranges['maxStorage'] && ranges['maxStorage'] != '' ? "#{ranges['maxStorage']} #{(it['config'] && it['config']['storageSizeType'] ? it['config']['storageSizeType'] : 'GB').upcase}" : nil,
           )
         }
       end
+      if (ranges['minPerDiskSize'] && ranges['minPerDiskSize'] != '') || (ranges['maxPerDiskSize'] && ranges['maxPerDiskSize'] != '')
+        description_cols['Custom Per Disk Range'] = lambda {|it|
+          get_range(
+            ranges['minPerDiskSize'] && ranges['minPerDiskSize'] != '' ? "#{ranges['minPerDiskSize']} GB" : nil,
+            ranges['maxPerDiskSize'] && ranges['maxPerDiskSize'] != '' ? "#{ranges['maxPerDiskSize']} GB" : nil
+          )
+        }
+      end
       if (ranges['minMemory'] && ranges['minMemory'] != '') || (ranges['maxMemory'] && ranges['maxMemory'] != '')
         description_cols['Custom Memory Range'] = lambda {|it|
           get_range(
@@ -264,6 +272,9 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on('--disks [NUMBER]', Integer, "Max disks allowed" ) do |val|
         params['maxDisks'] = val.to_i || 1
       end
+      opts.on('--cores-per-socket [NUMBER]', Integer, "Cores Per Socket") do |val|
+        params['coresPerSocket'] = val.to_i || 1
+      end
       opts.on('--custom-cores [on|off]', String, "Can be used to enable / disable customizable cores. Default is on") do |val|
         params['customCores'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
@@ -285,17 +296,17 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on('--price-sets [LIST]', Array, 'Price set(s), comma separated list of price set IDs') do |list|
         params['priceSets'] = list.collect {|it| it.to_s.strip.empty? || !it.to_i ? nil : it.to_s.strip}.compact.uniq.collect {|it| {'id' => it.to_i}}
       end
-      opts.on('--min-storage NUMBER', String, "Min storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
-        # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val, '--min-storage', 'GB', true)
-        ((params['config'] ||= {})['ranges'] ||= {})['minStorage'] = bytes[:number]
-        (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
+      opts.on('--min-storage NUMBER', String, "Min total storage in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minStorage'] = val.to_i
       end
-      opts.on('--max-storage NUMBER', String, "Max storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
-        # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val.to_s, '--max-storage', 'GB', true)
-        ((params['config'] ||= {})['ranges'] ||= {})['maxStorage'] = bytes[:number]
-        (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
+      opts.on('--max-storage NUMBER', String, "Max total storage in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxStorage'] = val.to_i
+      end
+      opts.on('--min-per-disk-size NUMBER', String, "Min per disk size in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minPerDiskSize'] = val.to_i
+      end
+      opts.on('--max-per-disk-size NUMBER', String, "Max per disk size in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxPerDiskSize'] = val.to_i
       end
       opts.on('--min-memory NUMBER', String, "Min memory. Assumes MB unless optional modifier specified, ex: 1GB") do |val|
         # Memory does get converted to bytes
@@ -315,6 +326,18 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on('--max-cores NUMBER', String, "Max cores") do |val|
         ((params['config'] ||= {})['ranges'] ||= {})['maxCores'] = val.to_i
       end
+      opts.on('--min-sockets NUMBER', String, "Min sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minSockets'] = val.to_i
+      end
+      opts.on('--max-sockets NUMBER', String, "Max sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxSockets'] = val.to_i
+      end
+      opts.on('--min-cores-per-socket NUMBER', String, "Min cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minCoresPerSocket'] = val.to_i
+      end
+      opts.on('--max-cores-per-socket NUMBER', String, "Max cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxCoresPerSocket'] = val.to_i
+      end
       add_perms_options(opts, options, ['plans', 'groupDefaults'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create service plan"
@@ -396,13 +419,41 @@ class Morpheus::Cli::ServicePlanCommand
                   true
               )
               params['maxMemory'] = bytes[:bytes]
-              # (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
             rescue
               print "Invalid Value... Please try again.\n"
             end
+            params['customMaxMemory'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'customMaxMemory', 'type' => 'checkbox', 'fieldLabel' => 'Custom Max Memory', 'required' => false, 'description' => 'Custom Max Memory', 'defaultValue' => false}],options[:options],@api_client,{}, options[:no_prompt])['customMaxMemory']
           end
         end
 
+        # add'n options
+        addn_options = [
+          {'fieldName' => 'maxCores', 'fieldLabel' => 'Core Count', 'type' => 'number', 'required' => true, 'defaultValue' => 1, 'displayOrder' => 1},
+          {'fieldName' => 'customCores', 'fieldLabel' => 'Custom Cores', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 2},
+          {'fieldName' => 'coresPerSocket', 'fieldLabel' => 'Cores Per Socket', 'type' => 'number', 'required' => true, 'defaultValue' => 1, 'displayOrder' => 3},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minStorage', 'fieldLabel' => 'Min Total Storage (GB)', 'type' => 'number', 'displayOrder' => 1},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxStorage', 'fieldLabel' => 'Max Total Storage (GB)', 'type' => 'number', 'displayOrder' => 2},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minPerDiskSize', 'fieldLabel' => 'Min Per Disk Size (GB)', 'type' => 'number', 'displayOrder' => 3},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxPerDiskSize', 'fieldLabel' => 'Max Per Disk Size (GB)', 'type' => 'number', 'displayOrder' => 4},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minMemory', 'fieldLabel' => 'Min Memory (GB)', 'type' => 'number', 'displayOrder' => 5},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxMemory', 'fieldLabel' => 'Max Memory (GB)', 'type' => 'number', 'displayOrder' => 6},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minCores', 'fieldLabel' => 'Min Cores', 'type' => 'number', 'displayOrder' => 7},
+          {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxCores', 'fieldLabel' => 'Max Cores', 'type' => 'number', 'displayOrder' => 8}
+        ]
+
+        if provision_type['hasSocketRange']
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minSockets', 'fieldLabel' => 'Min Sockets', 'type' => 'number', 'displayOrder' => 9})
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxSockets', 'fieldLabel' => 'Max Sockets', 'type' => 'number', 'displayOrder' => 10})
+        end
+
+        if provision_type['hasCoresPerSocketRange']
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minCoresPerSocket', 'fieldLabel' => 'Min Cores Per Socket', 'type' => 'number', 'displayOrder' => 11})
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxCoresPerSocket', 'fieldLabel' => 'Max Cores Per Socket', 'type' => 'number', 'displayOrder' => 12})
+        end
+
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(addn_options, options[:options], @api_client, params)
+        params.deep_merge!(v_prompt)
+
         # price sets
         if params['priceSets'].nil? && !options[:no_prompt]
           price_sets = []
@@ -517,17 +568,17 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on('--price-sets [LIST]', Array, 'Price set(s), comma separated list of price set IDs') do |list|
         params['priceSets'] = list.collect {|it| it.to_s.strip.empty? || !it.to_i ? nil : it.to_s.strip}.compact.uniq.collect {|it| {'id' => it.to_i}}
       end
-      opts.on('--min-storage NUMBER', String, "Min storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
-        # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val, '--min-storage', 'GB')
-        ((params['config'] ||= {})['ranges'] ||= {})['minStorage'] = bytes[:number]
-        (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
+      opts.on('--min-storage NUMBER', String, "Min total storage in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minStorage'] = val.to_i
       end
-      opts.on('--max-storage NUMBER', String, "Max storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
-        # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val, '--max-storage', 'GB', true)
-        ((params['config'] ||= {})['ranges'] ||= {})['maxStorage'] = bytes[:number]
-        (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
+      opts.on('--max-storage NUMBER', String, "Max total storage in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxStorage'] = val.to_i
+      end
+      opts.on('--min-per-disk-size NUMBER', String, "Min per disk size in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minPerDiskSize'] = val.to_i
+      end
+      opts.on('--max-per-disk-size NUMBER', String, "Max per disk size in GB.") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxPerDiskSize'] = val.to_i
       end
       opts.on('--min-memory NUMBER', String, "Min memory. Assumes MB unless optional modifier specified, ex: 1GB") do |val|
         # Memory does get converted to bytes
@@ -546,6 +597,18 @@ class Morpheus::Cli::ServicePlanCommand
       end
       opts.on('--max-cores NUMBER', String, "Max cores") do |val|
         ((params['config'] ||= {})['ranges'] ||= {})['maxCores'] = val.to_i
+      end
+       opts.on('--min-sockets NUMBER', String, "Min sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minSockets'] = val.to_i
+      end
+      opts.on('--max-sockets NUMBER', String, "Max sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxSockets'] = val.to_i
+      end
+      opts.on('--min-cores-per-socket NUMBER', String, "Min cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minCoresPerSocket'] = val.to_i
+      end
+      opts.on('--max-cores-per-socket NUMBER', String, "Max cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxCoresPerSocket'] = val.to_i
       end
       add_perms_options(opts, options, ['plans', 'groupDefaults'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])

data/lib/morpheus/cli/commands/shell.rb

@@ -359,7 +359,7 @@ class Morpheus::Cli::Shell
         end
         out <<  "See the available commands below.\n"
 
-        out << "\nCommands:"
+        out << "\nCommands:\n"
         # commands = @morpheus_commands + @shell_commands
         # @morpheus_commands.sort.each {|cmd|
         #   out <<  "\t#{cmd.to_s}\n"

data/lib/morpheus/cli/commands/tasks.rb

@@ -442,7 +442,7 @@ class Morpheus::Cli::Tasks
         # Result Type
         if options[:options]['resultType']
           payload['task']['resultType'] = options[:options]['resultType']
-        else
+        elsif task_type['hasResults']
           result_types_dropdown = [{"name" => "Value", "value" => "value"}, {"name" => "Exit Code", "value" => "exitCode"}, {"name" => "Key Value", "value" => "keyValue"}, {"name" => "JSON", "value" => "json"}]
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resultType', 'fieldLabel' => 'Result Type', 'type' => 'select', 'selectOptions' => result_types_dropdown}], options[:options], @api_client)
           payload['task']['resultType'] = v_prompt['resultType'] unless v_prompt['resultType'].to_s.empty?
@@ -471,6 +471,7 @@ class Morpheus::Cli::Tasks
             end
           end
         end
+        process_special_task_option_typeaheads(task_option_types)
         # inject file_params into options for file-content prompt
         # or into taskOptions.script for types not yet using file-content
         unless file_params.empty?
@@ -859,38 +860,99 @@ class Morpheus::Cli::Tasks
     target_type = nil
     instance_ids = []
     instances = []
+    instance_label = nil
     server_ids = []
     servers = []
-    default_refresh_interval = 10
+    server_label = nil
+    default_refresh_interval = 5
+    all_target_types = ['appliance', 'instance', 'instance-label', 'server', 'server-label']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[task] --instance [instance] [options]")
-      opts.on('--instance INSTANCE', String, "Instance name or id to execute the task on. This option can be passed more than once.") do |val|
+      opts.banner = subcommand_usage("[task] [options]")
+      opts.on('--context-type VALUE', String, "Context Type, #{ored_list(all_target_types)}") do |val|
+        val = val.downcase
+        val = 'appliance' if val == 'none'
+        if target_type && target_type != val
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        if !all_target_types.include?(val)
+          raise ::OptionParser::InvalidOption.new("'#{val}' is invalid. It must be one of the following: instance, instance-label, server, server-label or appliance")
+        end
+        target_type = val
+      end
+      opts.on('--target-type VALUE', String, "alias for context-type") do |val|
+        val = val.downcase
+        val = 'appliance' if val == 'none'
+        if target_type && target_type != val
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        if !all_target_types.include?(val)
+          raise ::OptionParser::InvalidOption.new("'#{val}' is invalid. It must be one of the following: instance, instance-label, server, server-label or appliance")
+        end
+        target_type = val
+      end
+      opts.add_hidden_option('--target-type')
+      opts.on('--instance INSTANCE', String, "Instance name or id to target for execution. This option can be passed more than once.") do |val|
+        if target_type && target_type != 'instance'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'instance'
         instance_ids << val
       end
-      opts.on('--instances [LIST]', Array, "Instances, comma separated list of instance names or IDs.") do |list|
+      opts.on('--instances LIST', Array, "Instances, comma separated list of instance names or IDs.") do |list|
+        if target_type && target_type != 'instance'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'instance'
         instance_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      opts.on('--host HOST', String, "Host name or id to execute the task on. This option can be passed more than once.") do |val|
+      opts.on('--instance-label LABEL', String, "Instance Label") do |val|
+        if target_type && target_type != 'instance-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        target_type = 'instance-label'
+        instance_label = val
+      end
+      opts.on('--server SERVER', String, "Server name or id to target for execution. This option can be passed more than once.") do |val|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids << val
       end
-      opts.on('--hosts [LIST]', Array, "Hosts, comma separated list of host names or IDs.") do |list|
+      opts.on('--servers LIST', Array, "Servers, comma separated list of host names or IDs.") do |list|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      opts.on('--server HOST', String, "alias for --host") do |val|
+      opts.on('--server-label LABEL', String, "Server Label") do |val|
+        if target_type && target_type != 'server-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        target_type = 'server-label'
+        server_label = val
+      end
+      opts.on('--host HOST', String, "alias for --server") do |val|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids << val
       end
-      opts.on('--servers [LIST]', Array, "alias for --hosts") do |list|
+      opts.add_hidden_option('--host')
+      opts.on('--hosts HOSTS', Array, "alias for --servers") do |list|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("The --hosts option cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      opts.add_hidden_option('--server')
-      opts.add_hidden_option('--servers')
+      opts.add_hidden_option('--hosts')
       opts.on('-a', '--appliance', "Execute on the appliance, the target is the appliance itself.") do
+        if target_type && target_type != 'appliance'
+          raise ::OptionParser::InvalidOption.new("The --appliance option cannot be combined with another context (#{target_type})")
+        end
         target_type = 'appliance'
       end
       opts.on('--config [TEXT]', String, "Custom config") do |val|
@@ -921,46 +983,59 @@ class Morpheus::Cli::Tasks
         payload = options[:payload]
         payload.deep_merge!({'job' => passed_options})  unless passed_options.empty?
       else
-        # always parse instances and/or hosts
-        if instance_ids.size > 0 && server_ids.size > 0
-          raise_command_error "Pass --instance or --host, not both.\n#{optparse}"
-        elsif instance_ids.size > 0
+        # prompt for target type and target
+        if target_type.nil?
+          # todo: Need api to fetch available Context Types for taskId/workflowId
+          available_target_types = get_available_contexts_for_task(task)
+          default_target_type = available_target_types.first ? available_target_types.first['name'] : nil
+          if !available_target_types.empty?
+            default_target_type = available_target_types.first ? available_target_types.first['name'] : nil
+            target_type = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'context-type', 'fieldName' => 'targetType', 'fieldLabel' => 'Context Type', 'type' => 'select', 'selectOptions' => available_target_types, 'defaultValue' => default_target_type, 'required' => true, 'description' => 'Context Type determines the type of target(s) for the execution'}], options[:options], @api_client)['targetType']
+          end
+        end
+        if target_type
+          params['targetType'] = target_type
+        end
+        if target_type == 'instance'
+          if instance_ids.empty?
+            instance_ids_value = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'instances', 'fieldName' => 'instances', 'fieldLabel' => 'Instance(s)', 'type' => 'text', 'required' => true, 'description' => 'Instances, comma separated list of instance names or IDs.'}], options[:options], @api_client)['instances']
+            instance_ids = parse_array(instance_ids_value)
+          end
           instance_ids.each do |instance_id|
             instance = find_instance_by_name_or_id(instance_id)
             return 1 if instance.nil?
             instances << instance
           end
           params['instances'] = instances.collect {|it| it['id'] }
-        elsif server_ids.size > 0
+        elsif target_type == 'instance-label'
+          if instance_label.nil?
+            instance_label = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'instance-label', 'fieldName' => 'instanceLabel', 'fieldLabel' => 'Instance Label', 'type' => 'text', 'required' => true, 'description' => 'Instance Label'}], options[:options], @api_client)['instanceLabel']
+          end
+          # params['config'] ||= {}
+          # params['config']['instanceLabel'] = instance_label
+          params['instanceLabel'] = instance_label
+        elsif target_type == 'server'
+          if server_ids.empty?
+            server_ids_value = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'servers', 'fieldName' => 'servers', 'fieldLabel' => 'Server(s)', 'type' => 'text', 'required' => true, 'description' => 'Servers, comma separated list of server names or IDs.'}], options[:options], @api_client)['servers']
+            server_ids = parse_array(server_ids_value)
+          end
           server_ids.each do |server_id|
             server = find_server_by_name_or_id(server_id)
             return 1 if server.nil?
             servers << server
           end
           params['servers'] = servers.collect {|it| it['id'] }
-        end
-        # validate requires inputs based on task executeTarget
-        if task['executeTarget'] == 'resource'
-          if instance_ids.empty? && server_ids.empty?
-            # todo: prompt for Context: None,Instance,Server and then Instance(s) or Server(s)
-            raise_command_error "missing required option: --instance or --host\n#{optparse}"
+        elsif target_type == 'server-label'
+          if server_label.nil?
+            server_label = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'server-label', 'fieldName' => 'serverLabel', 'fieldLabel' => 'Server Label', 'type' => 'text', 'required' => true, 'description' => 'Server Label'}], options[:options], @api_client)['serverLabel']
           end
-        elsif task['executeTarget'] == 'local'
-          # no targetType required for local
-        elsif task['executeTarget'] == 'remote'
-          # not sure about this one
-        else
-          # unknown executeTarget
+          # params['config'] ||= {}
+          # params['config']['serverLabel'] = server_label
+          params['serverLabel'] = server_label
         end
-        
-
-
         # todo: prompt to task optionTypes for customOptions
         if task['optionTypes']
           
-        end
-        if target_type
-          params['targetType'] = target_type
         end
         job_payload = {}
         job_payload.deep_merge!(params)
@@ -1293,4 +1368,24 @@ class Morpheus::Cli::Tasks
     end
   end
 
+  def process_special_task_option_typeaheads(option_types)
+    # massage special task typeaheads options
+    # this makes us all sad
+    option_types.each do |option_type|
+      if option_type['type'] == 'typeahead'
+        if ['operationalWorkflowName','containerScript','containerTemplate'].include?(option_type['code'])
+          option_type.deep_merge!({'config' => {'valueField' => 'name'}})
+        end
+      elsif option_type['type'] == 'hidden'
+        if ['operationalWorkflowId','containerScriptId','containerTemplateId'].include?(option_type['code'])
+          option_type['processValue'] = lambda {|val| 
+            if val.to_s.empty?
+              selected_option = Morpheus::Cli::OptionTypes.get_last_select()
+              selected_option ? selected_option['value'] : nil
+            end
+          }
+        end
+      end
+    end
+  end
 end

data/lib/morpheus/cli/commands/workflows.rb

@@ -550,40 +550,101 @@ class Morpheus::Cli::Workflows
     target_type = nil
     instance_ids = []
     instances = []
+    instance_label = nil
     server_ids = []
     servers = []
-    default_refresh_interval = 10
+    server_label = nil
+    default_refresh_interval = 5
+    all_target_types = ['appliance', 'instance', 'instance-label', 'server', 'server-label']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[workflow] --instance [instance] [options]")
-      opts.on('--instance INSTANCE', String, "Instance name or id to execute the workflow on. This option can be passed more than once.") do |val|
+      opts.banner = subcommand_usage("[workflow] [options]")
+      opts.on('--context-type VALUE', String, "Context Type, #{ored_list(all_target_types)}") do |val|
+        val = val.downcase
+        val = 'appliance' if val == 'none'
+        if target_type && target_type != val
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        if !all_target_types.include?(val)
+          raise ::OptionParser::InvalidOption.new("'#{val}' is invalid. It must be one of the following: instance, instance-label, server, server-label or appliance")
+        end
+        target_type = val
+      end
+      opts.on('--target-type VALUE', String, "alias for context-type") do |val|
+        val = val.downcase
+        val = 'appliance' if val == 'none'
+        if target_type && target_type != val
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        if !all_target_types.include?(val)
+          raise ::OptionParser::InvalidOption.new("'#{val}' is invalid. It must be one of the following: instance, instance-label, server, server-label or appliance")
+        end
+        target_type = val
+      end
+      opts.add_hidden_option('--target-type')
+      opts.on('--instance INSTANCE', String, "Instance name or id to target for execution. This option can be passed more than once.") do |val|
+        if target_type && target_type != 'instance'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'instance'
         instance_ids << val
       end
-      opts.on('--instances [LIST]', Array, "Instances, comma separated list of instance names or IDs.") do |list|
+      opts.on('--instances LIST', Array, "Instances, comma separated list of instance names or IDs.") do |list|
+        if target_type && target_type != 'instance'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'instance'
         instance_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      opts.on('--host HOST', String, "Host name or id to execute the workflow on. This option can be passed more than once.") do |val|
+      opts.on('--instance-label LABEL', String, "Instance Label") do |val|
+        if target_type && target_type != 'instance-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        target_type = 'instance-label'
+        instance_label = val
+      end
+      opts.on('--server SERVER', String, "Server name or id to target for execution. This option can be passed more than once.") do |val|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids << val
       end
-      opts.on('--hosts [LIST]', Array, "Hosts, comma separated list of host names or IDs.") do |list|
+      opts.on('--servers LIST', Array, "Servers, comma separated list of host names or IDs.") do |list|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      opts.on('--server HOST', String, "alias for --host") do |val|
+      opts.on('--server-label LABEL', String, "Server Label") do |val|
+        if target_type && target_type != 'server-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
+        target_type = 'server-label'
+        server_label = val
+      end
+      opts.on('--host HOST', String, "alias for --server") do |val|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids << val
       end
-      opts.on('--servers [LIST]', Array, "alias for --hosts") do |list|
+      opts.add_hidden_option('--host')
+      opts.on('--hosts HOSTS', Array, "alias for --servers") do |list|
+        if target_type && target_type != 'server'
+          raise ::OptionParser::InvalidOption.new("The --hosts option cannot be combined with another context (#{target_type})")
+        end
         target_type = 'server'
         server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
+      opts.add_hidden_option('--hosts')
       opts.on('-a', '--appliance', "Execute on the appliance, the target is the appliance itself.") do
+        if target_type && target_type != 'appliance'
+          raise ::OptionParser::InvalidOption.new("The --appliance option cannot be combined with another context (#{target_type})")
+        end
         target_type = 'appliance'
       end
-      opts.add_hidden_option('--server')
-      opts.add_hidden_option('--servers')
       opts.on('--config [TEXT]', String, "Custom config") do |val|
         params['customConfig'] = val.to_s
       end
@@ -611,27 +672,55 @@ class Morpheus::Cli::Workflows
         payload = options[:payload]
         payload.deep_merge!({'job' => passed_options})  unless passed_options.empty?
       else
-        if instance_ids.size > 0 && server_ids.size > 0
-          raise_command_error "Pass --instance or --host, not both.\n#{optparse}"
-        elsif instance_ids.size > 0
+        # prompt for target type and target
+        if target_type.nil?
+          # todo: Need api to fetch available Context Types for taskId/workflowId
+          available_target_types = get_available_contexts_for_workflow(workflow)
+          default_target_type = available_target_types.first ? available_target_types.first['name'] : nil
+          if !available_target_types.empty?
+            default_target_type = available_target_types.first ? available_target_types.first['name'] : nil
+            target_type = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'context-type', 'fieldName' => 'targetType', 'fieldLabel' => 'Context Type', 'type' => 'select', 'selectOptions' => available_target_types, 'defaultValue' => default_target_type, 'required' => true, 'description' => 'Context Type determines the type of target(s) for the execution'}], options[:options], @api_client)['targetType']
+          end
+        end
+        if target_type
+          params['targetType'] = target_type
+        end
+        if target_type == 'instance'
+          if instance_ids.empty?
+            instance_ids_value = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'instances', 'fieldName' => 'instances', 'fieldLabel' => 'Instance(s)', 'type' => 'text', 'required' => true, 'description' => 'Instances, comma separated list of instance names or IDs.'}], options[:options], @api_client)['instances']
+            instance_ids = parse_array(instance_ids_value)
+          end
           instance_ids.each do |instance_id|
             instance = find_instance_by_name_or_id(instance_id)
             return 1 if instance.nil?
             instances << instance
           end
           params['instances'] = instances.collect {|it| it['id'] }
-        elsif server_ids.size > 0
+        elsif target_type == 'instance-label'
+          if instance_label.nil?
+            instance_label = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'instance-label', 'fieldName' => 'instanceLabel', 'fieldLabel' => 'Instance Label', 'type' => 'text', 'required' => true, 'description' => 'Instance Label'}], options[:options], @api_client)['instanceLabel']
+          end
+          # params['config'] ||= {}
+          # params['config']['instanceLabel'] = instance_label
+          params['instanceLabel'] = instance_label
+        elsif target_type == 'server'
+          if server_ids.empty?
+            server_ids_value = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'servers', 'fieldName' => 'servers', 'fieldLabel' => 'Server(s)', 'type' => 'text', 'required' => true, 'description' => 'Servers, comma separated list of server names or IDs.'}], options[:options], @api_client)['servers']
+            server_ids = parse_array(server_ids_value)
+          end
           server_ids.each do |server_id|
             server = find_server_by_name_or_id(server_id)
             return 1 if server.nil?
             servers << server
           end
           params['servers'] = servers.collect {|it| it['id'] }
-        elsif target_type == 'appliance'
-          # cool, run it locally.
-        else
-          # cool, run it locally.
-          #raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
+        elsif target_type == 'server-label'
+          if server_label.nil?
+            server_label = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'server-label', 'fieldName' => 'serverLabel', 'fieldLabel' => 'Server Label', 'type' => 'text', 'required' => true, 'description' => 'Server Label'}], options[:options], @api_client)['serverLabel']
+          end
+          # params['config'] ||= {}
+          # params['config']['serverLabel'] = server_label
+          params['serverLabel'] = server_label
         end
 
         # prompt to workflow optionTypes for customOptions
@@ -643,9 +732,6 @@ class Morpheus::Cli::Workflows
           }
           custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
         end
-        if target_type
-          params['targetType'] = target_type
-        end
         job_payload = {}
         job_payload.deep_merge!(params)
         passed_options.delete('customOptions')

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

@@ -41,8 +41,8 @@ module Morpheus::Cli::JobsHelper
           "Created By" => lambda {|it| it[:created_by]},
           "Duration" => lambda {|it| it[:duration]},
           "Status" => lambda {|it| it[:status]},
-          "Error" => lambda {|it| options[:details] ? it[:error] : truncate_string(it[:error], 32) },
-          "Output" => lambda {|it| options[:details] ? it[:output] : truncate_string(it[:output], 32) }
+          "Error" => lambda {|it| options[:details] ? it[:error].to_s.strip : truncate_string(it[:error], 32).to_s.strip.gsub("\n", ' ') },
+          "Output" => lambda {|it| options[:details] ? it[:output].to_s.strip : truncate_string(it[:output], 32).to_s.strip.gsub("\n", ' ') }
       }
     print as_pretty_table(events.collect {|it| get_process_event_data(it)}, event_columns.upcase_keys!, options)
   end
@@ -147,7 +147,7 @@ module Morpheus::Cli::JobsHelper
   # refresh execution request until it is finished
   # returns json response data of the last execution request when status reached 'completed' or 'failed'
   def wait_for_job_execution(job_execution_id, options={}, print_output = true)
-    refresh_interval = 10
+    refresh_interval = 5
     if options[:refresh_interval].to_i > 0
       refresh_interval = options[:refresh_interval]
     end
@@ -168,5 +168,32 @@ module Morpheus::Cli::JobsHelper
   end
 
 
+  def get_available_contexts_for_task(task)
+    #If task has target of resource, then CAN NOT run it local
+    targets = []
+    has_resource = task['executeTarget'] == 'resource'
+    if !has_resource
+      targets << {'name' => 'None', 'value' => 'appliance'}
+    end
+    targets << {'name' => 'Instance', 'value' => 'instance'}
+    targets << {'name' => 'Instance Label', 'value' => 'instance-label'}
+    targets << {'name' => 'Server', 'value' => 'server'}
+    targets << {'name' => 'Server Label', 'value' => 'server-label'}
+    return targets
+  end
+
+  def get_available_contexts_for_workflow(workflow)
+    #If any task has target of resource, then CAN NOT run it local
+    targets = []
+    has_resource = workflow['taskSetTasks'].find {|task| task['executeTarget'] == 'resource' }
+    if !has_resource
+      targets << {'name' => 'None', 'value' => 'appliance'}
+    end
+    targets << {'name' => 'Instance', 'value' => 'instance'}
+    targets << {'name' => 'Instance Label', 'value' => 'instance-label'}
+    targets << {'name' => 'Server', 'value' => 'server'}
+    targets << {'name' => 'Server Label', 'value' => 'server-label'}
+    return targets
+  end
 
 end

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

@@ -88,36 +88,12 @@ module Morpheus::Cli::ProcessesHelper
 
   # decolorize, remove newlines and truncate for table cell
   def format_process_error(process, max_length=20, return_color=cyan)
-    #return max_length ? truncate_string(process['error'], max_length) :  process['error']
-    out = ""
-    if process['error']
-      # lines = process['error'].split("\n").collect {|line| reset + "#{line.to_s.strip}" }
-      # lines = process['error'].split("\n").collect {|line| "#{line.to_s.strip}" }
-      lines = [process['error']]
-      out = lines.join(" ")
-      if max_length
-        out = truncate_string(out, max_length)
-      end
-      out << return_color if return_color
-    end
-    out
+    truncate_string(process['error'].to_s.strip.gsub("\n", " "), max_length)
   end
 
   # decolorize, remove newlines and truncate for table cell
   def format_process_output(process, max_length=20, return_color=cyan)
-    return max_length ? truncate_string(process['output'], max_length) :  process['output']
-    out = ""
-    if process['output']
-      # lines = process['output'].split("\n").collect {|line| reset + "#{line.to_s.strip}" }
-      # lines = process['error'].split("\n").collect {|line| "#{line.to_s.strip}" }
-      lines = [process['output']]
-      out = lines.join(" ")
-      if max_length
-        out = truncate_string(out, max_length)
-      end
-      out << return_color if return_color
-    end
-    out
+    truncate_string(process['output'].to_s.strip.gsub("\n", " "), max_length)
   end
 
   # format for either ETA/Duration

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

@@ -777,15 +777,22 @@ module Morpheus::Cli::ProvisioningHelper
           option_type_list = option_type_list.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
 
           resource_pool_options = options_interface.options_for_source('zonePools', {groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], layoutId: layout["id"]}.merge(service_plan.nil? ? {} : {planId: service_plan["id"]}))['data']
-          resource_pool = resource_pool_options.find {|opt| opt['id'] == options[:resource_pool].to_i} if options[:resource_pool]
-
+          if options[:resource_pool]
+            resource_pool = resource_pool_options.find {|opt| opt['value'] == options[:resource_pool].to_s || opt['value'] == "pool-#{options[:resource_pool]}"}
+          end
+          pool_required = provision_type["zonePoolRequired"]
+          # Should pool_id have the pool-,poolGroup- prefix or not?
+          use_pool_prefix = resource_pool_options.find {|opt| opt['value'].to_s.include?("pool") }
           if resource_pool
-            pool_id = resource_pool['id']
+            pool_id = resource_pool['id'] # id or value?
           else
             if options[:default_resource_pool]
               default_resource_pool = resource_pool_options.find {|rp| rp['id'] == options[:default_resource_pool]}
             end
-            resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.', 'defaultValue' => default_resource_pool ? default_resource_pool['name'] : nil}
+            if use_pool_prefix && options[:options]['config'] && options[:options]['config']['resourcePoolId'] && !options[:options]['config']['resourcePoolId'].to_s.include?("pool")
+              options[:options]['config']['resourcePoolId'] = "pool-" + options[:options]['config']['resourcePoolId'].to_s
+            end
+            resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => pool_required, 'skipSingleOption' => true, 'description' => 'Select resource pool.', 'defaultValue' => default_resource_pool ? default_resource_pool['name'] : nil}
             resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{}, no_prompt, true)
             resource_pool_prompt.deep_compact!
             payload.deep_merge!(resource_pool_prompt)
@@ -795,7 +802,7 @@ module Morpheus::Cli::ProvisioningHelper
             elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
               pool_id = resource_pool_prompt[resource_pool_option_type['fieldName']]
             end
-            resource_pool ||= resource_pool_options.find {|it| it['id'] == pool_id}
+            resource_pool ||= resource_pool_options.find {|it| it['value'].to_s == pool_id.to_s}
           end
         end
       end

data/lib/morpheus/cli/option_types.rb

@@ -582,6 +582,9 @@ module Morpheus
 
         if no_prompt
           if !value_found
+            if default_value == ""
+              default_value = nil
+            end
             if !default_value.nil? && !select_options.nil?
               matched_option = select_options.find {|it| it[value_field].to_s == default_value.to_s }
               if matched_option.nil?
@@ -814,7 +817,7 @@ module Morpheus
           api_params ||= {}
           api_params['query'] = query_value
           # skip refresh if you just hit enter
-          if !query_value.empty?
+          if !query_value.empty? || (select_options.nil? || select_options.empty?)
             select_options = load_options(option_type, api_client, api_params, query_value)
           end
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.0.0"
+    VERSION = "6.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler