morpheus-cli 0.9.10 → 2.9.0

data/lib/morpheus/cli/remote.rb

@@ -1,12 +1,13 @@
 require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
+require 'morpheus/cli/cli_command'
 
 
 class Morpheus::Cli::Remote
-	include Term::ANSIColor
+	include Morpheus::Cli::CliCommand
+
 	def initialize() 
 		@appliances = ::Morpheus::Cli::Remote.load_appliance_file
 	end
@@ -32,35 +33,56 @@ class Morpheus::Cli::Remote
 	end
 
 	def list(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus remote list"
+			build_common_options(opts, options, [])
+		end
+		optparse.parse(args)
+
 		print "\n" ,cyan, bold, "Morpheus Appliances\n","==================", reset, "\n\n"
 		# print red, bold, "red bold", reset, "\n"
 		if @appliances == nil || @appliances.empty?
+			puts yellow,"No remote appliances configured.",reset
 		else
+			rows = @appliances.collect do |app_name, v|
+      	{
+      		active: (v[:active] ? "=>" : ""), 
+      		name: app_name, 
+      		host: v[:host]
+      	}
+    	end
+	    print cyan
+	    tp rows, {:active => {:display_name => ""}}, {:name => {:width => 16}}, {:host => {:width => 40}}
+	    print reset
+	  
+			# @appliances.each do |app_name, v| 
+			# 	print cyan
+			# 	if v[:active] == true
+			# 		print bold, "=> #{app_name}\t#{v[:host]}",reset,"\n"
+			# 	else
+			# 		print "=  #{app_name}\t#{v[:host]}",reset,"\n"
+			# 	end
+			# end
+
+			print "\n\n# => - current\n\n"
 		end
-		@appliances.each do |app_name, v| 
-			print cyan
-			if v[:active] == true
-				print bold, "=> #{app_name}\t#{v[:host]}",reset,"\n"
-			else
-				print "=  #{app_name}\t#{v[:host]}",reset,"\n"
-			end
-		end
-		print "\n\n# => - current\n\n"
 	end
 
 	def add(args)
-		if args.count < 2
-			puts "\nUsage: morpheus remote add [name] [host] [--default]\n\n"
-			return
-		end
-		params = {}
+		options = {}
 		optparse = OptionParser.new do|opts|
-			params[:default] = false
-			opts.on( '-d', '--default', "Default has been set" ) do
-				params[:default] = true
+			opts.banner = "Usage: morpheus remote add [name] [host] [--default]"
+			build_common_options(opts, options, [])
+			opts.on( '-d', '--default', "Make this the default remote appliance" ) do
+				options[:default] = true
 			end
 		end
 		optparse.parse(args)
+		if args.count < 2
+			puts "\n#{optparse.banner}\n\n"
+			return
+		end
 
 		name = args[0].to_sym
 		if @appliances[name] != nil
@@ -70,7 +92,7 @@ class Morpheus::Cli::Remote
 				host: args[1],
 				active: false
 			}
-			if params[:default] == true
+			if options[:default] == true
 				set_active_appliance name
 			end
 		end
