radfish-supermicro 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091a79bdcb460394274e35673826de2b0a0d92276723fda7c5964e436cdb2131'
-  data.tar.gz: 5ed7ad3a21c2362cee2353a9be01b90fa1fe979a6392d30130baaa8e8490829f
+  metadata.gz: 59513412ce8868b6e87e3ece78128ef58d5322e1589e76903b700f4d48a58465
+  data.tar.gz: 85c645e36f727accf1b29302ee4a33c2d12fcf72c6775218827e91a638f6eaf7
 SHA512:
-  metadata.gz: 2ca6e946b739c0d6346c2e5c2ab12d0a54920dff870b92aeadbd26881425aac0be9053f717cc8d54cb8804a46d86a77a3a55fcf6087ba64ff6730dec28979c24
-  data.tar.gz: 13fe882019ca53655ba5d39260abc219f8aa60d861e238e8c2a95f1a0cd097910e2d33a99f51fb977e797f88f72a126aef645af84762f3f3fd7fd01b2b4a480a
+  metadata.gz: 41df444620a328fdcef243eeaa19a9138454908e155fe8d640a1fe427bfb1f6a59635eee7aeb024ed73e6c61dfcf0d2e36f4237a6f1a633a8342af99f1f457c0
+  data.tar.gz: 2c3e82d1fba691c1b1095e21e857a603e1a451dac920e9f78c73146cd8b5b6762689822a30b984b78ea14b9d0a40f57f34a0464099b76fdea81383048dff3663

data/lib/radfish/supermicro/version.rb

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

data/lib/radfish/supermicro_adapter.rb

@@ -316,6 +316,12 @@ module Radfish
         if controller["drives"]
           controller["drives"] = controller["drives"].map { |drive| OpenStruct.new(drive) }
         end
+        # Normalize expected top-level fields
+        sc = controller["StorageControllers"]&.first || controller["storage_controllers"]&.first
+        controller["model"] ||= (sc && (sc["Model"] || sc["model"]))
+        controller["firmware_version"] ||= (sc && sc["FirmwareVersion"]) if sc
+        controller["drives_count"] ||= (controller["drives"]&.size || controller["Drives"]&.size)
+        # Keep status as already present; other fields may be nil
         OpenStruct.new(controller)
       end
     end
@@ -343,6 +349,40 @@ module Radfish
       # Convert to OpenStruct for consistency
       volume_data.map { |volume| OpenStruct.new(volume) }
     end
+
+    def volume_drives(volume)
+      raise ArgumentError, "Volume required" unless volume
+      controller_id = extract_controller_identifier(volume.controller)
+      # Try to fetch volume details to get Links->Drives
+      raw = volume.adapter_data
+      odata_id = nil
+      if raw.respond_to?(:[])
+        odata_id = raw['@odata.id'] || raw[:'@odata.id']
+      elsif raw.respond_to?(:instance_variable_get)
+        table = raw.instance_variable_get(:@table) rescue nil
+        odata_id = table && (table['@odata.id'] || table[:'@odata.id'])
+      end
+      drive_ids = []
+      if odata_id
+        begin
+          response = @supermicro_client.authenticated_request(:get, odata_id)
+          if response.status == 200
+            data = JSON.parse(response.body)
+            refs = data.dig('Links', 'Drives') || []
+            drive_ids = refs.map { |r| (r['@odata.id'] || '').split('/').last }.compact
+          end
+        rescue => e
+          debug "Error fetching volume details: #{e.message}", 1, :yellow
+        end
+      end
+      # Fallback: if no odata links, return all controller drives (unknown membership)
+      all_drives = @supermicro_client.drives(controller_id) rescue []
+      if drive_ids.any?
+        all_drives = all_drives.select { |d| d['id'] == d[:id] rescue false } if all_drives.is_a?(Array)
+        all_drives.select! { |d| drive_ids.include?(d['id'] || d[:id]) }
+      end
+      all_drives.map { |d| OpenStruct.new(d) }
+    end
     
     def storage_summary
       @supermicro_client.storage_summary
@@ -361,6 +401,8 @@ module Radfish
         controller.id
       end
     end
+
+    public
     
     # Virtual Media
     

metadata

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