morpheus-cli 2.10.0 → 2.10.1

data/lib/morpheus/cli.rb

@@ -8,65 +8,76 @@ Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
 
 module Morpheus
   module Cli
-  	require 'morpheus/api/api_client'
-    require 'morpheus/api/whoami_interface'
-    require 'morpheus/api/options_interface'
-  	require 'morpheus/api/groups_interface'
-  	require 'morpheus/api/clouds_interface'
-  	require 'morpheus/api/servers_interface'
-    require 'morpheus/api/tasks_interface'
-    require 'morpheus/api/deployments_interface'
-    require 'morpheus/api/license_interface'
-    require 'morpheus/api/virtual_images_interface'
-    require 'morpheus/api/task_sets_interface'
-    require 'morpheus/api/load_balancers_interface'
-  	require 'morpheus/api/instances_interface'
-    require 'morpheus/api/instance_types_interface'
-    require 'morpheus/api/provision_types_interface'
-    require 'morpheus/api/apps_interface'
-    require 'morpheus/api/app_templates_interface'
-    require 'morpheus/api/deploy_interface'
-    require 'morpheus/api/security_groups_interface'
-    require 'morpheus/api/security_group_rules_interface'
-    require 'morpheus/api/accounts_interface'
-    require 'morpheus/api/users_interface'
-    require 'morpheus/api/logs_interface'
-    require 'morpheus/api/roles_interface'
-    require 'morpheus/api/key_pairs_interface'
-    require 'morpheus/api/custom_instance_types_interface'
-    require 'morpheus/api/dashboard_interface'
-  	
-    require 'morpheus/cli/cli_command'
-    require 'morpheus/cli/remote'
-    require 'morpheus/cli/login'
-    require 'morpheus/cli/logout'
-    require 'morpheus/cli/whoami'
-    require 'morpheus/cli/dashboard_command'
-    require 'morpheus/cli/recent_activity_command'
-    require 'morpheus/cli/credentials'
-  	require 'morpheus/cli/groups'
-  	require 'morpheus/cli/clouds'
-  	require 'morpheus/cli/hosts'
-    require 'morpheus/cli/load_balancers'
-    require 'morpheus/cli/shell'
-    require 'morpheus/cli/tasks'
-    require 'morpheus/cli/workflows'
-    require 'morpheus/cli/deployments'
-    require 'morpheus/cli/instances'
-    require 'morpheus/cli/apps'
-    require 'morpheus/cli/app_templates'
-    require 'morpheus/cli/deploys'
-    require 'morpheus/cli/license'
-    require 'morpheus/cli/instance_types'
-    require 'morpheus/cli/security_groups'
-    require 'morpheus/cli/security_group_rules'
-    require 'morpheus/cli/accounts'
-    require 'morpheus/cli/users'
-    require 'morpheus/cli/roles'
-    require 'morpheus/cli/key_pairs'
-    require 'morpheus/cli/virtual_images'
-    require 'morpheus/cli/library'
-    require 'morpheus/cli/version_command'
-    # Your code goes here...
+  
+    # the home directory, where morpheus-cli stores things
+    def self.home_directory
+      if ENV['MORPHEUS_CLI_HOME']
+        ENV['MORPHEUS_CLI_HOME']
+      else
+        File.join(Dir.home, ".morpheus")
+      end
+    end
+
+    # the location of your config file
+    # this is not configurable right now.
+    def self.config_filename
+      File.join(self.home_directory, ".morpheusrc")
+    end
+
+    # load all the well known commands and utilties they need
+    def self.load!()
+      # load interfaces
+      require 'morpheus/api/api_client.rb'
+      Dir[File.dirname(__FILE__)  + "/api/*.rb"].each {|file| load file }
+
+      # load mixins
+      Dir[File.dirname(__FILE__)  + "/cli/mixins/*.rb"].each {|file| load file }
+
+      # load commands
+      # Dir[File.dirname(__FILE__)  + "/cli/*.rb"].each {|file| load file }
+
+      # utilites
+      load 'morpheus/cli/credentials.rb'
+      load 'morpheus/cli/cli_command.rb'
+      load 'morpheus/cli/option_types.rb'
+      
+      # all the known commands
+      load 'morpheus/cli/remote.rb'
+      load 'morpheus/cli/login.rb'
+      load 'morpheus/cli/logout.rb'
+      load 'morpheus/cli/whoami.rb'
+      load 'morpheus/cli/dashboard_command.rb'
+      load 'morpheus/cli/recent_activity_command.rb'
+      load 'morpheus/cli/groups.rb'
+      load 'morpheus/cli/clouds.rb'
+      load 'morpheus/cli/hosts.rb'
+      load 'morpheus/cli/load_balancers.rb'
+      load 'morpheus/cli/shell.rb'
+      load 'morpheus/cli/tasks.rb'
+      load 'morpheus/cli/workflows.rb'
+      load 'morpheus/cli/deployments.rb'
+      load 'morpheus/cli/instances.rb'
+      load 'morpheus/cli/apps.rb'
+      load 'morpheus/cli/app_templates.rb'
+      load 'morpheus/cli/deploys.rb'
+      load 'morpheus/cli/license.rb'
+      load 'morpheus/cli/instance_types.rb'
+      load 'morpheus/cli/security_groups.rb'
+      load 'morpheus/cli/security_group_rules.rb'
+      load 'morpheus/cli/accounts.rb'
+      load 'morpheus/cli/users.rb'
+      load 'morpheus/cli/roles.rb'
+      load 'morpheus/cli/key_pairs.rb'
+      load 'morpheus/cli/virtual_images.rb'
+      load 'morpheus/cli/library.rb'
+      load 'morpheus/cli/version_command.rb'
+      load 'morpheus/cli/alias_command.rb'
+      # Your new commands goes here...
+
+    end
+
+    load!
+    
   end
+
 end

data/lib/morpheus/cli/accounts.rb

@@ -10,320 +10,259 @@ require 'json'
 class Morpheus::Cli::Accounts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-  
-	def initialize() 
-		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-	end
-
-	def connect(opts)
-		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
-		if @access_token.empty?
-			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
-			exit 1
-		end
-		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
-		@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
-	end
-
-	def handle(args)
-		usage = "Usage: morpheus accounts [list,details,add,update,remove] [name]"
-		if args.empty?
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-
-		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])
-			else
-				puts "\n#{usage}\n\n"
-				exit 127
-		end
-	end
-
-	def list(args)
-		usage = "Usage: morpheus accounts list"
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, [:list, :json])
-		end
-		optparse.parse(args)
-		connect(options)
-		begin
-			params = {}
-			[:phrase, :offset, :max, :sort, :direction].each do |k|
-				params[k] = options[k] unless options[k].nil?
-			end
-
-			json_response = @accounts_interface.list(params)
-			accounts = json_response['accounts']
-			if options[:json]
-				print JSON.pretty_generate(json_response)
-				print "\n"
-			else
-				print "\n" ,cyan, bold, "Morpheus Accounts\n","==================", reset, "\n\n"
-				if accounts.empty?
-					puts yellow,"No accounts found.",reset
-				else
-					print_accounts_table(accounts)
-				end
-				print reset,"\n\n"
-			end
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def details(args)
-		usage = "Usage: morpheus accounts details [name] [options]"
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		name = args[0]
-
-		connect(options)
-		begin
-	
-			# todo: accounts_response = @accounts_interface.list({name: name})
-			#       there may be response data outside of account that needs to be displayed
-
-			account = nil
-			if name.to_s =~ /\Aid:/
-				id = name.sub('id:', '')
-				account = find_account_by_id(id)
-			else
-				account = find_account_by_name(name)
-			end
-			exit 1 if account.nil?
-
-			if options[:json]
-				print JSON.pretty_generate({account: account})
-				print "\n"
-			else
-				print "\n" ,cyan, bold, "Account Details\n","==================", reset, "\n\n"
-				print cyan
-				puts "ID: #{account['id']}"
-				puts "Name: #{account['name']}"
-				puts "Description: #{account['description']}"
-				puts "Currency: #{account['currency']}"
-				# puts "# Users: #{account['usersCount']}"
-				# puts "# Instances: #{account['instancesCount']}"
-				puts "Date Created: #{format_local_dt(account['dateCreated'])}"
-				puts "Last Updated: #{format_local_dt(account['lastUpdated'])}"
-				status_state = nil
-				if account['active']
-					status_state = "#{green}ACTIVE#{cyan}"
-				else
-					status_state = "#{red}INACTIVE#{cyan}"
-				end
-				puts "Status: #{status_state}"
-				print "\n" ,cyan, bold, "Account Instance Limits\n","==================", reset, "\n\n"
-				print cyan
-				puts "Max Storage (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxStorage'] : 0}"
-				puts "Max Memory (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxMemory'] : 0}"
-				puts "CPU Count: #{account['instanceLimits'] ? account['instanceLimits']['maxCpu'] : 0}"
-				print cyan
-				print reset,"\n\n"
-			end
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def add(args)
-		usage = "Usage: morpheus accounts add [options]"
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, [:options, :json])
-		end
-		optparse.parse(args)
-
-		connect(options)
-		
-		begin
-
-			params = Morpheus::Cli::OptionTypes.prompt(add_account_option_types, options[:options], @api_client, options[:params])
-
-			#puts "parsed params is : #{params.inspect}"
-			account_keys = ['name', 'description', 'currency']
-			account_payload = params.select {|k,v| account_keys.include?(k) }
-			account_payload['currency'] = account_payload['currency'].to_s.empty? ? "USD" : account_payload['currency'].upcase
-			if !account_payload['instanceLimits']
-				account_payload['instanceLimits'] = {}
-				account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-				account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-				account_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(nil, params['role'])
-				exit 1 if role.nil?
-				account_payload['role'] = {id: role['id']}
-			end
-			request_payload = {account: account_payload}
-			json_response = @accounts_interface.create(request_payload)
-			
-			if options[:json]
-				print JSON.pretty_generate(json_response)
-				print "\n"
-			else
-				print_green_success "Account #{account_payload['name']} added"
-				details([account_payload["name"]])
-			end
-
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def update(args)
-		usage = "Usage: morpheus accounts update [name] [options]"
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, [:options, :json])
-		end
-		optparse.parse(args)
-
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		name = args[0].strip
-
-		connect(options)
-		
-		begin
-
-			account = nil
-			if name.to_s =~ /\Aid:/
-				id = name.sub('id:', '').strip
-				account = find_account_by_id(id)
-			else
-				account = find_account_by_name(name)
-			end
-			exit 1 if account.nil?
-
-			#params = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options], @api_client, options[:params])
-			params = options[:options] || {}
-
-			if params.empty?
-				puts "\n#{usage}\n\n"
-				option_lines = update_account_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-				puts "\nAvailable Options:\n#{option_lines}\n\n"
-				exit 1
-			end
-
-			#puts "parsed params is : #{params.inspect}"
-			account_keys = ['name', 'description', 'currency', 'instanceLimits']
-			account_payload = params.select {|k,v| account_keys.include?(k) }
-			account_payload['currency'] = account_payload['currency'].upcase unless account_payload['currency'].to_s.empty?
-			if !account_payload['instanceLimits']
-				account_payload['instanceLimits'] = {}
-				account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-				account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-				account_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(nil, params['role'])
-				exit 1 if role.nil?
-				account_payload['role'] = {id: role['id']}
-			end
-			request_payload = {account: account_payload}
-			json_response = @accounts_interface.update(account['id'], request_payload)
-
-			if options[:json]
-				print JSON.pretty_generate(json_response)
-				print "\n"
-			else
-				account_name = account_payload['name'] || account['name']
-				print_green_success "Account #{account_name} updated"
-				details([account_name])
-			end
-			
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def remove(args)
-		usage = "Usage: morpheus accounts remove [name]"
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, [:auto_confirm, :json])
-		end
-		optparse.parse(args)
-
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		name = args[0]
-
-		connect(options)
-		begin
-			# allow finding by ID since name is not unique!
-			account = ((name.to_s =~ /\A\d{1,}\Z/) ? find_account_by_id(name) : find_account_by_name(name) )
-			exit 1 if account.nil?
-			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the account #{account['name']}?")
-				exit
-			end
-			json_response = @accounts_interface.destroy(account['id'])
-			
-			if options[:json]
-				print JSON.pretty_generate(json_response)
-				print "\n"
-			else
-				print_green_success "Account #{account['name']} removed"
-			end
-
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-private
-	
-
-	def add_account_option_types
-		[
-			{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-			{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-			{'fieldName' => 'role', 'fieldLabel' => 'Base Role', 'type' => 'text', 'displayOrder' => 3},
-			{'fieldName' => 'currency', 'fieldLabel' => 'Currency', 'type' => 'text', 'displayOrder' => 4},
-			{'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 5},
-			{'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 6},
-			{'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 7},
-		]
-	end
-
-	def update_account_option_types
-		add_account_option_types
-	end
+  register_subcommands :list, :get, :add, :update, :remove
+  alias_subcommand :details, :get
+  set_default_subcommand :list
+
+  def initialize()
+    @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+  end
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @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
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:list, :json])
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      [:phrase, :offset, :max, :sort, :direction].each do |k|
+        params[k] = options[k] unless options[k].nil?
+      end
+
+      json_response = @accounts_interface.list(params)
+      accounts = json_response['accounts']
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print "\n" ,cyan, bold, "Morpheus Accounts\n","==================", reset, "\n\n"
+        if accounts.empty?
+          puts yellow,"No accounts found.",reset
+        else
+          print_accounts_table(accounts)
+          print_results_pagination(json_response)
+        end
+        print reset,"\n"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:json])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+
+      account = find_account_by_name_or_id(args[0])
+      exit 1 if account.nil?
+
+      if options[:json]
+        print JSON.pretty_generate({account: account})
+        print "\n"
+      else
+        print "\n" ,cyan, bold, "Account Details\n","==================", reset, "\n\n"
+        print cyan
+        puts "ID: #{account['id']}"
+        puts "Name: #{account['name']}"
+        puts "Description: #{account['description']}"
+        puts "Currency: #{account['currency']}"
+        # puts "# Users: #{account['usersCount']}"
+        # puts "# Instances: #{account['instancesCount']}"
+        puts "Date Created: #{format_local_dt(account['dateCreated'])}"
+        puts "Last Updated: #{format_local_dt(account['lastUpdated'])}"
+        status_state = nil
+        if account['active']
+          status_state = "#{green}ACTIVE#{cyan}"
+        else
+          status_state = "#{red}INACTIVE#{cyan}"
+        end
+        puts "Status: #{status_state}"
+        print "\n" ,cyan, bold, "Account Instance Limits\n","==================", reset, "\n\n"
+        print cyan
+        puts "Max Storage (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxStorage'] : 0}"
+        puts "Max Memory (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxMemory'] : 0}"
+        puts "CPU Count: #{account['instanceLimits'] ? account['instanceLimits']['maxCpu'] : 0}"
+        print reset,"\n"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def add(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[options]")
+      build_common_options(opts, options, [:options, :json])
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = Morpheus::Cli::OptionTypes.prompt(add_account_option_types, options[:options], @api_client, options[:params])
+      #puts "parsed params is : #{params.inspect}"
+      account_keys = ['name', 'description', 'currency']
+      account_payload = params.select {|k,v| account_keys.include?(k) }
+      account_payload['currency'] = account_payload['currency'].to_s.empty? ? "USD" : account_payload['currency'].upcase
+      if !account_payload['instanceLimits']
+        account_payload['instanceLimits'] = {}
+        account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
+        account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
+        account_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(nil, params['role'])
+        exit 1 if role.nil?
+        account_payload['role'] = {id: role['id']}
+      end
+      request_payload = {account: account_payload}
+      json_response = @accounts_interface.create(request_payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Account #{account_payload['name']} added"
+        get([account_payload["name"]])
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      build_common_options(opts, options, [:options, :json])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      account = find_account_by_name_or_id(args[0])
+      exit 1 if account.nil?
+
+      #params = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options], @api_client, options[:params])
+      params = options[:options] || {}
+
+      if params.empty?
+        puts optparse
+        option_lines = update_account_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
+        puts "\nAvailable Options:\n#{option_lines}\n\n"
+        exit 1
+      end
+
+      #puts "parsed params is : #{params.inspect}"
+      account_keys = ['name', 'description', 'currency', 'instanceLimits']
+      account_payload = params.select {|k,v| account_keys.include?(k) }
+      account_payload['currency'] = account_payload['currency'].upcase unless account_payload['currency'].to_s.empty?
+      if !account_payload['instanceLimits']
+        account_payload['instanceLimits'] = {}
+        account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
+        account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
+        account_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(nil, params['role'])
+        exit 1 if role.nil?
+        account_payload['role'] = {id: role['id']}
+      end
+      request_payload = {account: account_payload}
+      json_response = @accounts_interface.update(account['id'], request_payload)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        account_name = account_payload['name'] || account['name']
+        print_green_success "Account #{account_name} updated"
+        get([account_name])
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:auto_confirm, :json])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      # allow finding by ID since name is not unique!
+      account = find_account_by_name_or_id(args[0])
+      exit 1 if account.nil?
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the account #{account['name']}?")
+        exit
+      end
+      json_response = @accounts_interface.destroy(account['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Account #{account['name']} removed"
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  private
+
+  def add_account_option_types
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
+      {'fieldName' => 'role', 'fieldLabel' => 'Base Role', 'type' => 'text', 'displayOrder' => 3},
+      {'fieldName' => 'currency', 'fieldLabel' => 'Currency', 'type' => 'text', 'displayOrder' => 4},
+      {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 5},
+      {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 6},
+      {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 7},
+    ]
+  end
+
+  def update_account_option_types
+    add_account_option_types
+  end
 
 end