morpheus-cli 0.1.1 → 0.9.0

data/lib/morpheus/cli/instances.rb

@@ -12,21 +12,37 @@ class Morpheus::Cli::Instances
 	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()
+		
+	end
+
+	def connect(opts)
+		if opts[:remote]
+			@appliance_url = opts[:remote]
+			@appliance_name = opts[:remote]
+			@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials(opts)
+		else
+			@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials(opts)
+		end
+		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)		
 		@instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
+		@task_sets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).task_sets
+		@logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
+		@tasks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).tasks
 		@instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
 		@groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
+		@provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
+		@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
+			exit 1
+		end
 	end
 
 
 	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
-			return 1
-		end
 		if args.empty?
-			puts "\nUsage: morpheus instances [list,add,remove,stop,start,restart,resize,upgrade,clone,envs,setenv,delenv,firewall_disable,firewall_enable,security_groups,apply_security_groups] [name]\n\n"
+			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"
 			return 
 		end
 
@@ -43,8 +59,18 @@ class Morpheus::Cli::Instances
 				start(args[1..-1])
 			when 'restart'
 				restart(args[1..-1])
+			when 'stop-service'
+				stop_service(args[1..-1])
+			when 'start-service'
+				start_service(args[1..-1])
+			when 'restart-service'
+				restart_service(args[1..-1])
+			when 'run-workflow'
+				run_workflow(args[1..-1])
 			when 'stats'
 				stats(args[1..-1])
+			when 'logs'
+				logs(args[1..-1])
 			when 'details'
 				details(args[1..-1])
 			when 'envs'
@@ -53,37 +79,76 @@ class Morpheus::Cli::Instances
 				setenv(args[1..-1])	
 			when 'delenv'
 				delenv(args[1..-1])	
-			when 'firewall_disable'
+			when 'firewall-disable'
 				firewall_disable(args[1..-1])	
-			when 'firewall_enable'
+			when 'firewall-enable'
 				firewall_enable(args[1..-1])	
-			when 'security_groups'	
+			when 'security-groups'	
 				security_groups(args[1..-1])	
-			when 'apply_security_groups'	
+			when 'apply-security-groups'	
 				apply_security_groups(args[1..-1])	
+			when 'backup'
+				backup(args[1..-1])	
 			else
-				puts "\nUsage: morpheus instances [list,add,remove,stop,start,restart,resize,upgrade,clone,envs,setenv,delenv] [name]\n\n"
+				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"
+				exit 127
 		end
 	end
 
 	def add(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances add TYPE NAME"
+			opts.on( '-g', '--group GROUP', "Group" ) do |val|
+				options[:group] = val
+			end
+			opts.on( '-c', '--cloud CLOUD', "Cloud" ) do |val|
+				options[:cloud] = val
+			end
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			
+		end
+
 		if args.count < 2
-			puts "\nUsage: morpheus instances add NAME TYPE\n\n"
+			puts "\n#{optparse}\n\n"
 			return
 		end
-
-		instance_name = args[0]
-		instance_type_code = args[1]
+		optparse.parse(args)
+		connect(options)
+		instance_name = args[1]
+		instance_type_code = args[0]
 		instance_type = find_instance_type_by_code(instance_type_code)
 		if instance_type.nil?
-			print reset,"\n\n"
-			return
+			exit 1
+		end
+		groupId = nil
+		if !options[:group].nil?
+			group = find_group_by_name(options[:group])
+			if !group.nil?
+				groupId = group
+			end
+		else
+			groupId = @active_groups[@appliance_name.to_sym]	
 		end
 
-		groupId = @active_groups[@appliance_name.to_sym]
+		if groupId.nil?
+			puts "Group not found or specified! \n #{optparse}"
+			exit 1
+		end
+
+		if options[:cloud].nil?
+			puts "Cloud not specified! \n #{optparse}"
+			exit 1
+		end
+		cloud = find_cloud_by_name(groupId,options[:cloud])
+		if cloud.nil?
+			puts "Cloud not found! \n #{optparse}"
+			exit 1
+		end
 
-		options = {
+		payload = {
 			:servicePlan => nil,
+			zoneId: cloud,
 			:instance => {
 				:name => instance_name,
 				:site => {
@@ -95,77 +160,60 @@ class Morpheus::Cli::Instances
 			}
 		}
 
+		version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption':true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],@api_client,{groupId: groupId, cloudId: cloud, instanceTypeId: instance_type['id']})
+		layout_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.'}],options[:options],@api_client,{groupId: groupId, cloudId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+		layout_id = layout_prompt['layout']
+		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']})
+		payload[:servicePlan] = plan_prompt['servicePlan']
+		layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'].to_i == layout_id.to_i}
 		instance_type['instanceTypeLayouts'].sort! { |x,y| y['sortOrder'] <=> x['sortOrder'] }
-		puts "Configurations: "
-		instance_type['instanceTypeLayouts'].each_with_index do |layout, index|
-			puts "  #{index+1}) #{layout['name']} (#{layout['code']})"
-		end
-		print "Selection: "
-		layout_selection = nil
-		layout = nil
-		while true do
-			layout_selection = $stdin.gets.chomp!
-			if layout_selection.to_i.to_s == layout_selection
-				layout_selection = layout_selection.to_i
-				break
-			end
+		
+		payload[:instance][:layout] = {id: layout['id']}
+
+		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']})
+		elsif !instance_type['optionTypes'].nil? && instance_type['optionTypes'].empty?
+			type_payload = Morpheus::Cli::OptionTypes.prompt(instance_type['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		end
-		layout = instance_type['instanceTypeLayouts'][layout_selection-1]['id']
-		options[:instance][:layout] = {id: layout}
-		print "\n"
-		if options[:servicePlan].nil?
-			plans = @instance_types_interface.service_plans(layout)
-			puts "Select a Plan: "
-			plans['servicePlans'].each_with_index do |plan, index|
-				puts "  #{index+1}) #{plan['name']}"
-			end
-			print "Selection: "
-			plan_selection = nil
-			while true do
-				plan_selection = $stdin.gets.chomp!
-				if plan_selection.to_i.to_s == plan_selection
-					plan_selection = plan_selection.to_i
-					break
-				end
-			end
-			options[:servicePlan] = plans['servicePlans'][plan_selection-1]['id']
-			print "\n"
-		end
-
-		if !instance_type['config'].nil?
-			instance_type_config = JSON.parse(instance_type['config'])
-			if instance_type_config['options'].nil? == false
-				instance_type_config['options'].each do |opt|
-					print "#{opt['label']}: "
-					if(opt['name'].downcase.include?("password"))
-						options[opt['name']] = STDIN.noecho(&:gets).chomp!
-						print "\n"
-					else
-						options[opt['name']] = $stdin.gets.chomp!
-					end
-					
-				end
-			end
+		if !type_payload['config'].nil?
+			payload.merge!(type_payload['config'])
+		end
+
+		provision_payload = {}
+		if !layout['provisionType'].nil? && !layout['provisionType']['optionTypes'].nil? && !layout['provisionType']['optionTypes'].empty?
+			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
+
+		if !provision_payload.nil? && !provision_payload['config'].nil?
+			payload.merge!(provision_payload['config'])
+		end
+		if !provision_payload.nil? && !provision_payload['server'].nil?
+			payload[:server] = provision_payload['server']
 		end
+
 		begin
-			@instances_interface.create(options)
-		rescue => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			@instances_interface.create(payload)
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			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)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances stats [name]\n\n"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
 			instance_results = @instances_interface.get({name: args[0]})
 			if instance_results['instances'].empty?
@@ -175,26 +223,85 @@ class Morpheus::Cli::Instances
 			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 
+			if options[:json]
+				print JSON.pretty_generate(stats)
+				print "\n"
+			else
+				print "\n" ,cyan, bold, "#{instance['name']} (#{instance['instanceType']['name']})\n","==================", "\n\n", reset, cyan
+				stats_map = {}
+				stats_map[:memory] = "#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}"
+				stats_map[:storage] = "#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}"
+				stats_map[:cpu] = "#{stats['usedCpu'].to_f.round(2)}%"
+				tp [stats_map], :memory,:storage,:cpu
+				print reset, "\n"
+			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
+		end
+	end
+
+	def logs(args) 
+		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
+		end
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			return
+		end
+		optparse.parse(args)
+		connect(options)
+		begin
+			instance = find_instance_by_name(args[0])
+			container_ids = instance['containers']
+			if options[:node_id] && container_ids.include?(options[:node_id])
+				container_ids = [options[:node_id]]
+			end
+			logs = @logs_interface.container_logs(container_ids, { max: options[:max] || 100, offset: options[:offset] || 0, query: options[:phrase]})
+			if options[:json]
+				puts logs
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				logs['data'].reverse.each do |log_entry|
+					log_level = ''
+					case log_entry['level']
+						when 'INFO'
+							log_level = "#{blue}#{bold}INFO#{reset}"
+						when 'DEBUG'
+							log_level = "#{white}#{bold}DEBUG#{reset}"
+						when 'WARN'
+							log_level = "#{yellow}#{bold}WARN#{reset}"
+						when 'ERROR'
+							log_level = "#{red}#{bold}ERROR#{reset}"
+						when 'FATAL'
+							log_level = "#{red}#{bold}FATAL#{reset}"
+					end
+					puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}"
+				end
+				print reset,"\n"
 			end
-			return nil
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def details(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances details [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances stats [name]\n\n"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
 			instance_results = @instances_interface.get({name: args[0]})
 			if instance_results['instances'].empty?
@@ -209,30 +316,26 @@ 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
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def envs(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances envs [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances envs [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-			instance = instance_results['instances'][0]
-			instance_id = instance['id']
-			env_results = @instances_interface.get_envs(instance_id)
+			instance = find_instance_by_name(args[0])
+			env_results = @instances_interface.get_envs(instance['id'])
 			print "\n" ,cyan, bold, "#{instance['name']} (#{instance['instanceType']['name']})\n","==================", "\n\n", reset, cyan
 			envs = env_results['envs'] || {}
 			if env_results['readOnlyEnvs']
@@ -245,148 +348,245 @@ class Morpheus::Cli::Instances
 			print reset, "\n"
 			
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def setenv(args)
+		options = {}
+
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances setenv INSTANCE NAME VALUE [-e]"
+			opts.on( '-e', "Exportable" ) do |exportable|
+					options[:export] = exportable
+				end
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 3
-			puts "\nUsage: morpheus instances setenv INSTANCE NAME VALUE [-e]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-			instance = instance_results['instances'][0]
-			instance_id = instance['id']
-			evar = {name: args[1], value: args[2], export: false}
+			instance = find_instance_by_name(args[0])
+			evar = {name: args[1], value: args[2], export: options[:export]}
 			params = {}
-			optparse = OptionParser.new do|opts|
-				opts.on( '-e', "Exportable" ) do |exportable|
-					evar[:export] = exportable
-				end
-			end
-			optparse.parse(args)
-
-			@instances_interface.create_env(instance_id, [evar])
+			@instances_interface.create_env(instance['id'], [evar])
 			envs([args[0]])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def delenv(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances setenv INSTANCE NAME"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 2
-			puts "\nUsage: morpheus instances setenv INSTANCE NAME\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-			instance = instance_results['instances'][0]
-			instance_id = instance['id']
-			name = args[1]
-
-			@instances_interface.del_env(instance_id, name)
+			instance = find_instance_by_name(args[0])
+			@instances_interface.del_env(instance['id'], args[1])
 			envs([args[0]])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def stop(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances stop [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances stop [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
+			instance = find_instance_by_name(args[0])
+			json_response = @instances_interface.stop(instance['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			end
-			@instances_interface.stop(instance_results['instances'][0]['id'])
-			list([])
+			return
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def start(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances start [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances start [name]\n\n"
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+		optparse.parse(args)
+		connect(options)
+		begin
+			instance = find_instance_by_name(args[0])
+			json_response = @instances_interface.start(instance['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			end
 			return
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
+		end
+	end
+
+	def restart(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances restart [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
 		end
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
+			instance = find_instance_by_name(args[0])
+			json_response = @instances_interface.restart(instance['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			end
-			@instances_interface.start(instance_results['instances'][0]['id'])
-			list([])
+			return
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
+		end
+	end
+
+		def stop_service(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances stop-service [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		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])
+			json_response = @instances_interface.stop(instance['id'],false)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				puts "Stopping service on #{args[0]}"
 			end
-			return nil
+			return
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
-	def restart(args)
+	def start_service(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances start-service [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances restart [name]\n\n"
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+		optparse.parse(args)
+		connect(options)
+		begin
+			instance = find_instance_by_name(args[0])
+			json_response = @instances_interface.start(instance['id'],false)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			else
+				puts "Starting service on #{args[0]}"
+			end
 			return
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
+		end
+	end
+
+	def restart_service(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances restart-service [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
+			instance = find_instance_by_name(args[0])
+			json_response = @instances_interface.restart(instance['id'],false)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			else
+				puts "Restarting service on instance #{args[0]}"
 			end
-			@instances_interface.restart(instance_results['instances'][0]['id'])
-			list([])
+			return
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
+		end
+	end
+
+	def backup(args) 
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances backup [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
+		puts "\n#{optparse.banner}\n\n" and exit 1 if args.count < 1
+		optparse.parse(args)
+		connect(options)
+		begin
+			instance = find_instance_by_name(args[0])
+			json_response = @instances_interface.backup(instance['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				puts "Backup initiated."
 			end
-			return nil
+			return
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
@@ -396,88 +596,124 @@ class Morpheus::Cli::Instances
 			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
 				options[:group] = group
 			end
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
 		end
 		optparse.parse(args)
+		connect(options)
 		begin
 			params = {}
 			if !options[:group].nil?
 				group = find_group_by_name(options[:group])
 				if !group.nil?
-					params['site'] = group['id']
+					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]
+			end
 
 			json_response = @instances_interface.get(params)
-			instances = json_response['instances']
-			print "\n" ,cyan, bold, "Morpheus Instances\n","==================", reset, "\n\n"
-			if instances.empty?
-				puts yellow,"No instances currently configured.",reset
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				instances.each do |instance|
-					print cyan, "=  #{instance['name']} (#{instance['instanceType']['name']}) - #{instance['status']['name']}\n"
+				instances = json_response['instances']
+
+				print "\n" ,cyan, bold, "Morpheus Instances\n","==================", reset, "\n\n"
+				if instances.empty?
+					puts yellow,"No instances currently configured.",reset
+				else
+					print cyan
+					instance_table = instances.collect do |instance|
+						status_string = instance['status']
+						if status_string == 'running'
+							status_string = "#{green}#{status_string.upcase}#{cyan}"
+						elsif status_string == 'stopped' or status_string == 'failed'
+							status_string = "#{red}#{status_string.upcase}#{cyan}"
+						elsif status_string == 'unknown'
+							status_string = "#{white}#{status_string.upcase}#{cyan}"
+						else
+							status_string = "#{yellow}#{status_string.upcase}#{cyan}"
+						end
+						connection_string = ''
+						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']}
+					end
+					tp instance_table, :id, :name, :type, :environment, :nodes, :connection, :status
 				end
+				print reset,"\n\n"
 			end
-			print reset,"\n\n"
 			
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def remove(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances remove [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances remove [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-			@instances_interface.destroy(instance_results['instances'][0]['id'])
+			instance = find_instance_by_name(args[0])
+			@instances_interface.destroy(instance['id'])
 			list([])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def firewall_disable(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances firewall-disable [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances firewall_disable [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-			@instances_interface.firewall_disable(instance_results['instances'][0]['id'])
+			instance = find_instance_by_name(args[0])
+			@instances_interface.firewall_disable(instance['id'])
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def firewall_enable(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances firewall-enable [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances firewall_enable [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
 			instance_results = @instances_interface.get({name: args[0]})
 			if instance_results['instances'].empty?
@@ -487,29 +723,26 @@ class Morpheus::Cli::Instances
 			@instances_interface.firewall_enable(instance_results['instances'][0]['id'])
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def security_groups(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances security-groups [name]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
 		if args.count < 1
-			puts "\nUsage: morpheus instances security_groups [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
+		optparse.parse(args)
+		connect(options)
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-
-			instance_id = instance_results['instances'][0]['id']
+			instance = find_instance_by_name(args[0])
+			instance_id = instance['id']
 			json_response = @instances_interface.security_groups(instance_id)
 
 			securityGroups = json_response['securityGroups']
@@ -525,43 +758,32 @@ class Morpheus::Cli::Instances
 			print reset,"\n\n"
 
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 	def apply_security_groups(args)
-		usage = <<-EOF
-Usage: morpheus instances apply_security_groups [name] [options]
-EOF
-		if args.count < 1
-			puts usage
-			return
-		end
-
 		options = {}
 		clear_or_secgroups_specified = false
 		optparse = OptionParser.new do|opts|
-			opts.banner = usage
+			opts.banner = "Usage: morpheus instances apply-security-groups [name] [options]"
 			opts.on( '-c', '--clear', "Clear all security groups" ) do
 				options[:securityGroupIds] = []
 				clear_or_secgroups_specified = true
 			end
-			opts.on( '-s', '--secgroups SECGROUPS', "Apply the specified comma separated security group ids" ) do |secgroups|
+			opts.on( '-S', '--secgroups SECGROUPS', "Apply the specified comma separated security group ids" ) do |secgroups|
 				options[:securityGroupIds] = secgroups.split(",")
 				clear_or_secgroups_specified = true
 			end
-			opts.on( '-h', '--help', "Prints this help" ) do
-				puts opts
-				exit
-			end
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
 		optparse.parse(args)
+		connect(options)
 
 		if !clear_or_secgroups_specified 
 			puts usage
@@ -569,33 +791,107 @@ EOF
 		end
 
 		begin
-			instance_results = @instances_interface.get({name: args[0]})
-			if instance_results['instances'].empty?
-				puts "Instance not found by name #{args[0]}"
-				return
-			end
-
-			@instances_interface.apply_security_groups(instance_results['instances'][0]['id'], options)
+			instance = find_instance_by_name(args[0])
+			@instances_interface.apply_security_groups(instance['id'], options)
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
+		end
+	end
+
+
+	def run_workflow(args)
+		options = {}
+		
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus instances run-workflow [INSTANCE] [name] [options]"
+			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+		end
+		if args.count < 2
+			puts "\n#{optparse}\n\n"
+			exit 1
+		end
+		
+		optparse.parse(args)
+		connect(options)
+		instance = find_instance_by_name(args[0])
+		workflow = find_workflow_by_name(args[1])
+		task_types = @tasks_interface.task_types()
+		editable_options = []
+		workflow['taskSetTasks'].sort{|a,b| a['taskOrder'] <=> b['taskOrder']}.each do |task_set_task|
+			task_type_id = task_set_task['task']['taskType']['id']
+			task_type = task_types['taskTypes'].find{ |current_task_type| current_task_type['id'] == task_type_id}
+			task_opts = task_type['optionTypes'].select { |otype| otype['editable']}
+			if !task_opts.nil? && !task_opts.empty?
+				editable_options += task_opts.collect do |task_opt|
+					new_task_opt = task_opt.clone
+					new_task_opt['fieldContext'] = "#{task_set_task['id']}.#{new_task_opt['fieldContext']}"
+				end
+			end
+		end
+		params = options[:options] || {}
+
+		if params.empty? && !editable_options.empty?
+			puts "\n#{optparse.banner}\n\n"
+			option_lines = editable_options.collect {|it| "\t-O #{it['fieldContext'] ? (it['fieldContext'] + '.') : ''}#{it['fieldName']}=\"value\"" }.join("\n")
+			puts "\nAvailable Options:\n#{option_lines}\n\n"
+			exit 1
+		end
+
+		workflow_payload = {taskSet: {"#{workflow['id']}": params }}
+		begin
+			
+			json_response = @instances_interface.workflow(instance['id'],workflow['id'], workflow_payload)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				puts "Running workflow..."
 			end
-			return nil
+		rescue RestClient::Exception => e
+			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			exit 1
 		end
 	end
 
 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}"
+			exit 1
+		end
+		return instance_results['instances'][0]
+	end
+	def find_workflow_by_name(name)
+		task_set_results = @task_sets_interface.get(name)
+		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}"
+			exit 1
+		end
+	end
 	def find_group_by_name(name)
-		group_results = @groups_interface.get(name)
-		if group_results['groups'].empty?
-			puts "Group not found by name #{name}"
+		option_results = @options_interface.options_for_source('groups',{})
+		match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
+		if match.nil?
+			return nil
+		else
+			return match['value']
+		end
+	end
+
+	def find_cloud_by_name(groupId,name)
+		option_results = @options_interface.options_for_source('clouds',{groupId: groupId})
+		match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
+		if match.nil?
 			return nil
+		else
+			return match['value']
 		end
-		return group_results['groups'][0]
 	end
 
 	def find_instance_type_by_code(code)