morpheus-cli 5.3.0.3 → 5.3.2.1

data/lib/morpheus/api/option_types_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::OptionTypesInterface < 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 == ''

data/lib/morpheus/api/options_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::OptionsInterface < 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 options_for_source(source,params = {})
     url = "#{@base_url}/api/options/#{source}"

data/lib/morpheus/api/packages_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::PackagesInterface < 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 == ''

data/lib/morpheus/api/policies_interface.rb

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
-require 'uri'
 
 class Morpheus::PoliciesInterface < 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, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
@@ -54,7 +47,7 @@ class Morpheus::PoliciesInterface < Morpheus::APIClient
 
   def get_policy_type(id, params={})
     raise "#{self.class}.get_policy_type() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/policy-types/#{URI.escape(id.to_s)}"
+    url = "#{@base_url}/api/policy-types/#{CGI::escape(id.to_s)}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/power_schedules_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::PowerSchedulesInterface < 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 == ''

data/lib/morpheus/api/price_sets_interface.rb

@@ -1,40 +1,37 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::PriceSetsInterface < 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
-    @api_url = "#{@base_url}/api/price-sets"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/price-sets"
   end
 
   def list(params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get(id, params={})
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def create(payload)
-    url = @api_url
+    url = base_path
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update(id, payload)
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def deactivate(id, params={})
-    url = "#{@api_url}/#{id}/deactivate"
+    url = "#{base_path}/#{id}/deactivate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end

data/lib/morpheus/api/prices_interface.rb

@@ -1,16 +1,13 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::PricesInterface < 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
-    @api_url = "#{@base_url}/api/prices"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/prices"
   end
 
   def list(params={})
-    url = @api_url
+    url = base_path
     if params['ids']
       url = "#{url}?#{params.delete('ids').collect {|id| "id=#{id}"}.join('&')}"
     end
@@ -19,49 +16,49 @@ class Morpheus::PricesInterface < Morpheus::APIClient
   end
 
   def get(id, params={})
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def create(payload)
-    url = @api_url
+    url = base_path
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update(id, payload)
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def deactivate(id, params={})
-    url = "#{@api_url}/#{id}/deactivate"
+    url = "#{base_path}/#{id}/deactivate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end
 
   def list_datastores(params={})
-    url = "#{@api_url}/datastores"
+    url = "#{base_path}/datastores"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get_datastore(id, params={})
-    url = "#{@api_url}/datastores/#{id}"
+    url = "#{base_path}/datastores/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def list_volume_types(params={})
-    url = "#{@api_url}/volume-types"
+    url = "#{base_path}/volume-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get_volume_type(id, params={})
-    url = "#{@api_url}/volume-types/#{id}"
+    url = "#{base_path}/volume-types/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/processes_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ProcessesInterface < 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 list(params={})
     url = "#{@base_url}/api/processes"

data/lib/morpheus/api/provision_types_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ProvisionTypesInterface < 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 list(params={})
     url = "#{@base_url}/api/provision-types"

data/lib/morpheus/api/provisioning_license_types_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ProvisioningLicenseTypesInterface < 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, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/provisioning_licenses_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ProvisioningLicensesInterface < 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, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/provisioning_settings_interface.rb

@@ -1,28 +1,25 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ProvisioningSettingsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='provisioning-settings')
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @api_url = "#{base_url}/api/#{api}"
-    @expires_at = expires_at
+  
+  def base_path
+    "/api/provisioning-settings"
   end
 
   def get()
-    url = @api_url
+    url = base_path
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def update(payload)
-    url = @api_url
+    url = base_path
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def template_types()
-    url = "#{@api_url}/template-types"
+    url = "#{base_path}/template-types"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/read_interface.rb

@@ -0,0 +1,23 @@
+require 'morpheus/api/api_client'
+
+# Interface class to be subclassed by interfaces that are read-only
+# and only provide list() and get() methods, not full CRUD
+# Subclasses must override the base_path method
+class Morpheus::ReadInterface < Morpheus::APIClient
+
+  # subclasses should override in your interface
+  # Example: "/api/thing-types"
+  def base_path
+    raise "#{self.class} has not defined base_path!"
+  end
+
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
+  end
+
+  def get(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
+  end
+
+end

data/lib/morpheus/api/reports_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ReportsInterface < 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, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/rest_interface.rb

@@ -1,5 +1,7 @@
 require 'morpheus/api/api_client'
 
+# Interface class to be subclassed by interfaces that provide CRUD endpoints
+# Subclasses must override the base_path method
 class Morpheus::RestInterface < Morpheus::APIClient
 
   # subclasses should override in your interface
@@ -8,27 +10,27 @@ class Morpheus::RestInterface < Morpheus::APIClient
     raise "#{self.class} has not defined base_path!"
   end
 
-  def list(params={})
-    execute(method: :get, url: "#{base_path}", params: params)
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
   end
 
-  def get(id, params={})
+  def get(id, params={}, headers={})
     validate_id!(id)
-    execute(method: :get, url: "#{base_path}/#{id}", params: params)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
   end
 
-  def create(payload, params={})
-    execute(method: :post, url: "#{base_path}", params: params, payload: payload.to_json)
+  def create(payload, params={}, headers={})
+    execute(method: :post, url: "#{base_path}", params: params, payload: payload, headers: headers)
   end
 
-  def update(id, payload, params={})
+  def update(id, payload, params={}, headers={})
     validate_id!(id)
-    execute(method: :put, url: "#{base_path}/#{id}", params: params, payload: payload.to_json)
+    execute(method: :put, url: "#{base_path}/#{id}", params: params, payload: payload, headers: headers)
   end
 
-  def destroy(id, params = {})
+  def destroy(id, params = {}, headers={})
     validate_id!(id)
-    execute(method: :delete, url: "#{base_path}/#{id}", params: params)
+    execute(method: :delete, url: "#{base_path}/#{id}", params: params, headers: headers)
   end
 
 end

data/lib/morpheus/api/roles_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::RolesInterface < 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(account_id, id)
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
@@ -91,6 +85,13 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_vdi_pool(account_id, id, options)
+    url = build_url(account_id, id) + "/update-vdi-pool"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
   private
 
   def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/api/secondary_read_interface.rb

@@ -0,0 +1,25 @@
+require 'morpheus/api/api_client'
+
+# Interface class to be subclassed by interfaces that provide CRUD endpoints
+# for objects underneath another resource
+# Subclasses must override the base_path(resource_id) method
+class Morpheus::SecondaryReadInterface < Morpheus::APIClient
+
+  # subclasses should override in your interface
+  # Example: "/api/things/#{resource_id}/widgets"
+  def base_path(resource_id)
+    raise "#{self.class} has not defined base_path(resource_id)!"
+  end
+
+  def list(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+end

data/lib/morpheus/api/secondary_rest_interface.rb

@@ -0,0 +1,42 @@
+require 'morpheus/api/api_client'
+
+# Interface class to be subclassed by interfaces that provide CRUD endpoints
+# for objects underneath another resource
+# Subclasses must override the base_path(resource_id) method
+class Morpheus::SecondaryRestInterface < Morpheus::APIClient
+
+  # subclasses should override in your interface
+  # Example: "/api/things/#{resource_id}/widgets"
+  def base_path(resource_id)
+    raise "#{self.class} has not defined base_path(resource_id)!"
+  end
+
+  def list(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+  def create(resource_id, payload, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :post, url: "#{base_path(resource_id)}", params: params, payload: payload, headers: headers)
+  end
+
+  def update(resource_id, id, payload, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path(resource_id)}/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy(resource_id, id, params = {}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+end