radfish-supermicro 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb355208e731336ea71522b738643717ba63056f8ed04126db23e9b2333bba2f
-  data.tar.gz: 9dfba4b3ca23d6a3eae1ff1d6b196585bccdbc06256928481401b035cf0babb8
+  metadata.gz: 45d69cff8a4fa9b65df7c4d70d77b5ffa0f1235630f47d2f9cea14260ee49819
+  data.tar.gz: 993665ad5c2b9c66c916e60803db3958fdfca4eccb2f4561c60ab6647d973118
 SHA512:
-  metadata.gz: 9fda793041d25007df301a82e637124f68847ba61185c3600a07b72f0b784c362f020e286de0190dbe46e796aca396607b996ab4a7c20ac2ac7d5921e6dee2de
-  data.tar.gz: 5ac4f1cda800abe4743116b84233a82baa1baf1f205d82106e170caf9dac92a44c8e3833c08a7d9e990b27b1afa6d12f602311f368c779946b282b0c3e99d0ae
+  metadata.gz: 354be81ceb943af7f5598b81deac1ff632df2a2caf100d3782c15582a67fb998922d5629c8050eb721fc0273220e9728c32056ae8998bdb4dd20a6fe53f8397f
+  data.tar.gz: 510680fa6b291f7a580a388171dd635a5d987205e6ed79e2ca472b2d7982cdef695b98b8775d795bea1db41aed011046a90ea755a77eafdbaa6283e671a57fd7

data/lib/radfish/supermicro/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Supermicro
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   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
@@ -340,9 +346,61 @@ module Radfish
       
       volume_data = @supermicro_client.volumes(controller_id)
       
+      # Normalize basic fields for consistency, and attach drive refs if missing
+      volume_data.each do |v|
+        v["raid_type"] ||= v["RAIDType"] if v["RAIDType"]
+        v["volume_type"] ||= v["VolumeType"] if v["VolumeType"]
+        v["health"] ||= v.dig("Status", "Health") if v["Status"].is_a?(Hash)
+        if v["drives"].nil? && v["@odata.id"]
+          begin
+            resp = @supermicro_client.authenticated_request(:get, v["@odata.id"])
+            if resp.status == 200
+              data = JSON.parse(resp.body)
+              v["drives"] = data.dig('Links', 'Drives') || []
+            end
+          rescue => e
+            debug "Could not fetch volume drives: #{e.message}", 2, :yellow
+          end
+        end
+      end
+      
       # 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

metadata

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