radfish 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58ebe70659a5db047e1d6efb8c8ec93ba7a7cce19f500f46204add014095566
-  data.tar.gz: 754e9d84d9bc6232cadaa4daf75fa4053b3d0fa9d53918b2f1160223775c85f9
+  metadata.gz: 064a6be3fcb21aa68b6786d7ca29470b67367b81153c9eea6b687957a4e7b94b
+  data.tar.gz: c3ce598858e7d82dde4be0d3694ce076f1e758f20687b2050cb845857ee60f01
 SHA512:
-  metadata.gz: 4653a3eb7d252f6a597db65f4a403f1b5f958dc5659d9a0a0f4eb73f669acc9b3be6b0d61b2686e4666823769e4027cd6eb31429a29c130cf08ab9b28aa64b77
-  data.tar.gz: dc6f9ffc5dd25d59ee68d70ab0071378d3d6aa4c4004f13e612d31415c817bdf48bc70433f7344685fb34ac529397226883d9e24ecfb66e3ccfbb1b6f52d7307
+  metadata.gz: 61143335dfd6f5cf5cd75867a5798510bc9c46f8fba8183df67b41deea3d3e7198619bf69e397e90391427daf7c05314736c3e6c0f5c5d0900f8e59496051de1
+  data.tar.gz: deaf413a2c8293ed11ce6f83a67815993036ae6a6ac6308ef80e33247b91371f0acc6b56e9ed52d7b9e99b8b612bb64076a365be7044a5df315c064db73ef34b

data/lib/radfish/cli.rb

@@ -351,23 +351,96 @@ module Radfish
             end
           end
         when 'drives', 'disks'
-          data = client.drives
+          # Get all drives from all controllers
+          controllers = client.storage_controllers
+          all_drives = []
+          
+          controllers.each do |controller|
+            # Handle different ways the controller ID might be stored
+            controller_id = if controller.is_a?(OpenStruct)
+                             # For OpenStruct, access the internal table
+                             controller.instance_variable_get(:@table)[:"@odata.id"] ||
+                             controller.instance_variable_get(:@table)["@odata.id"] ||
+                             controller.id
+                           elsif controller.respond_to?(:[])
+                             # For Hash-like objects
+                             controller['@odata.id'] || controller['id']
+                           else
+                             # For other objects
+                             controller.id rescue nil
+                           end
+            
+            if controller_id
+              begin
+                drives = client.drives(controller_id)
+                all_drives.concat(drives) if drives
+              rescue => e
+                puts "Error fetching drives for controller #{controller['name'] || controller_id}: #{e.message}".yellow if options[:verbose]
+              end
+            end
+          end
+          
           if options[:json]
-            puts JSON.pretty_generate(data)
+            puts JSON.pretty_generate(all_drives)
           else
             puts "=== Physical Drives ===".green
-            data.each do |drive|
-              puts "#{drive['name']}: #{drive['capacity_gb']} GB - #{drive['status']}".cyan
+            if all_drives.empty?
+              puts "No drives found".yellow
+            else
+              all_drives.each do |drive|
+                cert_status = drive['certified'] || drive.certified rescue nil
+                cert_info = cert_status ? " [Certified: #{cert_status}]" : ""
+                capacity = drive['capacity_gb'] || drive.capacity_gb rescue "Unknown"
+                status = drive['status'] || drive.status rescue "Unknown"
+                name = drive['name'] || drive.name rescue "Unknown"
+                puts "#{name}: #{capacity} GB - #{status}#{cert_info}".cyan
+              end
             end
           end
         when 'volumes', 'raids'
-          data = client.volumes
+          # Get all volumes from all controllers
+          controllers = client.storage_controllers
+          all_volumes = []
+          
+          controllers.each do |controller|
+            # Handle different ways the controller ID might be stored
+            controller_id = if controller.is_a?(OpenStruct)
+                             # For OpenStruct, access the internal table
+                             controller.instance_variable_get(:@table)[:"@odata.id"] ||
+                             controller.instance_variable_get(:@table)["@odata.id"] ||
+                             controller.id
+                           elsif controller.respond_to?(:[])
+                             # For Hash-like objects
+                             controller['@odata.id'] || controller['id']
+                           else
+                             # For other objects
+                             controller.id rescue nil
+                           end
+            
+            if controller_id
+              begin
+                volumes = client.volumes(controller_id)
+                all_volumes.concat(volumes) if volumes
+              rescue => e
+                puts "Error fetching volumes for controller #{controller['name'] || controller_id}: #{e.message}".yellow if options[:verbose]
+              end
+            end
+          end
+          
           if options[:json]
-            puts JSON.pretty_generate(data)
+            puts JSON.pretty_generate(all_volumes)
           else
             puts "=== Volumes ===".green
-            data.each do |vol|
-              puts "#{vol['name']}: #{vol['capacity_gb']} GB - #{vol['raid_type']}".cyan
+            if all_volumes.empty?
+              puts "No volumes found".yellow
+            else
+              all_volumes.each do |vol|
+                name = vol['name'] || vol.name rescue "Unknown"
+                capacity = vol['capacity_gb'] || vol.capacity_gb rescue "Unknown"
+                raid_type = vol['raid_type'] || vol.raid_type rescue "Unknown"
+                status = vol['status'] || vol.status rescue "Unknown"
+                puts "#{name}: #{capacity} GB - #{raid_type} (Status: #{status})".cyan
+              end
             end
           end
         else
@@ -795,7 +868,10 @@ module Radfish
         puts "\n=== Power Supplies ===".green
         data.each do |psu|
           status_color = psu['status'] == 'OK' ? :green : :red
-          puts "#{psu['name']}: #{psu['watts']}W - #{psu['status']}".send(status_color)
+          voltage_info = psu['voltage'] ? "#{psu['voltage']}V (#{psu['voltage_human'] || 'Unknown'})" : ""
+          puts "#{psu['name']}: #{voltage_info} #{psu['watts']}W - #{psu['status']}".send(status_color)
+          puts "  Model: #{psu['model']}" if psu['model']
+          puts "  Serial: #{psu['serial']}" if psu['serial']
         end
       end
     end

data/lib/radfish/core/storage.rb

@@ -7,12 +7,12 @@ module Radfish
         raise NotImplementedError, "Adapter must implement #storage_controllers"
       end
       
-      def drives
-        raise NotImplementedError, "Adapter must implement #drives"
+      def drives(controller_id)
+        raise NotImplementedError, "Adapter must implement #drives(controller_id)"
       end
       
-      def volumes
-        raise NotImplementedError, "Adapter must implement #volumes"
+      def volumes(controller_id)
+        raise NotImplementedError, "Adapter must implement #volumes(controller_id)"
       end
       
       def storage_summary

data/lib/radfish/core/system.rb

@@ -7,6 +7,22 @@ module Radfish
         raise NotImplementedError, "Adapter must implement #system_info"
       end
       
+      def service_tag
+        raise NotImplementedError, "Adapter must implement #service_tag"
+      end
+      
+      def make
+        raise NotImplementedError, "Adapter must implement #make"
+      end
+      
+      def model
+        raise NotImplementedError, "Adapter must implement #model"
+      end
+      
+      def serial
+        raise NotImplementedError, "Adapter must implement #serial"
+      end
+      
       def cpus
         raise NotImplementedError, "Adapter must implement #cpus"
       end

data/lib/radfish/system_info.rb

@@ -20,19 +20,19 @@ module Radfish
     end
     
     def service_tag
-      fetch_system_info[:service_tag]
+      @cache[:service_tag] ||= @client.adapter.service_tag
     end
     
     def make
-      fetch_system_info[:manufacturer] || fetch_system_info[:make]
+      @cache[:make] ||= @client.adapter.make
     end
     
     def model
-      fetch_system_info[:model]
+      @cache[:model] ||= @client.adapter.model
     end
     
     def serial
-      fetch_system_info[:serial_number] || fetch_system_info[:serial]
+      @cache[:serial] ||= @client.adapter.serial
     end
     
     def cpus

data/lib/radfish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Radfish
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Unified Redfish API Client for Server Management