oneview-sdk 1.0.0 → 2.0.0

data/lib/oneview-sdk/resource/volume_attachment.rb

@@ -0,0 +1,79 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module OneviewSDK
+  # Storage volume attachment resource implementation
+  class VolumeAttachment < Resource
+    BASE_URI = '/rest/storage-volume-attachments'.freeze
+
+    # Create a resource object, associate it with a client, and set its properties.
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [Hash] params The options for this resource (key-value pairs)
+    # @param [Integer] api_ver The api version to use when interracting with this resource.
+    def initialize(client, params = {}, api_ver = nil)
+      super
+      # Default values:
+      @data['type'] ||= 'StorageVolumeAttachment'
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def create
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def update
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def delete
+      unavailable_method
+    end
+
+    # Gets the list of extra unmanaged storage volumes
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    def self.get_extra_unmanaged_volumes(client)
+      response = client.rest_get(BASE_URI + '/repair?alertFixType=ExtraUnmanagedStorageVolumes')
+      client.response_handler(response)
+    end
+
+    # Removes extra presentations from a specific server profile
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [OneviewSDK::Resource] resource Oneview resource
+    def self.remove_extra_unmanaged_volume(client, resource)
+      requestBody = {
+        type: 'ExtraUnmanagedStorageVolumes',
+        resourceUri: resource['uri']
+      }
+      response = client.rest_post(BASE_URI + '/repair', 'body' => requestBody)
+      client.response_handler(response)
+    end
+
+    # Gets all volume attachment paths
+    # @return [Array] List of the storage volume attachments paths
+    def get_paths
+      response = @client.rest_get(@data['uri'] + '/paths')
+      @client.response_handler(response)
+    end
+
+    # Gets a volume attachment path by id
+    # @param [String] id Volume attachament path id
+    # @return [OneviewSDK::VolumeAttachmentPath]
+    def get_path(id)
+      response = @client.rest_get("#{@data['uri']}/paths/#{id}")
+      @client.response_handler(response)
+    end
+  end
+end

data/lib/oneview-sdk/resource/volume_snapshot.rb

@@ -1,18 +1,37 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 module OneviewSDK
   # Volume snapshot resource implementation
   class VolumeSnapshot < Resource
     BASE_URI = nil
 
+    # Create a resource object, associate it with a client, and set its properties.
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [Hash] params The options for this resource (key-value pairs)
+    # @param [Integer] api_ver The api version to use when interracting with this resource.
     def initialize(client, params = {}, api_ver = nil)
       super
       # Default values
       @data['type'] ||= 'Snapshot'
     end
 
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
     def create
       unavailable_method
     end
 
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
     def update
       unavailable_method
     end
@@ -20,7 +39,7 @@ module OneviewSDK
     # Sets the volume
     # @param [OneviewSDK::Volume] volume Volume
     def set_volume(volume)
-      fail 'Please set the volume\'s uri attribute!' unless volume['uri']
+      volume.retrieve! unless volume['uri']
       @data['storageVolumeUri'] = volume['uri']
     end
   end

data/lib/oneview-sdk/resource/volume_template.rb

@@ -1,10 +1,21 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 module OneviewSDK
   # Volume template resource implementation
   class VolumeTemplate < Resource
     BASE_URI = '/rest/storage-volume-templates'.freeze
 
-    # Create client object, establish connection, and set up logging and api version.
-    # @param [Client] client The Client object with a connection to the OneView appliance
+    # Create the client object, establishes connection, and set up the logging and api version.
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @param [Hash] params The options for this resource (key-value pairs)
     # @param [Integer] api_ver The api version to use when interracting with this resource.
     # Defaults to client.api_version if exists, or OneviewSDK::Client::DEFAULT_API_VERSION.
@@ -17,29 +28,10 @@ module OneviewSDK
       @data['type'] ||= 'StorageVolumeTemplateV3'
     end
 
-    # @!group Validates
-
-    VALID_REFRESH_STATES = %w(NotRefreshing RefreshFailed RefreshPending Refreshing).freeze
-    # Validate refreshState
-    # @param [String] value NotRefreshing, RefreshFailed, RefreshPending, Refreshing
-    def validate_refreshState(value)
-      fail 'Invalid refresh state' unless VALID_REFRESH_STATES.include?(value)
-    end
-
-    VALID_STATUSES = %w(OK Disabled Warning Critical Unknown).freeze
-    # Validate status
-    # @param [String] value OK, Disabled, Warning, Critical, Unknown
-    def validate_status(value)
-      fail 'Invalid status' unless VALID_STATUSES.include?(value)
-    end
-
-    # @!endgroup
-
     # Create the resource on OneView using the current data
-    # Adds Accept-Language attribute in the Header equal to "en_US"
     # @note Calls refresh method to set additional data
-    # @raise [RuntimeError] if the client is not set
-    # @raise [RuntimeError] if the resource creation fails
+    # @raise [OneviewSDK::IncompleteResource] if the client is not set
+    # @raise [StandardError] if the resource creation fails
     # @return [Resource] self
     def create
       ensure_client
@@ -48,9 +40,8 @@ module OneviewSDK
       set_all(body)
     end
 
-    # Delete volume template from OneView
-    # Adds Accept-Language attribute in the Header equal to "en_US"
-    # @return [TrueClass] if volume template was deleted successfully
+    # Deletes the volume template from OneView
+    # @return [TrueClass] if the volume template was deleted successfully
     def delete
       ensure_client && ensure_uri
       response = @client.rest_delete(@data['uri'], { 'Accept-Language' => 'en_US' }, @api_version)
@@ -58,8 +49,7 @@ module OneviewSDK
       true
     end
 
-    # Update volume template from OneView
-    # Adds Accept-Language attribute in the Header equal to "en_US"
+    # Updates the volume template from OneView
     # @return [Resource] self
     def update(attributes = {})
       set_all(attributes)
@@ -69,7 +59,7 @@ module OneviewSDK
       self
     end
 
-    # Set storage pool
+    # Sets the storage pool
     # @param [Boolean] shareable
     # @param [String] provisionType 'Thin' or 'Full'
     # @param [String] capacity (in bytes)
@@ -82,25 +72,24 @@ module OneviewSDK
       @data['provisioning']['storagePoolUri'] = storage_pool['uri']
     end
 
-    # Set storage system
+    # Sets the storage system
     # @param [OneviewSDK::StorageSystem] storage_system Storage System to be used to create the template
     def set_storage_system(storage_system)
       storage_system.retrieve! unless storage_system['uri']
       @data['storageSystemUri'] = storage_system['uri']
     end
 
-    # Set snapshot pool
+    # Sets the snapshot pool
     # @param [OneviewSDK::StoragePool] storage_pool Storage Pool to generate the template
     def set_snapshot_pool(storage_pool)
       storage_pool.retrieve! unless storage_pool['uri']
       @data['snapshotPoolUri'] = storage_pool['uri']
     end
 
-    # Get connectable volume templates by its attributes
+    # Gets the connectable volume templates by its attributes
     # @param [Hash] attributes Hash containing the attributes name and value
     def get_connectable_volume_templates(attributes = {})
       OneviewSDK::Resource.find_by(@client, attributes, BASE_URI + '/connectable-volume-templates')
     end
-
   end
 end

data/lib/oneview-sdk/resource.rb

@@ -1,3 +1,14 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 require_relative 'client'
 
 # OneviewSDK Resources
@@ -13,27 +24,28 @@ module OneviewSDK
       :logger
 
     # Create a resource object, associate it with a client, and set its properties.
-    # @param [Client] client The Client object with a connection to the OneView appliance
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @param [Hash] params The options for this resource (key-value pairs)
     # @param [Integer] api_ver The api version to use when interracting with this resource.
-    #   Defaults to client.api_version if exists, or OneviewSDK::Client::DEFAULT_API_VERSION.
+    #   Defaults to the client.api_version if it exists, or the OneviewSDK::Client::DEFAULT_API_VERSION.
     def initialize(client, params = {}, api_ver = nil)
-      fail 'Must specify a valid client' unless client.is_a?(OneviewSDK::Client)
+      fail InvalidClient, 'Must specify a valid client' unless client.is_a?(OneviewSDK::Client)
       @client = client
       @logger = @client.logger
       @api_version = api_ver || @client.api_version
       if @api_version > @client.max_api_version
-        fail "#{self.class.name} api_version '#{@api_version}' is greater than the client's max_api_version '#{@client.max_api_version}'"
+        fail UnsupportedVersion,
+             "#{self.class.name} api_version '#{@api_version}' is greater than the client's max_api_version '#{@client.max_api_version}'"
       end
       @data ||= {}
       set_all(params)
     end
 
     # Retrieve resource details based on this resource's name or URI.
-    # @note Name or URI must be specified inside resource
+    # @note Name or URI must be specified inside the resource
     # @return [Boolean] Whether or not retrieve was successful
     def retrieve!
-      fail 'Must set resource name or uri before trying to retrieve!' unless @data['name'] || @data['uri']
+      fail IncompleteResource, 'Must set resource name or uri before trying to retrieve!' unless @data['name'] || @data['uri']
       results = self.class.find_by(@client, name: @data['name']) if @data['name']
       results = self.class.find_by(@client, uri:  @data['uri'])  if @data['uri'] && (!results || results.empty?)
       return false unless results.size == 1
@@ -45,14 +57,14 @@ module OneviewSDK
     # @note name or uri must be specified inside resource
     # @return [Boolean] Whether or not resource exists
     def exists?
-      fail 'Must set resource name or uri before trying to retrieve!' unless @data['name'] || @data['uri']
+      fail IncompleteResource, 'Must set resource name or uri before trying to retrieve!' unless @data['name'] || @data['uri']
       return true if @data['name'] && self.class.find_by(@client, name: @data['name']).size == 1
       return true if @data['uri']  && self.class.find_by(@client, uri:  @data['uri']).size == 1
       false
     end
 
     # Set the given hash of key-value pairs as resource data attributes
-    # @param [Hash, Resource] params The options for this resource (key-value pairs or Resource object)
+    # @param [Hash, Resource] params The options for this resource (key-value pairs or resource object)
     # @note All top-level keys will be converted to strings
     # @return [Resource] self
     def set_all(params = {})
@@ -105,15 +117,15 @@ module OneviewSDK
     end
 
     # Check equality of 2 resources. Same as ==(other)
-    # @param [Resource] other The other resource to check equality for
+    # @param [Resource] other The other resource to check for equality
     # @return [Boolean] Whether or not the two objects are equal
     def eql?(other)
       self == other
     end
 
-    # Check equality of data on other resource with that of this resource.
-    # @note Doesn't check the client, logger, or api_version if another Resource is passed in
-    # @param [Hash, Resource] other Resource or hash to compare key-value pairs with
+    # Check the equality of the data for the other resource with this resource.
+    # @note Does not check the client, logger, or api_version if another resource is passed in
+    # @param [Hash, Resource] other resource or hash to compare the key-value pairs with
     # @example Compare to hash
     #   myResource = OneviewSDK::Resource.new(client, { name: 'res1', description: 'example'}, 200)
     #   myResource.like?(description: '') # returns false
@@ -125,8 +137,8 @@ module OneviewSDK
 
     # Create the resource on OneView using the current data
     # @note Calls the refresh method to set additional data
-    # @raise [RuntimeError] if the client is not set
-    # @raise [RuntimeError] if the resource creation fails
+    # @raise [OneviewSDK::IncompleteResource] if the client is not set
+    # @raise [StandardError] if the resource creation fails
     # @return [Resource] self
     def create
       ensure_client
@@ -138,8 +150,8 @@ module OneviewSDK
 
     # Delete the resource from OneView if it exists, then create it using the current data
     # @note Calls refresh method to set additional data
-    # @raise [RuntimeError] if the client is not set
-    # @raise [RuntimeError] if the resource creation fails
+    # @raise [OneviewSDK::IncompleteResource] if the client is not set
+    # @raise [StandardError] if the resource creation fails
     # @return [Resource] self
     def create!
       temp = self.class.new(@client, @data)
@@ -160,8 +172,8 @@ module OneviewSDK
 
     # Set data and save to OneView
     # @param [Hash] attributes The attributes to add/change for this resource (key-value pairs)
-    # @raise [RuntimeError] if the client or uri is not set
-    # @raise [RuntimeError] if the resource save fails
+    # @raise [OneviewSDK::IncompleteResource] if the client or uri is not set
+    # @raise [StandardError] if the resource save fails
     # @return [Resource] self
     def update(attributes = {})
       set_all(attributes)
@@ -194,7 +206,7 @@ module OneviewSDK
       when :yml, :yaml
         File.open(file_path, 'w') { |f| f.write(temp_data.to_yaml) }
       else
-        fail "Invalid format: #{format}"
+        fail InvalidFormat, "Invalid format: #{format}"
       end
       true
     end
@@ -207,7 +219,7 @@ module OneviewSDK
     end
 
     # Get resource schema
-    # @param [Client] client
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @return [Hash] Schema
     def self.schema(client)
       response = client.rest_get("#{self::BASE_URI}/schema", client.api_version)
@@ -218,7 +230,7 @@ module OneviewSDK
     end
 
     # Load resource from a .json or .yaml file
-    # @param [Client] client The client object to associate this resource with
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @param [String] file_path The full path to the file
     # @return [Resource] New resource created from the file contents
     def self.from_file(client, file_path)
@@ -226,8 +238,8 @@ module OneviewSDK
       new(client, resource['data'], resource['api_version'])
     end
 
-    # Make a GET request to the resource uri and return an array with results matching the search
-    # @param [Client] client
+    # Make a GET request to the resource uri, and returns an array with results matching the search
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @param [Hash] attributes Hash containing the attributes name and value
     # @param [String] uri URI of the endpoint
     # @return [Array<Resource>] Results matching the search
@@ -242,35 +254,61 @@ module OneviewSDK
           temp = new(client, member)
           results.push(temp) if temp.like?(attributes)
         end
-        break unless body['nextPageUri']
+        break unless body['nextPageUri'] && (body['nextPageUri'] != body['uri'])
         uri = body['nextPageUri']
       end
       results
     end
 
-    # Make a GET request to the resource base uri and return an array with all objects of this type
+    # Make a GET request to the resource base uri, and returns an array with all objects of this type
     # @return [Array<Resource>] Results
     def self.get_all(client)
       find_by(client, {})
     end
 
+    # Builds a Query string corresponding to the parameters passed
+    # @param [Hash{String=>String,OneviewSDK::Resource}] query_options Query parameters and values
+    #   to be applied to the query url.
+    #   All key values should be Strings in snake case, the values could be Strings or Resources.
+    # @option query_options [String] String Values that are Strings can be associated as usual
+    # @option query_options [String] Resources Values that are Resources can be associated as usual,
+    #   with keys representing only the resource names (like 'ethernet_network'). This method
+    #   translates the SDK and Ruby standards to OneView request standard.
+    def self.build_query(query_options)
+      return '' if !query_options || query_options.empty?
+      query_path = '?'
+      query_options.each do |k, v|
+        words = k.to_s.split('_')
+        words.map!(&:capitalize!)
+        words[0] = words.first.downcase
+        new_key = words.join
+        v.retrieve! if v.respond_to?(:retrieve!) && !v['uri']
+        if v.class <= OneviewSDK::Resource
+          new_key = new_key.concat('Uri')
+          v = v['uri']
+        end
+        query_path.concat("&#{new_key}=#{v}")
+      end
+      query_path.sub('?&', '?')
+    end
+
     protected
 
     # Fail unless @client is set for this resource.
     def ensure_client
-      fail 'Please set client attribute before interacting with this resource' unless @client
+      fail IncompleteResource, 'Please set client attribute before interacting with this resource' unless @client
       true
     end
 
     # Fail unless @data['uri'] is set for this resource.
     def ensure_uri
-      fail 'Please set uri attribute before interacting with this resource' unless @data['uri']
+      fail IncompleteResource, 'Please set uri attribute before interacting with this resource' unless @data['uri']
       true
     end
 
     # Fail for methods that are not available for one resource
     def unavailable_method
-      fail "The method ##{caller[0][/`.*'/][1..-2]} is unavailable for this resource"
+      fail MethodUnavailable, "The method ##{caller[0][/`.*'/][1..-2]} is unavailable for this resource"
     end
 
     private

data/lib/oneview-sdk/rest.rb

@@ -1,12 +1,23 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 require 'uri'
 require 'net/http'
 require 'openssl'
 require 'json'
 
 module OneviewSDK
-  # Contains all the methods for making API REST calls
+  # Contains all of the methods for making API REST calls
   module Rest
-    # Make a restful API request to OneView
+    # Makes a restful API request to OneView
     # @param [Symbol] type The rest method/type Options: [:get, :post, :delete, :patch, :put]
     # @param [String] path The path for the request. Usually starts with "/rest/"
     # @param [Hash] options The options for the request
@@ -14,11 +25,12 @@ module OneviewSDK
     # @option options [String] :Content-Type ('application/json') Set to nil or :none to have this option removed
     # @option options [Integer] :X-API-Version (client.api_version) API version to use for this request
     # @option options [Integer] :auth (client.token) Authentication token to use for this request
-    # @raise [RuntimeError] if SSL validation of OneView instance's certificate failed
+    # @param [Integer] api_ver The api version to use when interracting with this resource
+    # @raise [OpenSSL::SSL::SSLError] if SSL validation of OneView instance's certificate failed
     # @return [NetHTTPResponse] Response object
     def rest_api(type, path, options = {}, api_ver = @api_version)
       @logger.debug "Making :#{type} rest call to #{@url}#{path}"
-      fail 'Must specify path' unless path
+      fail InvalidRequest, 'Must specify path' unless path
 
       uri = URI.parse(URI.escape(@url + path))
       http = Net::HTTP.new(uri.host, uri.port)
@@ -27,6 +39,8 @@ module OneviewSDK
         http.cert_store = @cert_store if @cert_store
       else http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+      http.read_timeout = @timeout if @timeout # Timeout for a request
+      http.open_timeout = @timeout if @timeout # Timeout for a connection
 
       request = build_request(type, uri, options, api_ver)
       response = http.request(request)
@@ -42,32 +56,62 @@ module OneviewSDK
       raise e
     end
 
-    # Make a restful GET request to OneView
-    # Parameters & return value align with those of the {OneviewSDK::Rest::rest_api} method above
+    # Makes a restful GET request to OneView
+    # @param [String] path The path for the request. Usually starts with "/rest/"
+    # @param [Integer] api_ver The api version to use when interracting with this resource
+    # @return [NetHTTPResponse] Response object
     def rest_get(path, api_ver = @api_version)
       rest_api(:get, path, {}, api_ver)
     end
 
-    # Make a restful POST request to OneView
-    # Parameters & return value align with those of the {OneviewSDK::Rest::rest_api} method above
+    # Makes a restful POST request to OneView
+    # @param [String] path The path for the request. Usually starts with "/rest/"
+    # @param [Hash] options The options for the request
+    # @option options [String] :body Hash to be converted into json and set as the request body
+    # @option options [String] :Content-Type ('application/json') Set to nil or :none to have this option removed
+    # @option options [Integer] :X-API-Version (client.api_version) API version to use for this request
+    # @option options [Integer] :auth (client.token) Authentication token to use for this request
+    # @param [Integer] api_ver The api version to use when interracting with this resource
+    # @return [NetHTTPResponse] Response object
     def rest_post(path, options = {}, api_ver = @api_version)
       rest_api(:post, path, options, api_ver)
     end
 
-    # Make a restful PUT request to OneView
-    # Parameters & return value align with those of the {OneviewSDK::Rest::rest_api} method above
+    # Makes a restful PUT request to OneView
+    # @param [String] path The path for the request. Usually starts with "/rest/"
+    # @param [Hash] options The options for the request
+    # @option options [String] :body Hash to be converted into json and set as the request body
+    # @option options [String] :Content-Type ('application/json') Set to nil or :none to have this option removed
+    # @option options [Integer] :X-API-Version (client.api_version) API version to use for this request
+    # @option options [Integer] :auth (client.token) Authentication token to use for this request
+    # @param [Integer] api_ver The api version to use when interracting with this resource
+    # @return [NetHTTPResponse] Response object
     def rest_put(path, options = {}, api_ver = @api_version)
       rest_api(:put, path, options, api_ver)
     end
 
-    # Make a restful PATCH request to OneView
-    # Parameters & return value align with those of the {OneviewSDK::Rest::rest_api} method above
+    # Makes a restful PATCH request to OneView
+    # @param [String] path The path for the request. Usually starts with "/rest/"
+    # @param [Hash] options The options for the request
+    # @option options [String] :body Hash to be converted into json and set as the request body
+    # @option options [String] :Content-Type ('application/json') Set to nil or :none to have this option removed
+    # @option options [Integer] :X-API-Version (client.api_version) API version to use for this request
+    # @option options [Integer] :auth (client.token) Authentication token to use for this request
+    # @param [Integer] api_ver The api version to use when interracting with this resource
+    # @return [NetHTTPResponse] Response object
     def rest_patch(path, options = {}, api_ver = @api_version)
       rest_api(:patch, path, options, api_ver)
     end
 
-    # Make a restful DELETE request to OneView
-    # Parameters & return value align with those of the {OneviewSDK::Rest::rest_api} method above
+    # Makes a restful DELETE request to OneView
+    # @param [String] path The path for the request. Usually starts with "/rest/"
+    # @param [Hash] options The options for the request
+    # @option options [String] :body Hash to be converted into json and set as the request body
+    # @option options [String] :Content-Type ('application/json') Set to nil or :none to have this option removed
+    # @option options [Integer] :X-API-Version (client.api_version) API version to use for this request
+    # @option options [Integer] :auth (client.token) Authentication token to use for this request
+    # @param [Integer] api_ver The api version to use when interracting with this resource
+    # @return [NetHTTPResponse] Response object
     def rest_delete(path, options = {}, api_ver = @api_version)
       rest_api(:delete, path, options, api_ver)
     end
@@ -80,12 +124,12 @@ module OneviewSDK
     RESPONSE_CODE_UNAUTHORIZED = 401
     RESPONSE_CODE_NOT_FOUND    = 404
 
-    # Handle the response from a rest call.
+    # Handles the response from a rest call.
     #   If an asynchronous task was started, this waits for it to complete.
     # @param [HTTPResponse] response HTTP response
     # @param [Boolean] wait_on_task Wait on task (or just return task details)
-    # @raise [RuntimeError] if the request failed
-    # @raise [RuntimeError] if a task was returned that did not complete successfully
+    # @raise [StandardError] if the request failed
+    # @raise [StandardError] if a task was returned that did not complete successfully
     # @return [Hash] The parsed JSON body
     def response_handler(response, wait_on_task = true)
       case response.code.to_i
@@ -101,27 +145,28 @@ module OneviewSDK
       when RESPONSE_CODE_ACCEPTED # Asynchronous add, update or delete
         return JSON.parse(response.body) unless wait_on_task
         @logger.debug "Waiting for task: response.header['location']"
-        task = wait_for(response.header['location'])
+        uri = response.header['location'] || JSON.parse(response.body)['uri'] # If task uri is not returned in header
+        task = wait_for(uri)
         return true unless task['associatedResource'] && task['associatedResource']['resourceUri']
         resource_data = rest_get(task['associatedResource']['resourceUri'])
         return JSON.parse(resource_data.body)
       when RESPONSE_CODE_NO_CONTENT # Synchronous delete
         return {}
       when RESPONSE_CODE_BAD_REQUEST
-        fail "400 BAD REQUEST #{response.body}"
+        fail BadRequest, "400 BAD REQUEST #{response.body}"
       when RESPONSE_CODE_UNAUTHORIZED
-        fail "401 UNAUTHORIZED #{response.body}"
+        fail Unauthorized, "401 UNAUTHORIZED #{response.body}"
       when RESPONSE_CODE_NOT_FOUND
-        fail "404 NOT FOUND #{response.body}"
+        fail NotFound, "404 NOT FOUND #{response.body}"
       else
-        fail "#{response.code} #{response.body}"
+        fail RequestError, "#{response.code} #{response.body}"
       end
     end
 
 
     private
 
-    # Build a request object using the data given
+    # Builds a request object using the data given
     def build_request(type, uri, options, api_ver)
       case type.downcase.to_sym
       when :get
@@ -135,7 +180,7 @@ module OneviewSDK
       when :delete
         request = Net::HTTP::Delete.new(uri.request_uri)
       else
-        fail "Invalid rest call: #{type}"
+        fail InvalidRequest, "Invalid rest call: #{type}"
       end
 
       options['X-API-Version'] ||= api_ver