chef-provisioning-oneview 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167f2e17cf7e59a72a324e3e85741f0db2e61053
-  data.tar.gz: 0a0147bce30c20646fe355a5575ba75a8bced856
+  metadata.gz: 6fd131178c928b19abb6e06f8136b4d3b9e9a2eb
+  data.tar.gz: 80c192d8030a22b2d78ac8e58328265b83231718
 SHA512:
-  metadata.gz: 7e505bed54f9b378f6b0b4a21d879f968289547b75a2f239c138cefaf0d17990ba3cf1bccfd10cf05e12e558251139df1480ff8adea7b74f202e07e31ecb33e5
-  data.tar.gz: 259f701926f031b620b9db49de16ef2c8bf03c50b197c3833b9acfd8260d884a5cb4246589e5277b1f202a1abe9af43f8161cc879c7d7ae18c00a35f47c1ed3e
+  metadata.gz: 5e901b072f088b01d67943bda4af6aedcfb73e7eb5514388fda9e1d27df911f3c2c738daea6b8f7f7d696fc8145d784a15989a1e007bb03c814dbebae60bd53a
+  data.tar.gz: e5a12ab051c95788e8e6dc4e0c62e7d50caa8c810e16662e37f3fd76e91dd95dc9737181ba8a9330237636a313cef0ff50f2dd6c037c319a735de7c3bac185cf

data/README.md

@@ -14,6 +14,8 @@ Currently supports:
 
 # Installation
 
+- Install Ruby and the `ruby-devel` or `ruby-dev` package for your system.
+  
 - Require the gem in your Gemfile: `gem 'chef-provisioning-oneview'`
   
   Then run `$ bundle install`

data/lib/chef/provisioning/create_machine.rb

@@ -37,7 +37,7 @@ module CreateMachine
       options['X-API-Version'] = 200 if @current_oneview_api_version >= 200 && template['type'] == 'ServerProfileV5'
       task = rest_api(:oneview, :post, '/rest/server-profiles', options)
       task_uri = task['uri']
-      fail "Failed to create OneView server profile #{host_name}. Details: " unless task_uri
+      raise "Failed to create OneView server profile #{host_name}. Details: " unless task_uri
       # Wait for profile to be created
       60.times do # Wait for up to 5 min
         matching_profiles = rest_api(:oneview, :get, "/rest/server-profiles?filter=name matches '#{host_name}'&sort=name:asc")
@@ -46,7 +46,7 @@ module CreateMachine
         sleep 5
       end
       task = rest_api(:oneview, :get, task_uri)
-      fail "Server profile couldn't be created! #{task['taskStatus']}. #{task['taskErrors'].first['message']}"
+      raise "Server profile couldn't be created! #{task['taskStatus']}. #{task['taskErrors'].first['message']}"
     end
   end
 end

data/lib/chef/provisioning/customize_machine.rb

@@ -10,14 +10,14 @@ module CustomizeMachine
       action_handler.perform_action "Wait for #{machine_spec.name} server to start and profile to be applied" do
         action_handler.report_progress "INFO: Waiting for #{machine_spec.name} server to start and profile to be applied"
         task = oneview_wait_for(profile['taskUri'], 360) # Wait up to 60 min for profile to be created
-        fail 'Timed out waiting for server to start and profile to be applied' if task == false
+        raise 'Timed out waiting for server to start and profile to be applied' if task == false
         unless task == true
           server_template = machine_options[:driver_options][:server_template]
-          fail "Error creating server profile from template #{server_template}: #{task['taskErrors'].first['message']}"
+          raise "Error creating server profile from template #{server_template}: #{task['taskErrors'].first['message']}"
         end
       end
       profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number']) # Refresh profile
-      fail "Server profile state '#{profile['state']}' not 'Normal'" unless profile['state'] == 'Normal'
+      raise "Server profile state '#{profile['state']}' not 'Normal'" unless profile['state'] == 'Normal'
     end
 
     # Configure SAN storage (if applicable)
@@ -36,7 +36,7 @@ module CustomizeMachine
         print '.'
         sleep 10
       end
-      fail "Timeout waiting for server #{machine_spec.name} to register with ICSP" if my_server.nil?
+      raise "Timeout waiting for server #{machine_spec.name} to register with ICSP" if my_server.nil?
     end
 
     icsp_configure_nic_teams(machine_options, profile)
