morpheus-cli 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4160be97bfb96acf0fe1091e9e8d6ecde617bd2aba547ef1cfab8a11d6134ecf
-  data.tar.gz: 5e0675e4e1061595e560e2395625e7a7546813e68e09a8237ccd33d92aeb948d
+  metadata.gz: 57fffe54fd7ee43a1bd35bb15703bb85edca71ec59758374d9556d1743338f90
+  data.tar.gz: 3472c73b3bc3bf91b84e437eb593b367d86cf8aa32439d370eb6c15de40674fb
 SHA512:
-  metadata.gz: a2992a310163d78082f7d748ca4ae50c673c32e7ae782497bb89f721135ed66509549c124290e9b4bd644cad2e3838c878331427ddd1090325f8946c7d30e731
-  data.tar.gz: 48ec07412e0cdcad359ea2dc050cc5017a9a39e368fb662e50b880628213fc4681b85da9cd5d8503ea7426be0fbac77b5e61d2dd8bc397ab13f0ce21695d2758
+  metadata.gz: e87cbd833e3633ddf03129d7eabfdb11b12a2956f6c6f66b43a5d42fd41cbb7a209085b6f1008e89ffbcf98251b8d6fc8e0e0d1b845a952b863c0f6add10386b
+  data.tar.gz: f51460150a7ef907e7c679d75c54830405ef18323c26aa0bcf1bb158c03ff7e05c53114b0e9df2edf4bba337ec6c843871f0fd3bd0ab9ad15ce9ceed836f2bfe

data/Dockerfile

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

data/lib/morpheus/api/backups_interface.rb

@@ -6,6 +6,10 @@ class Morpheus::BackupsInterface < Morpheus::RestInterface
     "/api/backups"
   end
 
