radfish 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8cc83490b7562ec8aba8b5b477ff5b544ac13b5e0bb11c2213a9306c73ce724
-  data.tar.gz: 0aaa19bf9e17a85ca8f825f6260880795fc177a98dd6db8de55c0e49effa1078
+  metadata.gz: 5b04f4c83ffefc35a7faaa8793ca8c7fdc6c9eea300d1f9d21ae9b0e3a1cc93a
+  data.tar.gz: 4dcf1830e6510676f6b45014b339a5767a6de9ba73d444d107adb31a87e255a6
 SHA512:
-  metadata.gz: 5ee9bfeaf78e836cf5faff02ffe9b4f2058a87166eef954a2cc5a6a0469277b06475e229c858cbf5084ab6a8b6b40381018bfea4aca0fe5297140c86ef1472bd
-  data.tar.gz: 887f6b6ce8f38d3c69b5af446f700a2ab01cb3aa8bfa42316d23077e1d01ea74badee4f097503abf015facc70c785d745f0132f50a188bd9765028b77ffbab9c
+  metadata.gz: f9b99bdc943bf4915c6f2b94ee1e37ae04e368e71f8f022ece2322b47c890bd4532b54dd9401ce2b71a9f3d678c2b04c5704c136328f27225403b90af715110a
+  data.tar.gz: 22be0c17c6b71173d7e01ccdbbe049375035a98909cb76639d8a1ef414507847ca780d95f36df23556a9b924cba3519a6b2d531efa82d076252a5e3ac48da2f5

data/README.md

@@ -129,7 +129,9 @@ radfish system [OPTIONS]           # Display system information
 radfish cpus [OPTIONS]             # List CPUs
 radfish memory [OPTIONS]           # List memory modules
 radfish nics [OPTIONS]             # List network interfaces
-radfish drives [OPTIONS]           # List storage drives
+radfish storage controllers        # List storage controllers
+radfish storage drives             # List drives across controllers
+radfish storage volumes            # List volumes across controllers
 radfish psus [OPTIONS]             # List power supplies
 ```
 
@@ -361,7 +363,8 @@ info = client.system_info
 client.cpus      # CPU information
 client.memory    # Memory DIMMs
 client.nics      # Network interfaces
-client.drives    # Physical drives
+client.controllers.each { |c| c.drives }   # Physical drives (per controller)
+client.controllers.each { |c| c.volumes }  # RAID volumes (per controller)
 client.psus      # Power supplies
 ```
 

data/lib/radfish/cli.rb

@@ -342,32 +342,76 @@ module Radfish
           data = client.storage_summary
           output_result(data, nil) if options[:json]
         when 'controllers'
-          data = client.storage_controllers
-          output_result(data, nil) if options[:json]
-          unless options[:json]
+          ctrls = client.controllers
+          if options[:json]
+            puts JSON.pretty_generate(ctrls.map(&:to_h))
+          else
             puts "=== Storage Controllers ===".green
-            data.each do |ctrl|
-              puts "#{ctrl['name']} (#{ctrl['id']})".cyan
+            ctrls.each do |ctrl|
+              puts "#{ctrl.name || 'Controller'} (#{ctrl.id})".cyan
             end
           end
         when 'drives', 'disks'
-          data = client.drives
+          # Get all drives from all controllers
+          controllers = client.controllers
+          all_drives = []
+          
+          controllers.each do |controller|
+            begin
+              drives = controller.drives
+              all_drives.concat(drives) if drives
+            rescue => e
+              ctrl_name = controller.respond_to?(:name) ? controller.name : 'controller'
+              puts "Error fetching drives for #{ctrl_name}: #{e.message}".yellow if options[:verbose]
+            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.controllers
+          all_volumes = []
+          
+          controllers.each do |controller|
+            begin
+              volumes = controller.volumes
+              all_volumes.concat(volumes) if volumes
+            rescue => e
+              ctrl_name = controller.respond_to?(:name) ? controller.name : 'controller'
+              puts "Error fetching volumes for #{ctrl_name}: #{e.message}".yellow if options[:verbose]
+            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 +839,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
@@ -821,4 +868,4 @@ module Radfish
       end
     end
   end
-end
+end

data/lib/radfish/client.rb

@@ -165,5 +165,40 @@ module Radfish
         base_url: @adapter.base_url
       }
     end
+
+    # Storage convenience API
+    # Return normalized Controller objects while keeping adapter APIs intact.
+    def controllers
+      raw = @adapter.storage_controllers
+      Array(raw).map { |c| build_controller(c) }
+    end
+
+    # Public storage API (not backward-compatible): require a Controller object.
+    def drives(controller)
+      raise ArgumentError, "Controller required" unless controller.is_a?(Controller)
+      @adapter.drives(controller)
+    end
+
+    def volumes(controller)
+      raise ArgumentError, "Controller required" unless controller.is_a?(Controller)
+      @adapter.volumes(controller)
+    end
+
+    private
+
+    def build_controller(raw)
+      # Only extract friendly name/id if plainly available; keep raw in adapter_data
+      id = if raw.respond_to?(:[])
+             raw['id'] || raw[:id]
+           elsif raw.respond_to?(:id)
+             raw.id
+           end
+      name = if raw.respond_to?(:[])
+               raw['name'] || raw[:name]
+             elsif raw.respond_to?(:name)
+               raw.name
+             end
+      Controller.new(client: self, id: id, name: name, vendor: @vendor, adapter_data: raw)
+    end
   end
-end
+end

data/lib/radfish/controller.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Radfish
+  # Lightweight value object representing a storage controller.
+  # Holds a stable identifier and optional name.
+  class Controller
+    attr_reader :id, :name, :vendor, :adapter_data
+
+    def initialize(client:, id:, name: nil, vendor: nil, adapter_data: nil)
+      @client = client
+      @id = id
+      @name = name
+      @vendor = vendor
+      @adapter_data = adapter_data
+    end
+
+    # Convenience accessors delegate to the client wrappers
+    def drives
+      @client.drives(self)
+    end
+
+    def volumes
+      @client.volumes(self)
+    end
+
+    def to_h
+      { id: id, name: name, vendor: vendor }
+    end
+
+    def ==(other)
+      other.is_a?(Controller) && other.id == id && other.vendor.to_s == vendor.to_s
+    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)
+        raise NotImplementedError, "Adapter must implement #drives(controller)"
       end
       
-      def volumes
-        raise NotImplementedError, "Adapter must implement #volumes"
+      def volumes(controller)
+        raise NotImplementedError, "Adapter must implement #volumes(controller)"
       end
       
       def storage_summary
@@ -20,4 +20,4 @@ module Radfish
       end
     end
   end
-end
+end

data/lib/radfish/system_info.rb

@@ -62,7 +62,7 @@ module Radfish
     end
     
     def controllers
-      @cache[:controllers] ||= @client.adapter.storage_controllers
+      @cache[:controllers] ||= @client.controllers
     end
     
     private
@@ -71,4 +71,4 @@ module Radfish
       @cache[:system_info] ||= @client.adapter.system_info
     end
   end
-end
+end

data/lib/radfish/version.rb

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

data/lib/radfish.rb

@@ -92,6 +92,7 @@ require_relative 'radfish/bmc_info'
 require_relative 'radfish/power_info'
 require_relative 'radfish/thermal_info'
 require_relative 'radfish/pci_info'
+require_relative 'radfish/controller'
 require_relative 'radfish/client'
 
 # Auto-load adapters if available
@@ -105,4 +106,4 @@ begin
   require 'radfish/supermicro_adapter'
 rescue LoadError
   # radfish-supermicro gem not installed
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -169,6 +169,7 @@ files:
 - lib/radfish/cli.rb
 - lib/radfish/cli/base.rb
 - lib/radfish/client.rb
+- lib/radfish/controller.rb
 - lib/radfish/core/base_client.rb
 - lib/radfish/core/boot.rb
 - lib/radfish/core/jobs.rb