@@ -58,16 +58,16 @@ module CustomizeMachine
           action_handler.report_progress "INFO: Performing network flipping on #{machine_spec.name}, connection #{id}"
           deploy_network = available_networks['ethernetNetworks'].find {|n| n['name'] == data[:deployNet] }
           new_network = available_networks['ethernetNetworks'].find {|n| n['name'] == data[:net] }
-          fail "Failed to perform network flipping on #{machine_spec.name}, connection #{id}. '#{data[:net]}' network not found" if new_network.nil?
-          fail "Failed to perform network flipping on #{machine_spec.name}, connection #{id}. '#{data[:deployNet]}' network not found" if deploy_network.nil?
+          raise "Failed to perform network flipping on #{machine_spec.name}, connection #{id}. '#{data[:net]}' network not found" if new_network.nil?
+          raise "Failed to perform network flipping on #{machine_spec.name}, connection #{id}. '#{data[:deployNet]}' network not found" if deploy_network.nil?
           profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number'])
           profile['connections'].find {|c| c['networkUri'] == deploy_network['uri'] }['networkUri'] = new_network['uri']
           options = { 'body' => profile }
           task = rest_api(:oneview, :put, profile['uri'], options)
-          fail "Failed to perform network flipping on #{machine_spec.name}. Details: #{task['message'] || task}" unless task['uri']
+          raise "Failed to perform network flipping on #{machine_spec.name}. Details: #{task['message'] || task}" unless task['uri']
           task = oneview_wait_for(task['uri']) # Wait up to 10 min
-          fail "Timed out waiting for network flipping on #{machine_spec.name}" if task == false
-          fail "Error performing network flip on #{machine_spec.name}. Response: #{task}" unless task == true
+          raise "Timed out waiting for network flipping on #{machine_spec.name}" if task == false
+          raise "Error performing network flip on #{machine_spec.name}. Response: #{task}" unless task == true
         end
       end
       machine_spec.reference['network_personalitation_finished'] = true

data/lib/chef/provisioning/icsp/icsp_api.rb

@@ -8,10 +8,10 @@ module ICspAPI
   def get_icsp_api_version
     begin
       version = rest_api(:icsp, :get, '/rest/version', { 'Content-Type' => :none, 'X-API-Version' => :none, 'auth' => :none })['currentVersion']
-      fail "Couldn't get API version" unless version
+      raise "Couldn't get API version" unless version
       if version.class != Fixnum
         version = version.to_i
-        fail 'API version type mismatch' if !version > 0
+        raise 'API version type mismatch' if !version > 0
       end
     rescue
       puts 'Failed to get ICSP API version. Setting to default (102)'
@@ -31,11 +31,11 @@ module ICspAPI
     }
     response = rest_api(:icsp, :post, path, options)
     return response['sessionID'] if response['sessionID']
-    fail("\nERROR! Couldn't log into OneView server at #{@oneview_base_url}. Response:\n#{response}")
+    raise("\nERROR! Couldn't log into ICSP server at #{@icsp_base_url}. Response:\n#{response}")
   end
 
   def get_icsp_server_by_sn(serial_number)
-    fail 'Must specify a serialNumber!' if serial_number.nil? || serial_number.empty?
+    raise 'Must specify a serialNumber!' if serial_number.nil? || serial_number.empty?
     search_result = rest_api(:icsp, :get,
       "/rest/index/resources?category=osdserver&query='osdServerSerialNumber:\"#{serial_number}\"'")['members'] rescue nil
     if search_result && search_result.size == 1 && search_result.first['attributes']['osdServerSerialNumber'] == serial_number
@@ -57,7 +57,7 @@ module ICspAPI
   end
 
   def icsp_wait_for(task_uri, wait_iterations = 60, sleep_seconds = 10)
-    fail 'Must specify a task_uri!' if task_uri.nil? || task_uri.empty?
+    raise 'Must specify a task_uri!' if task_uri.nil? || task_uri.empty?
     wait_iterations.times do
       task = rest_api(:icsp, :get, task_uri)
       if task['taskState']
@@ -108,7 +108,7 @@ module ICspAPI
           print '.'
           sleep 10
         end
