radfish-ami 0.1.11 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446d9d41aafcddee32b13d9ed75c5d7e31a9e0667f004994c024d2ac3f84dc84
-  data.tar.gz: 24cd429c550b252eaae8fb96179f8cfd95e9f694cb6959e33b82332e331fcadd
+  metadata.gz: 177c683aa6971d7a736b42af44ad87a5d65bcfe9cf4bf5690cb7050c8971bae9
+  data.tar.gz: d1c29be71c6561e814eb4e245c03a702500f1393991b9fc02716428c0d2f2267
 SHA512:
-  metadata.gz: ae78d572d0836d07ec7d1f08aa639ce67c43f5bcce13f4c772fa7300cc070ab73c8cc65be2045543d6e488a762a2d5d18f6839d3ba7442b0dedac0937a0fd68f
-  data.tar.gz: 9301cf72f12f266e031de0f5b06eae07bf27d973a0b09d7ae2e44efbcd14bc15134e2370cf47735cd1256487ff0cc35aef9b42baec431688518759cd3db80ebc
+  metadata.gz: 153851c16bd783f43f08d132d50926460bba42d7304862173b69cdce06861edd5bb042b2d4278582eca6ba1e8ca9fbbedb10cd3e65caeb8ad5bb47f1b59f1eb5
+  data.tar.gz: 4602cb3e89e9095f4b620977ebef501eb554ff3dedac73253c3330731f1cabfaad4a3a73a96101b4aae922471c447345336134cdb3a5f173abbc6ea2444cd69c

data/lib/radfish/ami/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Ami
-    VERSION = "0.1.11"
+    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
@@ -484,7 +528,10 @@ module Radfish
       end
     end
 
-    def insert_virtual_media(iso_url, device: nil)
+    def insert_virtual_media(iso_url, device: nil, username: nil, password: nil)
+      # Ensure remote media is enabled (AMI-specific)
+      ensure_remote_media_enabled!
+
       devices = virtual_media
       target_device = if device
                         devices.find { |d| d["Id"] == device || d["Name"]&.include?(device.to_s) }
@@ -498,9 +545,20 @@ module Radfish
       device_path = target_device["@odata.id"]
       actions = target_device.dig("Actions", "#VirtualMedia.InsertMedia")
 
+      # Detect transfer protocol from URL (AMI requires this)
+      transfer_protocol = detect_transfer_protocol(iso_url)
+
       if actions && actions["target"]
         # Use the InsertMedia action
-        payload = { "Image" => iso_url, "Inserted" => true, "WriteProtected" => true }
+        # AMI requires UserName/Password even for anonymous access
+        payload = {
+          "Image" => iso_url,
+          "Inserted" => true,
+          "WriteProtected" => true,
+          "TransferProtocolType" => transfer_protocol,
+          "UserName" => username || "",
+          "Password" => password || ""
+        }
         response = authenticated_request(:post, actions["target"], body: payload.to_json)
       else
         # Fallback to PATCH method
@@ -508,12 +566,20 @@ module Radfish
         response = authenticated_request(:patch, device_path, body: payload.to_json)
       end
 
+      # 200, 202, 204 are all success (202 = accepted, async operation)
       if response.status.between?(200, 204)
-        debug "Virtual media inserted successfully", 1, :green
+        debug "Virtual media insert initiated successfully", 1, :green
         true
       else
         error_msg = begin
-                      JSON.parse(response.body).dig("error", "message")
+                      data = JSON.parse(response.body)
+                      # Try to get detailed error from ExtendedInfo
+                      extended = data.dig("error", "@Message.ExtendedInfo")
+                      if extended&.any?
+                        extended.map { |e| e["Message"] }.join("; ")
+                      else
+                        data.dig("error", "message")
+                      end
                     rescue
                       response.body
                     end
@@ -521,6 +587,34 @@ module Radfish
       end
     end
 
+    # Enable remote media support (AMI-specific, required before virtual media works)
+    def enable_remote_media
+      response = authenticated_request(
+        :post,
+        "/redfish/v1/Managers/#{MANAGER_ID}/Actions/Oem/AMIVirtualMedia.EnableRMedia",
+        body: { "RMediaState" => "Enable" }.to_json
+      )
+      response.status.between?(200, 204)
+    end
+
+    # Disable remote media support (AMI-specific)
+    def disable_remote_media
+      response = authenticated_request(
+        :post,
+        "/redfish/v1/Managers/#{MANAGER_ID}/Actions/Oem/AMIVirtualMedia.EnableRMedia",
+        body: { "RMediaState" => "Disable" }.to_json
+      )
+      response.status.between?(200, 204)
+    end
+
+    # Check if remote media is enabled
+    def remote_media_enabled?
+      response = authenticated_request(:get, "/redfish/v1/Managers/#{MANAGER_ID}")
+      return false unless response.status == 200
+      data = JSON.parse(response.body)
+      data.dig("Oem", "Ami", "VirtualMedia", "RMediaStatus") == "Enabled"
+    end
+
     def eject_virtual_media(device: nil)
       devices = virtual_media
       target_device = if device
@@ -707,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
 
@@ -962,6 +1056,38 @@ module Radfish
         end
       end
     end
+
+    # Detect transfer protocol from URL for AMI virtual media
+    def detect_transfer_protocol(url)
+      uri = URI.parse(url)
+      case uri.scheme&.downcase
+      when 'https'
+        'HTTPS'
+      when 'nfs'
+        'NFS'
+      when 'cifs', 'smb'
+        'CIFS'
+      when 'http'
+        # AMI doesn't support plain HTTP, try HTTPS
+        'HTTPS'
+      else
+        'HTTPS'  # Default to HTTPS
+      end
+    end
+
+    # Ensure remote media is enabled (AMI-specific requirement)
+    def ensure_remote_media_enabled!
+      return if remote_media_enabled?
+
+      response = authenticated_request(
+        :post,
+        "/redfish/v1/Managers/#{MANAGER_ID}/Actions/Oem/AMIVirtualMedia.EnableRMedia",
+        body: { "RMediaState" => "Enable" }.to_json
+      )
+
+      # Wait for the action to complete
+      sleep 3 if response.status.between?(200, 204)
+    end
   end
 
   # Register the AMI adapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radfish-ami
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  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