idrac 0.1.23 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19bd4d4dbb2b3c79b0b35e70067284d0b6c38dd548f37eabe2b1102b11dd8782
-  data.tar.gz: 0555e28ccfedbbdfe5e100c23700ae2dc8cab849b806baf739de7a1d6fbd6d66
+  metadata.gz: 4d751ffb6e590b80a6a5dc72457d8a4be11213224a13ebeae50698ae9f6cafff
+  data.tar.gz: 5a3f826850bf9aee8e40287ff7f8ab7c5bd71944ddce2b183dbe88dabed9c3fa
 SHA512:
-  metadata.gz: dec9acadc7a50d101322f111b4522aa886547c92e8c8d089a7811527e4be43227c7116c62b9c2b199424427ecb95ea75604160f5d728142fe14d5c78302668f0
-  data.tar.gz: 82b726d07aa328830a9a58292542712b0075b2865de7df56a1a2f161094a50762aed2b2f3aab80e835474f729a2ebbc131b452467607cbcb2bbcb70345baf61b
+  metadata.gz: 553bef804c000680be8ecadb15c19f2b4a335db5a7a44b5071ccb230f168880268e906f5a296a70c8659a5bbbb14a0ffb3a6f56cfc4c9ca216e0a1f8a6024a0f
+  data.tar.gz: ff4d0ce0967de6fbddd425844e0c86165276c44d508a2b8de41a20ec54e3998f7d2f1d5aa7cadf34201dd26113bd0abafb1e01d13439edbcb1d22f273e31a1f5

data/README.md

@@ -127,6 +127,28 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Changelog
 
+### Version 0.1.26
+- **Improved Redfish Session Creation**: Fixed issues with the Redfish session creation process
+- Added multiple fallback methods for creating sessions with different iDRAC versions
+- Fixed 415 Unsupported Media Type error by trying different content types
+- Added support for form-urlencoded requests when JSON requests fail
+- Enhanced error handling and logging during session creation
+
+### Version 0.1.25
+- **Enhanced Component Matching**: Improved firmware component matching with catalog entries
+- Added extraction of model numbers and identifiers from component names (X520, H730, etc.)
+- Implemented multiple matching strategies for better accuracy
+- Added special handling for different component types (NIC, PERC, BIOS, iDRAC, etc.)
+- Improved matching for components with different naming conventions
+
+### Version 0.1.24
+- **Improved Firmware Update Check**: Fixed issues with firmware version comparison
+- Eliminated duplicate entries in firmware update results
+- Improved matching logic between installed firmware and catalog entries
+- Added proper handling of BIOS updates
+- Fixed missing version information in update output
+- Enhanced name comparison with case-insensitive matching
+
 ### Version 0.1.23
 - **Fixed Duplicate Messages**: Removed duplicate "Retrieving system inventory..." message in firmware:status command
 - The message was appearing twice because it was being printed by both the CLI class and the Firmware class

data/lib/idrac/client.rb

@@ -130,67 +130,120 @@ module IDRAC
       url = '/redfish/v1/SessionService/Sessions'
       payload = { "UserName" => username, "Password" => password }
       
-      # Use Basic Auth for the initial session creation
-      basic_auth_headers = {
-        'Authorization' => "Basic #{Base64.strict_encode64("#{username}:#{password}")}",
-        'Content-Type' => 'application/json'
-      }
-      
-      response = connection.post(url) do |req|
-        req.headers.merge!(basic_auth_headers)
-        req.body = payload.to_json
+      # Try first with just Content-Type header (no Basic Auth)
+      begin
+        response = connection.post(url) do |req|
+          req.headers['Content-Type'] = 'application/json'
+          req.body = payload.to_json
+        end
+        
+        if response.status == 201 || response.status == 200
+          # Extract X-Auth-Token from response headers
+          @x_auth_token = response.headers['X-Auth-Token']
+          
+          # Extract session location from response headers
+          @session_location = response.headers['Location']
+          
+          puts "Redfish session created successfully"
+          @sessions_maxed = false
+          return true
+        end
+      rescue => e
+        puts "First session creation attempt failed: #{e.message}"
       end
       
-      if response.status == 201 || response.status == 200
-        # Extract X-Auth-Token from response headers
-        @x_auth_token = response.headers['X-Auth-Token']
-        
-        # Extract session location from response headers
-        @session_location = response.headers['Location']
+      # If that fails, try with Basic Auth
+      begin
+        # Use Basic Auth for the session creation
+        basic_auth_headers = {
+          'Authorization' => "Basic #{Base64.strict_encode64("#{username}:#{password}")}",
+          'Content-Type' => 'application/json'
+        }
         
-        puts "Redfish session created successfully"
-        @sessions_maxed = false
-        return true
-      elsif response.status == 400 && response.body.include?("maximum number of user sessions")
-        puts "Maximum sessions reached during Redfish session creation"
-        @sessions_maxed = true
+        response = connection.post(url) do |req|
+          req.headers.merge!(basic_auth_headers)
+          req.body = payload.to_json
+        end
         
-        # Try to clear sessions if auto_delete_sessions is enabled
-        if @auto_delete_sessions
-          puts "Auto-delete sessions is enabled, attempting to clear sessions"
-          if force_clear_sessions
-            puts "Successfully cleared sessions, trying to create a new session"
-            
-            # Try one more time after clearing
+        if response.status == 201 || response.status == 200
+          # Extract X-Auth-Token from response headers
+          @x_auth_token = response.headers['X-Auth-Token']
+          
+          # Extract session location from response headers
+          @session_location = response.headers['Location']
+          
+          puts "Redfish session created successfully with Basic Auth"
+          @sessions_maxed = false
+          return true
+        elsif response.status == 400 && response.body.include?("maximum number of user sessions")
+          puts "Maximum sessions reached during Redfish session creation"
+          @sessions_maxed = true
+          
+          # Try to clear sessions if auto_delete_sessions is enabled
+          if @auto_delete_sessions
+            puts "Auto-delete sessions is enabled, attempting to clear sessions"
+            if force_clear_sessions
+              puts "Successfully cleared sessions, trying to create a new session"
+              
+              # Try one more time after clearing
+              response = connection.post(url) do |req|
+                req.headers.merge!(basic_auth_headers)
+                req.body = payload.to_json
+              end
+              
+              if response.status == 201 || response.status == 200
+                @x_auth_token = response.headers['X-Auth-Token']
+                @session_location = response.headers['Location']
+                puts "Redfish session created successfully after clearing sessions"
+                @sessions_maxed = false
+                return true
+              else
+                puts "Failed to create Redfish session after clearing: #{response.status} - #{response.body}"
+                # If we still can't create a session, switch to direct mode
+                @direct_mode = true
+                return false
+              end
+            else
+              puts "Failed to clear sessions, switching to direct mode"
+              @direct_mode = true
+              return false
+            end
+          else
+            puts "Auto-delete sessions is disabled, switching to direct mode"
+            @direct_mode = true
+            return false
+          end
+        else
+          puts "Failed to create Redfish session: #{response.status} - #{response.body}"
+          
+          # If we get a 415 error, try with form-urlencoded
+          if response.status == 415
+            puts "Trying with form-urlencoded content type"
             response = connection.post(url) do |req|
-              req.headers.merge!(basic_auth_headers)
-              req.body = payload.to_json
+              req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+              req.headers['Authorization'] = "Basic #{Base64.strict_encode64("#{username}:#{password}")}"
+              req.body = "UserName=#{URI.encode_www_form_component(username)}&Password=#{URI.encode_www_form_component(password)}"
             end
             
             if response.status == 201 || response.status == 200
               @x_auth_token = response.headers['X-Auth-Token']
               @session_location = response.headers['Location']
-              puts "Redfish session created successfully after clearing sessions"
+              puts "Redfish session created successfully with form-urlencoded"
               @sessions_maxed = false
               return true
             else
-              puts "Failed to create Redfish session after clearing: #{response.status} - #{response.body}"
-              # If we still can't create a session, switch to direct mode
+              puts "Failed with form-urlencoded too: #{response.status} - #{response.body}"
               @direct_mode = true
               return false
             end
           else
-            puts "Failed to clear sessions, switching to direct mode"
             @direct_mode = true
             return false
           end
-        else
-          puts "Auto-delete sessions is disabled, switching to direct mode"
-          @direct_mode = true
-          return false
         end
-      else
-        puts "Failed to create Redfish session: #{response.status} - #{response.body}"
+      rescue => e
+        puts "Error during Redfish session creation: #{e.message}"
+        @direct_mode = true
         return false
       end
     end

data/lib/idrac/firmware.rb

@@ -153,7 +153,13 @@ module IDRAC
       # Get current firmware versions
       current_versions = {}
       inventory[:firmware].each do |fw|
-        current_versions[fw[:name]] = fw[:version]
+        # Use the ID as the key to avoid duplicates
+        current_versions[fw[:id]] = {
+          name: fw[:name],
+          version: fw[:version],
+          updateable: fw[:updateable],
+          identifiers: extract_identifiers(fw[:name]) # Extract identifiers for better matching
+        }
       end
       
       # Find matching components in catalog
@@ -163,29 +169,112 @@ module IDRAC
         path = component.at_xpath('Path')&.text
         component_type = component.at_xpath('ComponentType')&.text
         
+        next unless name && version && path # Skip if missing essential data
+        
+        # Extract identifiers from catalog component name for better matching
+        catalog_identifiers = extract_identifiers(name)
+        
         # Check if this component matches any of our firmware
-        inventory[:firmware].each do |fw|
-          if fw[:name].include?(name) || name.include?(fw[:name])
-            current_version = fw[:version]
-            
-            # Simple version comparison (this could be improved)
-            if version != current_version
-              updates << {
-                name: name,
-                current_version: current_version,
-                available_version: version,
-                path: path,
-                component_type: component_type,
-                download_url: "https://downloads.dell.com/#{path}"
-              }
+        # We'll track if we found a match to avoid duplicates
+        matched = false
+        
+        current_versions.each do |id, fw_info|
+          # Skip if not updateable
+          next unless fw_info[:updateable]
+          
+          # Normalize names for comparison
+          catalog_name = name.downcase.strip
+          firmware_name = fw_info[:name].downcase.strip
+          
+          # Check for matches using multiple strategies
+          match_found = false
+          
+          # 1. Check if names contain each other
+          if catalog_name.include?(firmware_name) || firmware_name.include?(catalog_name)
+            match_found = true
+          end
+          
+          # 2. Check if BIOS components match
+          if (catalog_name.include?("bios") && firmware_name.include?("bios"))
+            match_found = true
+          end
+          
+          # 3. Check if identifiers match
+          if !match_found && !fw_info[:identifiers].empty? && !catalog_identifiers.empty?
+            # Check if any identifier from firmware matches any identifier from catalog
+            if (fw_info[:identifiers] & catalog_identifiers).any?
+              match_found = true
             end
           end
+          
+          # If we found a match and versions differ, add to updates
+          if match_found && !matched && version != fw_info[:version]
+            updates << {
+              name: name,
+              current_version: fw_info[:version],
+              available_version: version,
+              path: path,
+              component_type: component_type,
+              download_url: "https://downloads.dell.com/#{path}"
+            }
+            
+            # Mark as matched to avoid duplicates
+            matched = true
+          end
         end
       end
       
       updates
     end
     
+    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
+    
     def interactive_update(catalog_path = nil)
       updates = check_updates(catalog_path)
       

data/lib/idrac/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idrac
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.26
 platform: ruby
 authors:
 - Jonathan Siegel