radfish-supermicro 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a0045b1cbad8f48e84fad5836a53ff4d3e49b69230f709722698934c9245564
-  data.tar.gz: 0d8a00612b320df6135f3d8f16548c96d6dbef15bb0aafc26235dac374c78dfd
+  metadata.gz: '091a79bdcb460394274e35673826de2b0a0d92276723fda7c5964e436cdb2131'
+  data.tar.gz: 5ed7ad3a21c2362cee2353a9be01b90fa1fe979a6392d30130baaa8e8490829f
 SHA512:
-  metadata.gz: 50a0bb9db7c28d0502a8259da5a1e3d30a55b596bfa153a74dd426782fec20600be6929e4bf3a9f2f5f2c027f5aa36e11d86a01a90d0f7f6d353b97a3a08315e
-  data.tar.gz: 35b56e38c069d0581d7572726b5b05c36c27dc068c16385dbd194d8fa68a120ab4346bf8d6b0cb023919288dfef06580d580dacb4a64c28c02ed951f0aa0a43e
+  metadata.gz: 2ca6e946b739c0d6346c2e5c2ab12d0a54920dff870b92aeadbd26881425aac0be9053f717cc8d54cb8804a46d86a77a3a55fcf6087ba64ff6730dec28979c24
+  data.tar.gz: 13fe882019ca53655ba5d39260abc219f8aa60d861e238e8c2a95f1a0cd097910e2d33a99f51fb977e797f88f72a126aef645af84762f3f3fd7fd01b2b4a480a

data/lib/radfish/supermicro/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Supermicro
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
-end
+end

data/lib/radfish/supermicro_adapter.rb

@@ -320,17 +320,47 @@ module Radfish
       end
     end
     
-    def drives
-      @supermicro_client.drives
+    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)
+      
+      # Convert to OpenStruct for consistency
+      drive_data.map { |drive| OpenStruct.new(drive) }
     end
     
-    def volumes
-      @supermicro_client.volumes
+    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)
+      
+      # Convert to OpenStruct for consistency
+      volume_data.map { |volume| OpenStruct.new(volume) }
     end
     
     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
     
     # Virtual Media
     
@@ -699,4 +729,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.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Siegel