morpheus-cli 3.6.3 → 3.6.4

data/lib/morpheus/cli/cli_command.rb

@@ -209,27 +209,53 @@ module Morpheus
                     nested_options[name_element] = nested_options[name_element] || {}
                     nested_options = nested_options[name_element]
                   else
-                    nested_options[name_element] = custom_option_args[1]
+                    val = custom_option_args[1]
+                    if val.to_s[0] == '{' && val.to_s[-1] == '}'
+                      begin
+                        val = JSON.parse(val)
+                      rescue
+                        Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                      end
+                    end
+                    nested_options[name_element] = val
                   end
                 end
               else
-                custom_options[custom_option_args[0]] = custom_option_args[1]
+                val = custom_option_args[1]
+                if val.to_s[0] == '{' && val.to_s[-1] == '}'
+                  begin
+                    val = JSON.parse(val)
+                  rescue
+                    Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                  end
+                end
+                custom_options[custom_option_args[0]] = val
               end
               # convert "true","on" and "false","off" to true and false
-              custom_options.booleanize!
+              unless options[:skip_booleanize]
+                custom_options.booleanize!
+              end
               options[:options] = custom_options
             end
+            opts.on('-P','--prompt', "Always prompts. Use passed options as the default value.") do |val|
+              options[:always_prompt] = true
+              options[:options] ||= {}
+              options[:options][:always_prompt] = true
+            end
             opts.on('-N','--no-prompt', "Skip prompts. Use default values for all optional fields.") do |val|
               options[:no_prompt] = true
-              # ew, stored in here for now because options[:options] is what is passed into OptionTypes.prompt() everywhere!
               options[:options] ||= {}
               options[:options][:no_prompt] = true
             end
 
-          when :noprompt
+          when :prompt
+            opts.on('-P','--prompt', "Always prompts. Use passed options as the default value.") do |val|
+              options[:always_prompt] = true
+              options[:options] ||= {}
+              options[:options][:always_prompt] = true
+            end
             opts.on('-N','--no-prompt', "Skip prompts. Use default values for all optional fields.") do |val|
               options[:no_prompt] = true
-              # ew, stored in here for now because options[:options] is what is passed into OptionTypes.prompt() everywhere!
               options[:options] ||= {}
               options[:options][:no_prompt] = true
             end
@@ -252,6 +278,37 @@ 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|
+              options[:payload_dir] = val.to_s
+              payload_dir = File.expand_path(options[:payload_dir])
+              if !Dir.exists?(payload_dir) || !File.directory?(payload_dir)
+                raise ::OptionParser::InvalidOption.new("Directory not found: #{payload_dir}")
+              end
+              payload = {}
+              begin
+                merged_payload = {}
+                payload_files = []
+                payload_files += Dir["#{payload_dir}/*.json"]
+                payload_files += Dir["#{payload_dir}/*.yml"]
+                payload_files += Dir["#{payload_dir}/*.yaml"]
+                if payload_files.empty?
+                  raise ::OptionParser::InvalidOption.new("No .json/yaml files found in config directory: #{payload_dir}")
+                end
+                payload_files.each do |payload_file|
+                  Morpheus::Logging::DarkPrinter.puts "parsing payload file: #{payload_file}" if Morpheus::Logging.debug?
+                  config_payload = {}
+                  if payload_file =~ /\.ya?ml\Z/
+                    config_payload = YAML.load_file(payload_file)
+                  else
+                    config_payload = JSON.parse(File.read(payload_file))
+                  end
+                  merged_payload.deep_merge!(config_payload)
+                end
+                options[:payload] = merged_payload
+              rescue => ex
+                raise ::OptionParser::InvalidOption.new("Failed to parse payload file: #{payload_file} Error: #{ex.message}")
+              end
+            end
             opts.on('--payload-json JSON', String, "Payload JSON, skip all prompting") do |val|
               begin
                 options[:payload] = JSON.parse(val.to_s)
@@ -455,6 +512,12 @@ module Morpheus
               options[:include_fields] = val
             end
 
+          when :outfile
+            opts.on('--out FILE', String, "Write standard output to a file instead of the terminal.") do |val|
+              # could validate directory is writable..
+              options[:outfile] = val
+            end
+
           when :dry_run
             opts.on('-d','--dry-run', "Dry Run, print the API request instead of executing it") do
               options[:dry_run] = true
@@ -754,6 +817,43 @@ module Morpheus
         return subtitles
       end
 
+      def print_to_file(txt, filename)
+        Morpheus::Logging::DarkPrinter.puts "Writing #{txt.to_s.bytesize} bytes to file #{filename}" if Morpheus::Logging.debug?
+        outfile = nil
+        begin
+          outfile = File.open(File.expand_path(filename), 'w')
+          outfile.print(txt)
+          return 0
+        rescue => ex
+          puts_error "Error printing to outfile '#{filename}'. Error: #{ex}"
+          return 1
+        ensure
+          outfile.close if outfile
+        end
+      end
+
+      # basic rendering for options :json, :yaml, :csv, :fields, and :outfile
+      # returns the string rendered, or nil if nothing was rendered.
+      def render_with_format(json_response, options, object_key=nil)
+        output = nil
+        if options[:json]
+          output = as_json(json_response, options, object_key)
+        elsif options[:yaml]
+          output = as_yaml(json_response, options, object_key)
+        elsif options[:csv]
+          row = object_key ? json_response[object_key] : json_response
+          output = records_as_csv([row], options)
+        end
+        if output
+          if options[:outfile]
+            print_to_file(output, options[:outfile])
+          else
+            puts output
+          end
+        end
+        return output
+      end
+
       module ClassMethods
 
         def set_command_name(cmd_name)

data/lib/morpheus/cli/cloud_datastores_command.rb

@@ -379,7 +379,7 @@ class Morpheus::Cli::CloudDatastoresCommand
     elsif datastores.size > 1
       print_red_alert "#{datastores.size} datastores found by name #{name}"
       # print_datastores_table(datastores, {color: red})
-      rows = datastores.collect do |datastore|
+      rows = datastores.collect do |it|
         {id: it['id'], name: it['name']}
       end
       print red

data/lib/morpheus/cli/commands/standard/cat_command.rb

@@ -0,0 +1,45 @@
+require 'morpheus/cli/cli_command'
+
+# This is for printing the content of files(s)
+class Morpheus::Cli::CatCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :cat
+  set_command_hidden
+
+  def handle(args)
+    append_newline = true
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [file ...]"
+      build_common_options(opts, options, [])
+      opts.footer = "Concatenate and print files." + "\n" +
+                    "[file] is required. This is the name of a file. Supports many [file] arguments."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "#{command_name} expects 1-N arguments and received #{args.count} #{args}\n#{optparse}"
+      return 1
+    end
+
+    arg_files = args
+    arg_files.each do |arg_file|
+      arg_file = File.expand_path(arg_file)
+      if !File.exists?(arg_file)
+        print_error Morpheus::Terminal.angry_prompt
+        puts_error  "#{command_name}:  file not found: '#{arg_file}'"
+        #print_red_alert "morpheus cat: file not found: '#{arg_file}'"
+        return 1
+      end
+      if File.directory?(arg_file)
+        print_red_alert "morpheus cat: file is a directory: '#{arg_file}'"
+        return 1
+      end
+      file_contents = File.read(arg_file)
+      print file_contents.to_s
+      return 0
+    end
+    return true
+  end
+
+end

data/lib/morpheus/cli/containers_command.rb

@@ -33,15 +33,14 @@ class Morpheus::Cli::ContainersCommand
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
-      opts.on('--refresh [status]', String, "Refresh until status is reached. Default status is running.") do |val|
-        if val.to_s.empty?
-          options[:refresh_until_status] = "running,failed"
-        else
-          options[:refresh_until_status] = val.to_s.downcase
+      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is 5 seconds.") do |val|
+        options[:refresh_until_status] ||= "running,failed"
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
         end
       end
-      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
-        options[:refresh_interval] = val.to_f
+      opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
+        options[:refresh_until_status] = val.to_s.downcase
       end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
@@ -140,8 +139,7 @@ class Morpheus::Cli::ContainersCommand
         statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
         if !statuses.include?(container['status'])
           print cyan
-          print "Status is #{container['status'] || 'unknown'}. Refreshing in #{options[:refresh_interval]} seconds"
-          #sleep(options[:refresh_interval])
+          print cyan, "Refreshing in #{options[:refresh_interval]} seconds"
           sleep_with_dots(options[:refresh_interval])
           print "\n"
           _get(arg, options)

data/lib/morpheus/cli/echo_command.rb

@@ -23,7 +23,9 @@ class Morpheus::Cli::Echo
     var_map.merge!(DEFAULT_VARIABLE_MAP)
     appliance = ::Morpheus::Cli::Remote.load_active_remote()
     if appliance
-      var_map.merge!({'%remote' => appliance[:name], '%remote_url' => appliance[:host], '%username' => appliance[:username]})
+      var_map.merge!({'%remote' => appliance[:name], '%remote_url' => appliance[:host].to_s, '%username' => appliance[:username].to_s})
+    else
+      var_map.merge!({'%remote' => '', '%remote_url' => '', '%username' => ''})
     end
     @output_variable_map = var_map
   end

data/lib/morpheus/cli/execution_request_command.rb

@@ -37,11 +37,11 @@ class Morpheus::Cli::ExecutionRequestCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[uid]")
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.on('--refresh', String, "Refresh until execution is finished.") do |val|
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is 5 seconds.") do |val|
         options[:refresh_until_finished] = true
-      end
-      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
-        options[:refresh_interval] = val.to_f
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
+        end
       end
       opts.footer = "Get details about an execution request." + "\n" +
                     "[uid] is required. This is the unique id of an execution request."

data/lib/morpheus/cli/expression_parser.rb

@@ -40,6 +40,10 @@ module Morpheus::Cli::ExpressionParser
 
   # parse an expression of morpheus commands into a list of expressions
   def self.parse(input)
+    # the input is a comment
+    if input.to_s =~ /^\s*#/
+      return [input]
+    end
     result = []
     # first, build up a temporary command string
     # swap in well known tokens so we can split it safely

data/lib/morpheus/cli/file_copy_request_command.rb

@@ -37,11 +37,11 @@ class Morpheus::Cli::FileCopyRequestCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[uid]")
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.on('--refresh', String, "Refresh until file copy is finished.") do |val|
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is 5 seconds.") do |val|
         options[:refresh_until_finished] = true
-      end
-      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
-        options[:refresh_interval] = val.to_f
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
+        end
       end
       opts.footer = "Get details about a file copy request." + "\n" +
                     "[uid] is required. This is the unique id of a file copy request."

data/lib/morpheus/cli/hosts.rb

@@ -254,15 +254,14 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--refresh [status]', String, "Refresh until status is reached. Default status is provisioned.") do |val|
-        if val.to_s.empty?
-          options[:refresh_until_status] = "provisioned,failed"
-        else
-          options[:refresh_until_status] = val.to_s.downcase
+      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is 5 seconds.") do |val|
+        options[:refresh_until_status] ||= "provisioned,failed"
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
         end
       end
-      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
-        options[:refresh_interval] = val.to_f
+      opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
+        options[:refresh_until_status] = val.to_s.downcase
       end
       build_common_options(opts, options, [:json, :csv, :yaml, :fields, :dry_run, :remote])
     end
@@ -337,8 +336,7 @@ class Morpheus::Cli::Hosts
         statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
         if !statuses.include?(server['status'])
           print cyan
-          print "Status is #{server['status'] || 'unknown'}. Refreshing in #{options[:refresh_interval]} seconds"
-          #sleep(options[:refresh_interval])
+          print cyan, "Refreshing in #{options[:refresh_interval]} seconds"
           sleep_with_dots(options[:refresh_interval])
           print "\n"
           _get(arg, options)
@@ -763,16 +761,16 @@ class Morpheus::Cli::Hosts
       #   query_params[:removeResources] = 'off'
       # end
       opts.on('--remove-resources [on|off]', ['on','off'], "Remove Infrastructure. Default is on if server is managed.") do |val|
-        query_params[:removeResources] = val
+        query_params[:removeResources] = val.nil? ? 'on' : val
       end
       opts.on('--preserve-volumes [on|off]', ['on','off'], "Preserve Volumes. Default is off.") do |val|
-        query_params[:preserveVolumes] = val
+        query_params[:preserveVolumes] = val.nil? ? 'on' : val
       end
       opts.on('--remove-instances [on|off]', ['on','off'], "Remove Associated Instances. Default is off.") do |val|
-        query_params[:removeInstances] = val
+        query_params[:removeInstances] = val.nil? ? 'on' : val
       end
       opts.on('--release-eips [on|off]', ['on','off'], "Release EIPs, default is on. Amazon only.") do |val|
-        params[:releaseEIPs] = val
+        params[:releaseEIPs] = val.nil? ? 'on' : val
       end
       opts.on( '-f', '--force', "Force Delete" ) do
         query_params[:force] = 'on'

data/lib/morpheus/cli/instances.rb

@@ -226,6 +226,9 @@ class Morpheus::Cli::Instances
       opts.on( '--name NAME', "Instance Name" ) do |val|
         options[:instance_name] = val
       end
+      opts.on("--description [TEXT]", String, "Description") do |val|
+        options[:description] = val.to_s
+      end
       opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
         options[:copies] = val.to_i
       end
@@ -250,8 +253,8 @@ class Morpheus::Cli::Instances
       opts.on("--expire-days NUMBER", Integer, "Automation: Expiration Days") do |val|
         options[:expire_days] = val.to_i
       end
-      opts.on("--create-backup on|off", String, "Automation: Create Backups.  Default is off.") do |val|
-        options[:create_backup] = ['on','true','1'].include?(val.to_s.downcase) ? 'on' : 'off'
+      opts.on("--create-backup [on|off]", String, "Automation: Create Backups.") do |val|
+        options[:create_backup] = ['on','true','1',''].include?(val.to_s.downcase) ? 'on' : 'off'
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create a new instance." + "\n" +
@@ -301,17 +304,17 @@ class Morpheus::Cli::Instances
           end
         end
       end
-
+      payload['instance'] ||= {}
       if options[:instance_name]
-        payload['instance'] ||= payload['instance']
         payload['instance']['name'] = options[:instance_name]
       end
       payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
       payload[:layoutSize] = options[:layout_size] if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
-      payload[:createBackup] = options[:create_backup] ? 'on' : 'off' if options[:create_backup] == true
+      payload[:createBackup] = options[:create_backup] if !options[:create_backup].nil?
       payload['instance']['expireDays'] = options[:expire_days] if options[:expire_days]
       payload['instance']['shutdownDays'] = options[:shutdown_days] if options[:shutdown_days]
       if options.key?(:create_user)
+        payload['config'] ||= {}
         payload['config']['createUser'] = options[:create_user]
       end
       if options[:user_group_id]
@@ -743,15 +746,14 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--scaling', "Display Instance Scaling Settings" ) do
         options[:include_scaling] = true
       end
-      opts.on('--refresh [status]', String, "Refresh until status is reached. Default status is running.") do |val|
-        if val.to_s.empty?
-          options[:refresh_until_status] = "running,failed"
-        else
-          options[:refresh_until_status] = val.to_s.downcase
+      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is 5 seconds.") do |val|
+        options[:refresh_until_status] ||= "running,failed"
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
         end
       end
-      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
-        options[:refresh_interval] = val.to_f
+      opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
+        options[:refresh_until_status] = val.to_s.downcase
       end
       # opts.on( nil, '--threshold', "Alias for --scaling" ) do
       #   options[:include_scaling] = true
@@ -957,9 +959,7 @@ class Morpheus::Cli::Instances
         end
         statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
         if !statuses.include?(instance['status'])
-          print cyan
-          print "Status is #{instance['status'] || 'unknown'}. Refreshing in #{options[:refresh_interval]} seconds"
-          #sleep(options[:refresh_interval])
+          print cyan, "Refreshing in #{options[:refresh_interval]} seconds"
           sleep_with_dots(options[:refresh_interval])
           print "\n"
           _get(arg, options)
@@ -1066,7 +1066,7 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1086,20 +1086,68 @@ class Morpheus::Cli::Instances
         puts as_json(json_response, options)
         return
       end
-      backups = json_response['backups']
+      
+      if json_response['backups'] && json_response['backups'][0] && json_response['backups'][0]['backupResults']
+        # new format
+        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
 
-      print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
-      backup_rows = backups.collect {|r| 
-        it = r['backup']
-        {id: it['id'], name: it['name'], dateCreated: format_local_dt(it['dateCreated'])}
-      }
-      print cyan
-      puts as_pretty_table backup_rows, [
-        :id,
-        :name,
-        {:dateCreated => {:display_name => "Date Created"} }
-      ]
-      print reset, "\n"
+
+        backup = json_response['backups'][0]
+
+        description_cols = {
+          "Backup ID" => lambda {|it| it['id'] },
+          "Name" => lambda {|it| it['name'] },
+          "Type" => lambda {|it| it['backupType'] ? (it['backupType']['name'] || it['backupType']['code']) : '' },
+          "Storage" => lambda {|it| it['storageProvider'] ? it['storageProvider']['name'] : '' },
+          "Schedule" => lambda {|it| it['cronDescription'] || it['cronExpression'] }
+        }
+        print_description_list(description_cols, backup)
+
+        backup_results = backup ? backup['backupResults'] : nil
+        backup_rows = backup_results.collect {|it| 
+          status_str = it['status'].to_s.upcase
+          # 'START_REQUESTED' //START_REQUESTED, IN_PROGRESS, CANCEL_REQUESTED, CANCELLED, SUCCEEDED, FAILED
+          if status_str == 'SUCCEEDED'
+            status_str = "#{green}#{status_str.upcase}#{cyan}"
+          elsif status_str == 'FAILED'
+            status_str = "#{red}#{status_str.upcase}#{cyan}"
+          else
+            status_str = "#{cyan}#{status_str.upcase}#{cyan}"
+          end
+          {id: it['id'], startDate: format_local_dt(it['dateCreated']), duration: format_duration_milliseconds(it['durationMillis']), 
+            size: format_bytes(it['sizeInMb'], 'MB'), status: status_str }
+        }
+        print_h1 "Backup Results"
+        print cyan
+        puts as_pretty_table backup_rows, [
+          :id,
+          {:startDate => {:display_name => "Started"} },
+          :duration,
+          :size,
+          :status
+        ]
+        print reset, "\n"
+      elsif json_response['backups'].size == 0
+        # no backup configured
+        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
+        print "#{yellow}No backups configured#{reset}\n\n"
+      else
+        # old format
+        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
+        backups = json_response['backups']
+        backup_rows = backups.collect {|r| 
+          it = r['backup']
+          {id: it['id'], name: it['name'], dateCreated: format_local_dt(it['dateCreated'])}
+        }
+        print cyan
+        puts as_pretty_table backup_rows, [
+          :id,
+          :name,
+          {:dateCreated => {:display_name => "Date Created"} }
+        ]
+        print reset, "\n"
+      end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1114,23 +1162,26 @@ class Morpheus::Cli::Instances
       opts.on( '-g', '--group GROUP', "Group Name or ID for the new instance" ) do |val|
         options[:group] = val
       end
+      opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID for the new instance" ) do |val|
+        options[:cloud] = val
+      end
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
       puts optparse
-      exit 1
-    end
-    if !options[:group]
-      print_red_alert "GROUP is required."
-      puts optparse
-      exit 1
+      return 1
     end
+    # if !options[:group]
+    #   print_red_alert "GROUP is required."
+    #   puts optparse
+    #   exit 1
+    # end
     connect(options)
     begin
       options[:options] ||= {}
       # use the -g GROUP or active group by default
-      options[:options]['group'] ||= options[:group] # || @active_group_id # always choose a group for now?
+      options[:options]['group'] ||= options[:group] || @active_group_id
       # support [new-name] 
       # if args[1]
       #   options[:options]['name'] = args[1]
@@ -1143,6 +1194,10 @@ class Morpheus::Cli::Instances
       payload.merge!(params)
       payload['group'] = {id: group['id']}
 
+      cloud = options[:cloud] ? find_zone_by_name_or_id(nil, options[:cloud]) : nil
+      if cloud
+        payload['cloud'] = {id: cloud['id']}
+      end
       instance = find_instance_by_name_or_id(args[0])
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to clone the instance '#{instance['name']}'?", options)
         exit 1
@@ -1808,8 +1863,21 @@ class Morpheus::Cli::Instances
         puts as_json(json_response, options)
         return 0
       else
-        puts "Backup initiated."
-        return 0
+        bad_results = []
+        if json_response['results']
+          json_response['results'].each do |result_id, result|
+            if result['success'] != true
+              bad_results << result['msg'] || "Failed to create backup for instance #{result_id}"
+            end
+          end
+        end
+        if bad_results.empty?
+          print_green_success "Backup initiated."
+          return 0
+        else
+          print_red_alert bad_results.join("\n")
+          return 1
+        end
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -1826,10 +1894,10 @@ class Morpheus::Cli::Instances
         query_params[:keepBackups] = 'on'
       end
       opts.on('--preserve-volumes [on|off]', ['on','off'], "Preserve Volumes. Default is off. Applies to certain types only.") do |val|
-        query_params[:preserveVolumes] = val
+        query_params[:preserveVolumes] = val.nil? ? 'on' : val
       end
       opts.on('--releaseEIPs [on|off]', ['on','off'], "Release EIPs. Default is on. Applies to Amazon only.") do |val|
-        query_params[:releaseEIPs] = val
+        query_params[:releaseEIPs] = val.nil? ? 'on' : val
       end
       opts.on( '-f', '--force', "Force Delete" ) do
         query_params[:force] = 'on'
@@ -2128,7 +2196,7 @@ class Morpheus::Cli::Instances
       if options[:json]
         puts as_json(json_response, options)
       else
-        puts "Snapshot import initiated."
+        print_green_success "Snapshot import initiated."
       end
       return 0
     rescue RestClient::Exception => e