radfish-ami 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177c683aa6971d7a736b42af44ad87a5d65bcfe9cf4bf5690cb7050c8971bae9
-  data.tar.gz: d1c29be71c6561e814eb4e245c03a702500f1393991b9fc02716428c0d2f2267
+  metadata.gz: 76cf67c7fb9c9e39fe6a8ce31abdd5aebdbe4a163b0ef2fe54f58dec66660df8
+  data.tar.gz: c43fe978df0f508e98ae8ce67825716cc82bb72e78b57072e092e9ee2dc201d4
 SHA512:
-  metadata.gz: 153851c16bd783f43f08d132d50926460bba42d7304862173b69cdce06861edd5bb042b2d4278582eca6ba1e8ca9fbbedb10cd3e65caeb8ad5bb47f1b59f1eb5
-  data.tar.gz: 4602cb3e89e9095f4b620977ebef501eb554ff3dedac73253c3330731f1cabfaad4a3a73a96101b4aae922471c447345336134cdb3a5f173abbc6ea2444cd69c
+  metadata.gz: b4d46e7bb0c116831756108ac58833fa4c314f8a963830b9a48fe45c0c25853dc330b915e372963062b532d738176b7d23a57b7453c4de05034fb8a70967e231
+  data.tar.gz: f484110570b0ee14ff6ae8b9fbc64a5dffbf7fa8dade0e359402cd41422d6d2df056bac88298cfd5709ef614fb44f167c1b04ae8cb6979ec81316b40d055fe6e

data/README.md

@@ -46,7 +46,7 @@ client.power_restart(force: true)
 
 # Virtual media
 client.insert_virtual_media('http://example.com/boot.iso')
-client.set_boot_override('Cd', persistent: false)
+client.set_boot_override('Cd', persistence: 'Once')
 client.power_restart
 
 # Thermal data

data/lib/radfish/ami/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Ami
-    VERSION = "0.1.14"
+    VERSION = "0.2.0"
   end
 end

data/lib/radfish/ami_adapter.rb

@@ -266,8 +266,9 @@ module Radfish
     end
 
     def psus
-      # AMI BMC reports power sensors in the Power endpoint, not traditional PSU info
-      # Filter to show only PSU-related power sensors (containing "PSU" in name)
+      # AMI BMC reports power sensors in the Power endpoint
+      # Format: { name: "PSU1", model: "...", serial: "...",
+      #           voltage: 208, voltage_human: "AC240V", watts: 320, status: "OK" }
       power_data = get_power_data
       all_sensors = power_data["PowerSupplies"] || []
 
@@ -286,36 +287,34 @@ module Radfish
         next unless match
 
         psu_num = match[1]
-        psu_groups[psu_num] ||= { input_watts: nil, output_watts: nil, status: nil, state: nil }
+        psu_groups[psu_num] ||= { watts: nil, status: nil }
 
-        if name.include?("PIN")
-          psu_groups[psu_num][:input_watts] = sensor["PowerInputWatts"]
-        elsif name.include?("POUT")
-          psu_groups[psu_num][:output_watts] = sensor["PowerInputWatts"] # POUT reported as PowerInputWatts
+        # Use PIN (input) watts as the primary wattage reading
+        if name.include?("PIN") && sensor["PowerInputWatts"]
+          psu_groups[psu_num][:watts] = sensor["PowerInputWatts"]
         end
 
-        # Track status - prefer non-Absent, but record Absent if that's all we have
+        # Track status - prefer non-Absent
         sensor_state = sensor.dig("Status", "State")
         sensor_health = sensor.dig("Status", "Health")
 
-        if sensor_state == "Absent"
-          psu_groups[psu_num][:state] ||= "Absent"
-          psu_groups[psu_num][:status] ||= "N/A"
-        else
-          # Override Absent with actual status
+        if sensor_state != "Absent"
           psu_groups[psu_num][:status] = sensor_health || "OK"
-          psu_groups[psu_num][:state] = sensor_state || "Enabled"
+        elsif psu_groups[psu_num][:status].nil?
+          psu_groups[psu_num][:status] = "Absent"
         end
       end
 
-      # Convert to OpenStruct array
+      # Convert to OpenStruct array matching expected format
       psu_groups.map do |psu_num, data|
         OpenStruct.new(
           name: "PSU#{psu_num}",
-          input_watts: data[:input_watts],
-          output_watts: data[:output_watts],
-          status: data[:status] || "Unknown",
-          state: data[:state] || "Unknown"
+          model: nil,           # AMI doesn't provide model info
+          serial: nil,          # AMI doesn't provide serial info
+          voltage: nil,         # AMI doesn't provide voltage info
+          voltage_human: nil,   # AMI doesn't provide voltage type
+          watts: data[:watts],
+          status: data[:status] || "Unknown"
         )
       end.sort_by { |psu| psu.name }
     end
@@ -649,7 +648,7 @@ module Radfish
 
     def mount_iso_and_boot(iso_url, device: nil)
       insert_virtual_media(iso_url, device: device)
-      set_boot_override("Cd", persistent: false)
+      set_boot_override("Cd", persistence: 'Once')
       power_restart(force: true)
     end
 
@@ -670,19 +669,19 @@ module Radfish
       }
     end
 
-    def set_boot_override(target, persistent: false)
-      enabled = persistent ? "Continuous" : "Once"
+    def set_boot_override(target, persistence: nil, mode: nil)
+      persistence = "Once" unless persistence
       payload = {
         "Boot" => {
           "BootSourceOverrideTarget" => target,
-          "BootSourceOverrideEnabled" => enabled
+          "BootSourceOverrideEnabled" => persistence
         }
       }
 
       response = authenticated_request(:patch, "/redfish/v1/Systems/#{SYSTEM_ID}", body: payload.to_json)
 
       if response.status.between?(200, 204)
-        debug "Boot override set to #{target} (#{enabled})", 1, :green
+        debug "Boot override set to #{target} (#{persistence})", 1, :green
         true
       else
         error_msg = begin
@@ -721,24 +720,24 @@ module Radfish
       boot_config["BootOrder"] || []
     end
 
-    def boot_to_pxe(persistent: false)
-      set_boot_override("Pxe", persistent: persistent)
+    def boot_to_pxe(persistence: nil, mode: nil)
+      set_boot_override("Pxe", persistence: persistence, mode: mode)
     end
 
-    def boot_to_disk(persistent: false)
-      set_boot_override("Hdd", persistent: persistent)
+    def boot_to_disk(persistence: nil, mode: nil)
+      set_boot_override("Hdd", persistence: persistence, mode: mode)
     end
 
-    def boot_to_cd(persistent: false)
-      set_boot_override("Cd", persistent: persistent)
+    def boot_to_cd(persistence: nil, mode: nil)
+      set_boot_override("Cd", persistence: persistence, mode: mode)
     end
 
-    def boot_to_usb(persistent: false)
-      set_boot_override("Usb", persistent: persistent)
+    def boot_to_usb(persistence: nil, mode: nil)
+      set_boot_override("Usb", persistence: persistence, mode: mode)
     end
 
-    def boot_to_bios_setup(persistent: false)
-      set_boot_override("BiosSetup", persistent: persistent)
+    def boot_to_bios_setup(persistence: nil, mode: nil)
+      set_boot_override("BiosSetup", persistence: persistence, mode: mode)
     end
 
     # Jobs/Tasks

data/radfish-ami.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "radfish", "~> 0.2"
+  spec.add_dependency "radfish", "~> 0.3", ">= 0.3.0"
   spec.add_dependency "ostruct", "~> 0.6"
 
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radfish-ami
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Siegel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-21 00:00:00.000000000 Z
+date: 2026-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: radfish
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement