oneview-sdk 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f224fcb81143087867edc94a434b56d65a78659
-  data.tar.gz: 03a1ef013585d8f80554745aa9f2910b18dd797f
+  metadata.gz: a7edacad4f95e018c2c4155c5d7bcbf502a14c7e
+  data.tar.gz: 3bd46a95ff7f58444d0b19f90939746d225ffa82
 SHA512:
-  metadata.gz: 5d524a3027585fabc531bd9726b5780f71d92f84f17f0891824313d999124ecbbb43e4e9b2449408549816853e58be6a28df0a669f316d59c1525c3f68ffb3b5
-  data.tar.gz: cf2ec71583906adb14782aadaeb81da5e41063ac79529040918b537688011416781b60ac8771e03bc74924ec8cf62e3329b58890a118713fae54e3706fbde9e4
+  metadata.gz: abd9687dfe8752cf416d1a4079e2dc99f3e29b3a43d8f77ae9ca8ad1f7f965238029381e92c658c58f4825e9322df23477fa6c80b197324cc44aaf29d4056f59
+  data.tar.gz: d90567809d527d9aa8990b0294e04e3e54ad7eab40f43fd5de331b39aaa1a5f936f33a9f2685cdae87e92deef9b90140d5916953a726b0c5af0cc6801f3d0a19

data/.rubocop.yml

@@ -1,5 +1,9 @@
 # See default at https://github.com/bbatsov/rubocop/blob/master/config/default.yml
 
+AllCops:
+  Exclude:
+    - 'examples/_client.rb'
+
 Metrics/ClassLength:
   Max: 200
   Exclude:

data/CHANGELOG.md

@@ -1,6 +1,85 @@
+# v2.0.0
+### Notes
+ This is the second version of the Ruby SDK for HPE OneView. It was given support to the major features of OneView, refactor in some of the already existing code, and also a full set of exceptions to make some common exceptions more explicit in the debugging process.
+ This version of this SDK officially supports OneView appliances version 2.00.00 or higher, using the OneView Rest API version 200.
+ For now only C7000 enclosure types are being supported.
+
+### Major changes
+ 1. Added full support to the already existing features:
+   - Server Profile
+   - Server Profile Template
+   - Server Hardware
+ 2. New features added:
+   - Connection Templates
+   - Datacenter
+   - Fabrics
+   - Logical downlinks
+   - Logical switch groups
+   - Logical switches
+   - Switches
+   - SAN managers
+   - Managed SANs
+   - Network sets
+   - Power devices
+   - Racks
+   - Server hardware types
+   - Unmanaged devices
+ 3. New exceptions to address the most common issues (Check them in *lib/oneview-sdk/resource/exceptions.rb*)
+
+### Breaking changes
+ 1. Refactored some method names that may cause incompatibility with older SDK versions. Due to the nature of OneView, the `create` and `delete` methods did not fit the physical infrastructure elements like Enclosures, or Switches, so they now have `add` and `remove` methods that act the same as before, but now it leaves no margin to misunderstand that OneView could actually create these resources. They are:
+   - Datacenters
+   - Enclosure
+   - Power devices
+   - Racks
+   - Storage systems
+   - Storage pools
+   - Firmware drivers
+   - Firmware bundles (Only `add`)
+   - SAN managers
+   - Server hardwares
+   - Server hardware types
+   - Switches
+   - Unmanaged devices
+
+### Features supported
+- Ethernet network
+- FC network
+- FCOE network
+- Network set
+- Connection template
+- Fabric
+- SAN manager
+- Managed SAN
+- Interconnect
+- Logical interconnect
+- Logical interconnect group
+- Uplink set
+- Logical downlink
+- Enclosure
+- Logical enclosure
+- Enclosure group
+- Firmware bundle
+- Firmware driver
+- Storage system
+- Storage pool
+- Volume
+- Volume template
+- Datacenter
+- Racks
+- Logical switch group
+- Logical switch
+- Switch
+- Power devices
+- Server profile
+- Server profile template
+- Server hardware
+- Server hardware type
+- Unmanaged devices
+
 # v1.0.0
 ### Notes
- This is the first release of the OneView SDK in Ruby and it adds full support to some core features listed bellow, with some execptions that are explicit.
+ This is the first release of the OneView SDK in Ruby and it adds full support to some core features listed bellow, with some execeptions that are explicit.
  This version of this SDK supports OneView appliances version 2.00.00 or higher, using the OneView Rest API version 200.
  For now it only supports C7000 enclosure types.
 
@@ -26,7 +105,7 @@
 - Server Profile Template (CRUD supported)
 - Server Hardware (CRUD Supported)
 
-### Know Issues
+### Known issues
 The integration tests may warn about 3 issues:
 
 1. OneviewSDK::LogicalInterconnect Firmware Updates perform the actions Stage

data/README.md

@@ -2,7 +2,7 @@
 [![Gem Version](https://badge.fury.io/rb/oneview-sdk.svg)](https://badge.fury.io/rb/oneview-sdk)
 
 
-The OneView SDK provides a Ruby library to easily interact with HPE OneView API. The Ruby SDK enables developers to easily build integration and scalable solutions with HPE OneView.
+The OneView SDK provides a Ruby library to easily interact with HPE OneView API. The Ruby SDK enables developers to easily build integrations and scalable solutions with HPE OneView.
 
 ## Installation
 - Require the gem in your Gemfile:
@@ -38,7 +38,7 @@ client = OneviewSDK::Client.new(
 
 :lock: Tip: Check the file permissions because the password is stored in clear-text.
 
-**Environment Variables**
+##### Environment Variables
 
 You can also set the url and credentials or an authentication token using environment variables. For bash:
 
@@ -64,7 +64,7 @@ client = OneviewSDK::Client.new
 ```
 NOTE: Run `$ oneview-sdk-ruby env` to see a list of available environment variables and their current values.
 
-**Configuration Files**
+##### Configuration Files
 
 Configuration files can also be used to define client configuration (json or yaml formats). Here's an example json file:
 
@@ -103,85 +103,85 @@ For example, once you instantiate a resource object, you can call intuitive meth
 
 Please see the [rubydoc.info](http://www.rubydoc.info/gems/oneview-sdk) documentation for the complete list and usage details, but here are a few examples to get you started:
 
-- **Create a resource**
+##### Create a resource
 
-  ```ruby
-  ethernet = OneviewSDK::EthernetNetwork.new(
-    client, { name: 'TestVlan', vlanId:  1001, purpose:  'General', smartLink: false, privateNetwork: false }
-  )
-  ethernet.create # Tells OneView to create this resource
-  ```
+```ruby
+ethernet = OneviewSDK::EthernetNetwork.new(
+  client, { name: 'TestVlan', vlanId:  1001, purpose:  'General', smartLink: false, privateNetwork: false }
+)
+ethernet.create # Tells OneView to create this resource
+```
 
-- **Access resource attributes**
+##### Access resource attributes
 
-  ```ruby
-  ethernet['name'] # Returns 'TestVlan'
+```ruby
+ethernet['name'] # Returns 'TestVlan'
 
-  ethernet.data # Returns hash of all data
+ethernet.data # Returns hash of all data
 
-  ethernet.each do |key, value|
-    puts "Attribute #{key} = #{value}"
-  end
-  ```
+ethernet.each do |key, value|
+  puts "Attribute #{key} = #{value}"
+end
+```
 
-  The resource's data is stored in its @data attribute.  However, you can access the data directly using a hash-like syntax on the resource object (recommended). `resource['key']` functions a lot like `resource.data['key']`. The difference is that when using the data attribute, you must be cautious to use the correct key type (Hash vs Symbol).
-  The direct hash accessor on the resource converts all keys to strings, so `resource[:key]` and `resource['key']` access the same thing: `resource.data['key']`.
+The resource's data is stored in its @data attribute.  However, you can access the data directly using a hash-like syntax on the resource object (recommended). `resource['key']` functions a lot like `resource.data['key']`. The difference is that when using the data attribute, you must be cautious to use the correct key type (Hash vs Symbol).
+The direct hash accessor on the resource converts all keys to strings, so `resource[:key]` and `resource['key']` access the same thing: `resource.data['key']`.
 
-- **Update a resource**
+##### Update a resource
 
-  Notice that there's a few different ways to do things, so pick your poison!
-  ```ruby
-  ethernet.set_all(name: 'newName', vlanId:  1002)
-  ethernet['purpose'] = 'General'
-  ethernet['ethernetNetworkType'] = 'Tagged'
-  ethernet.update # Saves current state to OneView
+Notice that there are a few different ways to do things, so pick your poison!
+```ruby
+ethernet.set_all(name: 'newName', vlanId:  1002)
+ethernet['purpose'] = 'General'
+ethernet['ethernetNetworkType'] = 'Tagged'
+ethernet.update # Saves current state to OneView
 
-  # Alternatively, you could do this in 1 step with:
-  ethernet.update(name: 'newName', vlanId:  1002, purpose: 'General', ethernetNetworkType: 'Tagged')
-  ```
+# Alternatively, you could do this in 1 step with:
+ethernet.update(name: 'newName', vlanId:  1002, purpose: 'General', ethernetNetworkType: 'Tagged')
+```
 
-- **Check resource equality**
+##### Check resource equality
 
-  You can use the `==`  or `.eql?` method to compare resource equality, or `.like` to compare just a subset of attributes.
-  ```ruby
-  ethernet2 = OneviewSDK::EthernetNetwork.new(
-    client, { name: 'OtherVlan', vlanId:  1000, purpose:  'General', smartLink: false, privateNetwork: false }
-  )
-  ethernet == ethernet2    # Returns false
-  ethernet.eql?(ethernet2) # Returns false
+You can use the `==`  or `.eql?` method to compare resource equality, or `.like` to compare just a subset of attributes.
+```ruby
+ethernet2 = OneviewSDK::EthernetNetwork.new(
+  client, { name: 'OtherVlan', vlanId:  1000, purpose:  'General', smartLink: false, privateNetwork: false }
+)
+ethernet == ethernet2    # Returns false
+ethernet.eql?(ethernet2) # Returns false
 
 
-  # To compare a subset of attributes:
-  ethernet3 = OneviewSDK::EthernetNetwork.new(client, { purpose:  'General' })
-  ethernet.like?(ethernet3)  # Returns true
-  ethernet.like?(name: TestVlan, purpose: 'General')  # Returns true
-  ```
+# To compare a subset of attributes:
+ethernet3 = OneviewSDK::EthernetNetwork.new(client, { purpose:  'General' })
+ethernet.like?(ethernet3)  # Returns true
+ethernet.like?(name: TestVlan, purpose: 'General')  # Returns true
+```
 
 
-- **Find resources**
+##### Find resources
 
-  ```ruby
-  ethernet = OneviewSDK::EthernetNetwork.new(client, { name: 'OtherVlan' })
-  ethernet.retrieve! # Uses the name attribute to search for the resource on the server and update the data in this object.
+```ruby
+ethernet = OneviewSDK::EthernetNetwork.new(client, { name: 'OtherVlan' })
+ethernet.retrieve! # Uses the name attribute to search for the resource on the server and update the data in this object.
 
 
-  # Each resource class also has a searching method (NOTE: class method, not instance method)
-  ethernet = OneviewSDK::EthernetNetwork.find_by(client, { name: 'OtherVlan' }).first
+# Each resource class also has a searching method (NOTE: class method, not instance method)
+ethernet = OneviewSDK::EthernetNetwork.find_by(client, { name: 'OtherVlan' }).first
 
-  OneviewSDK::EthernetNetwork.find_by(client, { purpose: 'General' }).each do |network|
-    puts "  #{network['name']}"
-  end
+OneviewSDK::EthernetNetwork.find_by(client, { purpose: 'General' }).each do |network|
+  puts "  #{network['name']}"
+end
 
-  # Get all resources:
-  networks = client.get_all(:EthernetNetwork)
-  ```
+# Get all resources:
+networks = client.get_all(:EthernetNetwork)
+```
 
-- **Delete a resource**
+##### Delete a resource
 
-  ```ruby
-  ethernet = OneviewSDK::EthernetNetwork.find_by(client, { name: 'OtherVlan' }).first
-  ethernet.delete # Tells OneView to delete this resource
-  ```
+```ruby
+ethernet = OneviewSDK::EthernetNetwork.find_by(client, { name: 'OtherVlan' }).first
+ethernet.delete # Tells OneView to delete this resource
+```
 
 ### Save/Load resources with files
 Resources can be saved to files and loaded again very easily using the built-in `.to_file` & `.from_file` methods.
@@ -191,7 +191,7 @@ Resources can be saved to files and loaded again very easily using the built-in
    ```ruby
    ethernet.to_file("full_file_path.json")
    ```
- - To load a Resource from a file: (note the class method, not instance method)
+ - To load a resource from a file: (note the class method, not instance method)
 
    ```ruby
    ethernet4 = OneviewSDK::Resource.from_file(client, "full_file_path.json")
@@ -231,58 +231,63 @@ To communicate with an appliance, you will need to set up a few environment vari
 
 The CLI does not expose everything in the SDK, but it is great for doing simple tasks such as creating or deleting resources from files, listing resources, and searching. Here are a few examples:
 
- - List ServerProfiles:
- ```bash
- $ oneview-sdk-ruby list ServerProfiles
- # Or to show in yaml format (json is also supported):
- $ oneview-sdk-ruby list ServerProfiles -f yaml
- ```
-
- - Show details for a specific resource:
- ```bash
- $ oneview-sdk-ruby show ServerProfile profile-1
- # Or to show specific attributes only:
- $ oneview-sdk-ruby show ServerProfile profile-1 -a name,uri,enclosureBay
- ```
-
- - Search by an attribute:
- ```bash
- $ oneview-sdk-ruby search ServerProfiles --filter state:Normal affinity:Bay
- # By default, it will just show a list of names of matching resources,
- #   but again, you can show only certain attributes by using the -a option
- # You can also chain keys together to search in nested hashes:
- $ oneview-sdk-ruby search ServerProfiles --filter state:Normal boot.manageBoot:true
- ```
-
- - Create or delete resource by file:
- ```bash
- $ oneview-sdk-ruby create_from_file /my-server-profile.json
- $ oneview-sdk-ruby delete_from_file /my-server-profile.json
- ```
-
- - Start an interactive console session with a OneView connection:
- ```bash
- $ oneview-sdk-ruby console
- Console Connected to https://oneview.example.com
- HINT: The @client object is available to you
- >
- ```
-
- - Import a self-signed SSL certificate from your OneView instance:
-
- Although you can disable ssl validation altogether for the client, this is strongly discouraged.
- Instead, please import the certificate using the built-in cli cert command:
- ```bash
- # Check the certificate first:
- $ oneview-sdk-ruby cert check https://oneview.example.com
-   Checking certificate for 'https://oneview.example.com' ...
-   ERROR: Certificate Validation Failed!
-
- # Import the certificate:
- $ oneview-sdk-ruby cert import https://oneview.example.com
-   Importing certificate for 'https://oneview.example.com' into '/home/users/user1/.oneview-sdk-ruby/trusted_certs.cer'...
-   Cert added to '/home/users/user1/.oneview-sdk-ruby/trusted_certs.cer'
- ```
+##### List ServerProfiles:
+
+```bash
+$ oneview-sdk-ruby list ServerProfiles
+# Or to show in yaml format (json is also supported):
+$ oneview-sdk-ruby list ServerProfiles -f yaml
+```
+
+##### Show details for a specific resource:
+
+```bash
+$ oneview-sdk-ruby show ServerProfile profile-1
+# Or to show specific attributes only:
+$ oneview-sdk-ruby show ServerProfile profile-1 -a name,uri,enclosureBay
+```
+
+##### Search by an attribute:
+
+```bash
+$ oneview-sdk-ruby search ServerProfiles --filter state:Normal affinity:Bay
+# By default, it will just show a list of names of matching resources,
+#   but again, you can show only certain attributes by using the -a option
+# You can also chain keys together to search in nested hashes:
+$ oneview-sdk-ruby search ServerProfiles --filter state:Normal boot.manageBoot:true
+```
+
+##### Create or delete resource by file:
+
+```bash
+$ oneview-sdk-ruby create_from_file /my-server-profile.json
+$ oneview-sdk-ruby delete_from_file /my-server-profile.json
+```
+
+##### Start an interactive console session with a OneView connection:
+
+```bash
+$ oneview-sdk-ruby console
+Console Connected to https://oneview.example.com
+HINT: The @client object is available to you
+>
+```
+
+##### Import a self-signed SSL certificate from your OneView instance:
+
+Although you can disable SSL validation altogether for the client, this is strongly discouraged.
+Instead, please import the certificate using the built-in CLI cert command:
+```bash
+# Check the certificate first:
+$ oneview-sdk-ruby cert check https://oneview.example.com
+ Checking certificate for 'https://oneview.example.com' ...
+ ERROR: Certificate Validation Failed!
+
+# Import the certificate:
+$ oneview-sdk-ruby cert import https://oneview.example.com
+ Importing certificate for 'https://oneview.example.com' into '/home/users/user1/.oneview-sdk-ruby/trusted_certs.cer'...
+ Cert added to '/home/users/user1/.oneview-sdk-ruby/trusted_certs.cer'
+```
 
 ## License
 This project is licensed under the Apache 2.0 license. Please see [LICENSE](LICENSE) for more info.

data/Rakefile

@@ -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 'bundler'
 require 'bundler/gem_tasks'
 require 'bundler/setup'

data/lib/oneview-sdk/cli.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 'thor'
 require 'json'
 require 'yaml'
@@ -180,9 +191,9 @@ module OneviewSDK
           options['attribute'].split(',').each do |attr|
             temp[attr] = d[attr]
           end
-          data.push temp
+          data.push(d['name'] => temp)
         end
-        output data
+        output data, -2 # Shift left by 2 so things look right
       else # List names only by default
         names = []
         matches.each { |m| names.push(m['name']) }
@@ -366,34 +377,29 @@ module OneviewSDK
       when 'yaml'
         puts data.to_yaml
       else
+        # rubocop:disable Metrics/BlockNesting
         if data.class == Hash || data.class <= OneviewSDK::Resource
           data.each do |k, v|
             if v.class == Hash || v.class == Array
-              puts "#{' ' * indent}#{k}:"
+              puts "#{' ' * indent}#{k.nil? ? 'nil' : k}:"
               output(v, indent + 2)
             else
-              puts "#{' ' * indent}#{k}: #{v}"
+              puts "#{' ' * indent}#{k.nil? ? 'nil' : k}: #{v.nil? ? 'nil' : v}"
             end
           end
         elsif data.class == Array
           data.each do |d|
             if d.class == Hash || d.class == Array
-              # rubocop:disable Metrics/BlockNesting
-              if indent == 0
-                puts ''
-                output(d, indent)
-              else
-                output(d, indent + 2)
-              end
-              # rubocop:enable Metrics/BlockNesting
+              output(d, indent + 2)
             else
-              puts "#{' ' * indent}#{d}"
+              puts "#{' ' * indent}#{d.nil? ? 'nil' : d}"
             end
           end
-          puts "\nTotal: #{data.size}" if indent == 0
+          puts "\nTotal: #{data.size}" if indent < 1
         else
-          puts "#{' ' * indent}#{data}"
+          puts "#{' ' * indent}#{data.nil? ? 'nil' : data}"
         end
+        # rubocop:enable Metrics/BlockNesting
       end
     end
   end

data/lib/oneview-sdk/client.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 'logger'
 require_relative 'config_loader'
 require_relative 'rest'
@@ -9,32 +20,33 @@ module OneviewSDK
     DEFAULT_API_VERSION = 200
 
     attr_reader :url, :user, :token, :password, :max_api_version
-    attr_accessor :ssl_enabled, :api_version, :logger, :log_level, :cert_store, :print_wait_dots
+    attr_accessor :ssl_enabled, :api_version, :logger, :log_level, :cert_store, :print_wait_dots, :timeout
 
     include Rest
 
-    # Create client object, establish connection, and set up logging and api version.
+    # Creates client object, establish connection, and set up logging and api version.
     # @param [Hash] options the options to configure the client
     # @option options [Logger] :logger (Logger.new(STDOUT)) Logger object to use.
     #   Must implement debug(String), info(String), warn(String), error(String), & level=
     # @option options [Symbol] :log_level (:info) Log level. Logger must define a constant with this name. ie Logger::INFO
-    # @option options [Boolean] :print_wait_dots (false) When true, prints status dots while waiting on tasks to complete.
+    # @option options [Boolean] :print_wait_dots (false) When true, prints status dots while waiting on the tasks to complete.
     # @option options [String] :url URL of OneView appliance
-    # @option options [String] :user ('Administrator') Username to use for authentication with OneView appliance
-    # @option options [String] :password (ENV['ONEVIEWSDK_PASSWORD']) Password to use for authentication with OneView appliance
-    # @option options [String] :token (ENV['ONEVIEWSDK_TOKEN']) Token to use for authentication with OneView appliance
-    #   Use this OR the username and password (not both). Token has precedence.
-    # @option options [Integer] :api_version (200) API Version to use by default for requests
+    # @option options [String] :user ('Administrator') The username to use for authentication with the OneView appliance
+    # @option options [String] :password (ENV['ONEVIEWSDK_PASSWORD']) The password to use for authentication with OneView appliance
+    # @option options [String] :token (ENV['ONEVIEWSDK_TOKEN']) The token to use for authentication with OneView appliance
+    #   Use the token or the username and password (not both). The token has precedence.
+    # @option options [Integer] :api_version (200) This is the API version to use by default for requests
     # @option options [Boolean] :ssl_enabled (true) Use ssl for requests? Respects ENV['ONEVIEWSDK_SSL_ENABLED']
+    # @option options [Integer] :timeout (nil) Override the default request timeout value
     def initialize(options = {})
       options = Hash[options.map { |k, v| [k.to_sym, v] }] # Convert string hash keys to symbols
       @logger = options[:logger] || Logger.new(STDOUT)
-      [:debug, :info, :warn, :error, :level=].each { |m| fail "Logger must respond to #{m} method " unless @logger.respond_to?(m) }
+      [:debug, :info, :warn, :error, :level=].each { |m| fail InvalidClient, "Logger must respond to #{m} method " unless @logger.respond_to?(m) }
       @log_level = options[:log_level] || :info
       @logger.level = @logger.class.const_get(@log_level.upcase) rescue @log_level
       @print_wait_dots = options.fetch(:print_wait_dots, false)
       @url = options[:url] || ENV['ONEVIEWSDK_URL']
-      fail 'Must set the url option' unless @url
+      fail InvalidClient, 'Must set the url option' unless @url
       @max_api_version = appliance_api_version
       if options[:api_version] && options[:api_version].to_i > @max_api_version
         logger.warn "API version #{options[:api_version]} is greater than the appliance API version (#{@max_api_version})"
@@ -49,24 +61,25 @@ module OneviewSDK
         end
       end
       @ssl_enabled = options[:ssl_enabled] unless options[:ssl_enabled].nil?
+      @timeout = options[:timeout] unless options[:timeout].nil?
       @cert_store = OneviewSDK::SSLHelper.load_trusted_certs if @ssl_enabled
       @token = options[:token] || ENV['ONEVIEWSDK_TOKEN']
       return if @token
       @logger.warn 'User option not set. Using default (Administrator)' unless options[:user] || ENV['ONEVIEWSDK_USER']
       @user = options[:user] || ENV['ONEVIEWSDK_USER'] || 'Administrator'
       @password = options[:password] || ENV['ONEVIEWSDK_PASSWORD']
-      fail 'Must set user & password options or token option' unless @password
+      fail InvalidClient, 'Must set user & password options or token option' unless @password
       @token = login
     end
 
-    # Tell OneView to create the resource using the current attribute data
+    # Tells OneView to create the resource using the current attribute data
     # @param [Resource] resource the object to create
     def create(resource)
       resource.client = self
       resource.create
     end
 
-    # Set attribute data and save to OneView
+    # Sets the attribute data, and then saves to OneView
     # @param [Resource] resource the object to update
     def update(resource, attributes = {})
       resource.client = self
@@ -95,15 +108,15 @@ module OneviewSDK
     def get_all(type)
       OneviewSDK.resource_named(type).get_all(self)
     rescue StandardError
-      raise "Invalid resource type '#{type}'"
+      raise TypeError, "Invalid resource type '#{type}'"
     end
 
     # Wait for a task to complete
     # @param [String] task_uri
-    # @raise [RuntimeError] if the task resulted in an error or early termination.
-    # @return [Hash] if the task completed sucessfully, return the task details
+    # @raise [OneviewSDK::TaskError] if the task resulted in an error or early termination.
+    # @return [Hash] if the task completed successfully, return the task details
     def wait_for(task_uri)
-      fail 'Must specify a task_uri!' if task_uri.nil? || task_uri.empty?
+      fail ArgumentError, 'Must specify a task_uri!' if task_uri.nil? || task_uri.empty?
       loop do
         task_uri.gsub!(%r{/https:(.*)\/rest/}, '/rest')
         task = rest_get(task_uri)
@@ -117,7 +130,7 @@ module OneviewSDK
         when 'error', 'killed', 'terminated'
           msg = "Task ended with bad state: '#{body['taskState']}'.\nResponse: "
           msg += body['taskErrors'] ? JSON.pretty_generate(body['taskErrors']) : JSON.pretty_generate(body)
-          fail(msg)
+          fail TaskError, msg
         else
           print '.' if @print_wait_dots
           sleep 10
@@ -133,10 +146,10 @@ module OneviewSDK
       options = { 'Content-Type' => :none, 'X-API-Version' => :none, 'auth' => :none }
       response = rest_api(:get, '/rest/version', options)
       version = response_handler(response)['currentVersion']
-      fail "Couldn't get API version" unless version
+      fail ConnectionError, "Couldn't get API version" unless version
       version = version.to_i if version.class != Fixnum
       version
-    rescue
+    rescue ConnectionError
       @logger.warn "Failed to get OneView max api version. Using default (#{DEFAULT_API_VERSION})"
       DEFAULT_API_VERSION
     end
@@ -153,7 +166,7 @@ module OneviewSDK
       response = rest_post('/rest/login-sessions', options)
       body = response_handler(response)
       return body['sessionID'] if body['sessionID']
-      fail "\nERROR! Couldn't log into OneView server at #{@url}. Response: #{response}\n#{response.body}"
+      fail ConnectionError, "\nERROR! Couldn't log into OneView server at #{@url}. Response: #{response}\n#{response.body}"
     rescue StandardError => e
       raise e unless retries > 0
       @logger.debug 'Failed to log in to OneView. Retrying...'

data/lib/oneview-sdk/config_loader.rb

@@ -1,8 +1,19 @@
+# (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 'yaml'
 require 'json'
 
 module OneviewSDK
-  # Configuration helper class to allow .yaml & .json files to be easily used to specify OneView Configuration
+  # Configuration helper class to allow .yaml and .json files to be easily used to specify OneView Configuration
   class Config
 
     # Load config from .yaml or .json file