radfish-ami 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8437153ec6bf1a793ee23f287fdea85dc0b3511b2e8a87e7fb615dd8ea9737d4
-  data.tar.gz: 18c7ea5001939cc76bbdd31673e1ad012ec94b79ab373f43ef216ff7fe9b6f35
+  metadata.gz: 68366b5bbb4d8bd874dace449a8f4f87c4ce9b94f503484429b94b825db10f25
+  data.tar.gz: 4be49b40686ca504e3d8dcb53aa39c2d3c707779f006f1dd187f56020cb1af90
 SHA512:
-  metadata.gz: 7663274856b229b95ec203efcf2cf9921b3bd5553b675ba2ca0a9e016671d9872f657c725fb021e4dbca04f998521054d334586bfdbaeb6e041cbd29842e1907
-  data.tar.gz: f26cb16d15eb2ffa2c16a94a518049e358c7aa9977c9e6e7811151aee0b33f693c7ddc440605809377b2d9c0e70010e525c89a0a19abc4605831b6d084855c3f
+  metadata.gz: 6d4e9353cab999154107ca5c3b22eb394654f11559da85da560010600225a8fa1e1cb2ecfb658bf54bdd7d41693ba4f0399ec9f5b2284d6fad9852fee6a48cb5
+  data.tar.gz: 84b352d9f9023aa6d75221c0038ea7b4efb3efd68df87ce484d62c267b55419bcfd479f65312c1b761dfc1adc099b8effa495ef04a690e0225226901b7a068c5

data/lib/radfish/ami/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Ami
-    VERSION = "0.1.6"
+    VERSION = "0.1.9"
   end
 end

data/lib/radfish/ami_adapter.rb

@@ -22,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)
@@ -295,19 +300,25 @@ module Radfish
         controller_response = authenticated_request(:get, member["@odata.id"])
         next nil unless controller_response.status == 200
         data = JSON.parse(controller_response.body)
-        Radfish::Controller.new(
-          client: self,
+        # Return OpenStruct - Radfish::Client will wrap in Controller
+        OpenStruct.new(
           id: data["Id"],
           name: data["Name"],
           model: data["Model"],
           status: data.dig("Status", "Health"),
-          adapter_data: data
+          "@odata.id": member["@odata.id"]
         )
       end.compact
     end
 
     def drives(controller)
-      controller_id = controller.is_a?(Radfish::Controller) ? controller.id : controller
+      controller_id = if controller.is_a?(Radfish::Controller)
+                        controller.id
+                      elsif controller.respond_to?(:id)
+                        controller.id
+                      else
+                        controller
+                      end
       response = authenticated_request(:get, "/redfish/v1/Systems/#{SYSTEM_ID}/Storage/#{controller_id}")
       return [] unless response.status == 200
 
@@ -334,8 +345,13 @@ module Radfish
     end
 
     def volumes(controller)
-      controller_obj = controller.is_a?(Radfish::Controller) ? controller : nil
-      controller_id = controller.is_a?(Radfish::Controller) ? controller.id : controller
+      controller_id = if controller.is_a?(Radfish::Controller)
+                        controller.id
+                      elsif controller.respond_to?(:id)
+                        controller.id
+                      else
+                        controller
+                      end
       response = authenticated_request(:get, "/redfish/v1/Systems/#{SYSTEM_ID}/Storage/#{controller_id}/Volumes")
       return [] unless response.status == 200
 
@@ -346,37 +362,37 @@ module Radfish
         volume_response = authenticated_request(:get, member["@odata.id"])
         next nil unless volume_response.status == 200
         data = JSON.parse(volume_response.body)
-        Radfish::Volume.new(
-          client: self,
-          controller: controller_obj,
-          id: data["Id"],
-          name: data["Name"],
-          capacity_bytes: data["CapacityBytes"],
-          raid_type: data["RAIDType"],
-          health: data.dig("Status", "Health"),
-          adapter_data: data
-        )
+        # Return hash with normalized keys - Radfish::Client will wrap in Volume
+        # Keep the raw data for adapter_data access
+        data["id"] = data["Id"]
+        data["name"] = data["Name"]
+        data["capacity_bytes"] = data["CapacityBytes"]
+        data["raid_type"] = data["RAIDType"]
+        data["health"] = data.dig("Status", "Health")
+        data
       end.compact
     end
 
     def volume_drives(volume)
       volume_id = volume.is_a?(Radfish::Volume) ? volume.id : volume
-      # Get volume details to find linked drives
+      # Get volume details to find linked drives - adapter_data is the raw hash
       volume_data = volume.is_a?(Radfish::Volume) ? volume.adapter_data : nil
 
-      unless volume_data
+      # volume_data should be a hash with "Links" -> "Drives"
+      unless volume_data.is_a?(Hash)
         # Need to fetch volume data
         storage_controllers.each do |controller|
           vols = volumes(controller)
-          vol = vols.find { |v| v.id == volume_id }
+          # volumes() returns hashes now
+          vol = vols.find { |v| (v["id"] || v["Id"]) == volume_id }
           if vol
-            volume_data = vol.adapter_data
+            volume_data = vol
             break
           end
         end
       end
 
-      return [] unless volume_data
+      return [] unless volume_data.is_a?(Hash)
 
       drive_refs = volume_data.dig("Links", "Drives") || []
       drive_refs.map do |ref|

data/radfish-ami.gemspec

@@ -14,8 +14,6 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.1.0"
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
 
   spec.files = Dir.chdir(__dir__) do
@@ -24,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "radfish", "~> 0.2"
-  spec.add_dependency "ostruct", ">= 0"
+  spec.add_dependency "ostruct", "~> 0.6"
 
   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.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -28,16 +28,16 @@ dependencies:
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,8 +113,6 @@ homepage: https://github.com/buildio/radfish-ami
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/buildio/radfish-ami
-  source_code_uri: https://github.com/buildio/radfish-ami
   changelog_uri: https://github.com/buildio/radfish-ami/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []