radfish-ami 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5eece6126f4c0d048e1aedcaa23d466e77c33dd4b69595bc6b53016815c7cec
-  data.tar.gz: 9da097025394a758dc0fa4a2347ce90993113d4d0086f985534580104a2298b3
+  metadata.gz: 177c683aa6971d7a736b42af44ad87a5d65bcfe9cf4bf5690cb7050c8971bae9
+  data.tar.gz: d1c29be71c6561e814eb4e245c03a702500f1393991b9fc02716428c0d2f2267
 SHA512:
-  metadata.gz: 3ec9ee1430c502c6e0364a9d345d16c67d9d459ee3ce226d8d92bafb0c1151a9bf714cb5cd94d4490da9a950ff50550d773a9062a45782b4cf6d3af8a91b8a53
-  data.tar.gz: 2a347044b3101aff4f31e47aaabf4d3bf68e752aea0e48864920b38b2a8a9df1c140fd97fd91fd6938cf9e148d75af36503069bcb10ae6471b28d9438b867add
+  metadata.gz: 153851c16bd783f43f08d132d50926460bba42d7304862173b69cdce06861edd5bb042b2d4278582eca6ba1e8ca9fbbedb10cd3e65caeb8ad5bb47f1b59f1eb5
+  data.tar.gz: 4602cb3e89e9095f4b620977ebef501eb554ff3dedac73253c3330731f1cabfaad4a3a73a96101b4aae922471c447345336134cdb3a5f173abbc6ea2444cd69c

data/lib/radfish/ami/version.rb

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

data/lib/radfish/ami_adapter.rb

@@ -241,9 +241,13 @@ module Radfish
         OpenStruct.new(
           name: fan["Name"] || fan["MemberId"],
           rpm: fan["Reading"],
+          reading_units: fan["ReadingUnits"] || "RPM",
           status: fan.dig("Status", "Health") || "OK",
+          state: fan.dig("Status", "State") || "Unknown",
+          lower_threshold_critical: fan["LowerThresholdNonCritical"],
           min_rpm: fan["MinReadingRange"],
-          max_rpm: fan["MaxReadingRange"]
+          max_rpm: fan["MaxReadingRange"],
+          physical_context: fan["PhysicalContext"]
         )
       end
     end
@@ -262,18 +266,58 @@ 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)
       power_data = get_power_data
-      (power_data["PowerSupplies"] || []).map do |psu|
+      all_sensors = power_data["PowerSupplies"] || []
+
+      # Filter for actual PSU sensors (PIN = input, POUT = output)
+      psu_sensors = all_sensors.select do |sensor|
+        name = sensor["Name"] || ""
+        name.include?("PSU")
+      end
+
+      # Group by PSU number and merge input/output readings
+      psu_groups = {}
+      psu_sensors.each do |sensor|
+        name = sensor["Name"] || ""
+        # Extract PSU number from names like "PWR_PSU3_PIN" or "PWR_PSU2_POUT"
+        match = name.match(/PSU(\d+)/)
+        next unless match
+
+        psu_num = match[1]
+        psu_groups[psu_num] ||= { input_watts: nil, output_watts: nil, status: nil, state: 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
+        end
+
+        # Track status - prefer non-Absent, but record Absent if that's all we have
+        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
+          psu_groups[psu_num][:status] = sensor_health || "OK"
+          psu_groups[psu_num][:state] = sensor_state || "Enabled"
+        end
+      end
+
+      # Convert to OpenStruct array
+      psu_groups.map do |psu_num, data|
         OpenStruct.new(
-          name: psu["Name"] || psu["MemberId"],
-          model: psu["Model"],
-          serial: psu["SerialNumber"],
-          watts: psu["PowerCapacityWatts"],
-          voltage: psu.dig("InputRanges", 0, "NominalVoltageVolts"),
-          voltage_human: psu.dig("InputRanges", 0, "InputType"),
-          status: psu.dig("Status", "Health") || "OK"
+          name: "PSU#{psu_num}",
+          input_watts: data[:input_watts],
+          output_watts: data[:output_watts],
+          status: data[:status] || "Unknown",
+          state: data[:state] || "Unknown"
         )
-      end
+      end.sort_by { |psu| psu.name }
     end
 
     def power_consumption
@@ -757,11 +801,11 @@ module Radfish
 
     def jobs_summary
       all_jobs = jobs
+      completed = all_jobs.count { |j| j["TaskState"] == "Completed" }
       {
-        total: all_jobs.size,
-        running: all_jobs.count { |j| j["TaskState"] == "Running" },
-        completed: all_jobs.count { |j| j["TaskState"] == "Completed" },
-        failed: all_jobs.count { |j| %w[Exception Killed Cancelled].include?(j["TaskState"]) }
+        'completed_count' => completed,
+        'incomplete_count' => all_jobs.size - completed,
+        'total_count' => all_jobs.size
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radfish-ami
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Jonathan Siegel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-20 00:00:00.000000000 Z
+date: 2025-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: radfish