morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/instance_types.rb

@@ -1,14 +1,11 @@
-# require 'yaml'
 require 'io/console'
-require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::InstanceTypes
   include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
 		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
@@ -20,7 +17,7 @@ class Morpheus::Cli::InstanceTypes
 
 	def handle(args) 
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			return 1
 		end
 		if args.empty?
@@ -40,46 +37,62 @@ class Morpheus::Cli::InstanceTypes
 
 
 	def details(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instance-type details [name]"
+			build_common_options(opts, options, [:json])
+		end
+		optparse.parse(args)
 		if args.count < 1
-			puts "\nUsage: morpheus instances stats [name]\n\n"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
+		name = args[0]
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
+			json_response = @instance_types_interface.get({name: name})
+
+			if options[:json]
+				print JSON.pretty_generate(json_response), "\n" and return
 			end
-			instance = instance_results['instances'][0]
-			instance_id = instance['id']
-			stats = instance_results['stats'][instance_id.to_s]
-			print "\n" ,cyan, bold, "#{instance['name']} (#{instance['instanceType']['name']})\n","==================", reset, "\n\n"
-			print cyan, "Memory: \t#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}\n"
-			print cyan, "Storage: \t#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}\n\n",reset
-			puts instance
-		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
+
+			instance_type = json_response['instanceTypes'][0]
+
+			if instance_type.nil?
+				puts yellow,"No instance type found by name #{name}.",reset
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				print "\n" ,cyan, bold, "Instance Type Details\n","==================", reset, "\n\n"
+				versions = instance_type['versions'].join(', ')
+				print cyan, "=  #{instance_type['name']} (#{instance_type['code']}) - #{versions}\n"
+				instance_type['instanceTypeLayouts'].each do |layout|
+					print green, "     - #{layout['name']}\n",reset
+				end
+				print reset,"\n\n"
 			end
-			return nil
+
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 
 	def list(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
-			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
-				options[:group] = group
-			end
+			build_common_options(opts, options, [:list, :json])
 		end
 		optparse.parse(args)
 		begin
 			params = {}
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
+			end
 
 			json_response = @instance_types_interface.get(params)
+
+			if options[:json]
+				print JSON.pretty_generate(json_response), "\n" and return
+			end
+
 			instance_types = json_response['instanceTypes']
 			print "\n" ,cyan, bold, "Morpheus Instance Types\n","==================", reset, "\n\n"
 			if instance_types.empty?
@@ -95,9 +108,9 @@ class Morpheus::Cli::InstanceTypes
 			end
 			print reset,"\n\n"
 			
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 end

data/lib/morpheus/cli/instances.rb

@@ -1,15 +1,15 @@
-# require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'filesize'
 require 'table_print'
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/provisioning_helper'
 
 class Morpheus::Cli::Instances
   include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+  include Morpheus::Cli::ProvisioningHelper
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
 		
@@ -34,15 +34,16 @@ class Morpheus::Cli::Instances
 		@options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
 		@active_groups = ::Morpheus::Cli::Groups.load_group_file
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			exit 1
 		end
 	end
 
 
 	def handle(args) 
+		usage = "Usage: morpheus instances [list,add,remove,stop,start,restart,backup,run-workflow,stop-service,start-service,restart-service,resize,upgrade,clone,envs,setenv,delenv] [name]"
 		if args.empty?
-			puts "\nUsage: morpheus instances [list,add,remove,stop,start,restart,backup,run-workflow,resize,upgrade,clone,envs,setenv,delenv,firewall_disable,firewall_enable,security_groups,apply_security_groups] [name]\n\n"
+			puts "\n#{usage}\n\n"
 			return 
 		end
 
@@ -65,6 +66,8 @@ class Morpheus::Cli::Instances
 				start_service(args[1..-1])
 			when 'restart-service'
 				restart_service(args[1..-1])
+			when 'resize'
+				resize(args[1..-1])
 			when 'run-workflow'
 				run_workflow(args[1..-1])
 			when 'stats'
@@ -90,7 +93,7 @@ class Morpheus::Cli::Instances
 			when 'backup'
 				backup(args[1..-1])	
 			else
-				puts "\nUsage: morpheus instances [list,add,remove,stop,start,restart,backup,run-workflow,stop-service,start-service,restart-service,resize,upgrade,clone,envs,setenv,delenv] [name]\n\n"
+				puts "\n#{usage}\n\n"
 				exit 127
 		end
 	end
@@ -105,7 +108,7 @@ class Morpheus::Cli::Instances
 			opts.on( '-c', '--cloud CLOUD', "Cloud" ) do |val|
 				options[:cloud] = val
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 			
 		end
 
@@ -171,6 +174,32 @@ class Morpheus::Cli::Instances
 		
 		payload[:instance][:layout] = {id: layout['id']}
 
+		
+		begin
+			service_plan_options_json = @instance_types_interface.service_plan_options(plan_prompt['servicePlan'], {cloudId: cloud, zoneId: cloud, layoutId: layout_id})
+			
+			# puts ""
+			# print JSON.pretty_generate(service_plan_options_json)
+			
+			plan_options = service_plan_options_json['plan']
+			volumes = prompt_instance_volumes(plan_options, options, @api_client, {})
+
+			# puts "VOLUMES:"
+			# print JSON.pretty_generate(volumes)
+
+			if !volumes.empty?
+				payload[:volumes] = volumes
+			end
+
+			# puts "\nexiting early...\n"
+			# exit 1
+
+		rescue RestClient::Exception => e
+			print_red_alert "Unable to load options for selected plan."
+			print_rest_exception(e, options)
+			exit 1
+		end
+
 		type_payload = {}
 		if !layout['optionTypes'].nil? && !layout['optionTypes'].empty?
 			type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
@@ -183,7 +212,7 @@ class Morpheus::Cli::Instances
 
 		provision_payload = {}
 		if !layout['provisionType'].nil? && !layout['provisionType']['optionTypes'].nil? && !layout['provisionType']['optionTypes'].empty?
-			puts "Checking for option Types"
+			#puts "Checking for option Types"
 			provision_payload = Morpheus::Cli::OptionTypes.prompt(layout['provisionType']['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		end
 
@@ -194,20 +223,29 @@ class Morpheus::Cli::Instances
 			payload[:server] = provision_payload['server']
 		end
 
+		# avoid 500 error
+		payload[:servicePlanOptions] = {}
+
 		begin
-			@instances_interface.create(payload)
+			json_response = @instances_interface.create(payload)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			else
+				print_green_success "Provisioning instance #{instance_name}"
+				list([])
+			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
-		list([])
 	end
 
 	def stats(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances stats [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -237,7 +275,7 @@ class Morpheus::Cli::Instances
 				print reset, "\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -246,10 +284,10 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances logs [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
 			opts.on( '-n', '--node NODE_ID', "Scope logs to specific Container or VM" ) do |node_id|
 				options[:node_id] = node_id.to_i
 			end
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -286,7 +324,7 @@ class Morpheus::Cli::Instances
 				print reset,"\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -295,7 +333,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances details [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -317,7 +355,7 @@ class Morpheus::Cli::Instances
 			print cyan, "Storage: \t#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}\n\n",reset
 			puts instance
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -326,7 +364,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances envs [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -349,7 +387,7 @@ class Morpheus::Cli::Instances
 			print reset, "\n"
 			
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -365,7 +403,7 @@ class Morpheus::Cli::Instances
 			opts.on( '-M', "Masked" ) do |masked|
 				options[:masked] = masked
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 3
 			puts "\n#{optparse.banner}\n\n"
@@ -380,7 +418,7 @@ class Morpheus::Cli::Instances
 			@instances_interface.create_env(instance['id'], [evar])
 			envs([args[0]])
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -389,7 +427,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances setenv INSTANCE NAME"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 2
 			puts "\n#{optparse.banner}\n\n"
@@ -402,7 +440,7 @@ class Morpheus::Cli::Instances
 			@instances_interface.del_env(instance['id'], args[1])
 			envs([args[0]])
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -411,7 +449,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances stop [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -421,7 +459,7 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			instance = find_instance_by_name(args[0])
-			if !::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
 				exit 1
 			end
 			json_response = @instances_interface.stop(instance['id'])
@@ -431,7 +469,7 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -440,7 +478,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances start [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -457,7 +495,7 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -466,7 +504,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances restart [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -476,7 +514,7 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			instance = find_instance_by_name(args[0])
-			if !::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
 				exit 1
 			end
 			json_response = @instances_interface.restart(instance['id'])
@@ -486,7 +524,7 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -495,7 +533,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances stop-service [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -505,7 +543,7 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			instance = find_instance_by_name(args[0])
-			if !::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
 				exit 1
 			end
 			json_response = @instances_interface.stop(instance['id'],false)
@@ -517,7 +555,7 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -526,7 +564,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances start-service [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -545,7 +583,7 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -554,7 +592,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances restart-service [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -564,7 +602,7 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			instance = find_instance_by_name(args[0])
-			if !::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
 				exit 1
 			end
 			json_response = @instances_interface.restart(instance['id'],false)
@@ -576,7 +614,95 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
+			exit 1
+		end
+	end
+
+	def resize(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances resize [name]"
+			build_common_options(opts, options, [:options, :json, :remote])
+		end
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+		optparse.parse(args)
+		connect(options)
+		begin
+			instance = find_instance_by_name(args[0])
+
+			group_id = instance['group']['id']
+			cloud_id = instance['cloud']['id']
+			layout_id = instance['layout']['id']
+
+			plan_id = instance['plan']['id']
+			payload = {}
+
+			# avoid 500 error
+			payload[:servicePlanOptions] = {}
+
+			puts "\nDue to limitations by most Guest Operating Systems, Disk sizes can only be expanded and not reduced.\nIf a smaller plan is selected, memory and CPU (if relevant) will be reduced but storage will not.\n\n"
+
+
+			#plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'optionSource' => 'instanceServicePlans', 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options],@api_client,{groupId: groupId, zoneId: cloud, instanceTypeId: instance_type['id'], layoutId: layout_id, version: version_prompt['version']})
+			available_plans_result = @options_interface.options_for_source('instanceServicePlans',{groupId: group_id, zoneId: cloud_id, instanceTypeId: instance['instanceType']['id'], layoutId: layout_id, version: instance['instanceVersion']})
+			available_plans = available_plans_result['data']
+			available_plans.each do |plan|
+				if plan['value'] && plan['value'].to_i == plan_id.to_i
+					plan['name'] = "#{plan['name']} (current)"
+				end
+			end
+
+			plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'New Plan', 'selectOptions' => available_plans, 'required' => true, 'description' => 'Choose the new plan for this instance'}],options[:options] )
+			new_plan_id = plan_prompt['servicePlan']
+			payload[:servicePlanId] = new_plan_id
+
+			volumes_response = @instances_interface.volumes(instance['id'])
+			current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+
+			begin
+				service_plan_options_json = @instance_types_interface.service_plan_options(new_plan_id, {cloudId: cloud_id, zoneId: cloud_id, layoutId: layout_id})
+				
+				# puts ""
+				# print JSON.pretty_generate(service_plan_options_json)
+				
+				plan_options = service_plan_options_json['plan']
+				volumes = prompt_resize_instance_volumes(current_volumes, plan_options, options, @api_client, {})
+
+				# puts "VOLUMES:"
+				# print JSON.pretty_generate(volumes)
+
+				if !volumes.empty?
+					payload[:volumes] = volumes
+				end
+
+				# puts "\nexiting early...\n"
+				# exit 1
+
+			rescue RestClient::Exception => e
+				print_red_alert "Unable to load options for selected plan."
+				print_rest_exception(e, options)
+				exit 1
+			end
+
+			# only amazon supports this option
+			# for now, always do this
+			payload[:deleteOriginalVolumes] = true
+
+			json_response = @instances_interface.resize(instance['id'], payload)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			else
+				print_green_success "Resizing instance #{instance['name']}"
+				list([])
+			end
+			
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -585,9 +711,12 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances backup [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
+		end
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1 
 		end
-		puts "\n#{optparse.banner}\n\n" and exit 1 if args.count < 1
 		optparse.parse(args)
 		connect(options)
 		begin
@@ -601,7 +730,7 @@ class Morpheus::Cli::Instances
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -612,7 +741,7 @@ class Morpheus::Cli::Instances
 			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
 				options[:group] = group
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -624,14 +753,8 @@ class Morpheus::Cli::Instances
 					params['site'] = group
 				end
 			end
-			if !options[:max].nil?
-				params['max'] = options[:max]
-			end
-			if !options[:offset].nil?
-				params['offset'] = options[:offset]
-			end
-			if !options[:phrase].nil?
-				params['phrase'] = options[:phrase]
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
 			end
 
 			json_response = @instances_interface.get(params)
@@ -661,15 +784,15 @@ class Morpheus::Cli::Instances
 						if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
 							connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
 						end
-						{id: instance['id'], name: instance['name'], connection: connection_string, environment: instance['instanceContext'], nodes: instance['containers'].count, status: status_string, type: instance['instanceType']['name'], group: !instance['group'].nil? ? instance['group']['name'] : nil}
+						{id: instance['id'], name: instance['name'], connection: connection_string, environment: instance['instanceContext'], nodes: instance['containers'].count, status: status_string, type: instance['instanceType']['name'], group: !instance['group'].nil? ? instance['group']['name'] : nil, cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil}
 					end
-					tp instance_table, :id, :name,:group, :type, :environment, :nodes, :connection, :status
+					tp instance_table, :id, :name, :group, :cloud, :type, :environment, :nodes, :connection, :status
 				end
 				print reset,"\n\n"
 			end
 			
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -685,7 +808,7 @@ class Morpheus::Cli::Instances
 			opts.on( '-B', '--keep-backups', "Preserve copy of backups" ) do
 				query_params[:keepBackups] = 'on'
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 
 		end
 		if args.count < 1
@@ -696,13 +819,13 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			instance = find_instance_by_name(args[0])
-			if !::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove this instance?", options)
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove this instance?", options)
 				exit 1
 			end
 			@instances_interface.destroy(instance['id'],query_params)
 			list([])
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -711,7 +834,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances firewall-disable [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -724,7 +847,7 @@ class Morpheus::Cli::Instances
 			@instances_interface.firewall_disable(instance['id'])
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -733,7 +856,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances firewall-enable [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -750,7 +873,7 @@ class Morpheus::Cli::Instances
 			@instances_interface.firewall_enable(instance_results['instances'][0]['id'])
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -759,7 +882,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances security-groups [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -785,7 +908,7 @@ class Morpheus::Cli::Instances
 			print reset,"\n\n"
 
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -803,7 +926,7 @@ class Morpheus::Cli::Instances
 				options[:securityGroupIds] = secgroups.split(",")
 				clear_or_secgroups_specified = true
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -822,7 +945,7 @@ class Morpheus::Cli::Instances
 			@instances_interface.apply_security_groups(instance['id'], options)
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -833,7 +956,7 @@ class Morpheus::Cli::Instances
 		
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances run-workflow [INSTANCE] [name] [options]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		if args.count < 2
 			puts "\n#{optparse}\n\n"
@@ -877,7 +1000,7 @@ class Morpheus::Cli::Instances
 				puts "Running workflow..."
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -887,7 +1010,7 @@ private
 	def find_instance_by_name(name)
 		instance_results = @instances_interface.get({name: name})
 		if instance_results['instances'].empty?
-			puts "Instance not found by name #{name}"
+			print_red_alert "Instance not found by name #{name}"
 			exit 1
 		end
 		return instance_results['instances'][0]
@@ -897,7 +1020,7 @@ private
 		if !task_set_results['taskSets'].nil? && !task_set_results['taskSets'].empty?
 			return task_set_results['taskSets'][0]
 		else
-			puts "Workflow not found by name #{name}"
+			print_red_alert "Workflow not found by name #{name}"
 			exit 1
 		end
 	end