radfish 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da783b12d9a90873743161fff969aae700800a544b1223f488e9828964b3a97
-  data.tar.gz: f42f9b1ae0ffbf3d50ad13732895b82472839133ece168b1cfb06b015f1d07a7
+  metadata.gz: 93a5fb3d6426c95928fb99dea4bf9fe1ec89d9e248bdee0998ca7905130a2c0a
+  data.tar.gz: 83d58cea483fd3b9f4a2ccf2bc9bea4671e6d905b66aea0c543a2a33f7722492
 SHA512:
-  metadata.gz: 0edb45f482cd15f8d389064273572d158f195500c613f99a652b713438c16715703de07130f8421dd6e2d6b7d1b2a7df4eb066d1aa0d6625cfa2e2827572bc9b
-  data.tar.gz: f0ba4c5e3c0d07e0f06df7f2b15a56dc99b9349d537e71c3c48037bf1d757aae773ac1d5b5df671a6398656cb12a2b0d000a6d923876c8f37d5f5f74c1f4c14a
+  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

@@ -182,7 +182,8 @@ module Radfish
 
     def volumes(controller)
       raise ArgumentError, "Controller required" unless controller.is_a?(Controller)
-      @adapter.volumes(controller)
+      raw = @adapter.volumes(controller)
+      Array(raw).map { |v| build_volume(v, controller) }
     end
 
     private
@@ -214,5 +215,35 @@ module Radfish
         adapter_data: raw
       )
     end
+
+    def build_volume(raw, controller)
+      fetch = ->(key) do
+        if raw.respond_to?(:[])
+          raw[key.to_s] || raw[key.to_sym]
+        elsif raw.respond_to?(key.to_sym)
+          raw.public_send(key.to_sym)
+        end
+      end
+
+      Volume.new(
+        client: self,
+        controller: controller,
+        id: fetch.call(:id),
+        name: fetch.call(:name),
+        capacity_bytes: fetch.call(:capacity_bytes),
+        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
   end
 end

data/lib/radfish/core/storage.rb

@@ -19,6 +19,11 @@ module Radfish
         raise NotImplementedError, "Adapter must implement #storage_summary"
       end
 
+      # Given a Volume, return its physical drive objects
+      def volume_drives(volume)
+        raise NotImplementedError, "Adapter must implement #volume_drives(volume)"
+      end
+
     end
   end
 end

data/lib/radfish/version.rb

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

data/lib/radfish/volume.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Radfish
+  class Volume
+    # 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,
+                   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
+      @raid_type = raid_type
+      @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
+
+    def drives
+      @client.adapter.volume_drives(self)
+    end
+
+    def to_h
+      {
+        id: id,
+        name: name,
+        capacity_bytes: capacity_bytes,
+        raid_type: raid_type,
+        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

data/lib/radfish.rb

@@ -93,6 +93,7 @@ require_relative 'radfish/power_info'
 require_relative 'radfish/thermal_info'
 require_relative 'radfish/pci_info'
 require_relative 'radfish/controller'
+require_relative 'radfish/volume'
 require_relative 'radfish/client'
 
 # Auto-load adapters if available

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -187,6 +187,7 @@ files:
 - lib/radfish/thermal_info.rb
 - lib/radfish/vendor_detector.rb
 - lib/radfish/version.rb
+- lib/radfish/volume.rb
 - radfish.gemspec
 homepage: https://github.com/buildio/radfish
 licenses: