radfish-ami 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472ba0bdf31346a59b277da4019f4d0d84cff7a2bac7831cd0335b2976cef8ea
-  data.tar.gz: b78f18b561ebc89e3647f4e29454e45054017fc231753e3c8eca83b3e0dfbafe
+  metadata.gz: 7a8366ebff88acb6537e811e7e94e4e07ed0d00e0f8ee9ee48b7cd003133f2dd
+  data.tar.gz: cc728ce842585bd10f7e6fe97506da24ee8d1405c865288f9dcffff22d00695c
 SHA512:
-  metadata.gz: b18bc999bb6607fae5568abaf52dca97f099d1b22d0b99b98a8e8c541f1e71df865b0a4936133ebcdeb81962acbe1a064b455edb4c8e35c2309878b1417af89d
-  data.tar.gz: 50e6c3098399c64b645d81dc9a8caefc5a480aa6836f9e3476c11a7194b5467576b7df32259ce2b30c4849f797364516f48d3de63ec439bb7c17ff83dee0cb25
+  metadata.gz: 4c74710a833e5fa6af773b910e679a5d0ead7a444e4c0ef3f66097cf1b4e5a3586e46b143baaed3c9f44a5b745680206e558c19b7a00ecf2a1ac4374b8942169
+  data.tar.gz: 1f3841480ba7b7affead0434fddf6350f47f20f8ee8c4a5f904fe27a62d7750af0b19840d20da1901682107021ae76647a9d016c7925b5edd1c67a925961ccf5

data/lib/radfish/ami/version.rb

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

data/lib/radfish/ami_adapter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ostruct'
+
 module Radfish
   class AmiAdapter < Core::BaseClient
     include Core::Power
@@ -20,6 +22,11 @@ module Radfish
       "ami"
     end
 
+    # Allow adapter to be used directly where code expects client.adapter
+    def adapter
+      self
+    end
+
     # Session management
     def login
       @session = Core::Session.new(self)
@@ -138,62 +145,12 @@ module Radfish
     def system_health
       info = system_info
       status = info["Status"] || {}
-      HealthStatus.new(
+      OpenStruct.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
@@ -219,7 +176,15 @@ module Radfish
         cpu_response = authenticated_request(:get, member["@odata.id"])
         next nil unless cpu_response.status == 200
         data = JSON.parse(cpu_response.body)
-        CpuInfo.new(data)
+        OpenStruct.new(
+          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"],
+          health: data.dig("Status", "Health") || "Unknown"
+        )
       end.compact
     end
 
@@ -233,7 +198,17 @@ module Radfish
       members.map do |member|
         mem_response = authenticated_request(:get, member["@odata.id"])
         next nil unless mem_response.status == 200
-        JSON.parse(mem_response.body)
+        data = JSON.parse(mem_response.body)
+        OpenStruct.new(
+          name: data["Name"] || data["Id"],
+          capacity_bytes: data["CapacityMiB"] ? data["CapacityMiB"] * 1024 * 1024 : nil,
+          speed_mhz: data["OperatingSpeedMhz"],
+          manufacturer: data["Manufacturer"],
+          part_number: data["PartNumber"],
+          serial_number: data["SerialNumber"],
+          memory_type: data["MemoryDeviceType"],
+          status: data.dig("Status", "Health") || "OK"
+        )
       end.compact
     end
 
@@ -247,23 +222,58 @@ module Radfish
       members.map do |member|
         nic_response = authenticated_request(:get, member["@odata.id"])
         next nil unless nic_response.status == 200
-        JSON.parse(nic_response.body)
+        data = JSON.parse(nic_response.body)
+        OpenStruct.new(
+          name: data["Name"] || data["Id"],
+          mac: data["MACAddress"],
+          speed_mbps: data["SpeedMbps"],
+          link_status: data["LinkStatus"],
+          ipv4_addresses: data["IPv4Addresses"],
+          ipv6_addresses: data["IPv6Addresses"],
+          status: data.dig("Status", "Health") || "OK"
+        )
       end.compact
     end
 
     def fans
       thermal = get_thermal_data
-      thermal["Fans"] || []
+      (thermal["Fans"] || []).map do |fan|
+        OpenStruct.new(
+          name: fan["Name"] || fan["MemberId"],
+          rpm: fan["Reading"],
+          status: fan.dig("Status", "Health") || "OK",
+          min_rpm: fan["MinReadingRange"],
+          max_rpm: fan["MaxReadingRange"]
+        )
+      end
     end
 
     def temperatures
       thermal = get_thermal_data
-      thermal["Temperatures"] || []
+      (thermal["Temperatures"] || []).map do |temp|
+        OpenStruct.new(
+          name: temp["Name"] || temp["MemberId"],
+          reading_celsius: temp["ReadingCelsius"],
+          status: temp.dig("Status", "Health") || "OK",
+          upper_threshold_critical: temp["UpperThresholdCritical"],
+          upper_threshold_fatal: temp["UpperThresholdFatal"]
+        )
+      end
     end
 
     def psus
       power_data = get_power_data
-      power_data["PowerSupplies"] || []
+      (power_data["PowerSupplies"] || []).map do |psu|
+        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"
+        )
+      end
     end
 
     def power_consumption
@@ -312,7 +322,19 @@ module Radfish
       drive_refs.map do |ref|
         drive_response = authenticated_request(:get, ref["@odata.id"])
         next nil unless drive_response.status == 200
-        JSON.parse(drive_response.body)
+        drive_data = JSON.parse(drive_response.body)
+        OpenStruct.new(
+          name: drive_data["Name"] || drive_data["Id"],
+          model: drive_data["Model"],
+          manufacturer: drive_data["Manufacturer"],
+          serial: drive_data["SerialNumber"],
+          capacity_bytes: drive_data["CapacityBytes"],
+          capacity_gb: drive_data["CapacityBytes"] ? (drive_data["CapacityBytes"] / 1_000_000_000.0).round(2) : nil,
+          media_type: drive_data["MediaType"],
+          protocol: drive_data["Protocol"],
+          status: drive_data.dig("Status", "Health") || "OK",
+          certified: drive_data.dig("Oem", "Dell", "Certified") || drive_data.dig("Oem", "AMI", "Certified")
+        )
       end.compact
     end
 
@@ -365,7 +387,18 @@ module Radfish
       drive_refs.map do |ref|
         drive_response = authenticated_request(:get, ref["@odata.id"])
         next nil unless drive_response.status == 200
-        JSON.parse(drive_response.body)
+        drive_data = JSON.parse(drive_response.body)
+        OpenStruct.new(
+          name: drive_data["Name"] || drive_data["Id"],
+          model: drive_data["Model"],
+          manufacturer: drive_data["Manufacturer"],
+          serial: drive_data["SerialNumber"],
+          capacity_bytes: drive_data["CapacityBytes"],
+          capacity_gb: drive_data["CapacityBytes"] ? (drive_data["CapacityBytes"] / 1_000_000_000.0).round(2) : nil,
+          media_type: drive_data["MediaType"],
+          protocol: drive_data["Protocol"],
+          status: drive_data.dig("Status", "Health") || "OK"
+        )
       end.compact
     end
 

data/radfish-ami.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "radfish", "~> 0.2"
+  spec.add_dependency "ostruct", ">= 0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish-ami
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement