radfish-ami 0.1.12 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5eece6126f4c0d048e1aedcaa23d466e77c33dd4b69595bc6b53016815c7cec
-  data.tar.gz: 9da097025394a758dc0fa4a2347ce90993113d4d0086f985534580104a2298b3
+  metadata.gz: b7fbc8a153c2cab4049f4f939fb0256b56e9e0c707a0a38414c676a08abe3e41
+  data.tar.gz: 9b1308064a87ba306e31af4c36a130289797bffeafa416a8664445dbbd87efad
 SHA512:
-  metadata.gz: 3ec9ee1430c502c6e0364a9d345d16c67d9d459ee3ce226d8d92bafb0c1151a9bf714cb5cd94d4490da9a950ff50550d773a9062a45782b4cf6d3af8a91b8a53
-  data.tar.gz: 2a347044b3101aff4f31e47aaabf4d3bf68e752aea0e48864920b38b2a8a9df1c140fd97fd91fd6938cf9e148d75af36503069bcb10ae6471b28d9438b867add
+  metadata.gz: 64c904e52a386179cccaf4ae1ccf063947424a3edf1544da07e3fad7dc466b72011638d8095960eb62a8127d70a2dff2877288a771a05d8e0386f4c6eb419a39
+  data.tar.gz: 646f1c49b11e8627520e2f4444a13b60686ff92828cf483f1091329e4604319d064ac70514bbba7b3163aa5ff902f9144bf2e60c2a0c9f92896840513ff22db1

data/lib/radfish/ami/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Ami
-    VERSION = "0.1.12"
+    VERSION = "0.1.15"
   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,57 @@ module Radfish
     end
 
     def psus
+      # 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
-      (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] ||= { watts: nil, status: nil }
+
+        # 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
+        sensor_state = sensor.dig("Status", "State")
+        sensor_health = sensor.dig("Status", "Health")
+
+        if sensor_state != "Absent"
+          psu_groups[psu_num][:status] = sensor_health || "OK"
+        elsif psu_groups[psu_num][:status].nil?
+          psu_groups[psu_num][:status] = "Absent"
+        end
+      end
+
+      # Convert to OpenStruct array matching expected format
+      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}",
+          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
+      end.sort_by { |psu| psu.name }
     end
 
     def power_consumption
@@ -757,11 +800,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.15
 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