radfish-idrac 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 498ca5982c494dc12664edf49adb339c54e4a6c642b649e307ce73ca5b13b760
-  data.tar.gz: ef423da63f06a0a0931b82c9faf2427b46ec91d85b647dac560cb957020dc042
+  metadata.gz: 9e06ed50701a0a34c99711a2cba0e5ee4238667d75988b7c78f06b66c6f08cf9
+  data.tar.gz: a4e88ec48073815ff1e368d5bd93b1c4d14b9b5dd44bcb0324e0aa037e79430d
 SHA512:
-  metadata.gz: f02763dccf483a5c969d6752a09db593249393b0983544d664c77f68e410d53fd63f1fc69a2201ccf9434560841f501492cf7491ae2ccc2d9a5d513dcabc5596
-  data.tar.gz: bbbca9598994cbe3ed5e38c55a6e5fe4a7672b0607168c624b2e4944098f6140ea569b5b7251c0f97786bea370dda9f17fc438e7e901a03a7b49ccc5657dd85b
+  metadata.gz: 1b189ac7729869a390ff50e4043a4eccd92dbf3fcab823d338130895a735ff7f1d30dd3d03aa3b5611d4eb5f54e8e8cab4e57307eebd82b33153049f1930c633
+  data.tar.gz: 451835735540908ea5a129e50dacc003088d2411d03eb89826ec4d423de594d49767c353dda430329a40df05639a9e7b8bfb76a075dc5bd091cbdad71a51fc22

data/lib/radfish/idrac/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Idrac
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

data/lib/radfish/idrac_adapter.rb

@@ -294,6 +294,15 @@ module Radfish
       controller_data = @idrac_client.controllers
       
       controller_data.map do |controller|
+        # Promote battery status if available in OEM fields
+        begin
+          battery = controller.dig("Oem", "Dell", "DellControllerBattery")
+          if battery
+            controller["battery_status"] ||= (battery["PrimaryStatus"] || battery["RAIDState"]) 
+          end
+        rescue => e
+          debug "Battery status parse error: #{e.message}", 2, :yellow
+        end
         # Convert drives array to OpenStruct objects if present
         if controller["drives"]
           controller["drives"] = controller["drives"].map { |drive| OpenStruct.new(drive) }
@@ -325,6 +334,33 @@ module Radfish
       # Convert to OpenStruct for consistency
       volume_data.map { |volume| OpenStruct.new(volume) }
     end
+
+    def volume_drives(volume)
+      # Resolve the physical drives that make up a volume
+      raise ArgumentError, "Volume required" unless volume
+      controller_id = extract_controller_identifier(volume.controller)
+      # Get all drives on the controller
+      drives = @idrac_client.drives(controller_id)
+      # The IDRAC client drive entries include 'odata_id'; volumes include Links.Drives as '@odata.id'
+      refs = nil
+      raw = volume.adapter_data
+      if raw.respond_to?(:[])
+        refs = raw['drives'] || raw[:drives]
+      elsif raw.respond_to?(:drives)
+        refs = raw.drives
+      end
+      return [] unless refs && refs.respond_to?(:map)
+      ref_ids = refs.map { |r| r['@odata.id'] || r[:'@odata.id'] }.compact
+      matched = drives.select do |d|
+        oid = if d.is_a?(Hash)
+                d['odata_id'] || d[:odata_id] || d['@odata.id'] || d[:'@odata.id']
+              elsif d.respond_to?(:[])
+                d['odata_id'] || d['@odata.id']
+              end
+        oid && ref_ids.include?(oid)
+      end
+      matched.map { |drive| OpenStruct.new(drive) }
+    end
     
     def storage_summary
       # The iDRAC gem doesn't have a storage_summary method

metadata

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