radfish-idrac 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58b55f6a0455e66cd44bed5363451e773c675d2a9fd65d7fa5e6bae77669778
-  data.tar.gz: fab0e351a3112e0376b6d065e5faeb6280f7a2dfea90db9d8845bca67e82e4fb
+  metadata.gz: ddb4b7b186fabe9d2a7f58677c4f5f073a31a2b97f9a10ac225d295ec51a134b
+  data.tar.gz: fb9346eb375ae8f4a99a5cdba15b7828aaa1e99a99306e3793a6d477f2768c3f
 SHA512:
-  metadata.gz: 05f39a32177f9ef7f07fed8d5911d5a0d6bccaad7d315868895356e645866a39ab6a2a6bb1063349925d82336cc65736ffee6a594dad88e643f501035289e658
-  data.tar.gz: 8e5e9cd3ef3f62d3152b695c35702bccd924df41540bac3434d20182f67c829eee7fa65ccd553ecaf43b75cd9bbbecfef1313269e63a2855aa5b984f831d0178
+  metadata.gz: 692a409e789ea2d3ed0fecec7e5340525cb87d1bcb3fa4b9554a2f8f0eb4b985450f8e92cb9bb01ea8805df0bb4f18d7cdbd6f65faa18639b2087b530c97f52d
+  data.tar.gz: 4827a7b9506c00a953f84ca5b521a64488ca8182899b6fe013beedb4ffec71b79a00f0368a538e3d97907eadf29464789dd92b65a76b73198f5d966df726ce8b

data/lib/radfish/idrac/version.rb

@@ -2,6 +2,6 @@
 
 module Radfish
   module Idrac
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
-end
+end

data/lib/radfish/idrac_adapter.rb

@@ -302,16 +302,75 @@ module Radfish
       end
     end
     
-    def drives
-      @idrac_client.drives
+    def drives(controller)
+      # The iDRAC gem requires a controller identifier; derive it from the controller
+      raise ArgumentError, "Controller required" unless controller
+      controller_id = extract_controller_identifier(controller)
+      raise ArgumentError, "Controller identifier missing" unless controller_id
+      
+      drive_data = @idrac_client.drives(controller_id)
+      
+      # Convert to OpenStruct for consistency
+      drive_data.map { |drive| OpenStruct.new(drive) }
     end
     
-    def volumes
-      @idrac_client.volumes
+    def volumes(controller)
+      # The iDRAC gem requires a controller identifier; derive it from the controller
+      raise ArgumentError, "Controller required" unless controller
+      controller_id = extract_controller_identifier(controller)
+      raise ArgumentError, "Controller identifier missing" unless controller_id
+      
+      volume_data = @idrac_client.volumes(controller_id)
+      
+      # Convert to OpenStruct for consistency
+      volume_data.map { |volume| OpenStruct.new(volume) }
     end
     
     def storage_summary
-      @idrac_client.storage_summary
+      # The iDRAC gem doesn't have a storage_summary method
+      # We need to build it from controllers, drives, and volumes
+      begin
+        controllers = @idrac_client.controllers
+        total_drives = 0
+        total_volumes = 0
+        
+        controllers.each do |controller|
+          if controller["@odata.id"]
+            drives = @idrac_client.drives(controller["@odata.id"]) rescue []
+            volumes = @idrac_client.volumes(controller["@odata.id"]) rescue []
+            total_drives += drives.size
+            total_volumes += volumes.size
+          end
+        end
+        
+        {
+          "controller_count" => controllers.size,
+          "drive_count" => total_drives,
+          "volume_count" => total_volumes
+        }
+      rescue => e
+        puts "Error fetching storage summary: #{e.message}" if @debug
+        {
+          "controller_count" => 0,
+          "drive_count" => 0,
+          "volume_count" => 0
+        }
+      end
+    end
+
+    private
+
+    def extract_controller_identifier(controller)
+      # Prefer vendor-native handle from adapter_data
+      raw = controller.respond_to?(:adapter_data) ? controller.adapter_data : controller
+      if defined?(OpenStruct) && raw.is_a?(OpenStruct)
+        table = raw.instance_variable_get(:@table)
+        table && (table[:"@odata.id"] || table["@odata.id"]) || controller.id
+      elsif raw.respond_to?(:[])
+        raw['@odata.id'] || raw[:'@odata.id'] || controller.id
+      else
+        controller.id
+      end
     end
     
     # Virtual Media
@@ -694,4 +753,4 @@ module Radfish
   # Register the adapter
   Radfish.register_adapter('dell', IdracAdapter)
   Radfish.register_adapter('idrac', IdracAdapter)
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish-idrac
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Siegel