radfish 0.2.9 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb7e0fad9f1c58627bb67908c36b48ee6345502dd697d060bfb2a2269168779
-  data.tar.gz: 1d0773d739fc075885f9c49abaf719394695af6e7120c2d42b0478638f78d0f7
+  metadata.gz: 56ac8a4bd0fa74d4925bd369825c0d7df1b87e77acea9a41d1327461a058e2e4
+  data.tar.gz: 5089df7444609d31fd193e8d6c022640ec57cbda96baf26c1df920eeb17bc3ab
 SHA512:
-  metadata.gz: 86cb61d2ce44dc0443bd41236074670645e8f16b8d6daa316b54159a6ebcacdf60184cc29ccbbce10747cd878a38b596703b631b2ef8b7e7fa8f922718928ed5
-  data.tar.gz: ee102d72d959c36cf16f997ebf8bacb9ae8ed6811b68fc6a08961510f85565e46ec132f42bd6d58da5b06af0acfb12fa543b9e3178abc1e86b69bfde01a582b9
+  metadata.gz: 10cdabeb27695b1a66aeb6531fa83da737b2a66e9f6ab24505a870797968ec5de49a388299627a954f1641e45ef356182535dcd7e4916bb2e8469b447c1d7dc4
+  data.tar.gz: bb95d3be33e59529b53231948763f60803f637353a707395cbc674aa898932696868dae481108fc64545055ed26072a7fda308c948214b770635618ab850b8dc

data/lib/radfish/boot_info.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Radfish
+  # Boot configuration facade. Reached as +client.boot+.
+  #
+  # The vendor-neutral entry point for the boot mechanics that used to be hand-rolled in raw
+  # Redfish by callers (reading BootSources, disabling stale UEFI placeholders, scheduling the
+  # config job). The heavy lifting lives in the adapter; this object just exposes it cleanly and
+  # keeps +to_h+ pointing at the underlying boot configuration for backward compatibility.
+  class BootInfo
+    attr_reader :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    # The still-enabled stale UEFI boot placeholders (Dell: "Unknown.Unknown.*"). [] when the
+    # adapter has nothing to report. Pass +match:+ to target a different set of entries.
+    def stale_uefi_entries(match: nil)
+      require_adapter!(:stale_uefi_boot_entries)
+      match ? adapter.stale_uefi_boot_entries(match: match) : adapter.stale_uefi_boot_entries
+    end
+
+    # Disable the matched UEFI boot entries via a config job and return the names disabled.
+    # With no +match:+ the adapter's default (the stale placeholders) applies. The adapter drains
+    # any pending LC config job first, so this never trips LC068.
+    def disable_entries(match: nil, **opts)
+      require_adapter!(:disable_boot_entries)
+      match ? adapter.disable_boot_entries(match: match, **opts) : adapter.disable_boot_entries(**opts)
+    end
+
+    # Underlying boot configuration hash (BootSourceOverride*, boot order, ...).
+    def to_h
+      adapter.boot_config
+    end
+    alias config to_h
+
+    private
+
+    def adapter
+      @client.adapter
+    end
+
+    def require_adapter!(method)
+      return if adapter.respond_to?(method)
+
+      raise NotImplementedError, "#{@client.vendor_name} adapter does not support ##{method}"
+    end
+  end
+end

data/lib/radfish/cli.rb

@@ -340,7 +340,15 @@ module Radfish
         case subcommand
         when 'summary', 'all'
           data = client.storage_summary
-          output_result(data, nil) if options[:json]
+          if options[:json]
+            puts JSON.pretty_generate(data)
+          else
+            puts "=== Storage Summary ===".green
+            puts "Total Controllers: #{data[:controller_count]}".cyan
+            data[:controllers]&.each do |ctrl|
+              puts "  #{ctrl[:name] || ctrl[:id]}: #{ctrl[:drive_count]} drives, #{ctrl[:volume_count]} volumes".cyan
+            end
+          end
         when 'controllers'
           ctrls = client.controllers
           if options[:json]

data/lib/radfish/client.rb

@@ -127,7 +127,67 @@ module Radfish
     def power
       @power ||= PowerInfo.new(self)
     end
-    
+
+    # Boot facade: client.boot.stale_uefi_entries / client.boot.disable_entries(match:).
+    def boot
+      @boot ||= BootInfo.new(self)
+    end
+
+    # Live BMC power state (e.g. "On"/"Off"), read straight from the adapter. Replaces callers
+    # reaching through the adapter to the vendor client's own power-state call.
+    def power_state
+      @adapter.power_status
+    end
+
+    # Canonical Redfish BootProgress order (normalized to snake_case), earliest to latest. Used to
+    # decide when a host has reached OR passed a requested state.
+    BOOT_PROGRESS_ORDER = %i[
+      none
+      primary_processor_initialization_started
+      bus_initialization_started
+      memory_initialization_started
+      secondary_processor_initialization_started
+      pci_resource_config_started
+      system_hardware_initialization_complete
+      setup_entered
+      os_boot_started
+      os_running
+    ].freeze
+
+    # Normalized last BootProgress state (a snake_case symbol), or nil when the BMC omits
+    # BootProgress entirely (iDRAC8). nil means "cannot observe", never "not running".
+    def boot_progress
+      return nil unless @adapter.respond_to?(:boot_progress)
+
+      @adapter.boot_progress
+    end
+
+    # Wait until the host reaches (or passes) +target+ BootProgress, bounded by +timeout+ or, when
+    # not given, the adapter's per-model POST ceiling. Returns the observed state on success, or nil
+    # when the BMC does not report BootProgress (nothing to wait on -- the caller uses other signals).
+    # Raises Radfish::BootProgressTimeout on a stall.
+    def wait_for_boot_progress(target, timeout: nil, poll: 20)
+      target = target.to_sym
+      ceiling = timeout || (@adapter.respond_to?(:boot_progress_ceiling) ? @adapter.boot_progress_ceiling(target) : 900)
+      deadline = Time.now + ceiling
+      target_idx = BOOT_PROGRESS_ORDER.index(target)
+
+      loop do
+        state = boot_progress
+        return nil if state.nil? # BMC omits BootProgress (iDRAC8): unobservable, not a failure
+        return state if state == target
+
+        state_idx = BOOT_PROGRESS_ORDER.index(state)
+        return state if target_idx && state_idx && state_idx >= target_idx
+
+        if Time.now > deadline
+          raise BootProgressTimeout,
+                "BootProgress did not reach #{target.inspect} within #{ceiling}s (last: #{state.inspect})"
+        end
+        sleep poll
+      end
+    end
+
     def thermal
       @thermal ||= ThermalInfo.new(self)
     end

data/lib/radfish/core/boot.rb

@@ -34,7 +34,16 @@ module Radfish
       def boot_to_cd
         raise NotImplementedError, "Adapter must implement #boot_to_cd"
       end
-      
+
+      # Convenience: one-time boot to the virtual CD. Default delegates to the adapter's standard
+      # Redfish boot override (boot_to_cd, which defaults to a one-time override). Adapters with a
+      # more reliable vendor path (e.g. Dell's SCP ServerBoot) override this. `reboot:` is accepted
+      # for signature parity with those overrides; the default does not reboot -- the caller cycles
+      # power (the app's install_os! does).
+      def set_one_time_cd_boot(reboot: false)
+        boot_to_cd
+      end
+
       def boot_to_usb
         raise NotImplementedError, "Adapter must implement #boot_to_usb"
       end

data/lib/radfish/vendor_detector.rb

@@ -124,7 +124,9 @@ module Radfish
         when /lenovo/i, /thinkserver/i, /thinksystem/i
           return 'lenovo'
         when /asrockrack/i, /asrock/i
-          return 'asrockrack'
+          return 'ami'
+        when /ami/i, /megarac/i
+          return 'ami'
         end
       end
       
@@ -167,7 +169,8 @@ module Radfish
               return 'hpe' if model.match?(/ilo/i) || description.match?(/ilo/i)
               return 'supermicro' if model.match?(/supermicro/i) || description.match?(/smc/i)
               return 'lenovo' if model.match?(/lenovo/i) || description.match?(/xcc/i)
-              return 'asrockrack' if model.match?(/asrock/i)
+              return 'ami' if model.match?(/asrock/i) || description.match?(/asrock/i)
+              return 'ami' if description.match?(/bmc/i) && manager_data.dig('Oem', 'Ami')
             end
           end
         end
@@ -199,7 +202,9 @@ module Radfish
       when /lenovo/i
         'lenovo'
       when /asrock/i
-        'asrockrack'
+        'ami'
+      when /ami/i, /megarac/i
+        'ami'
       else
         vendor_string.to_s.downcase
       end

data/lib/radfish/version.rb

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

data/lib/radfish.rb

@@ -30,6 +30,10 @@ module Radfish
   class TaskTimeoutError < TaskError; end
   class TaskFailedError < TaskError; end
 
+  # Raised by Client#wait_for_boot_progress when a host does not reach the requested
+  # BootProgress state within its (per-model) ceiling.
+  class BootProgressTimeout < TimeoutError; end
+
   module Debuggable
     def debug(message, level = 1, color = :light_cyan)
       return unless respond_to?(:verbosity) && verbosity >= level
@@ -90,6 +94,7 @@ require_relative 'radfish/vendor_detector'
 require_relative 'radfish/system_info'
 require_relative 'radfish/bmc_info'
 require_relative 'radfish/power_info'
+require_relative 'radfish/boot_info'
 require_relative 'radfish/thermal_info'
 require_relative 'radfish/pci_info'
 require_relative 'radfish/controller'
@@ -98,13 +103,19 @@ require_relative 'radfish/client'
 
 # Auto-load adapters if available
 begin
-  require 'radfish/idrac_adapter'
+  require 'radfish-idrac'
 rescue LoadError
   # radfish-idrac gem not installed
 end
 
 begin
-  require 'radfish/supermicro_adapter'
+  require 'radfish-supermicro'
 rescue LoadError
   # radfish-supermicro gem not installed
 end
+
+begin
+  require 'radfish-ami'
+rescue LoadError
+  # radfish-ami gem not installed
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: radfish
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.12
 platform: ruby
 authors:
 - Jonathan Siegel
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -166,6 +165,7 @@ files:
 - exe/radfish
 - lib/radfish.rb
 - lib/radfish/bmc_info.rb
+- lib/radfish/boot_info.rb
 - lib/radfish/cli.rb
 - lib/radfish/cli/base.rb
 - lib/radfish/client.rb
@@ -197,7 +197,6 @@ metadata:
   homepage_uri: https://github.com/buildio/radfish
   source_code_uri: https://github.com/buildio/radfish
   changelog_uri: https://github.com/buildio/radfish/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Unified Redfish API Client for Server Management
 test_files: []