morpheus-cli 2.10.0 → 2.10.1

data/lib/morpheus/api/tasks_interface.rb

@@ -1,72 +1,59 @@
-require 'json'
-require 'rest-client'
+require 'morpheus/api/api_client'
 
 class Morpheus::TasksInterface < 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 task_types(options={})
-		url = "#{@base_url}/api/task-types"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-		if options.is_a?(Hash)
-			headers[:params].merge!(options)
-		elsif options.is_a?(Numeric)
-			url = "#{@base_url}/api/task-types/#{options}"
-		elsif options.is_a?(String)
-			headers[:params]['name'] = options
-		end
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false)
-		JSON.parse(response.to_s)
-	end
-
-	def get(options=nil)
-		url = "#{@base_url}/api/tasks"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-		if options.is_a?(Hash)
-			headers[:params].merge!(options)
-		elsif options.is_a?(Numeric)
-			url = "#{@base_url}/api/tasks/#{options}"
-		elsif options.is_a?(String)
-			headers[:params]['name'] = options
-		end
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false)
-		JSON.parse(response.to_s)
-	end
-
-	def update(id, options)
-		url = "#{@base_url}/api/tasks/#{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 create(options)
-		url = "#{@base_url}/api/tasks"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		
-		payload = options
-		response = Morpheus::RestClient.execute(method: :post, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false, payload: payload.to_json)
-		JSON.parse(response.to_s)
-	end
-
-	def destroy(id)
-		url = "#{@base_url}/api/tasks/#{id}"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		response = Morpheus::RestClient.execute(method: :delete, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false)
-		JSON.parse(response.to_s)
-	end
+  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 task_types(options={})
+    url = "#{@base_url}/api/task-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+
+    if options.is_a?(Hash)
+      headers[:params].merge!(options)
+    elsif options.is_a?(Numeric)
+      url = "#{@base_url}/api/task-types/#{options}"
+    elsif options.is_a?(String)
+      headers[:params]['name'] = options
+    end
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def get(options=nil)
+    url = "#{@base_url}/api/tasks"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+
+    if options.is_a?(Hash)
+      headers[:params].merge!(options)
+    elsif options.is_a?(Numeric)
+      url = "#{@base_url}/api/tasks/#{options}"
+    elsif options.is_a?(String)
+      headers[:params]['name'] = options
+    end
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def update(id, options)
+    url = "#{@base_url}/api/tasks/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+
+  def create(options)
+    url = "#{@base_url}/api/tasks"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/tasks/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
 end

data/lib/morpheus/api/users_interface.rb

@@ -1,89 +1,80 @@
-require 'json'
-require 'rest-client'
+require 'morpheus/api/api_client'
 
 class Morpheus::UsersInterface < 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 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(account_id, id)
-		raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-		url = build_url(account_id, 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 get(account_id, id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = build_url(account_id, id)
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
 
-	def list(account_id, options={})
-		url = build_url(account_id)
-		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(account_id, options={})
+    url = build_url(account_id)
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
 
-	def feature_permissions(account_id, id)
-		url = build_url(account_id, id) + "/feature-permissions"
-		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 feature_permissions(account_id, id)
+    url = build_url(account_id, id) + "/feature-permissions"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
 
-	def available_roles(account_id, id=nil, options={})
-		url = build_url(account_id, id) + "/available-roles"
-		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 available_roles(account_id, id=nil, options={})
+    url = build_url(account_id, id) + "/available-roles"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
 
-	def create(account_id, options)
-		url = build_url(account_id)
-		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 create(account_id, options)
+    url = build_url(account_id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :post, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
 
-	def update(account_id, id, options)
-		url = build_url(account_id, 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 update(account_id, id, options)
+    url = build_url(account_id, id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
 
-	def destroy(account_id, id)
-		url = build_url(account_id, 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 destroy(account_id, id)
+    url = build_url(account_id, id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
 
-private
+  private
 
-	def build_url(account_id=nil, user_id=nil)
-		url = "#{@base_url}/api"
-		if account_id
-			url += "/accounts/#{account_id}/users"
-		else
-			url += "/users"
-		end
-		if user_id
-			url += "/#{user_id}"
-		end
-		url
-	end
+  def build_url(account_id=nil, user_id=nil)
+    url = "#{@base_url}/api"
+    if account_id
+      url += "/accounts/#{account_id}/users"
+    else
+      url += "/users"
+    end
+    if user_id
+      url += "/#{user_id}"
+    end
+    url
+  end
 
 end

data/lib/morpheus/api/virtual_images_interface.rb

@@ -1,72 +1,72 @@
-require 'json'
-require 'rest-client'
+require 'morpheus/api/api_client'
 
 class Morpheus::VirtualImagesInterface < 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 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 virtual_image_types(options={})
-		url = "#{@base_url}/api/virtual-image-types"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+  def virtual_image_types(options={})
+    url = "#{@base_url}/api/virtual-image-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    if options.is_a?(Hash)
+      headers[:params].merge!(options)
+    end
+    execute(method: :get, url: url, headers: headers)
+  end
 
-		if options.is_a?(Hash)
-			headers[:params].merge!(options)
-		elsif options.is_a?(Numeric)
-			url = "#{@base_url}/api/virtual-image-types/#{options}"
-		elsif options.is_a?(String)
-			headers[:params]['name'] = options
-		end
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false)
-		JSON.parse(response.to_s)
-	end
+  def get(options=nil)
+    url = "#{@base_url}/api/virtual-images"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
 
-	def get(options=nil)
-		url = "#{@base_url}/api/virtual-images"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    if options.is_a?(Hash)
+      headers[:params].merge!(options)
+    elsif options.is_a?(Numeric)
+      url = "#{@base_url}/api/virtual-images/#{options}"
+    elsif options.is_a?(String)
+      headers[:params]['name'] = options
+    end
+    execute(method: :get, url: url, headers: headers)
+  end
 
-		if options.is_a?(Hash)
-			headers[:params].merge!(options)
-		elsif options.is_a?(Numeric)
-			url = "#{@base_url}/api/virtual-images/#{options}"
-		elsif options.is_a?(String)
-			headers[:params]['name'] = options
-		end
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false)
-		JSON.parse(response.to_s)
-	end
+  def update(id, options)
+    url = "#{@base_url}/api/virtual-images/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
 
-	def update(id, options)
-		url = "#{@base_url}/api/virtual-images/#{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 create(options)
+    url = "#{@base_url}/api/virtual-images"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+        payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
 
-	def create(options)
-		url = "#{@base_url}/api/virtual-images"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		
-		payload = options
-		response = Morpheus::RestClient.execute(method: :post, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false, payload: payload.to_json)
-		JSON.parse(response.to_s)
-	end
+  def destroy(id)
+    url = "#{@base_url}/api/virtual-images/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
+  # NOT json, multipart file upload
+  def upload(id, image_file)
+    url = "#{@base_url}/api/virtual-images/#{id}/upload"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    payload[:file] = image_file
+    payload[:multipart] = true
+    execute(method: :post, url: url, headers: headers, payload: payload)
+  end
+
+  def destroy_file(id, filename)
+    url = "#{@base_url}/api/virtual-images/#{id}/files"
+    #url = "#{@base_url}/api/virtual-images/#{id}/files/#{filename}"
+    headers = { params: {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    headers[:params][:filename] = filename
+    execute(method: :delete, url: url, headers: headers)
+  end
 
-	def destroy(id)
-		url = "#{@base_url}/api/virtual-images/#{id}"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		response = Morpheus::RestClient.execute(method: :delete, url: url,
-                            timeout: 30, headers: headers, verify_ssl:false)
-		JSON.parse(response.to_s)
-	end
 end

data/lib/morpheus/api/whoami_interface.rb

@@ -1,20 +1,17 @@
-require 'json'
-require 'rest-client'
+require 'morpheus/api/api_client'
 
 class Morpheus::WhoamiInterface < 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 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()
-		url = "#{@base_url}/api/whoami"
-		headers = { 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
+  def get()
+    url = "#{@base_url}/api/whoami"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers, timeout: 5)
+  end
 
 end