radfish-idrac 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd2c3bf25651e2968b2bbb5646abfe3be4af7679d750f1f5d958a8440db7762a
-  data.tar.gz: e6235fd71297dc9ef3feea51d9d30e8ad80e645e4b37e8000a396be45fa628ec
+  metadata.gz: 498ca5982c494dc12664edf49adb339c54e4a6c642b649e307ce73ca5b13b760
+  data.tar.gz: ef423da63f06a0a0931b82c9faf2427b46ec91d85b647dac560cb957020dc042
 SHA512:
-  metadata.gz: c8a449130e8451cf9eacb9fc5cccbba1d8180ce874933488426b8ae1c589313a8ba6f725115351b40b2cf8c334869b6973c2d076231fe3347cbe96eed2727fb5
-  data.tar.gz: 8835042ad7199c7a88965099f2e5473101db5e5c7597ba09a195b1b790743aee2f2c2f7a1ba1110697094ac3dd8737154123e3c84f4bded61ea1f036c842888f
+  metadata.gz: f02763dccf483a5c969d6752a09db593249393b0983544d664c77f68e410d53fd63f1fc69a2201ccf9434560841f501492cf7491ae2ccc2d9a5d513dcabc5596
+  data.tar.gz: bbbca9598994cbe3ed5e38c55a6e5fe4a7672b0607168c624b2e4944098f6140ea569b5b7251c0f97786bea370dda9f17fc438e7e901a03a7b49ccc5657dd85b

data/lib/radfish/idrac/version.rb

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

data/lib/radfish/idrac_adapter.rb

@@ -302,9 +302,11 @@ module Radfish
       end
     end
     
-    def drives(controller_id)
-      # The iDRAC gem requires a controller_id
-      raise ArgumentError, "Controller ID is required" unless controller_id
+    def drives(controller)
+      # The iDRAC gem requires a controller identifier; derive it from the controller
+      raise ArgumentError, "Controller required" unless controller
+      controller_id = extract_controller_identifier(controller)
+      raise ArgumentError, "Controller identifier missing" unless controller_id
       
       drive_data = @idrac_client.drives(controller_id)
       
@@ -312,9 +314,11 @@ module Radfish
       drive_data.map { |drive| OpenStruct.new(drive) }
     end
     
-    def volumes(controller_id)
-      # The iDRAC gem requires a controller_id
-      raise ArgumentError, "Controller ID is required" unless controller_id
+    def volumes(controller)
+      # The iDRAC gem requires a controller identifier; derive it from the controller
+      raise ArgumentError, "Controller required" unless controller
+      controller_id = extract_controller_identifier(controller)
+      raise ArgumentError, "Controller identifier missing" unless controller_id
       
       volume_data = @idrac_client.volumes(controller_id)
       
@@ -353,6 +357,23 @@ module Radfish
         }
       end
     end
+
+    private
+
+    def extract_controller_identifier(controller)
+      # Prefer vendor-native handle from adapter_data
+      raw = controller.respond_to?(:adapter_data) ? controller.adapter_data : controller
+      if defined?(OpenStruct) && raw.is_a?(OpenStruct)
+        table = raw.instance_variable_get(:@table)
+        table && (table[:"@odata.id"] || table["@odata.id"]) || controller.id
+      elsif raw.respond_to?(:[])
+        raw['@odata.id'] || raw[:'@odata.id'] || controller.id
+      else
+        controller.id
+      end
+    end
+
+    public
     
     # Virtual Media
     
@@ -734,4 +755,4 @@ module Radfish
   # Register the adapter
   Radfish.register_adapter('dell', IdracAdapter)
   Radfish.register_adapter('idrac', IdracAdapter)
-end
+end

metadata

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