-        fail "Timed out waiting for #{machine_spec.name} to go into maintenance mode in ICsp. State: #{my_server['state']}" unless my_server['state'] == 'MAINTENANCE'
+        raise "Timed out waiting for #{machine_spec.name} to go into maintenance mode in ICsp. State: #{my_server['state']}" unless my_server['state'] == 'MAINTENANCE'
       end
     end
 
@@ -122,12 +122,12 @@ module ICspAPI
         uri = "/rest/index/resources?userQuery=\"'#{os_build}'\"&category=osdbuildplan"
         while uri
           matching_plans = rest_api(:icsp, :get, uri)
-          fail "Search failed for OSBP '#{os_build}'. Response: #{matching_plans}" unless matching_plans['members']
+          raise "Search failed for OSBP '#{os_build}'. Response: #{matching_plans}" unless matching_plans['members']
           build_plan_uri = matching_plans['members'].find {|bp| bp['name'] == os_build}['uri'] rescue nil
           break unless build_plan_uri.nil?
           uri = URI.unescape(matching_plans['nextPageUri']) rescue nil
         end
-        fail "OS build plan #{os_build} not found!" if build_plan_uri.nil?
+        raise "OS build plan #{os_build} not found!" if build_plan_uri.nil?
         build_plan_uris.push build_plan_uri
       end
     end
@@ -147,9 +147,9 @@ module ICspAPI
       action_handler.report_progress "INFO: Running: #{os_builds} OS Build Plan(s) on #{machine_spec.name}"
       task = rest_api(:icsp, :post, '/rest/os-deployment-jobs/?force=true', options)
       task_uri = task['uri']
-      fail "Failed to start OS Deployment Job. Details: #{task['details'] || task['message'] || task}" unless task_uri
+      raise "Failed to start OS Deployment Job. Details: #{task['details'] || task['message'] || task}" unless task_uri
       task = icsp_wait_for(task_uri, 720)
-      fail "Error running OS build plan(s) #{os_builds}: #{task['jobResult'].first['jobMessage']}\n#{task['jobResult'].first['jobResultErrorDetails']}" unless task == true
+      raise "Error running OS build plan(s) #{os_builds}: #{task['jobResult'].first['jobMessage']}\n#{task['jobResult'].first['jobResultErrorDetails']}" unless task == true
     end
   end
 
@@ -169,9 +169,9 @@ module ICspAPI
 
       task = rest_api(:icsp, :post, '/rest/os-deployment-jobs/?force=true', options)
       task_uri = task['uri']
-      fail "Failed to start network personalization job. Details: #{task['details']}" unless task_uri
+      raise "Failed to start network personalization job. Details: #{task['details']}" unless task_uri
       task = icsp_wait_for(task_uri, 60) # Wait for up to 10 min
-      fail "Error running network personalization job: #{task['jobResult'].first['jobMessage']}\n#{task['jobResult'].first['jobResultErrorDetails']}" unless task == true
+      raise "Error running network personalization job: #{task['jobResult'].first['jobMessage']}\n#{task['jobResult'].first['jobResultErrorDetails']}" unless task == true
 
       # Check if ICsp IP config matches machine options
       requested_ips = []
@@ -246,11 +246,11 @@ module ICspAPI
         task_uri = task['uri']
         90.times do # Wait for up to 15 minutes
           task = rest_api(:icsp, :get, task_uri)
-          break if task['taskState'].downcase == 'completed'
+          break if task['taskState'].casecmp('completed') == 0
           print '.'
           sleep 10
         end
-        fail "Deleting os deployment server #{machine_spec.name} at icsp failed!" unless task['taskState'].downcase == 'completed'
+        raise "Deleting os deployment server #{machine_spec.name} at icsp failed!" unless task['taskState'].casecmp('completed') == 0
       end
     end
   end
@@ -261,7 +261,7 @@ module ICspAPI
 
     machine_options[:driver_options][:connections].each do |id, options|
       next unless options.is_a?(Hash) && options[:team]
-      fail "#{options[:team]}: Team names must not include hyphens" if options[:team].to_s.match('-')
+      raise "#{options[:team]}: Team names must not include hyphens" if options[:team].to_s.include?('-')
       teams[options[:team].to_s] ||= []
       begin
         mac = profile['connections'].find {|x| x['id'] == id}['mac']
@@ -274,7 +274,7 @@ module ICspAPI
     end
     team_strings = []
     teams.each do |name, macs|
-      fail "Team '#{name}' must have at least 2 associated connections to form a NIC team" unless macs.size >= 2
+      raise "Team '#{name}' must have at least 2 associated connections to form a NIC team" unless macs.size >= 2
       team_strings.push "#{name}-#{macs.join(',')}"
     end
     machine_options[:driver_options][:custom_attributes] ||= {}

data/lib/chef/provisioning/oneview/oneview_api.rb

@@ -10,10 +10,10 @@ module OneViewAPI
   def get_oneview_api_version
     begin
       version = rest_api(:oneview, :get, '/rest/version', { 'Content-Type' => :none, 'X-API-Version' => :none, 'auth' => :none })['currentVersion']
-      fail "Couldn't get API version" unless version
+      raise "Couldn't get API version" unless version
       if version.class != Fixnum
         version = version.to_i
-        fail 'API version type mismatch' if !version > 0
+        raise 'API version type mismatch' if !version > 0
       end
     rescue
       puts 'Failed to get OneView API version. Setting to default (120)'
@@ -33,13 +33,13 @@ module OneViewAPI
     }
     response = rest_api(:oneview, :post, path, options)
     return response['sessionID'] if response['sessionID']
-    fail("\nERROR! Couldn't log into OneView server at #{@oneview_base_url}. Response:\n#{response}")
+    raise("\nERROR! Couldn't log into OneView server at #{@oneview_base_url}. Response:\n#{response}")
   end
 
   def get_oneview_profile_by_sn(serial_number)
-    fail 'Must specify a serialNumber!' if serial_number.nil? || serial_number.empty?
+    raise 'Must specify a serialNumber!' if serial_number.nil? || serial_number.empty?
     matching_profiles = rest_api(:oneview, :get, "/rest/server-profiles?filter=serialNumber matches '#{serial_number}'&sort=name:asc")
-    fail "Failed to get oneview profile by serialNumber: #{serial_number}. Response: #{matching_profiles}" unless matching_profiles['count']
+    raise "Failed to get oneview profile by serialNumber: #{serial_number}. Response: #{matching_profiles}" unless matching_profiles['count']
     return matching_profiles['members'].first if matching_profiles['count'] > 0
     nil
   end
@@ -51,7 +51,7 @@ module OneViewAPI
       options = { 'X-API-Version' => 200 }
       templates = rest_api(:oneview, :get, "/rest/server-profile-templates?filter=\"name matches '#{template_name}'\"&sort=name:asc", options)['members']
       return rest_api(:oneview, :get, "#{templates.first['uri']}/new-profile", options) if templates && templates.count == 1
-      fail "'#{template_name}' matches multiple templates! Please use a unique template name." if templates && templates.count > 1
+      raise "'#{template_name}' matches multiple templates! Please use a unique template name." if templates && templates.count > 1
     end
 
     # Look for Server Profile as second option
@@ -64,27 +64,27 @@ module OneViewAPI
       end
       return templates.first
     end
-    fail "'#{template_name}' matches multiple profiles! Please use a unique template name." if templates && templates.count > 1
+    raise "'#{template_name}' matches multiple profiles! Please use a unique template name." if templates && templates.count > 1
 
-    fail "Template '#{template_name}' not found! Please match the template name with one that exists on OneView."
+    raise "Template '#{template_name}' not found! Please match the template name with one that exists on OneView."
   end
 
   def available_hardware_for_template(template)
     server_hardware_type_uri = template['serverHardwareTypeUri']
     enclosure_group_uri      = template['enclosureGroupUri']
-    fail 'Template must specify a valid hardware type uri!' if server_hardware_type_uri.nil? || server_hardware_type_uri.empty?
-    fail 'Template must specify a valid hardware type uri!' if enclosure_group_uri.nil? || enclosure_group_uri.empty?
+    raise 'Template must specify a valid hardware type uri!' if server_hardware_type_uri.nil? || server_hardware_type_uri.empty?
+    raise 'Template must specify a valid hardware type uri!' if enclosure_group_uri.nil? || enclosure_group_uri.empty?
     params = "sort=name:asc&filter=serverHardwareTypeUri='#{server_hardware_type_uri}'&filter=serverGroupUri='#{enclosure_group_uri}'"
     blades = rest_api(:oneview, :get, "/rest/server-hardware?#{params}")
-    fail 'Error! No available blades that are compatible with the server template!' unless blades['count'] > 0
+    raise 'Error! No available blades that are compatible with the server template!' unless blades['count'] > 0
     blades['members'].each do |member|
       return member if member['state'] == 'NoProfileApplied'
     end
-    fail 'No more blades are available for provisioning!' # Every bay is full and no more machines can be allocated
+    raise 'No more blades are available for provisioning!' # Every bay is full and no more machines can be allocated
   end
 
   def oneview_wait_for(task_uri, wait_iterations = 60, sleep_seconds = 10) # Default time is 10 min
-    fail 'Must specify a task_uri!' if task_uri.nil? || task_uri.empty?
+    raise 'Must specify a task_uri!' if task_uri.nil? || task_uri.empty?
     wait_iterations.times do
       task = rest_api(:oneview, :get, task_uri)
       case task['taskState'].downcase
@@ -114,28 +114,28 @@ module OneViewAPI
       state = 'on'
     when :off, 'off', false
       state = 'off'
-    else fail "Invalid power state #{state}"
+    else raise "Invalid power state #{state}"
     end
 
     if hardware_uri.nil?
       profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number'])
-      fail "Could not power #{state} #{machine_spec.name}: Profile with serial number '#{machine_spec.reference['serial_number']}' not found!" unless profile
+      raise "Could not power #{state} #{machine_spec.name}: Profile with serial number '#{machine_spec.reference['serial_number']}' not found!" unless profile
       hardware_uri = profile['serverHardwareUri']
     end
 
     hardware_info = rest_api(:oneview, :get, hardware_uri)
-    unless hardware_info['powerState'].downcase == state
+    unless hardware_info['powerState'].casecmp(state) == 0
       action_handler.perform_action "Power #{state} server #{hardware_info['name']} for #{machine_spec.name}" do
         action_handler.report_progress "INFO: Powering #{state} server #{hardware_info['name']} for #{machine_spec.name}"
         task = rest_api(:oneview, :put, "#{hardware_uri}/powerState", { 'body' => { 'powerState' => state.capitalize, 'powerControl' => 'MomentaryPress' } })
         task_uri = task['uri']
         60.times do # Wait for up to 10 minutes
           task = rest_api(:oneview, :get, task_uri)
-          break if task['taskState'].downcase == 'completed'
+          break if task['taskState'].casecmp('completed') == 0
           print '.'
           sleep 10
         end
-        fail "Powering #{state} machine #{machine_spec.name} failed!" unless task['taskState'].downcase == 'completed'
+        raise "Powering #{state} machine #{machine_spec.name} failed!" unless task['taskState'].casecmp('completed') == 0
       end
     end
     hardware_uri
@@ -150,16 +150,16 @@ module OneViewAPI
     else
       action_handler.perform_action "Delete server #{machine_spec.name} from oneview" do
         action_handler.report_progress "INFO: Deleting server profile #{machine_spec.name}"
-        task = rest_api(:oneview, :Delete, "#{profile['uri']}")
+        task = rest_api(:oneview, :Delete, profile['uri'])
         task_uri = task['uri']
 
         60.times do # Wait for up to 10 minutes
           task = rest_api(:oneview, :get, task_uri)
-          break if task['taskState'].downcase == 'completed'
+          break if task['taskState'].casecmp('completed') == 0
           print '.'
           sleep 10
         end
-        fail "Deleting server profile #{machine_spec.name} failed!" unless task['taskState'].downcase == 'completed'
+        raise "Deleting server profile #{machine_spec.name} failed!" unless task['taskState'].casecmp('completed') == 0
       end
     end
   end

data/lib/chef/provisioning/oneview/san_storage.rb

@@ -20,10 +20,10 @@ module OneViewSanStorage
     boot_vols = []
     san_storage['volumeAttachments'].each do |v|
       fill_volume_details(v) unless profile['serverProfileTemplateUri']
-      fail "#{machine_spec.name}: Should know if volume is sharable:\n#{v}" unless v.key?('volumeShareable')
+      raise "#{machine_spec.name}: Should know if volume is sharable:\n#{v}" unless v.key?('volumeShareable')
 
       # Match boot disks by name
