idrac 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e60a1c39738e830b95e2e0c29ad603ab9c57966535ca40374b31cc37315f4138
-  data.tar.gz: 6b007a005002ff5eaf88561c3e6d717c1c6d51715aa6a994a4b72e86f1f6e2c8
+  metadata.gz: ada89d6fb4827e57600dda32ff7a93124b526ee3986335fb593c2a61ea767d29
+  data.tar.gz: 4237b089a51941b56524e3d4341835b5c60c36b365cfff9e74f90faa43bf0fad
 SHA512:
-  metadata.gz: 2b3014bfeb1061b6506fb9025885283015d7cd6a87868c41c832de71fdd5428dd96d6f16eb18aa2ea20ede8cb4d58d87d4f2922c2fed10958ad33ebc533469c4
-  data.tar.gz: f20ddd6b1be1f3105aead4387865e9b556cda333df23ba944915aa7805d83a28fef85a0acc7c33456b4d102d9f707dc0d4a70db470dd6726bfea08eaefd2ffd7
+  metadata.gz: 7a5367ff256299d380a8be3d9b1f284051e96ac415e377667e8118cb0511b138fa7a0c3644a1d48c69bba74e5d812cd0046add67a4a1b0d7913b482de9b03d87
+  data.tar.gz: ddc6e9496009474248636fe2037b6aa721bb9f50a333937835062f02aad4ed7fff46f098a824b0ef1eabe3c704e2584261d08e150f426e4c778886a56a7c164b

data/lib/idrac/boot.rb

@@ -356,7 +356,7 @@ module IDRAC
       else
         response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1/Bios")
         json = JSON.parse(response.body)
-        raise "Error reading HddPlaceholder setup" if json&.dig('SystemConfiguration').blank?
+        raise "Error reading HddPlaceholder setup" if json&.dig('Attributes','HddPlaceholder').blank?
         json["Attributes"]["HddPlaceholder"] == "Enabled"
       end
     end
@@ -371,7 +371,7 @@ module IDRAC
       else
         response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1/Bios")
         json = JSON.parse(response.body)
-        raise "Error reading PowerControl setup" if json&.dig('SystemConfiguration').blank?
+        raise "Error reading PowerControl setup" if json&.dig('Attributes').blank?
         json["Attributes"]["ProcCStates"] == "Enabled" &&
           json["Attributes"]["SysProfile"] == "PerfPerWattOptimizedOs" &&
           json["Attributes"]["ProcPwrPerf"] == "OsDbpm"

data/lib/idrac/client.rb

@@ -190,8 +190,7 @@ module IDRAC
       begin
         conn.options.timeout = timeout if timeout
         conn.options.open_timeout = open_timeout if open_timeout
-        
-        conn.run_request(method, path.sub(/^\//, ''), body, headers)
+        conn.run_request(method, path, body, headers)
       ensure
         conn.options.timeout = original_timeout
         conn.options.open_timeout = original_open_timeout

data/lib/idrac/lifecycle.rb

@@ -13,12 +13,13 @@ module IDRAC
       debug "Detected iDRAC version: #{idrac_version}", 1
       
       # Use version-specific methods
-      if idrac_version > 9
+      if idrac_version >= 9
         debug "Using modern approach for iDRAC > 9", 1
         return get_lifecycle_status_modern_firmware
-      elsif idrac_version == 9
-        debug "Using registry approach for iDRAC 9", 1
-        return get_lifecycle_status_from_registry
+      # This may have been one particularly odd oldish iDRAC 9
+      # elsif idrac_version == 9
+      #   debug "Using registry approach for iDRAC 9", 1
+      #   return get_lifecycle_status_from_registry
       else
         debug "Using SCP approach for older iDRAC (v#{idrac_version})", 1
         return get_lifecycle_status_from_scp
@@ -57,7 +58,7 @@ module IDRAC
         return false
       rescue => e
         debug "Error getting Lifecycle Controller status from SCP: #{e.message}", 1, :red
-        debug e.backtrace.join("\n"), 3, :red
+        debug e.backtrace.join("\n"), 10, :red
         return false
       end
     end
@@ -75,9 +76,11 @@ module IDRAC
       # This is the attribute we want:
       target = attributes&.dig('RegistryEntries', 'Attributes')&.find {|q| q['AttributeName'] =~ /LCAttributes.1.LifecycleControllerState/ }
       # This is the FQDN of the attribute we want to get the value of:
-      fqdn = target.dig('Id')  # LifecycleController.Embedded.1#LCAttributes.1#LifecycleControllerState
+      fqdn = target.dig('Id') # LifecycleController.Embedded.1#LCAttributes.1#LifecycleControllerState
+      subpath = fqdn.gsub(/#.*$/,'') # Remove everything # and onwards
       # This is the Current Value:
-      response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Oem/Dell/DellAttributes/#{fqdn}")
+      response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Oem/Dell/DellAttributes/#{subpath}")
+
       if response.status != 200
         debug "Failed to get Lifecycle Controller Attributes".red, 1
         return false

data/lib/idrac/system_config.rb

@@ -193,7 +193,36 @@ module IDRAC
       end
     end
 
-
+    # Merge multiple SCP configurations together
+    # Takes multiple arguments - each can be an SCP hash, array of components, or full SCP structure
+    def merge_scp(*scps)
+      merged_components = {}
+      
+      scps.compact.each do |scp|
+        components = extract_components(scp)
+        components.each do |component|
+          fqdd = component["FQDD"]
+          if merged_components[fqdd]
+            # Merge attributes for the same FQDD
+            existing_attrs = merged_components[fqdd]["Attributes"] || []
+            new_attrs = component["Attributes"] || []
+            
+            # Build hash of existing attributes by name for easy lookup
+            attr_hash = {}
+            existing_attrs.each { |attr| attr_hash[attr["Name"]] = attr }
+            
+            # Add/overwrite with new attributes
+            new_attrs.each { |attr| attr_hash[attr["Name"]] = attr }
+            
+            merged_components[fqdd]["Attributes"] = attr_hash.values
+          else
+            merged_components[fqdd] = component.dup
+          end
+        end
+      end
+      
+      merged_components.values
+    end
 
     # Handle location header for IP change operations. Monitors old IP until it fails,
     # then aggressively monitors new IP with tight timeouts.
@@ -266,5 +295,26 @@ module IDRAC
     end
 
     private
+    
+    # Extract components array from various SCP formats
+    def extract_components(scp)
+      case scp
+      when Hash
+        if scp["SystemConfiguration"] && scp["SystemConfiguration"]["Components"]
+          scp["SystemConfiguration"]["Components"]
+        elsif scp["Components"]
+          scp["Components"]  
+        elsif scp["FQDD"]
+          [scp] # Single component
+        else
+          # Assume it's a hash of FQDD => attributes
+          hash_to_scp(scp)
+        end
+      when Array
+        scp # Already an array of components
+      else
+        []
+      end
+    end
   end
 end 

data/lib/idrac/version.rb

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

metadata

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