Skip to content

Commit

Permalink
Adjusting the methods with header parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
aalexmonteiro committed Nov 8, 2017
1 parent b0b1e45 commit 8b10a36
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def get_settings
# @raise [OneviewSDK::IncompleteResource] if the client is not set
# @raise [StandardError] if the resource creation fails
# @return [Resource] self
def create(header = self.class::DEFAULT_REQUEST_HEADER)
def create(header = DEFAULT_REQUEST_HEADER)
verify_interconnects_before_save!
super(header)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/oneview-sdk/resource/api200/logical_switch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def initialize(client, params = {}, api_ver = nil)
# @raise [OneviewSDK::IncompleteResource] if the client is not set
# @raise [StandardError] if the resource creation fails
# @return [OneviewSDK::LogicalSwitch] self
def create(header = self.class::DEFAULT_REQUEST_HEADER)
def create(header = DEFAULT_REQUEST_HEADER)
ensure_client
request_body = {}
request_body['logicalSwitchCredentials'] = generate_logical_switch_credentials
Expand Down
2 changes: 1 addition & 1 deletion lib/oneview-sdk/resource/api200/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def initialize(client, params = {}, api_ver = nil)
# @raise [OneviewSDK::IncompleteResource] if the client is not set
# @raise [StandardError] if the resource creation fails
# @return [Resource] self
def create(header = self.class::DEFAULT_REQUEST_HEADER)
def create(header = DEFAULT_REQUEST_HEADER)
ensure_client
response = @client.rest_post(BASE_URI, header.merge('body' => @data), @api_version)
body = @client.response_handler(response)
Expand Down
6 changes: 3 additions & 3 deletions lib/oneview-sdk/resource/api200/volume.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Volume < Resource
# @raise [OneviewSDK::IncompleteResource] if the client is not set
# @raise [StandardError] if the resource creation fails
# @return [Resource] self
def create(header = self.class::DEFAULT_REQUEST_HEADER)
def create(header = DEFAULT_REQUEST_HEADER)
super(header)
@data.delete('provisioningParameters')
self
Expand All @@ -43,7 +43,7 @@ def create(header = self.class::DEFAULT_REQUEST_HEADER)
# @raise [OneviewSDK::IncompleteResource] if the client is not set
# @raise [StandardError] if the resource creation fails
# @return [Resource] self
def create!(header = self.class::DEFAULT_REQUEST_HEADER)
def create!(header = DEFAULT_REQUEST_HEADER)
temp = self.class.new(@client, @data)
temp.delete(:all, header) if temp.retrieve!(header)
create(header)
Expand All @@ -61,7 +61,7 @@ def update(attributes = {})
# @param [Symbol] flag Delete storage system from Oneview only or in storage system as well
# @param [Hash] header The header options for the request (key-value pairs)
# @return [true] if resource was deleted successfully
def delete(flag = :all, header = self.class::DEFAULT_REQUEST_HEADER)
def delete(flag = :all, header = DEFAULT_REQUEST_HEADER)
ensure_client && ensure_uri
raise InvalidResource, 'Invalid flag value, use :oneview or :all' unless %i[oneview all].include?(flag)
header = header.merge('exportOnly' => true) if flag == :oneview
Expand Down
4 changes: 2 additions & 2 deletions lib/oneview-sdk/resource/api200/volume_template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ def initialize(client, params = {}, api_ver = nil)
# @raise [OneviewSDK::IncompleteResource] if the client is not set
# @raise [StandardError] if the resource creation fails
# @return [Resource] self
def create(header = self.class::DEFAULT_REQUEST_HEADER)
def create(header = DEFAULT_REQUEST_HEADER)
super(header.merge('Accept-Language' => 'en_US'))
end

# Deletes the volume template from OneView
# @param [Hash] header The header options for the request (key-value pairs)
# @return [TrueClass] if the volume template was deleted successfully
def delete(header = self.class::DEFAULT_REQUEST_HEADER)
def delete(header = DEFAULT_REQUEST_HEADER)
super(header.merge('Accept-Language' => 'en_US'))
end

Expand Down
2 changes: 1 addition & 1 deletion lib/oneview-sdk/resource/api300/c7000/scope.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def update(attributes = {})
# @param [Hash] header The header options for the request (key-value pairs)
# @raise [OneviewSDK::IncompleteResource] if the client or uri is not set
# @return [true] if resource was deleted successfully
def delete(header = self.class::DEFAULT_REQUEST_HEADER)
def delete(header = DEFAULT_REQUEST_HEADER)
super(header.merge('If-Match' => @data['eTag']))
end

Expand Down
8 changes: 4 additions & 4 deletions lib/oneview-sdk/resource/api500/c7000/volume.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def set_storage_system(*)
# @raise [OneviewSDK::IncompleteResource] if the client is not set.
# @raise [StandardError] if the resource creation fails.
# @return [Resource] self
def create(header = self.class::DEFAULT_REQUEST_HEADER)
def create(header = DEFAULT_REQUEST_HEADER)
properties = Hash[@data['properties'].map { |k, v| [k.to_sym, v] }]
family = properties[:dataProtectionLevel].nil? ? 'StoreServ' : 'StoreVirtual'
template_data = {
Expand Down Expand Up @@ -58,7 +58,7 @@ def update(attributes = {})
# @param [Hash] header The header options for the request (key-value pairs)
# @raise [InvalidResource] if an invalid flag is passed.
# @return [true] if resource was deleted successfully.
def delete(flag = :all, header = self.class::DEFAULT_REQUEST_HEADER)
def delete(flag = :all, header = DEFAULT_REQUEST_HEADER)
ensure_client && ensure_uri
raise InvalidResource, 'Invalid flag value, use :oneview or :all' unless %i[oneview all].include?(flag)
uri = @data['uri']
Expand Down Expand Up @@ -162,7 +162,7 @@ def add
# @note one of the UNIQUE_IDENTIFIERS, e.g. name or uri or properties['name'], must be specified in the resource
# @param [Hash] header The header options for the request (key-value pairs)
# @return [Boolean] Whether or not retrieve was successful
def retrieve!(header = self.class::DEFAULT_REQUEST_HEADER)
def retrieve!(header = DEFAULT_REQUEST_HEADER)
return super(header) unless @data['properties']
results = find_by_name_in_properties(header)
return false unless results.size == 1
Expand All @@ -174,7 +174,7 @@ def retrieve!(header = self.class::DEFAULT_REQUEST_HEADER)
# @note one of the UNIQUE_IDENTIFIERS, e.g. name or uri or properties['name'], must be specified in the resource
# @param [Hash] header The header options for the request (key-value pairs)
# @return [Boolean] Whether or not resource exists
def exists?(header = self.class::DEFAULT_REQUEST_HEADER)
def exists?(header = DEFAULT_REQUEST_HEADER)
return super(header) unless @data['properties']
find_by_name_in_properties(header).size == 1
end
Expand Down
2 changes: 1 addition & 1 deletion lib/oneview-sdk/resource/api500/c7000/volume_template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class VolumeTemplate < Resource
# Delete resource from OneView
# @param [Hash] header The header options for the request (key-value pairs)
# @return [true] if resource was deleted successfully
def delete(header = self.class::DEFAULT_REQUEST_HEADER)
def delete(header = DEFAULT_REQUEST_HEADER)
super(header.merge('If-Match' => @data['eTag']))
end

Expand Down

0 comments on commit 8b10a36

Please sign in to comment.