-      boot_vols.push(v['volumeName']) if v['volumeName'].downcase.match(/^boot/)
+      boot_vols.push(v['volumeName']) if v['volumeName'] =~ /^boot/i
       v['volumeName'] += " #{profile['name']}" unless v['volumeShareable'] # Append profile name to volume name
 
       unless profile['serverProfileTemplateUri'] # Only needed when coppied from profile
@@ -37,11 +37,11 @@ module OneViewSanStorage
 
           # Assumes all cloned volumes are non-permanet. Might want some global config to control this
           v['permanent'] = false
-          v['lun'] = nil if v['lunType'].downcase == 'auto'
+          v['lun'] = nil if v['lunType'].casecmp('auto') == 0
         end
       end
     end
-    fail "#{machine_spec.name}: There should only be 1 SAN boot volume. Boot volumes: #{boot_vols}" if boot_vols.size > 1
+    raise "#{machine_spec.name}: There should only be 1 SAN boot volume. Boot volumes: #{boot_vols}" if boot_vols.size > 1
     profile
   end
 
@@ -53,15 +53,15 @@ module OneViewSanStorage
     update_needed = false
     profile['sanStorage']['volumeAttachments'].each do |v|
       vol_details = rest_api(:oneview, :get, v['volumeUri'])
-      next unless vol_details['name'].downcase.match(/^boot/)
+      next unless vol_details['name'] =~ /^boot/i
       # Find the enabled path(s), get target wwpn, and then update connection, setting boot targets
       v['storagePaths'].each do |s|
         next if !s['isEnabled'] || s['storageTargets'].nil? || s['storageTargets'].empty?
         connection = profile['connections'].find { |c| c['id'] == s['connectionId'] }
-        fail "#{machine_spec.name}: Connection #{s['connectionId']} not found! Check SAN settings" unless connection
+        raise "#{machine_spec.name}: Connection #{s['connectionId']} not found! Check SAN settings" unless connection
         if connection['boot'].nil? || connection['boot']['priority'] == 'NotBootable'
           msg = "#{machine_spec.name}: Connection #{s['connectionId']} is labeled for boot, but the connection is not marked as bootable."
-          fail "#{msg} Set the connection boot target to Primary or Secondary"
+          raise "#{msg} Set the connection boot target to Primary or Secondary"
         end
         target = {}
         target['arrayWwpn'] = s['storageTargets'].first.delete(':')
@@ -81,8 +81,8 @@ module OneViewSanStorage
         power_off(action_handler, machine_spec, profile['serverHardwareUri'])
         task = rest_api(:oneview, :put, profile['uri'], { 'body' => profile })
         task = oneview_wait_for(task['uri'], 90) # Wait for up to 15 min for profile to be updated
-        fail "Timed out waiting for enabling SAN-bootable connections on #{machine_spec.name}" if task == false
-        fail "Error enabling SAN-bootable connections on #{machine_spec.name}. Response: #{task}" unless task == true
+        raise "Timed out waiting for enabling SAN-bootable connections on #{machine_spec.name}" if task == false
+        raise "Error enabling SAN-bootable connections on #{machine_spec.name}. Response: #{task}" unless task == true
       end
       profile = rest_api(:oneview, :get, profile['uri'])
     end

data/lib/chef/provisioning/oneview_driver.rb

@@ -28,7 +28,7 @@ module Chef::Provisioning
       if oneview_url.nil? || oneview_url == ''
         oneview_url = config[:knife][:oneview_url]
       end
-      fail 'Must set the knife[:oneview_url] attribute!' if oneview_url.nil? || oneview_url.empty?
+      raise 'Must set the knife[:oneview_url] attribute!' if oneview_url.nil? || oneview_url.empty?
       'oneview:' + oneview_url
     end
 
@@ -40,22 +40,22 @@ module Chef::Provisioning
       super(canonical_url, config)
 
       @oneview_base_url    = config[:knife][:oneview_url]
-      fail 'Must set the knife[:oneview_url] attribute!' if @oneview_base_url.nil? || @oneview_base_url.empty?
+      raise 'Must set the knife[:oneview_url] attribute!' if @oneview_base_url.nil? || @oneview_base_url.empty?
       @oneview_username    = config[:knife][:oneview_username]
-      fail 'Must set the knife[:oneview_username] attribute!' if @oneview_username.nil? || @oneview_username.empty?
+      raise 'Must set the knife[:oneview_username] attribute!' if @oneview_username.nil? || @oneview_username.empty?
       @oneview_password    = config[:knife][:oneview_password]
-      fail 'Must set the knife[:oneview_password] attribute!' if @oneview_password.nil? || @oneview_password.empty?
+      raise 'Must set the knife[:oneview_password] attribute!' if @oneview_password.nil? || @oneview_password.empty?
       @oneview_disable_ssl = config[:knife][:oneview_ignore_ssl]
       @oneview_api_version = 120 # Use this version for all calls that don't override it
       @current_oneview_api_version = get_oneview_api_version
       @oneview_key         = login_to_oneview
 
       @icsp_base_url       = config[:knife][:icsp_url]
-      fail 'Must set the knife[:icsp_url] attribute!' if @icsp_base_url.nil? || @icsp_base_url.empty?
+      raise 'Must set the knife[:icsp_url] attribute!' if @icsp_base_url.nil? || @icsp_base_url.empty?
       @icsp_username       = config[:knife][:icsp_username]
-      fail 'Must set the knife[:icsp_username] attribute!' if @icsp_username.nil? || @icsp_username.empty?
+      raise 'Must set the knife[:icsp_username] attribute!' if @icsp_username.nil? || @icsp_username.empty?
       @icsp_password       = config[:knife][:icsp_password]
-      fail 'Must set the knife[:icsp_password] attribute!' if @icsp_password.nil? || @icsp_password.empty?
+      raise 'Must set the knife[:icsp_password] attribute!' if @icsp_password.nil? || @icsp_password.empty?
       @icsp_disable_ssl    = config[:knife][:icsp_ignore_ssl]
       @icsp_api_version    = 102 # Use this version for all calls that don't override it
       @current_icsp_api_version = get_icsp_api_version
@@ -96,7 +96,7 @@ module Chef::Provisioning
 
     def ready_machine(action_handler, machine_spec, machine_options)
       profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number'])
-      fail "Failed to retrieve Server Profile for #{machine_spec.name}. Serial Number used to search: #{machine_spec.reference['serial_number']}" unless profile
+      raise "Failed to retrieve Server Profile for #{machine_spec.name}. Serial Number used to search: #{machine_spec.reference['serial_number']}" unless profile
       customize_machine(action_handler, machine_spec, machine_options, profile)
       machine_for(machine_spec, machine_options) # Return the Machine object
     end
@@ -106,7 +106,7 @@ module Chef::Provisioning
       bootstrap_ip_address = machine_options[:driver_options][:ip_address]
       unless bootstrap_ip_address
         id, connection = machine_options[:driver_options][:connections].find { |_id, c| c[:bootstrap] == true }
-        fail 'Must specify a connection to use to bootstrap!' unless id && connection
+        raise 'Must specify a connection to use to bootstrap!' unless id && connection
         bootstrap_ip_address = connection[:ip4Address] # For static IPs
         unless bootstrap_ip_address # Look for dhcp address given to this connection
           profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number'])
@@ -117,7 +117,7 @@ module Chef::Provisioning
         end
         bootstrap_ip_address ||= my_server['hostName'] # Fall back on hostName
       end
