radfish-supermicro 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202dcec4a1ba67974964ada0218d40876d291858bba3de7d163f401c05206fd9
-  data.tar.gz: a944dca7885e3df865a6ba44f2b776c321dfbce0480ed11533e49d92fa91e21f
+  metadata.gz: eb355208e731336ea71522b738643717ba63056f8ed04126db23e9b2333bba2f
+  data.tar.gz: 9dfba4b3ca23d6a3eae1ff1d6b196585bccdbc06256928481401b035cf0babb8
 SHA512:
-  metadata.gz: 9fbe20bfba799ddb24d2a7b14aaf66d4d123c4a5b15a4cebf2f52dac6a2a501c420d29662cfb432a06bb667666404d9b4721e5caf0a60b855f75d2df429c766e
-  data.tar.gz: 642e58e514d1baa77c972cfa4acb520d692490e421e273b92fd8b5a9b8e73ec342f3fdd460cc64e5b76a1de00a74ccf266fab04da01af31736354669e7ba2dbe
+  metadata.gz: 9fda793041d25007df301a82e637124f68847ba61185c3600a07b72f0b784c362f020e286de0190dbe46e796aca396607b996ab4a7c20ac2ac7d5921e6dee2de
+  data.tar.gz: 5ac4f1cda800abe4743116b84233a82baa1baf1f205d82106e170caf9dac92a44c8e3833c08a7d9e990b27b1afa6d12f602311f368c779946b282b0c3e99d0ae

data/lib/radfish/supermicro/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Supermicro
-    VERSION = "0.1.6"
+    VERSION = "0.2.1"
   end
-end
+end

data/lib/radfish/supermicro_adapter.rb

@@ -320,9 +320,11 @@ module Radfish
       end
     end
     
-    def drives(controller_id)
-      # The Supermicro gem now requires controller_id following natural Redfish pattern
-      raise ArgumentError, "Controller ID is required" unless controller_id
+    def drives(controller)
+      # The Supermicro 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 = @supermicro_client.drives(controller_id)
       
@@ -330,9 +332,11 @@ module Radfish
       drive_data.map { |drive| OpenStruct.new(drive) }
     end
     
-    def volumes(controller_id)
-      # The Supermicro gem now requires controller_id following natural Redfish pattern
-      raise ArgumentError, "Controller ID is required" unless controller_id
+    def volumes(controller)
+      # The Supermicro 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 = @supermicro_client.volumes(controller_id)
       
@@ -343,6 +347,22 @@ module Radfish
     def storage_summary
       @supermicro_client.storage_summary
     end
+
+    private
+
+    def extract_controller_identifier(controller)
+      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
     
@@ -711,4 +731,4 @@ module Radfish
   # Register the adapter
   Radfish.register_adapter('supermicro', SupermicroAdapter)
   Radfish.register_adapter('smc', SupermicroAdapter)
-end
+end

metadata

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