radfish 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73011007c472b46cd1b41258548fdc37da25f15a4d14c370809aeafe5d67953b
-  data.tar.gz: 0b649b8aa1b6c5d05eae02641b2fef7fc6bb9d45b913fdd7727c875c69c62562
+  metadata.gz: 2a440779d106c4dab6553860f7a70b63c606072fdf79ebf37164d32a6e9dd5bd
+  data.tar.gz: 3c1c74fb4bea5668de9e8fb68fddd16e72b7ba716c62e3d650b8cbd368822da5
 SHA512:
-  metadata.gz: 65195d4125e3afb35707adc1b87d1370de1df0b2e19afe6a5a7e56a0ace94a8437b83f9c70d1d6ada0861074d7dede5d3ccb06c5861e1e20aec95388d79ae763
-  data.tar.gz: c99fcf649bb95dd02a861457920c310f276ec544f86fa3016771953dd277ac8a9c996add49207c59fa7f200384db570ae2b45d64abe2612663145e5b13085b98
+  metadata.gz: 2023d3129b3cac7eb57f0a7d1f2b999700636571a6d21080069ae49137e7efd81aac059a8cdda4419ba8f21daf4216f3b72e8ef1a1c6fcd1569aab88030f9bb9
+  data.tar.gz: 784a58288211fbfdca734a5581fdaa311f9f32c95edc7240b5ad0eaaa7d64617aa575a8792111d893e2e4d940ba4493a3c6caaaeb3f17d9474a2f94163e54a33

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
@@ -209,9 +210,33 @@ module Radfish
         pci_slot: fetch.call(:pci_slot),
         status: fetch.call(:status),
         drives_count: fetch.call(:drives_count),
+        battery_status: fetch.call(:battery_status),
         vendor: @vendor,
         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),
+        capacity_gb: fetch.call(:capacity_gb),
+        raid_type: fetch.call(:raid_type) || fetch.call(:volume_type),
+        status: fetch.call(:status) || fetch.call(:health),
+        encrypted: fetch.call(:encrypted),
+        adapter_data: raw
+      )
+    end
   end
 end

data/lib/radfish/controller.rb

@@ -6,11 +6,12 @@ module Radfish
   class Controller
     attr_reader :id, :name, :model, :vendor, :adapter_data, :firmware_version,
                 :encryption_mode, :encryption_capability, :controller_type,
-                :pci_slot, :status, :drives_count
+                :pci_slot, :status, :drives_count, :battery_status
 
     def initialize(client:, id:, name: nil, model: nil, vendor: nil, adapter_data: nil,
                    firmware_version: nil, encryption_mode: nil, encryption_capability: nil,
-                   controller_type: nil, pci_slot: nil, status: nil, drives_count: nil)
+                   controller_type: nil, pci_slot: nil, status: nil, drives_count: nil,
+                   battery_status: nil)
       @client = client
       @id = id
       @name = name
@@ -24,6 +25,7 @@ module Radfish
       @pci_slot = pci_slot
       @status = status
       @drives_count = drives_count
+      @battery_status = battery_status
     end
 
     # Convenience accessors delegate to the client wrappers
@@ -47,7 +49,8 @@ module Radfish
         controller_type: controller_type,
         pci_slot: pci_slot,
         status: status,
-        drives_count: drives_count
+        drives_count: drives_count,
+        battery_status: battery_status
       }.compact
     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.3"
+  VERSION = "0.2.5"
 end

data/lib/radfish/volume.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Radfish
+  class Volume
+    attr_reader :id, :name, :capacity_bytes, :capacity_gb, :raid_type,
+                :status, :encrypted, :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)
+      @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
+      @encrypted = encrypted
+      @adapter_data = adapter_data
+    end
+
+    def drives
+      @client.adapter.volume_drives(self)
+    end
+
+    def to_h
+      {
+        id: id,
+        name: name,
+        capacity_bytes: capacity_bytes,
+        capacity_gb: capacity_gb,
+        raid_type: raid_type,
+        status: status,
+        encrypted: encrypted
+      }.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.3
+  version: 0.2.5
 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: