morpheus-cli 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ad744bd14853ed09ab8a7b563c75fa952e1b8d
-  data.tar.gz: e0fea0c877f8eab378652f69f22e9d9779e7cf36
+  metadata.gz: 1d8887267dd938f32dd8541223f21e0011b15f9f
+  data.tar.gz: 9654191eb9c4bf4162c42f3cad2955ff9502c79d
 SHA512:
-  metadata.gz: 80f09808f4bc334d284dd8c8488046e6c1948511999e93325d7e46b8496eaf95819ad2e6b7e2dbe96f7066070afaff2598fa91eb003c8eb016dedcc317a1e72e
-  data.tar.gz: c718702cb6de2fdc36b18276d22237b274c018dced4182cd075d7bc652418a37f5cef0984f9917dc85782357a11b203c1df200d23ad441417b496819d68f2887
+  metadata.gz: e3999564f5e8a363160a78f50e8b55ae27ca7835982eb777fa8645b573833231f23c5ffae9b444e5d4a494d5661376611542a8b40d96b5cdab000715c2463b21
+  data.tar.gz: 792e9432f9817331b73dceca9d476c763953b912b49d1253db36b715452d581e8cff554233c4c80a87d8e000167a458fb073d5aff2c0ebb12c3d2947653fc2be

data/lib/morpheus/api/api_client.rb

@@ -59,6 +59,10 @@ class Morpheus::APIClient
 		Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
 	end
 
+	def app_templates
+		Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+	end
+
 	def deploy
 		Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
 	end

data/lib/morpheus/api/app_templates_interface.rb

@@ -0,0 +1,74 @@
+require 'json'
+require 'rest-client'
+
+class Morpheus::AppTemplatesInterface < Morpheus::APIClient
+	def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+		@access_token = access_token
+		@refresh_token = refresh_token
+		@base_url = base_url
+		@expires_at = expires_at
+	end
+
+	def get(id)
+		raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+		url = "#{@base_url}/api/app-templates/#{id}"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+
+	def list(options={})
+		url = "#{@base_url}/api/app-templates"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		headers[:params].merge!(options)
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+
+	def create(options)
+		url = "#{@base_url}/api/app-templates"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		payload = options
+		response = Morpheus::RestClient.execute(method: :post, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
+	def update(id, options)
+		url = "#{@base_url}/api/app-templates/#{id}"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
+	def destroy(id)
+		url = "#{@base_url}/api/app-templates/#{id}"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		response = Morpheus::RestClient.execute(method: :delete, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+
+	def list_tiers(options={})
+		url = "#{@base_url}/api/app-templates/tiers"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		headers[:params].merge!(options)
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+
+	def list_types(options={})
+		url = "#{@base_url}/api/app-templates/types"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		headers[:params].merge!(options)
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+	
+end

data/lib/morpheus/api/instance_types_interface.rb

@@ -38,5 +38,14 @@ class Morpheus::InstanceTypesInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
+	def service_plan_options(service_plan_id, params)
+		url = "#{@base_url}/api/instance-types/service-plans/#{service_plan_id}/options"
+		headers = { params: params, authorization: "Bearer #{@access_token}" }
+
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 30, headers: headers, verify_ssl: false)
+		JSON.parse(response.to_s)
+	end
+
 
 end

data/lib/morpheus/api/instances_interface.rb

@@ -95,6 +95,22 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
+	def volumes(id)
+		url = "#{@base_url}/api/instances/#{id}/volumes"
+		headers = { :params => {},:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 30, headers: headers,verify_ssl: false)
+		JSON.parse(response.to_s)
+	end
+
+	def resize(id,payload)
+		url = "#{@base_url}/api/instances/#{id}/resize"
+		headers = { :params => {},:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 30, headers: headers,verify_ssl: false,payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
 	def workflow(id,task_set_id,payload)
 		url = "#{@base_url}/api/instances/#{id}/workflow"
 		headers = { :params => {:taskSetId => task_set_id},:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/roles_interface.rb

@@ -41,7 +41,7 @@ class Morpheus::RolesInterface < Morpheus::APIClient
 		url = build_url(account_id, id)
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
 		payload = options
-		response = Morpheus::RestClient.execute(method: :post, url: url,
+		response = Morpheus::RestClient.execute(method: :put, url: url,
                             timeout: 10, headers: headers, payload: payload.to_json)
 		JSON.parse(response.to_s)
 	end
@@ -54,6 +54,42 @@ class Morpheus::RolesInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
+	def update_permission(account_id, id, options)
+		url = build_url(account_id, id) + "/update-permission"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
+	def update_instance_type(account_id, id, options)
+		url = build_url(account_id, id) + "/update-instance-type"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
+	def update_group(account_id, id, options)
+		url = build_url(account_id, id) + "/update-group"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
+	def update_cloud(account_id, id, options)
+		url = build_url(account_id, id) + "/update-cloud"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
 	private
 
 	def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/cli.rb

@@ -3,6 +3,8 @@ require "morpheus/rest_client"
 require 'morpheus/formatters'
 require 'term/ansicolor'
 
+Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
+
 module Morpheus
   module Cli
   	require 'morpheus/api/api_client'
@@ -20,6 +22,7 @@ module Morpheus
     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'
@@ -30,7 +33,6 @@ module Morpheus
     require 'morpheus/api/key_pairs_interface'
   	
     require 'morpheus/cli/credentials'
-  	require 'morpheus/cli/error_handler'
   	require 'morpheus/cli/remote'
   	require 'morpheus/cli/groups'
   	require 'morpheus/cli/clouds'
@@ -42,6 +44,7 @@ module Morpheus
     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'

data/lib/morpheus/cli/accounts.rb

@@ -1,7 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/option_types'
@@ -9,7 +8,6 @@ require 'morpheus/cli/mixins/accounts_helper'
 require 'json'
 
 class Morpheus::Cli::Accounts
-	include Term::ANSIColor
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   
@@ -21,7 +19,7 @@ class Morpheus::Cli::Accounts
 	def connect(opts)
 		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			exit 1
 		end
 		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
@@ -55,14 +53,16 @@ class Morpheus::Cli::Accounts
 	end
 
 	def list(args)
+		usage = "Usage: morpheus accounts list"
 		options = {}
-		params = {}
 		optparse = OptionParser.new do|opts|
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			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
@@ -82,26 +82,26 @@ class Morpheus::Cli::Accounts
 				print reset,"\n\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	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]
-		options = {}
-		params = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
 
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
-		end
-		optparse.parse(args)
 		connect(options)
 		begin
 	
@@ -118,7 +118,7 @@ class Morpheus::Cli::Accounts
 			exit 1 if account.nil?
 
 			if options[:json]
-				print JSON.pretty_generate(account)
+				print JSON.pretty_generate({account: account})
 				print "\n"
 			else
 				print "\n" ,cyan, bold, "Account Details\n","==================", reset, "\n\n"
@@ -147,21 +147,17 @@ class Morpheus::Cli::Accounts
 				print reset,"\n\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def add(args)
 		usage = "Usage: morpheus accounts add [options]"
-		# if args.count > 0
-		# 	puts "\nUsage: morpheus accounts add [options]\n\n"
-		# 	exit 1
-		# end
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json])
 		end
 		optparse.parse(args)
 
@@ -169,62 +165,69 @@ class Morpheus::Cli::Accounts
 		
 		begin
 
-			params = Morpheus::Cli::OptionTypes.prompt(add_account_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
+			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
-			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 != ''
+			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}
-			response = @accounts_interface.create(request_payload)
-			
-			print_green_success "Account #{account_payload['name']} added"
+			json_response = @accounts_interface.create(request_payload)
 			
-			details([account_payload["name"]])
+			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
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def update(args)
 		usage = "Usage: morpheus accounts update [name] [options]"
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		name = args[0].strip
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			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:', '')
+				id = name.sub('id:', '').strip
 				account = find_account_by_id(id)
 			else
-				find_account_by_name(name)
+				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]) # options[:params] is mysterious
+			#params = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options], @api_client, options[:params])
 			params = options[:options] || {}
 
 			if params.empty?
@@ -235,51 +238,72 @@ class Morpheus::Cli::Accounts
 			end
 
 			#puts "parsed params is : #{params.inspect}"
-			account_keys = ['name', 'description', 'currency']
+			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?
-			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 != ''
+			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}
-			response = @accounts_interface.update(account['id'], request_payload)
-			print "\n", cyan, "Account #{account_payload['name'] || account['name']} updated", reset, "\n\n"
+			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
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def remove(args)
 		usage = "Usage: morpheus accounts remove [name]"
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		name = args[0]
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			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?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the account #{account['name']}?")
-			@accounts_interface.destroy(account['id'])
-			# list([])
-			print "\n", cyan, "Account #{account['name']} removed", reset, "\n\n"
+			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
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end