@@ -79,10 +101,20 @@ class Morpheus::Cli::Remote
 	end
 
 	def remove(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus remote remove [name]"
+			build_common_options(opts, options, [])
+			opts.on( '-d', '--default', "Make this the default remote appliance" ) do
+				options[:default] = true
+			end
+		end
+		optparse.parse(args)
 		if args.empty?
-			puts "\nUsage: morpheus remote remove [name]\n\n"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
+		
 		name = args[0].to_sym
 		if @appliances[name] == nil
 			print red, "Remote appliance not configured for #{args[0]}", reset, "\n"
@@ -101,10 +133,20 @@ class Morpheus::Cli::Remote
 	end
 
 	def use(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus remote use [name]"
+			build_common_options(opts, options, [])
+			opts.on( '-d', '--default', "Make this the default remote appliance. This does the same thing as remote use." ) do
+				options[:default] = true
+			end
+		end
+		optparse.parse(args)
 		if args.empty?
-			puts "Usage: morpheus remote use [name]"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
+		
 		name = args[0].to_sym
 		if @appliances[name] == nil
 			print red, "Remote appliance not configured for #{args[0]}", reset, "\n"
@@ -141,12 +183,13 @@ class Morpheus::Cli::Remote
 		if File.exist? remote_file
 			return YAML.load_file(remote_file)
 		else
-			return {
-				morpheus: {
-					host: 'https://api.gomorpheus.com',
-					active: true
-				}
-			}
+			return {}
+			# return {
+			# 	morpheus: {
+			# 		host: 'https://api.gomorpheus.com',
+			# 		active: true
+			# 	}
+			# }
 		end
 	end
 

data/lib/morpheus/cli/roles.rb

@@ -23,6 +23,7 @@ class Morpheus::Cli::Roles
 			exit 1
 		end
 		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
+		@whoami_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).whoami
 		@users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
 		@accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
 		@roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
@@ -84,6 +85,8 @@ class Morpheus::Cli::Roles
 		connect(options)
 		begin
 			
+			load_whoami()
+
 			account = find_account_from_options(options)
 			account_id = account ? account['id'] : nil
 			
@@ -103,7 +106,7 @@ class Morpheus::Cli::Roles
 				if roles.empty?
 					puts yellow,"No roles found.",reset
 				else
-					print_roles_table(roles)
+					print_roles_table(roles, {is_master_account: @is_master_account})
 				end
 				print reset,"\n\n"
 			end
@@ -168,6 +171,8 @@ class Morpheus::Cli::Roles
 				puts "Name: #{role['authority']}"
 				puts "Description: #{role['description']}"
 				puts "Scope: #{role['scope']}"
+				puts "Type: #{format_role_type(role)}"
+				puts "Multitenant: #{role['multitenant'] ? 'Yes' : 'No'}"
 				puts "Owner: #{role['owner'] ? role['owner']['name'] : nil}"
 				puts "Date Created: #{format_local_dt(role['dateCreated'])}"
 				puts "Last Updated: #{format_local_dt(role['lastUpdated'])}"
@@ -268,25 +273,55 @@ class Morpheus::Cli::Roles
 		connect(options)
 		begin
 
+			load_whoami()
+			
 			account = find_account_from_options(options)
 			account_id = account ? account['id'] : nil
 
-			params = Morpheus::Cli::OptionTypes.prompt(add_role_option_types, options[:options], @api_client, options[:params])
+			# argh, some options depend on others here...eg. multitenant is only available when roleType == 'user'
+			#prompt_option_types = update_role_option_types()
 
-			#puts "parsed params is : #{params.inspect}"
-			role_keys = ['authority', 'description', 'instanceLimits']
-			role_payload = params.select {|k,v| role_keys.include?(k) }
-			if !role_payload['instanceLimits']
-				role_payload['instanceLimits'] = {}
-				role_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-				role_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-				role_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
+			role_payload = {}
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1}], options[:options])
+			role_payload['authority'] = v_prompt['authority']
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2}], options[:options])
+			role_payload['description'] = v_prompt['description']
+
+			if @is_master_account
+				v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => role_type_options, 'defaultValue' => 'user', 'displayOrder' => 3}], options[:options])
+				role_payload['roleType'] = v_prompt['roleType']
+			else
+				role_payload['roleType'] = 'user'
 			end
-			if params['baseRole'].to_s != ''
-				base_role = find_role_by_name(account_id, params['baseRole'])
+
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 4}], options[:options])
+			if v_prompt['baseRole'].to_s != ''
+				base_role = find_role_by_name(account_id, v_prompt['baseRole'])
 				exit 1 if base_role.nil?
 				role_payload['baseRoleId'] = base_role['id']
 			end
+
+			if @is_master_account
+				if role_payload['roleType'] == 'user'
+					v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use', 'displayOrder' => 5}], options[:options])
+					role_payload['multitenant'] = ['on','true'].include?(v_prompt['multitenant'].to_s)
+				end
+			end
+
+			role_payload['instanceLimits'] = {}
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8}], options[:options])
+			if v_prompt['instanceLimits.maxStorage'].to_s.strip != ''
+				role_payload['instanceLimits']['maxStorage'] = v_prompt['instanceLimits.maxStorage'].to_i
+			end
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9}], options[:options])
+			if v_prompt['instanceLimits.maxMemory'].to_s.strip != ''
+				role_payload['instanceLimits']['maxMemory'] = v_prompt['instanceLimits.maxMemory'].to_i
+			end
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10}], options[:options])
+			if v_prompt['instanceLimits.maxCpu'].to_s.strip != ''
+				role_payload['instanceLimits']['maxCpu'] = v_prompt['instanceLimits.maxCpu'].to_i
+			end
+
 			request_payload = {role: role_payload}
 			response = @roles_interface.create(account_id, request_payload)
 
@@ -327,18 +362,27 @@ class Morpheus::Cli::Roles
 		
 		begin
 
+			load_whoami()
+
 			account = find_account_from_options(options)
 			account_id = account ? account['id'] : nil
 
 			role = find_role_by_name(account_id, name)
 			exit 1 if role.nil?
 
-			#params = Morpheus::Cli::OptionTypes.prompt(update_role_option_types, options[:options], @api_client, options[:params])
+			prompt_option_types = update_role_option_types()
+			if !@is_master_account
+				prompt_option_types = prompt_option_types.reject {|it| ['roleType', 'multitenant'].include?(it['fieldName']) }
+			end
+			if role['roleType'] != 'user'
+				prompt_option_types = prompt_option_types.reject {|it| ['multitenant'].include?(it['fieldName']) }
+			end
+			#params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
 			params = options[:options] || {}
 
 			if params.empty?
 				puts "\n#{usage}\n\n"
-				option_lines = update_role_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
+				option_lines = prompt_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
 				puts "\nAvailable Options:\n#{option_lines}\n\n"
 				exit 1
 			end
@@ -352,6 +396,10 @@ class Morpheus::Cli::Roles
 				role_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
 				role_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
 			end
+
+			if params['multitenant'].to_s != ''
+				role_payload['multitenant'] = ['on','true'].include?(v_prompt['multitenant'].to_s)
+			end
 			request_payload = {role: role_payload}
 			response = @roles_interface.update(account_id, role['id'], request_payload)
 			
@@ -785,28 +833,31 @@ class Morpheus::Cli::Roles
 
 private
 	
-	def get_access_string(val)
-		val ||= 'none'
-		if val == 'none'
-			"#{white}#{val.to_s.capitalize}#{cyan}"
-		else
-			"#{green}#{val.to_s.capitalize}#{cyan}"
-		end
-	end
+	# def get_access_string(val)
+	# 	val ||= 'none'
+	# 	if val == 'none'
+	# 		"#{white}#{val.to_s.capitalize}#{cyan}"
+	# 	else
+	# 		"#{green}#{val.to_s.capitalize}#{cyan}"
+	# 	end
+	# end
 
 	def add_role_option_types
 		[
 			{'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
 			{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-			{'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 3},
+			{'fieldName' => 'roleType', 'fieldLabel' => 'Role Type', 'type' => 'select', 'selectOptions' => [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}], 'defaultValue' => 'user', 'displayOrder' => 3},
+			{'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 4},
+			{'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use', 'displayOrder' => 5},
 			{'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
 			{'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
 			{'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
 		]
 	end
 
+	"A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use"
 	def update_role_option_types
-		add_role_option_types.reject {|it| ['baseRole'].include?(it['fieldName']) }
+		add_role_option_types.reject {|it| ['roleType', 'baseRole'].include?(it['fieldName']) }
 	end
 
 
@@ -852,4 +903,18 @@ private
 		return results['instanceTypes'][0]
 	end
 
+	def load_whoami
+		whoami_response = @whoami_interface.get()
+		@current_user = whoami_response["user"] 
+		if @current_user.empty?
+			print_red_alert "Unauthenticated. Please login."
+			exit 1
+		end
+		@is_master_account = whoami_response["isMasterAccount"]
+	end
+
+	def role_type_options
+		[{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}]
+	end
+
 end

data/lib/morpheus/cli/shell.rb

@@ -1,7 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'table_print'
 require 'morpheus/cli/cli_command'
@@ -13,7 +12,7 @@ require 'fileutils'
 
 class Morpheus::Cli::Shell
 	include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
 		@auto_complete = proc do |s|
@@ -55,7 +54,6 @@ class Morpheus::Cli::Shell
 		@history_logger.info "shell started" if @history_logger
 		load_history_from_log_file()
 
-		remote_handler = Morpheus::Cli::Remote.new()
 		exit = false
 		while !exit do
 			Readline.completion_append_character = " "
@@ -122,13 +120,18 @@ class Morpheus::Cli::Shell
 						if @command_options[:nocolor]
 							argv.push "--nocolor"
 						end
+
+						# set global log level to debug (print stack trace for bubbled exceptions)
+						if argv.find {|arg| arg == '-V' || arg == '--debug'}
+							@return_to_log_level = Morpheus::Logging.log_level
+						  Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+						end
+						argv = argv.find_all {|arg| arg != '-V' && arg != '--debug'}
+
 						#puts "cmd: #{argv.join(' ')}"
 
 						if argv[0] == 'shell'
-							puts "Unrecognized Command."
-						elsif argv[0] == 'remote'
-							log_history_command(input)
-							remote_handler.handle(argv[1..-1])
+							puts "You are already in a shell."
 						elsif Morpheus::Cli::CliRegistry.has_command?(argv[0])
 							log_history_command(input)
 							Morpheus::Cli::CliRegistry.exec(argv[0], argv[1..-1])
@@ -145,13 +148,23 @@ class Morpheus::Cli::Shell
 					rescue SystemExit
 						# nothing to do
 						print "\n"
+					rescue OptionParser::InvalidOption => e
+						print Term::ANSIColor.red, "\n", "#{e.message}", "", Term::ANSIColor.reset
+						print "\n", "Try -h for help with this command.", "\n\n"
 					rescue => e
-						
 						@history_logger.error "#{e.message}" if @history_logger
-						print red, "\n", e.message, "\n", reset
-						print e.backtrace.join("\n"), "\n"
+						print Term::ANSIColor.red, "\n", "Unexpected Error", "\n\n", Term::ANSIColor.reset
+						if Morpheus::Logging.print_stacktrace?
+							print Term::ANSIColor.red, "\n", "#{e.class}: #{e.message}", "\n", Term::ANSIColor.reset
+							print e.backtrace.join("\n"), "\n\n"
+						end
 					end
-				
+						
+					if @return_to_log_level
+						Morpheus::Logging.set_log_level(@return_to_log_level)
+						@return_to_log_level = nil
+					end
+
 			end
 		end
 	end

data/lib/morpheus/cli/users.rb

@@ -23,6 +23,7 @@ class Morpheus::Cli::Users
 			exit 1
 		end
 		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
+		@whoami_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).whoami
 		@users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
 		@accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
 		@roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
@@ -46,6 +47,8 @@ class Morpheus::Cli::Users
 				update(args[1..-1])
 			when 'remove'
 				remove(args[1..-1])
+			when 'feature-permissions'
+				feature_permissions(args[1..-1])
 			else
 				puts "\n#{usage}\n\n"
 				exit 127
@@ -84,7 +87,7 @@ class Morpheus::Cli::Users
 				else
 					print_users_table(users)
 				end
-				print reset,"\n\n"
+				print reset,"\n"
 			end
 		rescue RestClient::Exception => e
 			print_rest_exception(e, options)
@@ -98,6 +101,24 @@ class Morpheus::Cli::Users
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
       build_common_options(opts, options, [:account, :json])
+      opts.on(nil,'--feature-access', "Display Feature Access") do |val|
+				options[:include_feature_access] = true
+			end
+			# opts.on(nil,'--group-access', "Display Group Access") do
+			# 	options[:include_group_access] = true
+			# end
+			# opts.on(nil,'--cloud-access', "Display Cloud Access") do
+			# 	options[:include_cloud_access] = true
+			# end
+			# opts.on(nil,'--instance-type-access', "Display Instance Type Access") do
+			# 	options[:include_instance_type_access] = true
+			# end
+			opts.on(nil,'--all-access', "Display All Access Lists") do
+				options[:include_feature_access] = true
+				options[:include_group_access] = true
+				options[:include_cloud_access] = true
+				options[:include_instance_type_access] = true
+			end
 		end
 		optparse.parse(args)
 
@@ -118,18 +139,31 @@ class Morpheus::Cli::Users
 			user = find_user_by_username(account_id, username)
 			exit 1 if user.nil?
 
+			# meh, this should just always be returned with GET /api/users/:id
+			user_feature_permissions_json = nil
+			user_feature_permissions = nil
+			if options[:include_feature_access]
+				user_feature_permissions_json = @users_interface.feature_permissions(account_id, user['id'])
+				user_feature_permissions = user_feature_permissions_json['featurePermissions']
+			end
+
 			if options[:json]
 				print JSON.pretty_generate({user:user})
 				print "\n"
+				if (user_feature_permissions_json)
+					print JSON.pretty_generate(user_feature_permissions_json)
+					print "\n"
+				end
 			else
 				print "\n" ,cyan, bold, "User Details\n","==================", reset, "\n\n"
 				print cyan
 				puts "ID: #{user['id']}"
 				puts "Account: #{user['account'] ? user['account']['name'] : nil}"
 				puts "First Name: #{user['firstName']}"
-				puts "Last Name: #{user['firstName']}"
+				puts "Last Name: #{user['lastName']}"
 				puts "Username: #{user['username']}"
-				puts "Role: #{user['role'] ? user['role']['authority'] : nil}"
+				puts "Email: #{user['email']}"
+				puts "Role: #{format_user_role_names(user)}"
 				puts "Date Created: #{format_local_dt(user['dateCreated'])}"
 				puts "Last Updated: #{format_local_dt(user['lastUpdated'])}"
 				print "\n" ,cyan, bold, "User Instance Limits\n","==================", reset, "\n\n"
@@ -137,8 +171,22 @@ class Morpheus::Cli::Users
 				puts "Max Storage (bytes): #{user['instanceLimits'] ? user['instanceLimits']['maxStorage'] : 0}"
 				puts "Max Memory (bytes): #{user['instanceLimits'] ? user['instanceLimits']['maxMemory'] : 0}"
 				puts "CPU Count: #{user['instanceLimits'] ? user['instanceLimits']['maxCpu'] : 0}"
+
+				if options[:include_feature_access] && user_feature_permissions
+					if user_feature_permissions
+						print "\n" ,cyan, bold, "Feature Permissions\n","==================", reset, "\n\n"
+						print cyan
+						rows = user_feature_permissions.collect do |code, access|
+							{code: code, access: get_access_string(access) }
+						end
+						tp rows, [:code, :access]
+					else
+						puts yellow,"No permissions found.",reset
+					end
+				end
+
 				print cyan
-				print reset,"\n\n"
+				print reset,"\n"
 			end
 		rescue RestClient::Exception => e
 			print_rest_exception(e, options)
@@ -152,6 +200,11 @@ class Morpheus::Cli::Users
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
 			build_common_options(opts, options, [:account, :options, :json])
+			opts.on('-h', '--help', "Prints this help" ) do
+        puts opts
+				puts Morpheus::Cli::OptionTypes.display_option_types_help(add_user_option_types)
+        exit
+      end
 		end
 		optparse.parse(args)
 
@@ -162,7 +215,10 @@ class Morpheus::Cli::Users
 			account = find_account_from_options(options)
 			account_id = account ? account['id'] : nil
 
-			params = Morpheus::Cli::OptionTypes.prompt(add_user_option_types, options[:options], @api_client, options[:params])
+			# remove role option_type, it is just for help display, the role prompt is separate down below
+			prompt_option_types = add_user_option_types().reject {|it| ['role'].include?(it['fieldName']) }
+			
+			params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
 
 			#puts "parsed params is : #{params.inspect}"
 			user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'passwordConfirmation', 'instanceLimits']
@@ -173,11 +229,12 @@ class Morpheus::Cli::Users
 				user_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
 				user_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
 			end
-			if params['role'].to_s != ''
-				role = find_role_by_name(account_id, params['role'])
-				exit 1 if role.nil?
-				user_payload['role'] = {id: role['id']}
+
+			roles = prompt_user_roles(account_id, nil, options)
+			if !roles.empty?
+				user_payload['roles'] = roles.collect {|r| {id: r['id']} }
 			end
+
 			request_payload = {user: user_payload}
 			json_response = @users_interface.create(account_id, request_payload)
 
@@ -210,11 +267,17 @@ class Morpheus::Cli::Users
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
 			build_common_options(opts, options, [:account, :options, :json])
+			opts.on('-h', '--help', "Prints this help" ) do
+        puts opts
+				puts Morpheus::Cli::OptionTypes.display_option_types_help(update_user_option_types)
+        exit
+      end
 		end
 		optparse.parse(args)
 
 		if args.count < 1
-			puts "\n#{usage}\n\n"
+			puts "#{usage}\n\n"
+			puts Morpheus::Cli::OptionTypes.display_option_types_help(update_user_option_types)
 			exit 1
 		end
 		username = args[0]
@@ -231,16 +294,19 @@ class Morpheus::Cli::Users
 
 			#params = Morpheus::Cli::OptionTypes.prompt(update_user_option_types, options[:options], @api_client, options[:params])
 			params = options[:options] || {}
-
+			roles = prompt_user_roles(account_id, user['id'], options.merge(no_prompt: true))
+			if !roles.empty?
+				params['roles'] = roles.collect {|r| {id: r['id']} }
+			end
+			
 			if params.empty?
 				puts "\n#{usage}\n\n"
-				option_lines = update_user_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-				puts "\nAvailable Options:\n#{option_lines}\n\n"
+				puts Morpheus::Cli::OptionTypes.display_option_types_help(update_user_option_types)
 				exit 1
 			end
 
 			#puts "parsed params is : #{params.inspect}"
-			user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'instanceLimits']
+			user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'instanceLimits', 'roles']
 			user_payload = params.select {|k,v| user_keys.include?(k) }
 			if !user_payload['instanceLimits']
 				user_payload['instanceLimits'] = {}
@@ -248,11 +314,7 @@ class Morpheus::Cli::Users
 				user_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
 				user_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
 			end
-			if params['role'].to_s != ''
-				role = find_role_by_name(account_id, params['role'])
-				exit 1 if role.nil?
-				user_payload['role'] = {id: role['id']}
-			end
+
 			request_payload = {user: user_payload}
 			json_response = @users_interface.update(account_id, user['id'], request_payload)
 			
@@ -320,21 +382,101 @@ private
 
 	def add_user_option_types
 		[
-			{'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-			{'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
-			{'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
+			{'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => false, 'displayOrder' => 1},
+			{'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
+			{'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
 			{'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'displayOrder' => 4},
-			{'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 5},
 			{'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
 			{'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 7},
 			{'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
 			{'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
 			{'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
+			{'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
 		]
 	end
 
 	def update_user_option_types
-		add_user_option_types.reject {|it| ['passwordConfirmation'].include?(it['fieldName']) }
+		[
+			{'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => false, 'displayOrder' => 1},
+			{'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
+			{'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
+			{'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
+			{'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => false, 'displayOrder' => 6},
+			{'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => false, 'displayOrder' => 7},
+			{'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
+			{'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
+			{'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
+			{'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
+		]
+	end
+
+	# prompt user to select roles for a new or existing user
+	# options['role'] can be passed as comma separated role names
+	# if so, it will be used instead of prompting
+	# returns array of role objects
+	def prompt_user_roles(account_id, user_id, options={})
+
+		passed_role_string = nil
+		if options['role'] || (options[:options] && (options[:options]['role'] || options[:options]['roles']))
+			passed_role_string = options['role'] || (options[:options] && (options[:options]['role'] || options[:options]['roles']))
+		end
+		passed_role_names = []
+		if !passed_role_string.empty?
+			passed_role_names = passed_role_string.split(',').uniq.compact.collect {|r| r.strip}
+		end
+
+		available_roles = @users_interface.available_roles(account_id, user_id)['roles']
+
+		if available_roles.empty?
+			print_red_alert "No available roles found."
+			exit 1
+		end
+		role_options = available_roles.collect {|role|
+			{'name' => role['authority'], 'value' => role['id']}
+		}
+
+		# found_roles = []
+		roles = []
+
+		if !passed_role_names.empty?
+			invalid_role_names = []
+			passed_role_names.each do |role_name| 
+				found_role = available_roles.find {|ar| ar['authority'] == role_name}
+				if found_role
+					# found_roles << found_role
+					roles << found_role
+				else
+					invalid_role_names << role_name
+				end
+			end
+			if !invalid_role_names.empty?
+				print_red_alert "Invalid Roles: #{invalid_role_names.join(', ')}"
+				exit 1
+			end
+		end
+
+		if roles.empty?
+			no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+			if !no_prompt
+				v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleId', 'fieldLabel' => 'Role', 'type' => 'select', 'selectOptions' => role_options, 'required' => true}], options[:options])
+				role_id = v_prompt['roleId']
+				roles << available_roles.find {|r| r['id'].to_i == role_id.to_i }
+				add_another_role = true
+				while add_another_role do
+					v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleId', 'fieldLabel' => 'Another Role', 'type' => 'select', 'selectOptions' => role_options, 'required' => false}], options[:options])
+					if v_prompt['roleId'].to_s.empty?
+						add_another_role = false
+					else
+						role_id = v_prompt['roleId']
+						roles << available_roles.find {|r| r['id'].to_i == role_id.to_i }
+					end
+				end
+			end
+		end
+
+		roles = roles.compact
+		return roles
+
 	end
 
 end