storcs 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3dad4d085753517c22a3026d8a0d8a44959dbe5
-  data.tar.gz: 190d894f84584c5d151084256e2554f0fbef7fe3
+  metadata.gz: 01ab35a82f0d0635bbda3aa181da50e8ab1e9db7
+  data.tar.gz: 0061cc673f990135149034ac9da979e791893823
 SHA512:
-  metadata.gz: e4ebfb6321245cf8b17af2731c9da161c4806f169e6f26afaaeec735b9d40ad70ea6238bdfce144f921ff93204cbe5291524b43bc13b92f35f6b5a9bafec5486
-  data.tar.gz: 1d6781e41e887180006a4c8885a584feda51e817647b474a06e9ec412d30d7ed9e34a1122b00e61592287679886c20ee0328e25ea24c5eb72861e2209638ce1c
+  metadata.gz: f86093087262680ab08ec14bf47ec442e5c9e1e758ed400df35098042577cba5825b4c5c1c7c81858911452ecd739baa9f7bc5cfadd5ce1b00b053612c640b75
+  data.tar.gz: 5c98cdd60f875508951313bd8b5741b672a1395e5f7aa03f963114112351dbc260d211ac014a65b3e1339af0522063e8bbe864f0b84af5e433ece0f9863434bd

data/README.textile

@@ -115,6 +115,20 @@ h3. Equalogic PS5000 and PS6000
 
 It parses the output of a 'show' command in the shell. Unfortunately, I wasn't able to run it remotely since my network administrator didn't allow me. So I have a script based on the "expect" tool with the @show@ command inside.
 
+h3. Falconstor NSS
+
+Tested against NSS 6.15 and 7.70
+It ignores physical devices not assigned to a storage pool
+
+bc. iscli getpdevinfo -s server -L >file.txt
+
+h3. NetApp
+
+Tested against NetApp release 8.1.3 (7-mode)
+A pseudo volume is added in each aggregate in order to see snapshot space.
+
+bc. ssh aaa@netapp1 aggr show_space >file.txt
+
 h3. Yours!
 
 If you have a storage device you'd like to see in this list, feel free to open an issue here with at least an example 'profile' file (this can be the output of a command, a plain text or structured file) and the result I should find (used size/total size at least). Maybe somebody else (or me) will be interested in building a parser for your device.

data/lib/storcs/parsers.rb

@@ -3,6 +3,7 @@ require 'storcs/parsers/df_nas'
 require 'storcs/parsers/ibm'
 require 'storcs/parsers/equalogic'
 require 'storcs/parsers/nss'
+require 'storcs/parsers/netapp'
 
 module Storcs
   module Parsers

data/lib/storcs/parsers/netapp.rb

@@ -0,0 +1,81 @@
+module Storcs::Parsers
+  class Netapp
+    include Storcs::Parsers::Utils
+
+    attr_accessor :device
+
+    def initialize(name, file)
+      @device = Storcs::Device.new(name)
+      @lines = File.readlines(file)
+      parse!
+    end
+
+    def parse!
+      @device.children = aggregates
+    end
+
+    def aggregates
+      return @aggregates if @aggregates
+      @aggregates = []
+
+      state = nil
+      current_aggr = nil
+      current_aggr_usable_size = 0
+
+      @lines.each do |line|
+        # Aggregate 'aggr0'
+        if line =~ /^Aggregate '([^']*)'/
+          name = Regexp.last_match[1]
+          current_aggr = Storcs::Device.new(name)
+          current_aggr.children = []
+          state = :aggr
+        elsif state == :aggr
+          case line
+          # Volume Allocated Used Guarantee
+          when /^Volume.+Allocated/
+            state = :volume
+          # Total space 492030416KB 12922692KB 23052692KB
+          when /^Total space\s+(.*)$/
+            data = Regexp.last_match[1]
+            alloc = parse_size(data.split(/\s+/).first)
+            current_aggr.real_unassigned = current_aggr_usable_size - alloc
+            current_aggr_usable_size = 0
+          # Snap reserve 0KB 1406504KB 0KB
+          when /^Snap reserve\s+(.*)$/
+            data = Regexp.last_match[1]
+            vol = Storcs::Device.new('Snapshots')
+            size = parse_size(data.split(/\s+/)[1])
+            vol.real_size = vol.real_used = size
+            current_aggr.children << vol
+            current_aggr.real_unassigned -= size
+            @aggregates << current_aggr
+            current_aggr = nil
+          # Total space  WAFL reserve  Snap reserve  ...
+          when /^\s+Total space/
+            state = :aggr_total
+          end
+        # 573419008KB 57341880KB 0KB 516077128KB 0KB 0KB 0KB
+        elsif state == :aggr_total
+          usable_size = line.split(/\s+/)[4]
+          current_aggr_usable_size = parse_size(usable_size)
+          state = :aggr
+        elsif state == :volume
+          case line
+          when /^\s*$/
+            state = :aggr
+          # vol0 492030416KB 12922692KB volume
+          else
+            name, alloc, used = line.split(/\s+/)
+            vol = Storcs::Device.new(name)
+            vol.real_size = parse_size(alloc)
+            vol.real_used = parse_size(used)
+
+            current_aggr.children << vol
+          end
+        end
+      end
+
+      @aggregates
+    end
+  end
+end

data/lib/storcs/parsers/nss.rb

@@ -20,12 +20,13 @@ module Storcs::Parsers
 
       current_allocated = nil
       @lines.each do |line|
