radfish-ami 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177c683aa6971d7a736b42af44ad87a5d65bcfe9cf4bf5690cb7050c8971bae9
-  data.tar.gz: d1c29be71c6561e814eb4e245c03a702500f1393991b9fc02716428c0d2f2267
+  metadata.gz: b7fbc8a153c2cab4049f4f939fb0256b56e9e0c707a0a38414c676a08abe3e41
+  data.tar.gz: 9b1308064a87ba306e31af4c36a130289797bffeafa416a8664445dbbd87efad
 SHA512:
-  metadata.gz: 153851c16bd783f43f08d132d50926460bba42d7304862173b69cdce06861edd5bb042b2d4278582eca6ba1e8ca9fbbedb10cd3e65caeb8ad5bb47f1b59f1eb5
-  data.tar.gz: 4602cb3e89e9095f4b620977ebef501eb554ff3dedac73253c3330731f1cabfaad4a3a73a96101b4aae922471c447345336134cdb3a5f173abbc6ea2444cd69c
+  metadata.gz: 64c904e52a386179cccaf4ae1ccf063947424a3edf1544da07e3fad7dc466b72011638d8095960eb62a8127d70a2dff2877288a771a05d8e0386f4c6eb419a39
+  data.tar.gz: 646f1c49b11e8627520e2f4444a13b60686ff92828cf483f1091329e4604319d064ac70514bbba7b3163aa5ff902f9144bf2e60c2a0c9f92896840513ff22db1

data/lib/radfish/ami/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Ami
-    VERSION = "0.1.14"
+    VERSION = "0.1.15"
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish-ami
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Jonathan Siegel