morpheus-cli 6.0.2 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb39926e3f31b77cdca9175335ca0260b720641e469a240618fc98816b2b98ee
-  data.tar.gz: ef40d39ffa3f4a6d51139524fee83dd990b082c326b528ad66a6a8e6629c43e0
+  metadata.gz: 3cf8719e8fbab69a6e0de10b9d2920b0394bb55d4928ba4266b82c9430f53658
+  data.tar.gz: a518e58f7b2adc050e786ca6f29e0f7832787e5c294c495d5599960f7232aacc
 SHA512:
-  metadata.gz: 32d58f65d940360fdfb48ff00f88d7f2221dbe4ad1d50adbd441ee68ae79cf7fb5e1314b7d1644808a8795fa362b0e0698e0d89ef8f57187442880fc1a0fec40
-  data.tar.gz: 19f7a173551371d306edbbbde91ad910f96c5c77fe8c70ef09200ba85e50885e4533cfb36c1f6c26b3cacacb629d7459aabb569f03e71d07e0a5720e3134fc9c
+  metadata.gz: 30263a5621c68dc42d8bb1093c67c21a27eab9c440bd12848a345ddee7200d45d8744531418dd9b936529405623a7c464d44b957503903ac0fc1e2bb462b431a
+  data.tar.gz: 2bc5e8dc185195a1dc470394d487b1c970c1c8626701803636441ae84a6f138352dcafd07481d39a151c24911a05526dfa8748882ee7b1b48f57c02bba584e54

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -492,6 +492,10 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def load_balancer_pools_secondary
+    Morpheus::LoadBalancerPoolsSecondaryInterface.new(common_interface_options).setopts(@options)
+  end
+
   def load_balancer_profiles
     Morpheus::LoadBalancerProfilesInterface.new(common_interface_options).setopts(@options)
   end
@@ -500,6 +504,10 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerMonitorsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def load_balancer_pool_nodes
+    Morpheus::LoadBalancerPoolNodesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def tasks
     Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end

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

@@ -9,7 +9,7 @@ class Morpheus::CypherInterface < Morpheus::APIClient
 
   def get(item_key, params={})
     raise "#{self.class}.get() passed a blank item_key!" if item_key.to_s == ''
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
@@ -17,29 +17,35 @@ class Morpheus::CypherInterface < Morpheus::APIClient
   # list url is the same as get but uses $itemKey/?list=true
   # method: 'LIST' would be neat though
   def list(item_key=nil, params={})
-    url = item_key ? "#{@base_url}#{base_path}/#{item_key}" : "#{@base_url}#{base_path}"
+    url = item_key ? "#{@base_url}#{base_path}/#{escape_item_key(item_key)}" : "#{@base_url}#{base_path}"
     params.merge!({list:'true'}) # ditch this probably
     headers = { :params => params, :authorization => "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
 
   def create(item_key, params={}, payload={})
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute({method: :post, url: url, headers: headers, payload: payload.to_json})
   end
 
   # update is not even needed I don't think, same as POST
   def update(item_key, params={}, payload={})
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute({method: :put, url: url, headers: headers, payload: payload.to_json})
   end
 
   def destroy(item_key, params={})
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute({method: :delete, url: url, headers: headers})
   end
 
+  protected 
+
+  def escape_item_key(item_key)
+    item_key.to_s.split("/").collect {|i| CGI::escape(i.to_s) }.join("/")
+  end
+
 end

data/lib/morpheus/api/load_balancer_pool_nodes_interface.rb

@@ -0,0 +1,8 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerPoolNodesInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(pool_id)
+    "/api/load-balancer-pools/#{pool_id}/nodes"
+  end
+end

data/lib/morpheus/api/load_balancer_pools_interface.rb

@@ -1,9 +1,9 @@
-require 'morpheus/api/secondary_rest_interface'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancerPoolsInterface < Morpheus::SecondaryRestInterface
+class Morpheus::LoadBalancerPoolsInterface < Morpheus::RestInterface
 
-  def base_path(load_balancer_id)
-    "/api/load-balancers/#{load_balancer_id}/pools"
+  def base_path
+    "/api/load-balancer-pools"
   end
 
 end

data/lib/morpheus/api/load_balancer_pools_secondary_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerPoolsSecondaryInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(load_balancer_id)
+    "/api/load-balancers/#{load_balancer_id}/pools"
+  end
+
+end

data/lib/morpheus/api/roles_interface.rb

@@ -2,10 +2,10 @@ require 'morpheus/api/api_client'
 
 class Morpheus::RolesInterface < Morpheus::APIClient
 
-  def get(account_id, id)
+  def get(account_id, id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
     url = build_url(account_id, id)
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
@@ -21,24 +21,24 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def create(account_id, options)
+  def create(account_id, options, params={})
     url = build_url(account_id)
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json, params: params)
   end
 
-  def update(account_id, id, options)
+  def update(account_id, id, options, params={})
     url = build_url(account_id, id)
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json, params: params)
   end
 
-  def destroy(account_id, id)
+  def destroy(account_id, id, params={})
     url = build_url(account_id, id)
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
+    execute(method: :delete, url: url, headers: headers, params: params)
   end
 
   def update_permission(account_id, id, options)

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

@@ -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