-        if line =~ /^Total (Available|Allocated) Space in "([^"]*)" \(ID: \d+\): (.* MB)/
+        if line =~ /^Total (Available|Allocated) Space in "([^"]*)" \(ID: \d+\): (.*) MB/
+          size = $3.tr(',', '').to_i * 1024 * 1024
           case $1
           when 'Allocated'
-            current_allocated = parse_size($3)
+            current_allocated = size
           when 'Available'
-            current_available = parse_size($3)
+            current_available = size
             @pools << Storcs::Device.new($2)
             @pools.last.real_size = current_allocated + current_available
             @pools.last.real_used = current_allocated

data/lib/storcs/version.rb

@@ -1,3 +1,3 @@
 module Storcs
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/data/netapp.txt

@@ -0,0 +1,33 @@
+Aggregate 'aggr0'
+
+    Total space    WAFL reserve    Snap reserve    Usable space       BSR NVLOG           A-SIS          Smtape
+    573419008KB      57341880KB             0KB     516077128KB             0KB             0KB             0KB 
+
+Space allocated to volumes in the aggregate
+
+Volume                          Allocated            Used       Guarantee
+vol0                          492030416KB      12922692KB          volume
+
+Aggregate                       Allocated            Used           Avail
+Total space                   492030416KB      12922692KB      23052692KB 
+Snap reserve                          0KB        962896KB             0KB 
+WAFL reserve                   57341880KB       4693232KB      52648648KB 
+
+
+Aggregate 'aggr_SAS_data'
+
+    Total space    WAFL reserve    Snap reserve    Usable space       BSR NVLOG           A-SIS          Smtape
+  15482313216KB    1548231320KB             0KB   13934081896KB             0KB             0KB             0KB 
+
+Space allocated to volumes in the aggregate
+
+Volume                          Allocated            Used       Guarantee
+a                            4318828224KB    2018428164KB          volume
+b                            6484207568KB    4366182720KB          volume
+
+Aggregate                       Allocated            Used           Avail
+Total space                 10803035792KB    6384610884KB    2713964636KB 
+Snap reserve                          0KB     416122712KB             0KB 
+WAFL reserve                 1548231320KB     165426212KB    1382805108KB 
+
+

data/spec/parsers/netapp_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Storcs::Parsers::Netapp do
+
+  it "parses the output of 'aggr show_space'" do
+    parsed = Storcs::Parsers::Netapp.new("netapp", "spec/data/netapp.txt")
+
+    device = parsed.device
+    device.size.should == 11993243459584 # total allocated + snapshots
+    device.unassigned.should == 2803719380992
+
+    device.children.size.should == 2
+    aggr_1 = device.children.last
+    aggr_1.name.should == "aggr_SAS_data"
+    aggr_1.size.should == 11488418308096
+    aggr_1.used.should == 6963951202304
+    aggr_1.free.should == 4524467105792
+
+    aggr_1.children.size.should == 3
+    vol_a = aggr_1.children.first
+    vol_a.name.should == "a"
+    vol_a.size.should == 4422480101376
+    vol_a.used.should == 2066870439936
+    vol_a.free.should == 2355609661440
+  end
+end

data/spec/parsers/nss_spec.rb

@@ -7,16 +7,16 @@ describe Storcs::Parsers::Nss do
 
     device = parsed.device
 
-    device.size.should == 17165189
-    device.used.should == 3230663
-    device.free.should == 13934526
+    device.size.should == 17165189120
+    device.used.should == 3230662656
+    device.free.should == 13934526464
 
     device.children.size.should == 2
 
     pool_a = device.children.first
     pool_a.name.should == "pool-a"
-    pool_a.size.should == 8582594
-    pool_a.used.should == 2153775
-    pool_a.free.should == 6428819
+    pool_a.size.should == 8582594560
+    pool_a.used.should == 2153775104
+    pool_a.free.should == 6428819456
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storcs
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jean-Baptiste Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,6 +60,7 @@ files:
 - lib/storcs/parsers/df_nas.rb
 - lib/storcs/parsers/equalogic.rb
 - lib/storcs/parsers/ibm.rb
+- lib/storcs/parsers/netapp.rb
 - lib/storcs/parsers/nss.rb
 - lib/storcs/parsers/utils.rb
 - lib/storcs/summable_sizes.rb
@@ -68,12 +69,14 @@ files:
 - spec/data/equalogic_PS5000XV.txt
 - spec/data/ibm_DS3400.txt
 - spec/data/ibm_DS4500.txt
+- spec/data/netapp.txt
 - spec/data/nss.txt
 - spec/device_spec.rb
 - spec/formatter_spec.rb
 - spec/parsers/df_nas_spec.rb
 - spec/parsers/equalogic_spec.rb
 - spec/parsers/ibm_spec.rb
+- spec/parsers/netapp_spec.rb
 - spec/parsers/nss_spec.rb
 - spec/parsers/utils_spec.rb
 - spec/spec_helper.rb
@@ -106,12 +109,14 @@ test_files:
 - spec/data/equalogic_PS5000XV.txt
 - spec/data/ibm_DS3400.txt
 - spec/data/ibm_DS4500.txt
+- spec/data/netapp.txt
 - spec/data/nss.txt
 - spec/device_spec.rb
 - spec/formatter_spec.rb
 - spec/parsers/df_nas_spec.rb
 - spec/parsers/equalogic_spec.rb
 - spec/parsers/ibm_spec.rb
+- spec/parsers/netapp_spec.rb
 - spec/parsers/nss_spec.rb
 - spec/parsers/utils_spec.rb
 - spec/spec_helper.rb