radfish 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a440779d106c4dab6553860f7a70b63c606072fdf79ebf37164d32a6e9dd5bd
-  data.tar.gz: 3c1c74fb4bea5668de9e8fb68fddd16e72b7ba716c62e3d650b8cbd368822da5
+  metadata.gz: 93a5fb3d6426c95928fb99dea4bf9fe1ec89d9e248bdee0998ca7905130a2c0a
+  data.tar.gz: 83d58cea483fd3b9f4a2ccf2bc9bea4671e6d905b66aea0c543a2a33f7722492
 SHA512:
-  metadata.gz: 2023d3129b3cac7eb57f0a7d1f2b999700636571a6d21080069ae49137e7efd81aac059a8cdda4419ba8f21daf4216f3b72e8ef1a1c6fcd1569aab88030f9bb9
-  data.tar.gz: 784a58288211fbfdca734a5581fdaa311f9f32c95edc7240b5ad0eaaa7d64617aa575a8792111d893e2e4d940ba4493a3c6caaaeb3f17d9474a2f94163e54a33
+  metadata.gz: 1613faa69f988928629451af00a4ee1631945eaf869a86b823079503d87123bbde630af14fa8cb04aa4cee178794432f0267ef202c05da57946b08ec0b94fe56
+  data.tar.gz: 3edb39da507013792b8bdb65fe8dd38d0a1bb8a65007891dec52278b95c9f99be3ca86eed7ae0048e86d4123a8fb2544b51153fee56ffdbce2f9abebe9e6edc0

data/lib/radfish/cli.rb

@@ -406,11 +406,13 @@ module Radfish
               puts "No volumes found".yellow
             else
               all_volumes.each do |vol|
-                name = vol['name'] || vol.name rescue "Unknown"
-                capacity = vol['capacity_gb'] || vol.capacity_gb rescue "Unknown"
-                raid_type = vol['raid_type'] || vol.raid_type rescue "Unknown"
-                status = vol['status'] || vol.status rescue "Unknown"
-                puts "#{name}: #{capacity} GB - #{raid_type} (Status: #{status})".cyan
+                name = vol.name
+                bytes = vol.respond_to?(:capacity_bytes) ? vol.capacity_bytes : nil
+                capacity = bytes ? (bytes.to_f / (1000**3)).round(2) : nil
+                raid_type = vol.raid_type
+                status = vol.health
+                cap_str = capacity ? "#{capacity} GB" : "Unknown size"
+                puts "#{name}: #{cap_str} - #{raid_type} (Status: #{status})".cyan
               end
             end
           end

data/lib/radfish/client.rb

@@ -231,10 +231,17 @@ module Radfish
         id: fetch.call(:id),
         name: fetch.call(:name),
         capacity_bytes: fetch.call(:capacity_bytes),
-        capacity_gb: fetch.call(:capacity_gb),
-        raid_type: fetch.call(:raid_type) || fetch.call(:volume_type),
-        status: fetch.call(:status) || fetch.call(:health),
+        raid_type: fetch.call(:raid_type),
+        volume_type: fetch.call(:volume_type),
+        drives: fetch.call(:drives),
         encrypted: fetch.call(:encrypted),
+        lock_status: fetch.call(:lock_status),
+        stripe_size: fetch.call(:stripe_size),
+        operation_percent_complete: fetch.call(:operation_percent_complete),
+        operation_name: fetch.call(:operation_name),
+        write_cache_policy: fetch.call(:write_cache_policy),
+        read_cache_policy: fetch.call(:read_cache_policy),
+        health: fetch.call(:health),
         adapter_data: raw
       )
     end

data/lib/radfish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Radfish
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/radfish/volume.rb

@@ -2,21 +2,35 @@
 
 module Radfish
   class Volume
-    attr_reader :id, :name, :capacity_bytes, :capacity_gb, :raid_type,
-                :status, :encrypted, :adapter_data, :controller
+    # Canonical, normalized attributes only.
+    attr_reader :id, :name, :capacity_bytes, :raid_type, :volume_type, :drives,
+                :encrypted, :lock_status, :stripe_size,
+                :operation_percent_complete, :operation_name,
+                :write_cache_policy, :read_cache_policy, :health,
+                :adapter_data, :controller
 
     def initialize(client:, controller:, id: nil, name: nil, capacity_bytes: nil,
-                   capacity_gb: nil, raid_type: nil, status: nil, encrypted: nil,
-                   adapter_data: nil)
+                   raid_type: nil, volume_type: nil, drives: nil, encrypted: nil,
+                   lock_status: nil, stripe_size: nil,
+                   operation_percent_complete: nil, operation_name: nil,
+                   write_cache_policy: nil, read_cache_policy: nil,
+                   health: nil, adapter_data: nil)
       @client = client
       @controller = controller
       @id = id
       @name = name
       @capacity_bytes = capacity_bytes
-      @capacity_gb = capacity_gb || (capacity_bytes ? (capacity_bytes.to_f / (1000**3)).round(2) : nil)
       @raid_type = raid_type
-      @status = status
+      @volume_type = volume_type
+      @drives = Array(drives) # normalized list of drive reference ids (e.g., @odata.id)
       @encrypted = encrypted
+      @lock_status = lock_status
+      @stripe_size = stripe_size
+      @operation_percent_complete = operation_percent_complete
+      @operation_name = operation_name
+      @write_cache_policy = write_cache_policy
+      @read_cache_policy = read_cache_policy
+      @health = health
       @adapter_data = adapter_data
     end
 
@@ -29,12 +43,18 @@ module Radfish
         id: id,
         name: name,
         capacity_bytes: capacity_bytes,
-        capacity_gb: capacity_gb,
         raid_type: raid_type,
-        status: status,
-        encrypted: encrypted
+        volume_type: volume_type,
+        drives: drives,
+        encrypted: encrypted,
+        lock_status: lock_status,
+        stripe_size: stripe_size,
+        operation_percent_complete: operation_percent_complete,
+        operation_name: operation_name,
+        write_cache_policy: write_cache_policy,
+        read_cache_policy: read_cache_policy,
+        health: health
       }.compact
     end
   end
 end
-

metadata

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