+  def create_options(payload, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/create", params: params, payload: payload, headers: headers)
+  end
+
   def summary(params={})
     execute(method: :get, url: "#{base_path}/summary", params: params)
   end

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/cli_command.rb

@@ -293,6 +293,7 @@ module Morpheus
         #opts.separator ""
         # opts.separator "Common options:"
         option_keys = includes.clone
+        all_option_keys = option_keys.dup
         # todo: support --quiet everywhere
         # turn on some options all the time..
         # unless command_name == "shell"
@@ -445,7 +446,8 @@ module Morpheus
                 raise ::OptionParser::InvalidOption.new("Failed to parse payload file: #{payload_file} Error: #{ex.message}")
               end
             end
-            opts.on('--payload-dir DIRECTORY', String, "Payload from a local directory containing 1-N JSON or YAML files, skip all prompting.") do |val|
+            opts.on('--payload-dir DIRECTORY', String, "Payload from a local directory containing 1-N JSON or YAML files, skip all prompting. This makes one request, merging all the files into a single payload.") do |val|
+              print_error yellow,"[DEPRECATED] The option `--payload-dir` is deprecated and will be removed. Use `--payloads` to make requests for each file in a directory.",reset,"\n"
               options[:payload_dir] = val.to_s
               payload_dir = File.expand_path(options[:payload_dir])
               if !Dir.exist?(payload_dir) || !File.directory?(payload_dir)
@@ -476,6 +478,7 @@ module Morpheus
                 raise ::OptionParser::InvalidOption.new("Failed to parse payload file: #{payload_file} Error: #{ex.message}")
               end
             end
+            opts.add_hidden_option('--payload-dir')
             opts.on('--payload-json JSON', String, "Payload JSON, skip all prompting") do |val|
               begin
                 options[:payload] = JSON.parse(val.to_s)
@@ -490,7 +493,69 @@ module Morpheus
                 raise ::OptionParser::InvalidOption.new("Failed to parse payload as YAML. Error: #{ex.message}")
               end
             end
-
+            # --payloads test-data/item*.json
+            opts.on('--payloads PATH', String, "Payload(s) from one or more local JSON or YAML files, skip all prompting and execute the request 1-N times, once for each file. PATH can be a directory or a file pattern.") do |val|
+              # maybe use parse_array(val) to support csv..
+              # find files matching PATH
+              # todo: probably support recursive... can be done with '**/*.json' now though.
+              if val.to_s.strip.empty?
+                raise ::OptionParser::InvalidOption.new("PATH must be provided as directory, file or pattern to find JSON or YAML files.")
+              end
+              filepath = File.expand_path(val.to_s.strip)
+              files = []
+              if File.directory?(filepath)
+                # passed the name of a directory, include all the JSON and YAML files directly under it
+                Dir.glob(File.join(filepath, "*")).each do |file| 
+                  if File.file?(file) && ['.json','.yaml','.yml'].include?(File.extname(file))
+                    files << file
+                  end
+                end
+                if files.empty?
+                  raise ::OptionParser::InvalidOption.new("Failed to find any .json or .yaml files under the directory: #{filepath}")
+                end
+              elsif File.file?(filepath)
+                # passed the name of a file
+                files << filepath
+              else
+                # assume it is a pattern to find files with
+                files = Dir.glob(filepath)
+                if files.empty?
+                  raise ::OptionParser::InvalidOption.new("Failed to find any files matching path: #{filepath}")
+                end
+              end
+              # parse files as JSON or YAML
+              options[:payload_files] ||= []
+              options[:payloads] ||= []
+              files.each do |file|
+                if options[:payload_files].include?(file)
+                  next
+                else
+                  options[:payload_files] << file
+                end
+                payload = nil
+                begin
+                  payload_file = File.expand_path(file)
+                  if !File.exist?(payload_file) || !File.file?(payload_file)
+                    raise ::OptionParser::InvalidOption.new("File not found: #{payload_file}")
+                  end
+                  # todo: could use parse_json_or_yaml()
+                  payload = nil
+                  if payload_file =~ /\.ya?ml\Z/
+                    payload = YAML.load_file(payload_file)
+                  else
+                    payload = JSON.parse(File.read(payload_file))
+                  end
+                  options[:payloads] << payload
+                rescue => ex
+                  raise ::OptionParser::InvalidOption.new("Failed to parse payload file: #{payload_file} Error: #{ex.message}")
+                end
+              end
+            end if all_option_keys.include?(:payloads)
+            opts.on('--payloads-ignore-error', "Continue processing payloads if an error occurs. The default behavior is to stop processing when an error occurs.") do
+              options[:payloads_ignore_error] = true
+            end if all_option_keys.include?(:payloads)
+          when :payloads
+            # added under when :payloads... just need it here to avoid unknown key error
           when :list
             opts.on( '-m', '--max MAX', "Max Results" ) do |val|
               # api supports max=-1 for all at the moment..
@@ -1435,6 +1500,54 @@ module Morpheus
         payload
       end
 
+      def parse_payloads(options={}, object_key=nil, &block)
+        payloads = []
+        if options[:payload]
+          # --payload option was used
+          payload = options[:payload]
+          # support -O OPTION switch on top of --payload
+          apply_options(payload, options, object_key)
+          payloads << payload
+        elsif options[:payloads]
+          # --payloads option was used
+          payloads = options[:payloads]
+          # payloads.each { |it| apply_options(it, options, object_key) }
+        else
+          # default is to construct one using the block
+          payload = {}
+          apply_options(payload, options, object_key)
+          if block_given?
+            result = yield payload
+            #payload = result if result
+          end
+          payloads << payload
+        end
+        return payloads
+      end
+
+      def process_payloads(payloads, options, &block)
+        if !payloads.is_a?(Array) || payloads.compact.empty?
+          raise "process_payloads() requires an Array of at least one payload and instead got: (#{payloads.class}) #{payloads.inspect}"
+        end
+        results = []
+        payloads.each do |payload|
+          begin
+            result = yield payload
+            results << [0, nil]
+          rescue => e
+            if options[:payloads_ignore_error]
+              # results << [1, e.message]
+              result = Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).handle_error(e) # lol
+              results << result
+              # continue
+            else
+              raise e
+            end
+          end
+        end
+        return results.last
+      end
+
       def build_payload(options, object_key=nil)
         payload = {}
         if options[:payload]

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

@@ -10,7 +10,7 @@ class Morpheus::Cli::BackupJobsCommand
 
   set_command_name :'backup-jobs'
 
-  register_subcommands :list, :get #, :add, :update, :remove, :run
+  register_subcommands :list, :get, :add, :update, :remove, :run
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -55,11 +55,7 @@ class Morpheus::Cli::BackupJobsCommand
       end
       print reset,"\n"
     end
-    if backup_jobs.empty?
-      return 1, "no backup jobs found"
-    else
-      return 0, nil
-    end
+    return 0, nil
   end
   
   def get(args)
@@ -250,7 +246,7 @@ EOT
   def add_backup_job_option_types
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
+      #{'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
       {'fieldName' => 'retentionCount', 'fieldLabel' => 'Retention Count', 'type' => 'number', 'displayOrder' => 3},
       {'fieldName' => 'scheduleId', 'fieldLabel' => 'Schedule', 'type' => 'select', 'optionSource' => 'executeSchedules', 'displayOrder' => 4}, # should use jobSchedules instead maybe? do we support manual schedules for backups?
     ]

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

@@ -10,12 +10,14 @@ class Morpheus::Cli::BackupsCommand
   
   set_command_name :'backups'
 
-  register_subcommands :list, :get #, :add, :update, :remove, :run, :restore
+  register_subcommands :list, :get, :add, :update, :remove, :run, :restore
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @backups_interface = @api_client.backups
     @backup_jobs_interface = @api_client.backup_jobs
+    @instances_interface = @api_client.instances
+    @servers_interface = @api_client.servers
   end
 
   def handle(args)
@@ -50,16 +52,12 @@ class Morpheus::Cli::BackupsCommand
       if backups.empty?
         print cyan,"No backups found.",reset,"\n"
       else
-        print as_pretty_table(backups, backup_column_definitions.upcase_keys!, options)
+        print as_pretty_table(backups, backup_list_column_definitions.upcase_keys!, options)
         print_results_pagination(json_response)
       end
       print reset,"\n"
     end
-    if backups.empty?
-      return 1, "no backups found"
-    else
-      return 0, nil
-    end
+    return 0, nil
   end
   
   def get(args)
@@ -83,6 +81,13 @@ EOT
   end
 
   def _get(id, params, options)
+    if id.to_s !~ /\A\d{1,}\Z/
+      record = find_by_name(:backup, id)
+      if record.nil?
+        return 1, "Backup not found for '#{id}'"
+      end
+      id = record['id']
+    end
     @backups_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @backups_interface.dry.get(id, params)
@@ -93,7 +98,11 @@ EOT
     render_response(json_response, options, 'backup') do
       print_h1 "Backup Details", [], options
       print cyan
-      print_description_list(backup_column_definitions, backup)
+      columns = backup_column_definitions
+      columns.delete("Instance") if backup['instance'].nil?
+      columns.delete("Container ID") if backup['containerId'].nil?
+      columns.delete("Host") if backup['server'].nil?
+      print_description_list(columns, backup, options)
       print reset,"\n"
     end
     return 0, nil
@@ -104,8 +113,26 @@ EOT
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
-      build_option_type_options(opts, options, add_backup_option_types)
-      build_option_type_options(opts, options, add_backup_advanced_option_types)
+      # build_option_type_options(opts, options, add_backup_option_types)
+      opts.on('--source VALUE', String, "Backup Source: instance, host or provider") do |val|
+        options[:options]['source'] = val
+      end
+      opts.on('--instance VALUE', String, "Instance Name or ID") do |val|
+        options[:options]['source'] = 'instance'
+        options[:options]['instanceId'] = val
+      end
+      opts.on('--host VALUE', String, "Host Name or ID") do |val|
+        options[:options]['source'] = 'server'
+        options[:options]['serverId'] = val
+      end
+      opts.on('--server VALUE', String, "alias for --host") do |val|
+        options[:options]['source'] = 'server'
+        options[:options]['serverId'] = val
+      end
+      opts.add_hidden_option('--server')
+      opts.on('--name VALUE', String, "Name") do |val|
+        options[:options]['name'] = val
+      end
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a new backup.
@@ -121,11 +148,74 @@ EOT
       payload.deep_merge!({'backup' => parse_passed_options(options)})
     else
       payload.deep_merge!({'backup' => parse_passed_options(options)})
-      v_prompt = Morpheus::Cli::OptionTypes.prompt(add_backup_option_types(), options[:options], @api_client, options[:params])
-      params.deep_merge!(v_prompt)
-      advanced_config = Morpheus::Cli::OptionTypes.no_prompt(add_backup_advanced_option_types, options[:options], @api_client, options[:params])
-      advanced_config.deep_compact!
-      params.deep_merge!(advanced_config)
+
+      location_type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'source', 'fieldLabel' => 'Source', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Host', 'value' => 'server'}, {'name' => 'Provider', 'value' => 'provider'}], 'defaultValue' => 'instance', 'required' => true, 'description' => 'Where is the backup located?'}], options[:options], @api_client)['source']
+      params['locationType'] = location_type
+      if location_type == 'instance'
+        # Instance
+        avail_instances = @instances_interface.list({max:10000})['instances'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
+        params['instanceId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceId', 'fieldLabel' => 'Instance', 'type' => 'select', 'selectOptions' => avail_instances, 'required' => true}], options[:options], @api_client)['instanceId']
+        # Name
+        params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Backup Name'}], options[:options], @api_client)['name']
+      elsif location_type == 'server'
+        # Server
+        avail_servers = @servers_interface.list({max:10000, 'vmHypervisor' => nil, 'containerHypervisor' => nil})['servers'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
+        params['serverId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'serverId', 'fieldLabel' => 'Host', 'type' => 'select', 'selectOptions' => avail_servers, 'required' => true}], options[:options], @api_client)['serverId']
+        # Name
+        params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Backup Name'}], options[:options], @api_client)['name']
+      elsif location_type == 'provider'
+        # todo: prompt for provider inputs
+        # sourceProviderId
+        # storageProvider
+      end
+      # POST to /create to get available option info for containers, backupTypes, backupProviderTypes, etc.
+      payload['backup'].deep_merge!(params)
+      create_results = @backups_interface.create_options(payload)
+
+      if location_type == 'instance' || location_type == 'server'
+        if location_type == 'instance'
+          # Container
+          avail_containers = (create_results['containers'] || []).collect {|it| {'name' => it['name'], 'value' => it['id']} }
+          if avail_containers.empty?
+            raise_command_error "No available containers found for selected instance"
+          else
+            params['containerId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerId', 'fieldLabel' => 'Container', 'type' => 'select', 'selectOptions' => avail_containers, 'defaultValue' => avail_containers[0] ? avail_containers[0]['name'] : nil, 'required' => true}], options[:options], @api_client)['containerId']
+          end
+        elsif location_type == 'server'
+          
+          
+        end
+        # Backup Type
+        avail_backup_types = (create_results['backupTypes'] || []).collect {|it| {'name' => it['name'], 'value' => it['code']} }
+        if avail_backup_types.empty?
+          raise_command_error "No available backup types found"
+        else
+          params['backupType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'backupType', 'fieldLabel' => 'Backup Type', 'type' => 'select', 'selectOptions' => avail_backup_types, 'defaultValue' => avail_backup_types[0] ? avail_backup_types[0]['name'] : nil, 'required' => true}], options[:options], @api_client)['backupType']  
+        end
+
+        # Job / Schedule
+        params['jobAction'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobAction', 'fieldLabel' => 'Backup Job Type', 'type' => 'select', 'optionSource' => 'backupJobActions', 'required' => true, 'defaultValue' => 'new'}], options[:options], @api_client)['jobAction']
+        if params['jobAction'] == 'new'
+          params['jobName'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobName', 'fieldLabel' => 'Job Name', 'type' => 'text', 'required' => false, 'defaultValue' => nil}], options[:options], @api_client)['jobName']
+          default_retention_count = create_results['backup'] ? create_results['backup']['retentionCount'] : nil
+          params['retentionCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retentionCount', 'fieldLabel' => 'Retention Count', 'type' => 'number', 'required' => false, 'defaultValue' => default_retention_count}], options[:options], @api_client)['retentionCount']
+          params['jobSchedule'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobSchedule', 'fieldLabel' => 'Backup Schedule', 'type' => 'select', 'optionSource' => 'executeSchedules', 'required' => true}], options[:options], @api_client)['jobSchedule']
+        elsif params['jobAction'] == 'clone'
+          params['jobId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobId', 'fieldLabel' => 'Backup Job', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
+            @backup_jobs_interface.list({max:10000})['jobs'].collect {|backup_job|
+              {'name' => backup_job['name'], 'value' => backup_job['id'], 'id' => backup_job['id']}
+            }
+          }, 'required' => true}], options[:options], @api_client)['jobId']
+          params['jobName'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobName', 'fieldLabel' => 'Job Name', 'type' => 'text', 'required' => false, 'defaultValue' => nil}], options[:options], @api_client)['jobName']
+        elsif params['jobAction'] == 'addTo'
+          params['jobId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobId', 'fieldLabel' => 'Backup Job', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
+            @backup_jobs_interface.list({max:10000})['jobs'].collect {|backup_job|
+              {'name' => backup_job['name'], 'value' => backup_job['id'], 'id' => backup_job['id']}
+            }
+          }, 'required' => true}], options[:options], @api_client)['jobId']
+        end
+      end
+
       payload['backup'].deep_merge!(params)
     end
     @backups_interface.setopts(options)
@@ -226,10 +316,33 @@ EOT
 
   private
 
+  def backup_list_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Schedule" => lambda {|it| it['schedule']['name'] rescue '' },
+      "Backup Job" => lambda {|it| it['job']['name'] rescue '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
   def backup_column_definitions()
     {
       "ID" => 'id',
       "Name" => 'name',
+      "Location Type" => lambda {|it| 
+        if it['locationType'] == "instance"
+          "Instance"
+        elsif it['locationType'] == "server"
+          "Host"
+        elsif it['locationType'] == "storage"
+          "Provider"
+        end
+      },
+      "Instance" => lambda {|it| it['instance']['name'] rescue '' },
+      "Container ID" => lambda {|it| it['containerId'] rescue '' },
+      "Host" => lambda {|it| it['server']['name'] rescue '' },
       "Schedule" => lambda {|it| it['schedule']['name'] rescue '' },
       "Backup Job" => lambda {|it| it['job']['name'] rescue '' },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
@@ -240,13 +353,14 @@ EOT
   # this is not so simple, need to first choose select instance, host or provider
   def add_backup_option_types
     [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'backupType', 'fieldLabel' => 'Backup Type', 'type' => 'select', 'optionSource' => 'backupTypes', 'required' => true},
+      {'fieldName' => 'jobAction', 'fieldLabel' => 'Backup Job Type', 'type' => 'select', 'optionSource' => 'backupJobActions', 'required' => true},
       {'fieldName' => 'jobId', 'fieldLabel' => 'Backup Job', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
-        # @options_interface.options_for_source("licenseTypes", {})['data']
-        @backup_jobs_interface.list({max:10000})['backupJobs'].collect {|backup_job|
+        @backup_jobs_interface.list({max:10000})['jobs'].collect {|backup_job|
           {'name' => backup_job['name'], 'value' => backup_job['id'], 'id' => backup_job['id']}
         }
-      }, 'required' => true, 'displayOrder' => 3},
+      }, 'required' => true},
     ]
   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/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"
@@ -641,7 +641,7 @@ Update an invoice.
         payload[:date] = val.to_s
       end
       opts.on( '--rebuild', "Rebuild invoices for period. Only applies to mode=costing." ) do |val|
-        query_params[:rebuild] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+        payload[:rebuild] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       build_standard_update_options(opts, options, [:query, :auto_confirm])
       opts.footer = <<-EOT

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/networks_command.rb

@@ -222,8 +222,10 @@ class Morpheus::Cli::NetworksCommand
         "Domain" => lambda {|it| it['networkDomain'] ? it['networkDomain']['name'] : '' },
         "Search Domains" => lambda {|it| it['searchDomains'] },
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
+        "IPv6 Pool" => lambda {|it| it['poolIPv6'] ? it['poolIPv6']['name'] : '' },
         "VPC" => lambda {|it| it['zonePool'] ? it['zonePool']['name'] : '' },
         "DHCP" => lambda {|it| it['dhcpServer'] ? 'Yes' : 'No' },
+        "IPv6 DHCP" => lambda {|it| it['dhcpServerIPv6'] ? 'Yes' : 'No' },
         "Active" => lambda {|it| format_boolean(it['active']) },
         "Allow IP Override" => lambda {|it| it['allowStaticOverride'] ? 'Yes' : 'No' },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
@@ -381,6 +383,12 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--dhcp-server [on|off]', String, "DHCP Server") do |val|
         options['dhcpServer'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--dhcp-serverIPv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--dhcp-server-ipv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--allow-ip-override [on|off]', String, "Allow IP Override") do |val|
         options['allowStaticOverride'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
@@ -723,6 +731,15 @@ class Morpheus::Cli::NetworksCommand
               v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondaryIPv6', 'fieldLabel' => 'IPv6 DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
               payload['network']['dnsSecondaryIPv6'] = v_prompt['dnsSecondaryIPv6']
             end
+          end
+                    # DHCP Server
+          if network_type['dhcpServerEditable'] && payload['network']['dhcpServerIPv6'].nil?
+            if options['dhcpServerIPv6'] != nil
+              payload['network']['dhcpServerIPv6'] = options['dhcpServerIPv6']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServerIPv6', 'fieldLabel' => 'IPv6 DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+              payload['network']['dhcpServerIPv6'] = v_prompt['dhcpServerIPv6']
+            end
           end
         end
 
@@ -1003,6 +1020,12 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--dhcp-server [on|off]', String, "DHCP Server") do |val|
         options['dhcpServer'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--dhcp-serverIPv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--dhcp-server-ipv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--allow-ip-override [on|off]', String, "Allow IP Override") do |val|
         options['allowStaticOverride'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
@@ -1244,6 +1267,14 @@ class Morpheus::Cli::NetworksCommand
           # payload['network']['dhcpServer'] = v_prompt['dhcpServer']
         end
 
+        # IPv6 DHCP Server
+        if options['dhcpServerIPv6'] != nil
+          payload['network']['dhcpServerIPv6'] = options['dhcpServerIPv6']
+        else
+          # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServerIPv6', 'fieldLabel' => 'IPv6 DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+          # payload['network']['dhcpServerIPv6'] = v_prompt['dhcpServerIPv6']
+        end
+
         # Allow IP Override
         if options['allowStaticOverride'] != nil
           payload['network']['allowStaticOverride'] = options['allowStaticOverride']

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

@@ -544,13 +544,12 @@ EOT
   def update_cart(args)
     options = {}
     params = {}
-    payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("--name [name]")
       opts.on('--name [NAME]', String, "Set an optional name for your catalog order") do |val|
         options[:options]['name'] = val.to_s
       end
-      build_standard_update_options(opts, options, [:sigdig])
+      build_standard_update_options(opts, options, [:payloads, :sigdig])
       opts.footer = <<-EOT
 Update your cart settings, such as name.
 EOT
@@ -560,29 +559,26 @@ EOT
     connect(options)
     # fetch current cart
     # cart = @service_catalog_interface.get_cart()['cart']
-    payload = {}
     update_cart_object_key = 'order'
-    if options[:payload]
-      payload = options[:payload]
+    payloads = parse_payloads(options, update_cart_object_key) do |payload|
       payload.deep_merge!({update_cart_object_key => parse_passed_options(options)})
-    else
-      payload.deep_merge!({update_cart_object_key => parse_passed_options(options)})
-      payload.deep_merge!({update_cart_object_key => params})
       if payload[update_cart_object_key].empty? # || options[:no_prompt]
         raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
     end
-    @service_catalog_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.update_cart(payload)
-      return
-    end
-    json_response = @service_catalog_interface.update_cart(payload)
-    #cart = json_response['cart']
-    #cart = @service_catalog_interface.get_cart()['cart']
-    render_response(json_response, options, 'cart') do
-      print_green_success "Updated cart"
-      get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
+    process_payloads(payloads, options) do |payload|
+      @service_catalog_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_catalog_interface.dry.update_cart(payload)
+        next
+      end
+      json_response = @service_catalog_interface.update_cart(payload)
+      #cart = json_response['cart']
+      #cart = @service_catalog_interface.get_cart()['cart']
+      render_response(json_response, options, 'cart') do
+        print_green_success "Updated cart"
+        get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
     end
     return 0, nil
   end
@@ -590,7 +586,6 @@ EOT
   def add(args)
     options = {}
     params = {}
-    payload = {}
     type_id = nil
     workflow_context = nil
     workflow_target = nil
@@ -613,7 +608,7 @@ EOT
         workflow_target = val.to_s
       end
       opts.add_hidden_option('--sigdig')
-      build_standard_update_options(opts, options, [:sigdig])
+      build_standard_update_options(opts, options, [:payloads, :sigdig])
       opts.footer = <<-EOT
 Add an item to your cart
 [type] is required, this is name or id of a catalog item type.
@@ -626,13 +621,8 @@ EOT
     if args.count > 0
       type_id = args.join(" ")
     end
-    payload = {}
     add_item_object_key = 'item'
-    payload = {add_item_object_key => {} }
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({add_item_object_key => parse_passed_options(options)})
-    else
+    payloads = parse_payloads(options, add_item_object_key) do |payload|
       payload.deep_merge!({add_item_object_key => parse_passed_options(options)})
       # prompt for Type
       if type_id
@@ -725,49 +715,45 @@ EOT
     if options[:validate_only]
       params['validate'] = true
     end
-    @service_catalog_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.create_cart_item(payload, params)
-      return
-    end
-    json_response = @service_catalog_interface.create_cart_item(payload, params)
-    cart_item = json_response['item']
-    render_response(json_response, options) do
-      if options[:validate_only]
-        if json_response['success']
-          print_h2 "Validated Cart Item", [], options
-          cart_item_columns = {
-            "Type" => lambda {|it| it['type']['name'] rescue '' },
-            #"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)
-              if it['errorMessage'].to_s != ""
-                status_string << " - #{it['errorMessage']}"
-              end
-              status_string
-            },
-            #"Config" => lambda {|it| truncate_string(format_name_values(it['config']), 50) }
-          }
-          print as_pretty_table([cart_item], cart_item_columns.upcase_keys!)
-          print reset, "\n"
-          print_green_success(json_response['msg'] || "Item is valid")
-          print reset, "\n"
+    process_payloads(payloads, options) do |payload|
+      @service_catalog_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_catalog_interface.dry.create_cart_item(payload, params)
+        next
+      end
+      json_response = @service_catalog_interface.create_cart_item(payload, params)
+      cart_item = json_response['item']
+      render_response(json_response, options) do
+        if options[:validate_only]
+          if json_response['success']
+            print_h2 "Validated Cart Item", [], options
+            cart_item_columns = {
+              "Type" => lambda {|it| it['type']['name'] rescue '' },
+              #"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)
+                if it['errorMessage'].to_s != ""
+                  status_string << " - #{it['errorMessage']}"
+                end
+                status_string
+              },
+              #"Config" => lambda {|it| truncate_string(format_name_values(it['config']), 50) }
+            }
+            print as_pretty_table([cart_item], cart_item_columns.upcase_keys!)
+            print reset, "\n"
+            print_green_success(json_response['msg'] || "Item is valid")
+            print reset, "\n"
+          else
+            # not needed because it will be http 400
+            print_rest_errors(json_response, options)
+          end
         else
-          # not needed because it will be http 400
-          print_rest_errors(json_response, options)
+          print_green_success "Added item to cart"
+          get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
         end
-      else
-        print_green_success "Added item to cart"
-        get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     end
-    if json_response['success']
-      return 0, nil
-    else
-      # not needed because it will be http 400
-      return 1, json_response['msg'] || 'request failed'
-    end
   end
 
   def update_cart_item(args)
@@ -882,7 +868,6 @@ EOT
   def checkout(args)
     options = {}
     params = {}
-    payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_standard_add_options(opts, options, [:auto_confirm, :sigdig])
@@ -936,7 +921,6 @@ EOT
   def add_order(args)
     options = {}
     params = {}
-    payload = {}
     type_id = nil
     workflow_context = nil
     workflow_target = nil
@@ -961,7 +945,7 @@ EOT
       opts.on('--target ID', String, "Target Resource (Instance or Server) for operational workflow types") do |val|
         workflow_target = val.to_s
       end
-      build_standard_add_options(opts, options, [:sigdig])
+      build_standard_add_options(opts, options, [:payloads, :sigdig])
       opts.footer = <<-EOT
 Place an order for new inventory.
 This allows creating a new order without using the cart.
@@ -978,14 +962,8 @@ EOT
     end
     payload = {}
     order_object_key = 'order'
-    payload = {order_object_key => {} }
-    passed_options = parse_passed_options(options)
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({order_object_key => passed_options}) unless passed_options.empty?
-    else
-      payload.deep_merge!({order_object_key => passed_options}) unless passed_options.empty?
-
+    payloads = parse_payloads(options, order_object_key) do |payload|
+      payload.deep_merge!({order_object_key => {}})
       # Prompt for 1-N Types
       # still_prompting = options[:no_prompt] != true
       still_prompting = true
@@ -1106,36 +1084,32 @@ EOT
       params['validate'] = true
       #payload['validate'] = true
     end
-    @service_catalog_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.create_order(payload, params)
-      return
-    end
-    json_response = @service_catalog_interface.create_order(payload, params)
-    order = json_response['order'] || json_response['cart']
-    render_response(json_response, options) do
-      if options[:validate_only]
-        if json_response['success']
-          print_h2 "Review Order", [], options
-          print_order_details(order, options)
-          print_green_success(json_response['msg'] || "Order is valid")
-          print reset, "\n"
+    process_payloads(payloads, options) do |payload|
+      @service_catalog_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_catalog_interface.dry.create_order(payload, params)
+        next
+      end
+      json_response = @service_catalog_interface.create_order(payload, params)
+      order = json_response['order'] || json_response['cart']
+      render_response(json_response, options) do
+        if options[:validate_only]
+          if json_response['success']
+            print_h2 "Review Order", [], options
+            print_order_details(order, options)
+            print_green_success(json_response['msg'] || "Order is valid")
+            print reset, "\n"
+          else
+            # not needed because it will be http 400
+            print_rest_errors(json_response, options)
+          end
         else
-          # not needed because it will be http 400
-          print_rest_errors(json_response, options)
+          print_green_success "Order placed"
+          print_h2 "Order Details", [], options
+          print_order_details(order, options)
         end
-      else
-        print_green_success "Order placed"
-        print_h2 "Order Details", [], options
-        print_order_details(order, options)
       end
     end
-    if json_response['success']
-      return 0, nil
-    else
-      # not needed because it will be http 400
-      return 1, json_response['msg'] || 'request failed'
-    end
   end
 
   def remove(args)

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

@@ -326,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"
@@ -429,6 +441,16 @@ class Morpheus::Cli::ServicePlanCommand
           {'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)
 
@@ -575,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/mixins/backups_helper.rb

@@ -12,7 +12,7 @@ module Morpheus::Cli::BackupsHelper
     @backups_interface
   end
 
-  def backup_jobs_interfaces
+  def backup_jobs_interface
     raise "#{self.class} has not defined @backup_jobs_interface" if @backup_jobs_interface.nil?
     @backup_jobs_interface
   end

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

@@ -777,15 +777,21 @@ 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
+            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!
@@ -796,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?

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.0.1"
+    VERSION = "6.1.0"
   end
 end

metadata

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