morpheus-cli 2.9.4 → 2.10.0

data/lib/morpheus/cli/instance_types.rb

@@ -10,8 +10,6 @@ class Morpheus::Cli::InstanceTypes
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
 		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
 		@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
-		@active_groups = ::Morpheus::Cli::Groups.load_group_file
 	end
 
 

data/lib/morpheus/cli/instances.rb

@@ -41,7 +41,7 @@ class Morpheus::Cli::Instances
 
 
 	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]"
+		usage = "Usage: morpheus instances [list,details,add,update,remove,stop,start,restart,backup,run-workflow,stop-service,start-service,restart-service,resize,upgrade,clone,envs,setenv,delenv] [name]"
 		if args.empty?
 			puts "\n#{usage}\n\n"
 			return 
@@ -50,8 +50,12 @@ class Morpheus::Cli::Instances
 		case args[0]
 			when 'list'
 				list(args[1..-1])
+			when 'details'
+				details(args[1..-1])
 			when 'add'
 				add(args[1..-1])
+			when 'update'
+				update(args[1..-1])
 			when 'remove'
 				remove(args[1..-1])
 			when 'stop'
@@ -74,8 +78,6 @@ class Morpheus::Cli::Instances
 				stats(args[1..-1])
 			when 'logs'
 				logs(args[1..-1])
-			when 'details'
-				details(args[1..-1])
 			when 'envs'
 				envs(args[1..-1])
 			when 'setenv'
@@ -101,146 +103,51 @@ class Morpheus::Cli::Instances
 	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
+			opts.banner = "Usage: morpheus instances add [type] [name]"
+			opts.on( '-g', '--group GROUP', "Group Name" ) do |val|
+				options[:group_name] = val
 			end
-			opts.on( '-c', '--cloud CLOUD', "Cloud" ) do |val|
-				options[:cloud] = val
+			opts.on( '-G', '--group-id ID', "Group Id" ) do |val|
+				options[:group_id] = val
+			end
+			opts.on( '-c', '--cloud CLOUD', "Cloud Name" ) do |val|
+				options[:cloud_name] = val
+			end
+			# this conflicts with --nocolor option
+			# opts.on( '-C', '--cloud CLOUD', "Cloud Id" ) do |val|
+			# 	options[:cloud] = val
+			# end
+			opts.on( '-t', '--type CODE', "Instance Type" ) do |val|
+				options[:instance_type_code] = val
 			end
 			build_common_options(opts, options, [:options, :json, :dry_run, :remote])
 			
 		end
 
-		if args.count < 2
-			puts "\n#{optparse}\n\n"
-			return
-		end
 		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?
-			exit 1
-		end
-		group_id = nil
-		if !options[:group].nil?
-			group_id = find_group_by_name(options[:group])
-		else
-			group_id = @active_groups[@appliance_name.to_sym]	
-		end
-
-		if group_id.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_id = find_cloud_by_name(group_id, options[:cloud])
-		if cloud_id.nil?
-			puts "Cloud not found! \n #{optparse}"
-			exit 1
-		end
 
-		payload = {
-			:servicePlan => nil,
-			:zoneId => cloud_id,
-			:instance => {
-				:name => instance_name,
-				:site => {
-					:id => group_id
-				},
-				:instanceType => {
-					:code => instance_type_code
-				}
-			}
-		}
-
-		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: group_id, cloudId: cloud_id, 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: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
-		layout_id = layout_prompt['layout']
-		layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'] == layout_id.to_i}
-		payload[:instance][:layout] = {id: layout['id']}
-
-		# prompt for service plan
-		service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, layoutId: layout_id})
-		service_plans = service_plans_json["plans"]
-		service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
-		plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
-		service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['servicePlan'].to_i }
-		payload[:servicePlan] = service_plan["id"]
-
-		# prompt for volumes
-		volumes = prompt_volumes(service_plan, options, @api_client, {})
-		if !volumes.empty?
-			payload[:volumes] = volumes
-		end
-
-		if layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasNetworks"]
-			# prompt for network interfaces (if supported)
-			begin
-				network_interfaces = prompt_network_interfaces(cloud_id, layout["provisionType"]["id"], options, @api_client)
-				if !network_interfaces.empty?
-					payload[:networkInterfaces] = network_interfaces
-				end
-			rescue RestClient::Exception => e
-				print_yellow_warning "Unable to load network options. Proceeding..."
-				print_rest_exception(e, options) if Morpheus::Logging.print_stacktrace?
+		# support old format of `instance add TYPE NAME`
+		if args[0] && args[0] !~ /\A\-/
+			options[:instance_type_code] = args[0]
+			if args[1] && args[1] !~ /\A\-/
+				options[:instance_name] = args[1]
 			end
 		end
 		
