idrac 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2daa5d9eb50a541d372954c84db4e371b0f34b02aaf4e57d915d0a08a4a839d5
-  data.tar.gz: 994b6605e51925c70d1c6948aa8855f45018b951c58c96bc464f4a7598f48827
+  metadata.gz: 35af179780aaa39d3e0ecec031f951c09a9d1cbb2da98e28708aca8e603e8da2
+  data.tar.gz: 106abac6bd24e51135c62ec299119be92bd75ddd44df8ff460292a464e699ec0
 SHA512:
-  metadata.gz: 4430c49903bfff3a52f746b1a526ca7ffce1d116fef8dc8a1c610daa03bee6c3dafc7a5828483a9db58269d6082b384ba60e1d5897e6cc10df867988123905d6
-  data.tar.gz: ad6ecfb6c6908ddb7c7572db3265c6e10eb985374046aa6af172fbc917fe4e4db246e9336c780872f6a243fbc3d6b5145dd8bafd6cff972e47f855fe1011fbc0
+  metadata.gz: 4bf2ceda937c51d8f0a060a8cecba03465f3823f5032e59c41c94fbf67521e80ae9315ca1925415335e6f332274bf8431bf9f6fb1cd5b996835b301e775587bc
+  data.tar.gz: 329d1cc1cc4c8b1ec79c671f12cd273e9cd50f1512548bb083ebbc649a9c448991f6428c4b3646a7ee7fb536c84142c6cc8573ad4c7148ea36572b7f60bb8404

data/README.md

@@ -218,6 +218,15 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Changelog
 
+### Version 0.7.5
+- **Code Cleanup**: Consolidated duplicate methods across the codebase
+- Removed 5 sets of duplicate methods: `base_url`, `get_firmware_version`, `wait_for_task`, `handle_location`, and `extract_identifiers`
+- Simplified method delegation patterns for better maintainability
+- Eliminated ~150+ lines of duplicate code while preserving all functionality
+
+### Version 0.7.4
+- Added tolerance fol SSL Timeout errors during iDRAC operations.
+
 ### Version 0.7.3
 - Improved error handling around SystemConfigurationProfile.
 

data/lib/idrac/client.rb

@@ -148,12 +148,16 @@ module IDRAC
           end
           
           return response
-        rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+        rescue Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::SSLError => e
+          # Old iDRACs (e.g. R630s) can have occasional connection issues--even SSLError is common
           debug "Connection error in direct mode: #{e.message}", 1, :red
           sleep(retry_count + 1) # Add some delay before retry
           return _perform_authenticated_request(method, path, options, retry_count + 1)
         rescue => e
+          debugger
           debug "Error during direct mode request: #{e.message}", 1, :red
+          # sleep(retry_count + 1) # Add some delay before retry
+          # return _perform_authenticated_request(method, path, options, retry_count + 1)
           raise Error, "Error during authenticated request: #{e.message}"
         end
       # Use Redfish session token if available
@@ -395,7 +399,6 @@ module IDRAC
         
         # Check final task state
         if task["TaskState"] == "Completed" && task["TaskStatus"] == "OK"
-          debugger
           return { status: :success }
         elsif task["SystemConfiguration"] # SystemConfigurationProfile requests yield a 202 with a SystemConfiguration key
           return task

data/lib/idrac/firmware.rb

@@ -170,7 +170,7 @@ module IDRAC
         displayed_components.add(firmware_name.downcase)
         
         # Extract key identifiers from the firmware name
-        identifiers = extract_identifiers(firmware_name)
+        identifiers = catalog.extract_identifiers(firmware_name)
         
         # Try to find a matching update
         matching_updates = catalog_updates.select do |update|
@@ -255,7 +255,7 @@ module IDRAC
         # Skip if this update was already matched to a current firmware
         next if inventory[:firmware].any? do |fw|
           firmware_name = fw[:name] || ""
-          identifiers = extract_identifiers(firmware_name)
+          identifiers = catalog.extract_identifiers(firmware_name)
           
           identifiers.any? { |id| update_name.downcase.include?(id.downcase) } ||
           update_name.downcase.include?(firmware_name.downcase) ||
@@ -429,23 +429,7 @@ module IDRAC
       end
     end
 
-    def get_power_state
-      # Ensure we have a client
-      raise Error, "Client is required for power management" unless client
-      
-      # Login to iDRAC if needed
-      client.login unless client.instance_variable_get(:@session_id)
-      
-      # Get system information
-      response = client.authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1")
-      
-      if response.status == 200
-        system_data = JSON.parse(response.body)
-        return system_data["PowerState"]
-      else
-        raise Error, "Failed to get power state. Status code: #{response.status}"
-      end
-    end
+
 
     private
 
@@ -750,53 +734,6 @@ module IDRAC
       end
     end
 
-    # Helper method to extract identifiers from component names
-    def extract_identifiers(name)
-      return [] unless name
-      
-      identifiers = []
-      
-      # Extract model numbers like X520, I350, etc.
-      model_matches = name.scan(/[IX]\d{3,4}/)
-      identifiers.concat(model_matches)
-      
-      # Extract PERC model like H730
-      perc_matches = name.scan(/[HP]\d{3,4}/)
-      identifiers.concat(perc_matches)
-      
-      # Extract other common identifiers
-      if name.include?("NIC") || name.include?("Ethernet") || name.include?("Network")
-        identifiers << "NIC"
-      end
-      
-      if name.include?("PERC") || name.include?("RAID")
-        identifiers << "PERC"
-        # Extract PERC model like H730
-        perc_match = name.match(/PERC\s+([A-Z]\d{3})/)
-        identifiers << perc_match[1] if perc_match
-      end
-      
-      if name.include?("BIOS")
-        identifiers << "BIOS"
-      end
-      
-      if name.include?("iDRAC") || name.include?("IDRAC") || name.include?("Remote Access Controller")
-        identifiers << "iDRAC"
-      end
-      
-      if name.include?("Power Supply") || name.include?("PSU")
-        identifiers << "PSU"
-      end
-      
-      if name.include?("Lifecycle Controller")
-        identifiers << "LC"
-      end
-      
-      if name.include?("CPLD")
-        identifiers << "CPLD"
-      end
-      
-      identifiers
-    end
+
   end
 end 

data/lib/idrac/session.rb

@@ -282,8 +282,7 @@ module IDRAC
     private
 
     def base_url
-      protocol = use_ssl ? 'https' : 'http'
-      "#{protocol}://#{host}:#{port}"
+      client.base_url
     end
     
     def print_connection_debug_info

data/lib/idrac/storage.rb

@@ -382,7 +382,6 @@ module IDRAC
         end
       end
       
-      debugger
       # Map RAID type to proper format
       raid_level = case raid_type
                    when "RAID0" then "0"
@@ -522,33 +521,7 @@ module IDRAC
       all_seds?(drives) && controller_encryption_capable?(controller) && controller_encryption_enabled?(controller)
     end
 
-    # Get firmware version
-    def get_firmware_version
-      response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1?$select=FirmwareVersion")
-      
-      if response.status == 200
-        begin
-          data = JSON.parse(response.body)
-          return data["FirmwareVersion"]
-        rescue JSON::ParserError
-          raise Error, "Failed to parse firmware version response: #{response.body}"
-        end
-      else
-        # Try again without the $select parameter for older firmware
-        response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1")
-        
-        if response.status == 200
-          begin
-            data = JSON.parse(response.body)
-            return data["FirmwareVersion"]
-          rescue JSON::ParserError
-            raise Error, "Failed to parse firmware version response: #{response.body}"
-          end
-        else
-          raise Error, "Failed to get firmware version. Status code: #{response.status}"
-        end
-      end
-    end
+
 
     # Check if the controller is capable of encryption
     def controller_encryption_capable?(controller)

data/lib/idrac/system_config.rb

@@ -77,85 +77,7 @@ module IDRAC
       return true
     end
 
-    # Wait for a task to complete
-    def wait_for_task(task_id)
-      task = nil
-      
-      begin
-        loop do
-          task_response = authenticated_request(:get, "/redfish/v1/TaskService/Tasks/#{task_id}")
-          
-          case task_response.status
-            # 200-299
-          when 200..299
-            task = JSON.parse(task_response.body)
 
-            if task["TaskState"] != "Running"
-              break
-            end
-            
-            # Extract percentage complete if available
-            percent_complete = nil
-            if task["Oem"] && task["Oem"]["Dell"] && task["Oem"]["Dell"]["PercentComplete"]
-              percent_complete = task["Oem"]["Dell"]["PercentComplete"]
-              debug "Task progress: #{percent_complete}% complete", 1
-            end
-            
-            debug "Waiting for task to complete...: #{task["TaskState"]} #{task["TaskStatus"]}", 1
-            sleep 5
-          else
-            return { 
-              status: :failed, 
-              error: "Failed to check task status: #{task_response.status} - #{task_response.body}" 
-            }
-          end
-        end
-        
-        # Check final task state
-        if task["TaskState"] == "Completed" && task["TaskStatus"] == "OK"
-          debugger
-          return { status: :success }
-        elsif task["SystemConfiguration"] # SystemConfigurationProfile requests yield a 202 with a SystemConfiguration key
-          return task
-        else
-          # For debugging purposes
-          debug task.inspect, 1, :yellow
-          
-          # Extract any messages from the response
-          messages = []
-          if task["Messages"] && task["Messages"].is_a?(Array)
-            messages = task["Messages"].map { |m| m["Message"] }.compact
-          end
-          
-          return { 
-            status: :failed, 
-            task_state: task["TaskState"], 
-            task_status: task["TaskStatus"],
-            messages: messages,
-            error: messages.first || "Task failed with state: #{task["TaskState"]}"
-          }
-        end
-      rescue => e
-        debugger
-        return { status: :error, error: "Exception monitoring task: #{e.message}" }
-      end
-    end
-
-    # Handle location header and determine whether to use wait_for_job or wait_for_task
-    def handle_location(location)
-      return nil if location.nil? || location.empty?
-      
-      # Extract the ID from the location
-      id = location.split("/").last
-      
-      # Determine if it's a task or job based on the URL pattern
-      if location.include?("/TaskService/Tasks/")
-        wait_for_task(id)
-      else
-        # Assuming it's a job
-        wait_for_job(id)
-      end
-    end
 
     # Get the system configuration profile for a given target (e.g. "RAID")
     def get_system_configuration_profile(target: "RAID")

data/lib/idrac/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IDRAC
-  VERSION = "0.7.3"
+  VERSION = "0.7.5"
 end

data/lib/idrac/virtual_media.rb

@@ -244,32 +244,6 @@ module IDRAC
 
     private
 
-    # Get firmware version (helper method for virtual media operations)
-    def get_firmware_version
-      response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1?$select=FirmwareVersion")
-      
-      if response.status == 200
-        begin
-          data = JSON.parse(response.body)
-          return data["FirmwareVersion"]
-        rescue JSON::ParserError
-          raise Error, "Failed to parse firmware version response: #{response.body}"
-        end
-      else
-        # Try again without the $select parameter for older firmware
-        response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1")
-        
-        if response.status == 200
-          begin
-            data = JSON.parse(response.body)
-            return data["FirmwareVersion"]
-          rescue JSON::ParserError
-            raise Error, "Failed to parse firmware version response: #{response.body}"
-          end
-        else
-          raise Error, "Failed to get firmware version. Status code: #{response.status}"
-        end
-      end
-    end
+
   end
 end 

data/lib/idrac/web.rb

@@ -180,8 +180,7 @@ module IDRAC
     private
 
     def base_url
-      protocol = client.use_ssl ? 'https' : 'http'
-      "#{protocol}://#{client.host}:#{client.port}"
+      client.base_url
     end
   end
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idrac
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Jonathan Siegel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty