oneview-sdk 3.1.0 → 4.0.0

data/lib/oneview-sdk/resource/api300/synergy/enclosure_group.rb

@@ -9,13 +9,13 @@
 # CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require_relative '../../api200/enclosure_group'
+require_relative '../c7000/enclosure_group'
 
 module OneviewSDK
   module API300
     module Synergy
       # Enclosure group resource implementation on API300 Synergy
-      class EnclosureGroup < OneviewSDK::API200::EnclosureGroup
+      class EnclosureGroup < OneviewSDK::API300::C7000::EnclosureGroup
 
         # Create a resource object, associate it with a client, and set its properties.
         # @param [OneviewSDK::Client] client The client object for the OneView appliance
@@ -24,8 +24,6 @@ module OneviewSDK
         def initialize(client, params = {}, api_ver = nil)
           @data ||= {}
           # Default values:
-          @data['type'] ||= 'EnclosureGroupV300'
-          @data['stackingMode'] ||= 'Enclosure'
           @data['ipAddressingMode'] ||= 'DHCP'
           @data['interconnectBayMappingCount'] ||= 6
           super
@@ -33,10 +31,9 @@ module OneviewSDK
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def set_script
+        def set_script(*)
           unavailable_method
         end
-
       end
     end
   end

data/lib/oneview-sdk/resource/api300/synergy/logical_downlink.rb

@@ -19,13 +19,13 @@ module OneviewSDK
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def self.get_without_ethernet
+        def self.get_without_ethernet(*)
           raise MethodUnavailable, 'The method #self.get_without_ethernet is unavailable for this resource'
         end
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def get_without_ethernet
+        def get_without_ethernet(*)
           unavailable_method
         end
       end

data/lib/oneview-sdk/resource/api300/synergy/logical_enclosure.rb

@@ -50,7 +50,7 @@ module OneviewSDK
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def set_script
+        def set_script(*)
           unavailable_method
         end
       end

data/lib/oneview-sdk/resource/api300/synergy/logical_interconnect_group.rb

@@ -34,6 +34,7 @@ module OneviewSDK
           @data['interconnectBaySet'] ||= 1
           @data['interconnectMapTemplate'] ||= {}
           @data['interconnectMapTemplate']['interconnectMapEntryTemplates'] ||= []
+          @data['redundancyType'] ||= 'Redundant'
         end
 
         # Get the logical interconnect group default settings
@@ -66,22 +67,24 @@ module OneviewSDK
         # Adds an interconnect
         # @param [Fixnum] bay Bay number
         # @param [String] type Interconnect type
+        # @param [String, OneviewSDK::LogicalDownlink] logical_downlink Name of logical downlink or LogicalDownlink object
+        # @return [Hash] interconnectMapEntryTemplates entry that was added
         # @raise [StandardError] if a invalid type is given then raises an error
-        def add_interconnect(bay, type, logical_downlink = nil, enclosure_index = 1)
-          parse_interconnect_map_template(bay, enclosure_index)
-          @data['interconnectMapTemplate']['interconnectMapEntryTemplates'].each do |entry|
-            # Default value in case of no specified logical downlink
-            entry['logicalDownlinkUri'] = nil
-            if logical_downlink
-              ld = OneviewSDK::API300::Synergy::LogicalDownlink.find_by(@client, name: logical_downlink).first['uri']
-              entry['logicalDownlinkUri'] = ld
-            end
-            entry['logicalLocation']['locationEntries'].each do |location|
-              if location['type'] == 'Bay' && location['relativeValue'] == bay
-                entry['permittedInterconnectTypeUri'] = OneviewSDK::API300::Synergy::Interconnect.get_type(@client, type)['uri']
-              end
+        def add_interconnect(bay, type, logical_downlink = nil, enclosure_index = nil)
+          enclosure_index ||= type.include?('Virtual Connect SE 16Gb FC Module') ? -1 : 1
+          entry = parse_interconnect_map_template(bay, enclosure_index)
+          entry['logicalDownlinkUri'] ||= nil # Default value in case of no specified logical downlink
+          if logical_downlink
+            ld = logical_downlink if logical_downlink.class < OneviewSDK::Resource
+            ld ||= OneviewSDK::API300::Synergy::LogicalDownlink.find_by(@client, name: logical_downlink).first
+            entry['logicalDownlinkUri'] = ld['uri']
+          end
+          entry['logicalLocation']['locationEntries'].each do |location|
+            if location['type'] == 'Bay' && location['relativeValue'] == bay
+              entry['permittedInterconnectTypeUri'] = OneviewSDK::API300::Synergy::Interconnect.get_type(@client, type)['uri']
             end
           end
+          entry
         rescue StandardError
           raise 'Interconnect type or Logical Downlink not found!'
         end
@@ -89,29 +92,27 @@ module OneviewSDK
         private
 
         # Parse interconnect map template structure for specified bay
+        # @return the entry that was added (or already existed)
         def parse_interconnect_map_template(bay, enclosure_index)
           entry = {
             'logicalLocation' => {
               'locationEntries' => [
                 { 'relativeValue' => bay, 'type' => 'Bay' },
-                { 'relativeValue' => 1, 'type' => 'Enclosure' }
+                { 'relativeValue' => enclosure_index, 'type' => 'Enclosure' }
               ]
             },
             'enclosureIndex' => enclosure_index,
             'permittedInterconnectTypeUri' => nil
           }
 
-          # If no interconnect map entry templates exist yet, add the specified entry
-          first_run = @data['interconnectMapTemplate']['interconnectMapEntryTemplates'].empty?
-          return @data['interconnectMapTemplate']['interconnectMapEntryTemplates'] << entry if first_run
-
-          # Verifies if the bay specified in the entry is already added, otherwise adds it
-          @data['interconnectMapTemplate']['interconnectMapEntryTemplates'].each do |single_entry|
-            single_entry['logicalLocation']['locationEntries'].each do |location|
-              return true if location['type'] == 'Bay' && location['relativeValue'] == bay
-            end
+          # Add the interconnect if it is not already specified
+          @data['interconnectMapTemplate']['interconnectMapEntryTemplates'].each do |temp|
+            same_bay = temp['logicalLocation']['locationEntries'].include? entry['logicalLocation']['locationEntries'][0]
+            same_enc = temp['logicalLocation']['locationEntries'].include? entry['logicalLocation']['locationEntries'][1]
+            return temp if same_bay && same_enc
           end
           @data['interconnectMapTemplate']['interconnectMapEntryTemplates'] << entry
+          entry
         end
       end
     end

data/lib/oneview-sdk/resource/api300/synergy/logical_switch.rb

@@ -9,6 +9,8 @@
 # CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require_relative '../c7000/logical_switch'
+
 module OneviewSDK
   module API300
     module Synergy

data/lib/oneview-sdk/resource/api300/synergy/sas_interconnect.rb

@@ -29,19 +29,19 @@ module OneviewSDK
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def create
+        def create(*)
           unavailable_method
         end
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def update
+        def update(*)
           unavailable_method
         end
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def delete
+        def delete(*)
           unavailable_method
         end
 

data/lib/oneview-sdk/resource/api300/synergy/sas_logical_interconnect.rb

@@ -28,13 +28,13 @@ module OneviewSDK
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def create
+        def create(*)
           unavailable_method
         end
 
         # Method is not available
         # @raise [OneviewSDK::MethodUnavailable] method is not available
-        def delete
+        def delete(*)
           unavailable_method
         end
 

data/lib/oneview-sdk/resource/api300/synergy/scope.rb

@@ -0,0 +1,22 @@
+# (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 '../c7000/scope'
+
+module OneviewSDK
+  module API300
+    module Synergy
+      # Scope resource implementation for API300 Synergy
+      class Scope < OneviewSDK::API300::C7000::Scope
+      end
+    end
+  end
+end

data/lib/oneview-sdk/resource/api300/synergy/user.rb

@@ -0,0 +1,22 @@
+# (c) Copyright 2017 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 '../../api200/user'
+
+module OneviewSDK
+  module API300
+    module Synergy
+      # User resource implementation for API300 Synergy
+      class User < OneviewSDK::API200::User
+      end
+    end
+  end
+end

data/lib/oneview-sdk/rest.rb

@@ -26,9 +26,10 @@ module OneviewSDK
     # @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
+    # @param [Integer] redirect_limit Number of redirects it is allowed to follow
     # @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)
+    def rest_api(type, path, options = {}, api_ver = @api_version, redirect_limit = 3)
       @logger.debug "Making :#{type} rest call to #{@url}#{path}"
       raise InvalidRequest, 'Must specify path' unless path
 
@@ -42,9 +43,13 @@ module OneviewSDK
       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)
+      request = build_request(type, uri, options.dup, api_ver)
       response = http.request(request)
       @logger.debug "  Response: Code=#{response.code}. Headers=#{response.to_hash}\n  Body=#{response.body}"
+      if response.class <= Net::HTTPRedirection && redirect_limit > 0 && response['location']
+        @logger.debug "Redirecting to #{response['location']}"
+        return rest_api(type, response['location'], options, api_ver, redirect_limit - 1)
+      end
       response
     rescue OpenSSL::SSL::SSLError => e
       msg = 'SSL verification failed for request. Please either:'

data/lib/oneview-sdk/version.rb

@@ -1,4 +1,4 @@
-# (c) Copyright 2016 Hewlett Packard Enterprise Development LP
+# (c) Copyright 2016-2017 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.
@@ -11,5 +11,5 @@
 
 # Gem version defined here
 module OneviewSDK
-  VERSION = '3.1.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/oneview-sdk.gemspec

@@ -39,5 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'rubocop', '= 0.42.0'
+  spec.add_development_dependency 'byebug'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oneview-sdk
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Henrique Diomede
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -139,6 +139,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.42.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to interact with the HPE OneView API
 email:
 - henrique.diomede@hpe.com
@@ -161,6 +175,16 @@ files:
 - lib/oneview-sdk/client.rb
 - lib/oneview-sdk/config_loader.rb
 - lib/oneview-sdk/exceptions.rb
+- lib/oneview-sdk/image-streamer/client.rb
+- lib/oneview-sdk/image-streamer/resource/api300/artifacts_bundle.rb
+- lib/oneview-sdk/image-streamer/resource/api300/build_plan.rb
+- lib/oneview-sdk/image-streamer/resource/api300/deployment_plan.rb
+- lib/oneview-sdk/image-streamer/resource/api300/golden_image.rb
+- lib/oneview-sdk/image-streamer/resource/api300/os_volume.rb
+- lib/oneview-sdk/image-streamer/resource/api300/plan_script.rb
+- lib/oneview-sdk/image-streamer/resource/api300/resource.rb
+- lib/oneview-sdk/image-streamer/resource/api_300.rb
+- lib/oneview-sdk/image_streamer.rb
 - lib/oneview-sdk/resource.rb
 - lib/oneview-sdk/resource/api200.rb
 - lib/oneview-sdk/resource/api200/connection_template.rb
@@ -196,6 +220,7 @@ files:
 - lib/oneview-sdk/resource/api200/switch.rb
 - lib/oneview-sdk/resource/api200/unmanaged_device.rb
 - lib/oneview-sdk/resource/api200/uplink_set.rb
+- lib/oneview-sdk/resource/api200/user.rb
 - lib/oneview-sdk/resource/api200/volume.rb
 - lib/oneview-sdk/resource/api200/volume_attachment.rb
 - lib/oneview-sdk/resource/api200/volume_snapshot.rb
@@ -226,6 +251,7 @@ files:
 - lib/oneview-sdk/resource/api300/c7000/rack.rb
 - lib/oneview-sdk/resource/api300/c7000/resource.rb
 - lib/oneview-sdk/resource/api300/c7000/san_manager.rb
+- lib/oneview-sdk/resource/api300/c7000/scope.rb
 - lib/oneview-sdk/resource/api300/c7000/server_hardware.rb
 - lib/oneview-sdk/resource/api300/c7000/server_hardware_type.rb
 - lib/oneview-sdk/resource/api300/c7000/server_profile.rb
@@ -235,6 +261,7 @@ files:
 - lib/oneview-sdk/resource/api300/c7000/switch.rb
 - lib/oneview-sdk/resource/api300/c7000/unmanaged_device.rb
 - lib/oneview-sdk/resource/api300/c7000/uplink_set.rb
+- lib/oneview-sdk/resource/api300/c7000/user.rb
 - lib/oneview-sdk/resource/api300/c7000/volume.rb
 - lib/oneview-sdk/resource/api300/c7000/volume_attachment.rb
 - lib/oneview-sdk/resource/api300/c7000/volume_snapshot.rb
@@ -258,7 +285,6 @@ files:
 - lib/oneview-sdk/resource/api300/synergy/logical_interconnect.rb
 - lib/oneview-sdk/resource/api300/synergy/logical_interconnect_group.rb
 - lib/oneview-sdk/resource/api300/synergy/logical_switch.rb
-- lib/oneview-sdk/resource/api300/synergy/logical_switch_group.rb
 - lib/oneview-sdk/resource/api300/synergy/managed_san.rb
 - lib/oneview-sdk/resource/api300/synergy/network_set.rb
 - lib/oneview-sdk/resource/api300/synergy/power_device.rb
@@ -268,6 +294,7 @@ files:
 - lib/oneview-sdk/resource/api300/synergy/sas_interconnect.rb
 - lib/oneview-sdk/resource/api300/synergy/sas_logical_interconnect.rb
 - lib/oneview-sdk/resource/api300/synergy/sas_logical_interconnect_group.rb
+- lib/oneview-sdk/resource/api300/synergy/scope.rb
 - lib/oneview-sdk/resource/api300/synergy/server_hardware.rb
 - lib/oneview-sdk/resource/api300/synergy/server_hardware_type.rb
 - lib/oneview-sdk/resource/api300/synergy/server_profile.rb
@@ -277,6 +304,7 @@ files:
 - lib/oneview-sdk/resource/api300/synergy/switch.rb
 - lib/oneview-sdk/resource/api300/synergy/unmanaged_device.rb
 - lib/oneview-sdk/resource/api300/synergy/uplink_set.rb
+- lib/oneview-sdk/resource/api300/synergy/user.rb
 - lib/oneview-sdk/resource/api300/synergy/volume.rb
 - lib/oneview-sdk/resource/api300/synergy/volume_attachment.rb
 - lib/oneview-sdk/resource/api300/synergy/volume_snapshot.rb
@@ -305,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Gem to interact with the HPE OneView API