-		
-		type_payload = {}
-		if !layout['optionTypes'].nil? && !layout['optionTypes'].empty?
-			type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, 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: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
-		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?
-			instance_type_option_types = layout['provisionType']['optionTypes']
-			# remove volume options if volumes were configured
-			if !payload[:volumes].empty?
-				instance_type_option_types = reject_volume_option_types(instance_type_option_types)
-			end
-			# remove networkId option if networks were configured above
-			if !payload[:networkInterfaces].empty?
-				instance_type_option_types = reject_networking_option_types(instance_type_option_types)
-			end
-			provision_payload = Morpheus::Cli::OptionTypes.prompt(instance_type_option_types,options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+		# use active group by default
+		if !options[:group_name] && !options[:group_id]
+			options[:group_id] = @active_groups[@appliance_name.to_sym]
 		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
+		options[:name_required] = true
+		
+		begin
 
-		# avoid 500 error
-		payload[:servicePlanOptions] = {}
+			payload = prompt_new_instance(options)
 
-		begin
 			if options[:dry_run]
-				print "\n" ,cyan, bold, "DRY RUN\n","==================", "\n\n", reset
-				print cyan
-				print "Request: ", "\n"
-				print reset
-				print "POST #{@appliance_url}/api/instances", "\n\n"
-				print cyan
-				print "JSON: ", "\n"
-				print reset
-				print JSON.pretty_generate(payload)
-				print "\n"
-				print reset
+				print_dry_run("POST #{@appliance_url}/api/instances", payload)
 				return
 			end
 			json_response = @instances_interface.create(payload)
@@ -248,6 +155,7 @@ class Morpheus::Cli::Instances
 				print JSON.pretty_generate(json_response)
 				print "\n"
 			else
+				instance_name = json_response["instance"]["name"]
 				print_green_success "Provisioning instance #{instance_name}"
 				list([])
 			end
@@ -257,6 +165,74 @@ class Morpheus::Cli::Instances
 		end
 	end
 
+	def update(args)
+		usage = "Usage: morpheus instances update [name] [options]"
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse(args)
+    if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+    connect(options)
+
+    begin
+  		
+  		instance = find_instance_by_name_or_id(args[0])
+
+			# group = find_group_from_options(options)
+
+			payload = {
+				'instance' => {id: instance["id"]}
+			}
+
+			update_instance_option_types = [
+				{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this instance'},
+				{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
+				{'fieldName' => 'instanceContext', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => instance_context_options()},
+				{'fieldName' => 'tags', 'fieldLabel' => 'Tags', 'type' => 'text', 'required' => false}
+			]
+
+			params = options[:options] || {}
+
+      if params.empty?
+        puts "\n#{usage}\n"
+        option_lines = update_instance_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
+        puts "\nAvailable Options:\n#{option_lines}\n\n"
+        exit 1
+      end
+
+      instance_keys = ['name', 'description', 'instanceContext', 'tags']
+      params = params.select {|k,v| instance_keys.include?(k) }
+      params['tags'] = params['tags'].split(',').collect {|it| it.to_s.strip }.compact.uniq if params['tags']
+      payload['instance'].merge!(params)
+			
+      json_response = @instances_interface.update(instance["id"], payload)
+
+      if options[:dry_run]
+      	print_dry_run("PUT #{@appliance_url}/api/instances", payload)
+				return
+			end
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Updated instance #{instance['name']}"
+        list([])
+        # details_options = [payload['app']['name']]
+        # details(details_options)
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+	end
+
 	def stats(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
@@ -270,14 +246,14 @@ class Morpheus::Cli::Instances
 		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]}"
+			instance = find_instance_by_name_or_id(args[0])
+			json_response = @instances_interface.get(instance['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
 				return
 			end
-			instance = instance_results['instances'][0]
-			instance_id = instance['id']
-			stats = instance_results['stats'][instance_id.to_s]
+			instance = json_response['instance']
+			stats = json_response['stats'] || {}
 			if options[:json]
 				print JSON.pretty_generate(stats)
 				print "\n"
@@ -312,7 +288,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			container_ids = instance['containers']
 			if options[:node_id] && container_ids.include?(options[:node_id])
 				container_ids = [options[:node_id]]
@@ -353,23 +329,53 @@ class Morpheus::Cli::Instances
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
-			return
+			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]}"
+			instance = find_instance_by_name_or_id(args[0])
+			json_response = @instances_interface.get(instance['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
 				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"
+			instance = json_response['instance']
+			stats = json_response['stats'] || {}
+			# load_balancers = stats = json_response['loadBalancers'] || {}
+
+			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
+
+			print "\n" ,cyan, bold, "Instance Details\n","==================", reset, "\n\n"
+			print cyan
+			puts "ID: #{instance['id']}"
+			puts "Name: #{instance['name']}"
+			puts "Description: #{instance['description']}"
+			puts "Group: #{instance['group'] ? instance['group']['name'] : ''}"
+			puts "Cloud: #{instance['cloud'] ? instance['cloud']['name'] : ''}"
+			puts "Type: #{instance['instanceType']['name']}"
+			puts "Environment: #{instance['instanceContext']}"
+			puts "Nodes: #{instance['containers'] ? instance['containers'].count : 0}"
+			puts "Connection: #{connection_string}"
+			#puts "Account: #{instance['account'] ? instance['account']['name'] : ''}"
+			puts "Status: #{status_string}"
 			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
+
+			#puts instance
 		rescue RestClient::Exception => e
 			print_rest_exception(e, options)
 			exit 1
@@ -389,7 +395,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(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'] || {}
@@ -428,7 +434,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			evar = {name: args[1], value: args[2], export: options[:export], masked: options[:masked]}
 			params = {}
 			@instances_interface.create_env(instance['id'], [evar])
@@ -452,7 +458,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			@instances_interface.del_env(instance['id'], args[1])
 			envs([args[0]])
 		rescue RestClient::Exception => e
@@ -474,7 +480,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
 				exit 1
 			end
@@ -503,7 +509,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			json_response = @instances_interface.start(instance['id'])
 			if options[:json]
 				print JSON.pretty_generate(json_response)
@@ -529,7 +535,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
 				exit 1
 			end
@@ -558,7 +564,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
 				exit 1
 			end
@@ -589,7 +595,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			json_response = @instances_interface.start(instance['id'],false)
 			if options[:json]
 				print JSON.pretty_generate(json_response)
@@ -617,7 +623,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
 				exit 1
 			end
@@ -639,7 +645,7 @@ class Morpheus::Cli::Instances
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances resize [name]"
-			build_common_options(opts, options, [:options, :json, :remote])
+			build_common_options(opts, options, [:options, :json, :dry_run, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -648,17 +654,19 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 
 			group_id = instance['group']['id']
 			cloud_id = instance['cloud']['id']
 			layout_id = instance['layout']['id']
 
 			plan_id = instance['plan']['id']
-			payload = {}
+			payload = {
+				:instance => {:id => instance["id"]}
+			}
 
 			# avoid 500 error
-			payload[:servicePlanOptions] = {}
+			# 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"
 
@@ -676,6 +684,7 @@ class Morpheus::Cli::Instances
 			new_plan_id = service_plan["id"]
 			#payload[:servicePlan] = new_plan_id # ew, this api uses servicePlanId instead
 			payload[:servicePlanId] = new_plan_id
+			payload[:instance][:plan] = {id: service_plan["id"]}
 
 			volumes_response = @instances_interface.volumes(instance['id'])
 			current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
@@ -690,6 +699,10 @@ class Morpheus::Cli::Instances
 			# for now, always do this
 			payload[:deleteOriginalVolumes] = true
 
+			if options[:dry_run]
+				print_dry_run("PUT #{@appliance_url}/api/instances/#{instance['id']}/resize", payload)
+				return
+			end
 			json_response = @instances_interface.resize(instance['id'], payload)
 			if options[:json]
 				print JSON.pretty_generate(json_response)
@@ -718,7 +731,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			json_response = @instances_interface.backup(instance['id'])
 			if options[:json]
 				print JSON.pretty_generate(json_response)
@@ -736,8 +749,8 @@ class Morpheus::Cli::Instances
 	def list(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
-			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
-				options[:group] = group
+			opts.on( '-g', '--group GROUP', "Group Name" ) do |val|
+				options[:group_name] = val
 			end
 			build_common_options(opts, options, [:list, :json, :remote])
 		end
@@ -745,11 +758,9 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			params = {}
-			if !options[:group].nil?
-				group = find_group_by_name(options[:group])
-				if !group.nil?
-					params['site'] = group
-				end
+			group = find_group_from_options(options)
+			if group
+				params['site'] = group['id']
 			end
 			[:phrase, :offset, :max, :sort, :direction].each do |k|
 				params[k] = options[k] unless options[k].nil?
@@ -816,8 +827,8 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
-			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove this instance?", options)
+			instance = find_instance_by_name_or_id(args[0])
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the instance '#{instance['name']}'?", options)
 				exit 1
 			end
 			@instances_interface.destroy(instance['id'],query_params)
@@ -841,7 +852,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			@instances_interface.firewall_disable(instance['id'])
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
@@ -889,7 +900,7 @@ class Morpheus::Cli::Instances
 		optparse.parse(args)
 		connect(options)
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			instance_id = instance['id']
 			json_response = @instances_interface.security_groups(instance_id)
 
@@ -939,7 +950,7 @@ class Morpheus::Cli::Instances
 		end
 
 		begin
-			instance = find_instance_by_name(args[0])
+			instance = find_instance_by_name_or_id(args[0])
 			@instances_interface.apply_security_groups(instance['id'], options)
 			security_groups([args[0]])
 		rescue RestClient::Exception => e
@@ -963,7 +974,7 @@ class Morpheus::Cli::Instances
 		
 		optparse.parse(args)
 		connect(options)
-		instance = find_instance_by_name(args[0])
+		instance = find_instance_by_name_or_id(args[0])
 		workflow = find_workflow_by_name(args[1])
 		task_types = @tasks_interface.task_types()
 		editable_options = []
@@ -1005,14 +1016,37 @@ class Morpheus::Cli::Instances
 
 private 
 	
+	def find_instance_by_id(id)
+		instance_results = @instances_interface.get(id.to_i)
+		if instance_results['instance'].empty?
+			print_red_alert "Instance not found by id #{id}"
+			exit 1
+		end
+		instance = instance_results['instance']
+		# instance['stats'] = instance_results['stats'] || {}
+		# instance['loadBalancers'] = instance_results['loadBalancers'][0]['lbs'] || {}
+		return instance
+	end
+
 	def find_instance_by_name(name)
 		instance_results = @instances_interface.get({name: name})
 		if instance_results['instances'].empty?
 			print_red_alert "Instance not found by name #{name}"
 			exit 1
 		end
-		return instance_results['instances'][0]
+		instance = instance_results['instances'][0]
+		# instance['stats'] = instance_results['stats'][instance['id'].to_s] || {}
+		return instance
+	end
+
+	def find_instance_by_name_or_id(val)
+		if val.to_s =~ /\A\d{1,}\Z/
+			return find_instance_by_id(val)
+		else
+			return find_instance_by_name(val)
+		end
 	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?
@@ -1022,32 +1056,5 @@ private
 			exit 1
 		end
 	end
-	def find_group_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(group_id, name)
-		option_results = @options_interface.options_for_source('clouds',{groupId: group_id})
-		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_instance_type_by_code(code)
-		instance_type_results = @instance_types_interface.get({code: code})
-		if instance_type_results['instanceTypes'].empty?
-			puts "Instance Type not found by code #{code}"
-			return nil
-		end
-		return instance_type_results['instanceTypes'][0]
-	end
 end