radfish-ami 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6767dac25a52c3487bb03d27e87ba1f6b86446999b9c911e56e5c03a249238
-  data.tar.gz: 8ec968e4cb4e7fab05a12268e9d4bc6e24e5b8c58e33d65fd138482362e5a6f5
+  metadata.gz: 472ba0bdf31346a59b277da4019f4d0d84cff7a2bac7831cd0335b2976cef8ea
+  data.tar.gz: b78f18b561ebc89e3647f4e29454e45054017fc231753e3c8eca83b3e0dfbafe
 SHA512:
-  metadata.gz: 9364ad69a1ed099c1df80c6482a182c33da58ae4b1f37c31be3b44f5ec0cbed85736c5850242d4c1355c485f6080ad0ad8c53b7a6d580a11aa18815a698c6cc0
-  data.tar.gz: f1ce4e6eb97e276db96dbfd9f1e75780a45347908bb1dfa0b9b4a0fe2f04049ca85196eddff83b3c66dd1331536477a9d4ca2d6b20d855432e4687549a611c7a
+  metadata.gz: b18bc999bb6607fae5568abaf52dca97f099d1b22d0b99b98a8e8c541f1e71df865b0a4936133ebcdeb81962acbe1a064b455edb4c8e35c2309878b1417af89d
+  data.tar.gz: 50e6c3098399c64b645d81dc9a8caefc5a480aa6836f9e3476c11a7194b5467576b7df32259ce2b30c4849f797364516f48d3de63ec439bb7c17ff83dee0cb25

data/lib/radfish/ami/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Ami
-    VERSION = "0.1.2"
+    VERSION = "0.1.5"
   end
 end

data/lib/radfish/ami_adapter.rb

@@ -137,7 +137,75 @@ module Radfish
 
     def system_health
       info = system_info
-      info.dig("Status", "Health") || info.dig("Status", "HealthRollup") || "Unknown"
+      status = info["Status"] || {}
+      HealthStatus.new(
+        health: status["Health"] || "Unknown",
+        rollup: status["HealthRollup"] || status["Health"] || "Unknown"
+      )
+    end
+
+    # Simple struct for health status with rollup
+    class HealthStatus
+      attr_reader :health, :rollup
+
+      def initialize(health:, rollup:)
+        @health = health
+        @rollup = rollup
+      end
+
+      def to_s
+        @health
+      end
+
+      def ==(other)
+        other.to_s == to_s
+      end
+    end
+
+    # CPU info wrapper
+    class CpuInfo
+      attr_reader :socket, :manufacturer, :model, :cores, :threads, :speed_mhz, :status, :raw_data
+
+      def initialize(data)
+        @raw_data = data
+        @socket = data["Socket"] || data["Id"]
+        @manufacturer = data["Manufacturer"]
+        @model = data.dig("ProcessorId", "EffectiveFamily")&.strip || data["Model"]
+        @cores = data["TotalCores"]
+        @threads = data["TotalThreads"]
+        @speed_mhz = data["MaxSpeedMHz"]
+        @status = data.dig("Status", "Health") || "Unknown"
+      end
+
+      def to_h
+        {
+          socket: @socket,
+          manufacturer: @manufacturer,
+          model: @model,
+          cores: @cores,
+          threads: @threads,
+          speed_mhz: @speed_mhz,
+          status: @status
+        }
+      end
+
+      def [](key)
+        @raw_data[key]
+      end
+    end
+
+    def bmc_info
+      manager = get_manager_info
+      network = get_bmc_network
+
+      {
+        firmware_version: manager["FirmwareVersion"],
+        redfish_version: service_root["RedfishVersion"],
+        mac_address: network["mac_address"],
+        ip_address: network["ipv4_address"],
+        hostname: network["hostname"],
+        health: manager.dig("Status", "Health") || "OK"
+      }
     end
 
     def cpus
@@ -150,7 +218,8 @@ module Radfish
       members.map do |member|
         cpu_response = authenticated_request(:get, member["@odata.id"])
         next nil unless cpu_response.status == 200
-        JSON.parse(cpu_response.body)
+        data = JSON.parse(cpu_response.body)
+        CpuInfo.new(data)
       end.compact
     end
 
@@ -424,6 +493,17 @@ module Radfish
       info["Boot"] || {}
     end
 
+    def boot_options
+      boot = boot_config
+      {
+        "boot_source_override_enabled" => boot["BootSourceOverrideEnabled"],
+        "boot_source_override_target" => boot["BootSourceOverrideTarget"],
+        "boot_source_override_mode" => boot["BootSourceOverrideMode"],
+        "boot_order" => boot["BootOrder"],
+        "allowed_targets" => boot["BootSourceOverrideTarget@Redfish.AllowableValues"]
+      }
+    end
+
     def set_boot_override(target, persistent: false)
       enabled = persistent ? "Continuous" : "Once"
       payload = {
@@ -790,6 +870,26 @@ module Radfish
         {}
       end
     end
+
+    def get_manager_info
+      response = authenticated_request(:get, "/redfish/v1/Managers/#{MANAGER_ID}")
+      if response.status == 200
+        JSON.parse(response.body)
+      else
+        {}
+      end
+    end
+
+    def service_root
+      @service_root ||= begin
+        response = authenticated_request(:get, "/redfish/v1")
+        if response.status == 200
+          JSON.parse(response.body)
+        else
+          {}
+        end
+      end
+    end
   end
 
   # Register the AMI adapter

metadata

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