-      fail 'Server IP address not specified and could not be retrieved!' unless bootstrap_ip_address
+      raise 'Server IP address not specified and could not be retrieved!' unless bootstrap_ip_address
       username = machine_options[:transport_options][:user] || 'root' rescue 'root'
       default_ssh_options = {
         # auth_methods: ['password', 'publickey'],

data/lib/chef/provisioning/rest.rb

@@ -14,7 +14,7 @@ module RestAPI
       options['auth'] ||= @oneview_key
       disable_ssl = true if @oneview_disable_ssl
     else
-      fail "Invalid rest host: #{host}"
+      raise "Invalid rest host: #{host}"
     end
 
     http = Net::HTTP.new(uri.host, uri.port)
@@ -31,14 +31,14 @@ module RestAPI
     when 'delete', :delete
       request = Net::HTTP::Delete.new(uri.request_uri)
     else
-      fail "Invalid rest call: #{type}"
+      raise "Invalid rest call: #{type}"
     end
     options['Content-Type'] ||= 'application/json'
     options.delete('Content-Type')  if [:none, 'none', nil].include?(options['Content-Type'])
     options.delete('X-API-Version') if [:none, 'none', nil].include?(options['X-API-Version'])
     options.delete('auth')          if [:none, 'none', nil].include?(options['auth'])
     options.each do |key, val|
-      if key.downcase == 'body'
+      if key.casecmp('body') == 0
         request.body = val.to_json rescue val
       else
         request[key] = val

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Provisioning
-    ONEVIEW_DRIVER_VERSION = '1.1.2'
+    ONEVIEW_DRIVER_VERSION = '1.1.3'.freeze
   end
 end

data/spec/support/fake_oneview.rb

@@ -15,10 +15,10 @@ class FakeOneView < Sinatra::Base
   get '/rest/server-profile-templates' do
     version = env['HTTP_X_API_VERSION']
     file_name = 'server-profile-templates_invalid.json'
-    if params['filter'] && params['filter'].match('name matches')
-      if params['filter'].match('Web Server Template with SAN')
+    if params['filter'] && params['filter'] =~ /name matches/
+      if params['filter'] =~ /Web Server Template with SAN/
         file_name = 'server-profile-templates_WebServerTemplateWithSAN.json'
-      elsif params['filter'].match('Web Server Template')
+      elsif params['filter'] =~ /Web Server Template/
         file_name = 'server-profile-templates_WebServerTemplate.json'
       end
     end
@@ -40,28 +40,28 @@ class FakeOneView < Sinatra::Base
     version = env['HTTP_X_API_VERSION']
     file_name = 'server-profiles.json'
     if params['filter']
-      if params['filter'].match('matches \'\'') || params['filter'].match('INVALIDFILTER')
+      if params['filter'].match('matches \'\'') || params['filter'] =~ /INVALIDFILTER/
         file_name = 'server-profiles_invalid_filter.json'
-      elsif params['filter'].match('serialNumber matches')
-        if params['filter'].match('VCGE9KB041')
-          file_name = 'server-profiles_sn_VCGE9KB041.json'
-        elsif params['filter'].match('VCGE9KB042')
-          file_name = 'server-profiles_sn_VCGE9KB042.json'
-        else
-          file_name = 'server-profiles_sn_empty.json'
-        end
-      elsif params['filter'].match('name matches')
-        if params['filter'].match('Template - Web Server with SAN')
-          file_name = 'server-profiles_name_Template-WebServerWithSAN.json'
-        elsif params['filter'].match('Template - Web Server')
-          file_name = 'server-profiles_name_Template-WebServer.json'
-        elsif params['filter'].match('chef-web01')
-          file_name = 'server-profiles_name_chef-web01.json'
-        elsif $server_created == 'chef-web03'
-          file_name = 'server-profiles_name_chef-web03.json'
-        else
-          file_name = 'server-profiles_name_empty.json'
-        end
+      elsif params['filter'] =~ /serialNumber matches/
+        file_name = if params['filter'] =~ /VCGE9KB041/
+                      'server-profiles_sn_VCGE9KB041.json'
+                    elsif params['filter'] =~ /VCGE9KB042/
+                      'server-profiles_sn_VCGE9KB042.json'
+                    else
+                      'server-profiles_sn_empty.json'
+                    end
+      elsif params['filter'] =~ /name matches/
+        file_name = if params['filter'] =~ /Template - Web Server with SAN/
+                      'server-profiles_name_Template-WebServerWithSAN.json'
+                    elsif params['filter'] =~ /Template - Web Server/
+                      'server-profiles_name_Template-WebServer.json'
+                    elsif params['filter'] =~ /chef-web01/
+                      'server-profiles_name_chef-web01.json'
+                    elsif $server_created == 'chef-web03'
+                      'server-profiles_name_chef-web03.json'
+                    else
+                      'server-profiles_name_empty.json'
+                    end
       end
     end
     json_response(200, file_name, version)
@@ -80,7 +80,7 @@ class FakeOneView < Sinatra::Base
   get '/rest/server-hardware' do
     version = env['HTTP_X_API_VERSION']
     file_name = 'server-hardware.json'
-    if params['filter'].match('enclosure-groups/3a11ccdd-b352-4046-a568-a8b0faa6cc39') # && params['filter'].match('') # TODO
+    if params['filter'] =~ %r{enclosure-groups/3a11ccdd-b352-4046-a568-a8b0faa6cc39}
       file_name = 'server-hardware_Template-WebServer.json'
     end
     json_response(200, file_name, version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-oneview
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Hewlett Packard Enterprise
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef