stoarray 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53326d24d57ffb7ff0dfb2d411eba1a8ef69e4a
-  data.tar.gz: 403071201cf86e546061ca8803cd2c7be16fc357
+  metadata.gz: 54621ac991e320be941167c659727b3b74612451
+  data.tar.gz: 3fb264dd34728b63ab4bf0878cd49ac7c8df4686
 SHA512:
-  metadata.gz: a0b004540bc61a3bd412b1b480c056bcfadf70b84ead88fffe33c6d0e7b7eb3628ae9d0c8332c33a6045c8cbfc7b426685eb997ae22c9d583b846dc81893a0ca
-  data.tar.gz: f073c3e361096a7a1752ccf4b3c32b2428d8553339a6d3dfd8b03c892242a9fe84d860f3e1d3755d487d9f5d3fa0d01cf777ecccd24355c1fc64924a5cc35d72
+  metadata.gz: da928a8f35f7b7a0bb2b98429cf197ccc23f4f4fea05c7a3190b9feda5be45e3549551b12e0f2ea6de50db64a39872c92b32d20f2d7459ae14e6650d57edd04f
+  data.tar.gz: 74ad7745fb5cc5d4da4af6bec87a94f8e2227376fbbf689f25fe9f85e3ee03924da807d246c6dab026a59b3a0c29b33b17e7446537daea32384fe35eca7ab31d

data/CHANGELOG.md

@@ -0,0 +1,40 @@
+# CHANGELOG for stoarray
+
+This file is used to list changes made to the stoarray gem.
+
+## 03172016
+
+* All code should have test coverage now!
+* Conversion to rest-client complete. Removed getty, del33t, verbal_gerbil.
+* make_call - (previously cally) Added rescue so I can return error messages.
+* cookie - Removed "testy" stuff & added break on failure (raise).
+* Consistent success messages for both Pure and Xtremio clone refreshes.
+
+## 03152016
+
+* Add Mark Gibbon's line to generate an error if a valid cookie is not received.
+* All code should be covered now except the cookie block!
+
+## 03142016
+
+* Additional tests using mockable.io: Refresh and flippy covered now.
+* New delete method using rest-client. Needs work! (handling params).
+
+## 03112016
+
+* Using mockable.io for API call testing, updating rspec tests.
+
+## 03102016
+
+* Added new array method for gathering stats from the arrays.
+
+## 03092016
+
+* Break call setup out of initialize and into new methods.
+* Update dependent methods to use new call methods.
+* Add rest-client gem to resolve issue with GETs on Xtremio.
+
+- - -
+Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
+
+The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.

data/README.md

@@ -35,8 +35,8 @@ It is very easy to then build from there.
 ###First the json configuration file:
 
     {
-      "authorization":"123li123o90yourapitoken2h1hi3",
-      "base_url":"https:///purearray01.something.net/api/1.4/",
+      "authorization": "123li123o90yourapitoken2h1hi3",
+      "base_url": "https://purearray01.something.net/api/1.4/",
       "headers": { "Content-Type": "application/json" },
       "params_snap_u23": {
         "snap_pairs": {

data/lib/arraycalls.rb

@@ -1,37 +1,48 @@
 class Stoarray
 
   VERBS = {
-    'get'    => Net::HTTP::Get,
-    'post'   => Net::HTTP::Post,
-    'put'    => Net::HTTP::Put,
-    'delete' => Net::HTTP::Delete
+    'delete' => :Delete,
+    'get'    => :Get,
+    'post'   => :Post,
+    'put'    => :Put
   }
 
   def initialize(headers: {}, meth: 'Get', params: {}, url: 'https://array/')
-    @url = URI.parse(url) # URL of the call
     @headers = headers
-    @call = VERBS[meth.downcase].new(@url.path, initheader = @headers)
-    @call.body = params.to_json # Pure and Xtremio expect json parameters
-    @request = Net::HTTP.new(@url.host, @url.port)
-    @request.read_timeout = 30
-    @request.use_ssl = true if @url.to_s =~ /https/
-    @request.verify_mode = OpenSSL::SSL::VERIFY_NONE # parameterize?
+    @meth    = meth
+    @params  = params
+    @url     = url
   end
 
-  def cookie(testy: false)
-    if @url.to_s =~ /auth\/session/
-      case testy
-      when false
-        @response = @request.start { |http| http.request(@call) }
-        all_cookies = @response.get_fields('set-cookie')
-      when true
-        all_cookies = ['cookie time']
-      end
-      cookies_array = Array.new
-      all_cookies.each { | cookie |
-        cookies_array.push(cookie.split('; ')[0])
-      }
-      cookies = cookies_array.join('; ')
+  def array
+    if @url.to_s =~ /array/
+      responder(make_call)
+    else
+      error_text("array", @url.to_s, "array")
+    end
+  end
+
+  def make_call
+    @params = @params.to_json unless @meth.downcase == 'get' || @meth.downcase == 'delete'
+    begin
+      response = RestClient::Request.execute(headers: @headers,
+                                             method: VERBS[@meth.downcase],
+                                             payload: @params,
+                                             timeout: 30,
+                                             url: @url,
+                                             verify_ssl: false)
+    rescue => e
+      e.response
+    else
+      response
+    end
+  end
+
+  def cookie
+    if @url =~ /auth\/session/
+      response = make_call
+      raise 'There was an issue getting a cookie!' unless response.code == 200
+      cookie = (response.cookies.map{|key,val| key + '=' + val})[0]
     else
       error_text("cookie", @url.to_s, 'auth/session')
     end
@@ -47,19 +58,12 @@ class Stoarray
     }
   end
 
-  def flippy(temp_hash, testy: false)
+  def flippy(temp_hash)
+    # This method is to get around a "feature" of Xtremio where it renames the
+    # target snapshot set. We flip between name and name_347. Comprende?
     flippy = temp_hash['to-snapshot-set-id'] + '_347'
-    url = 'https://' + @url.host + '/api/json/v2/types/snapshot-sets'
-    case testy
-    when false
-      x = Stoarray.new(headers: @headers, meth: 'Get', params: {}, url: url).snap
-    when true
-      x = {
-        "response" => {
-          "snapshot-sets" => [ { "name" => flippy } ]
-        }
-      }
-    end
+    url = 'https://' + URI.parse(@url).host + '/api/json/v2/types/snapshot-sets'
+    x = Stoarray.new(headers: @headers, meth: 'Get', params: {}, url: url).snap
     if x['response']['snapshot-sets'].any? { |y| y['name'].include?(flippy) }
       temp_hash['snapshot-set-name']  = temp_hash['to-snapshot-set-id']
       temp_hash['to-snapshot-set-id'] = flippy
@@ -72,8 +76,7 @@ class Stoarray
 
   def host
     if @url.to_s =~ /host/
-      response = @request.start { |http| http.request(@call) }
-      responder(response)
+      responder(make_call)
     else
       error_text("host", @url.to_s, "host")
     end
@@ -81,8 +84,7 @@ class Stoarray
 
   def pgroup
     if @url.to_s =~ /pgroup/
-      response = @request.start { |http| http.request(@call) }
-      responder(response)
+      responder(make_call)
     else
       error_text("pgroup", @url.to_s, "pgroup")
     end
@@ -91,14 +93,22 @@ class Stoarray
   def refresh
     case @url.to_s
     when /snapshot/ # Xtremio
-      @call.body = flippy(JSON.parse(@call.body)).to_json
-      refreshy = @request.start { |http| http.request(@call) }
-      responder(refreshy)
+      tgt     = @params['to-snapshot-set-id']
+      @params = flippy(@params)
+      src     = @params['from-consistency-group-id']
+      cln     = responder(make_call)
+      if cln['status'] == 201
+        cln['response'] = 'SUCCESS: Xtremio refresh completed from consistency group ' \
+                          + src + ' to snapshot set ' + tgt + '.'
+        cln
+      else
+        cln
+      end
     when /1.4/ # Pure, handle the interim snap automagically
       error_state = false
-      url     = 'https://' + @url.host + '/api/1.4/pgroup'
-      source  = (JSON.parse(@call.body))['source']
-      suffix  = Time.new.strftime("%A") # Day of the week.
+      url     = 'https://' + URI.parse(@url).host + '/api/1.4/pgroup'
+      source  = @params['source']
+      suffix  = 'interim'
       pam     = { :snap => true, :source => source, :suffix => suffix }
       snap    = Stoarray.new(headers: @headers, meth: 'Post', params: pam, url: url).pgroup
       respond = {
@@ -114,12 +124,11 @@ class Stoarray
         }
       }
       if snap['status'] >= 200 && snap['status'] <= 299
-        pairs   = (JSON.parse(@call.body))['snap_pairs']
-        pairs.each do |key, val|
-          tgt = 'clone_' + val
+        @params['snap_pairs'].each do |key, val|
+          tgt = 'clone_' + val # used only for logging!
           src = source[0] + '.' + suffix + '.' + key
           pam = { :overwrite => true, :source => src }
-          url = 'https://' + @url.host + '/api/1.4/volume/' + val
+          url = 'https://' + URI.parse(@url).host + '/api/1.4/volume/' + val
           clone = Stoarray.new(headers: @headers, meth: 'Post', params: pam, url: url).volume
           respond['response'][tgt] = {
             "response" => clone['response']
@@ -128,7 +137,7 @@ class Stoarray
             "status" => clone['status']
           }
         end
-        url   = 'https://' + @url.host + '/api/1.4/pgroup/' + source[0] + '.' + suffix
+        url   = 'https://' + URI.parse(@url).host + '/api/1.4/pgroup/' + source[0] + '.' + suffix
         zappy = Stoarray.new(headers: @headers, meth: 'Delete', params: {}, url: url).pgroup
         respond['response']['destroy'] = {
           "response" => zappy['response']
@@ -136,16 +145,14 @@ class Stoarray
         respond['status']['destroy'] = {
           "status" => zappy['status']
         }
-        pam   = { :eradicate => true }
-        disintegrate = Stoarray.new(headers: @headers, meth: 'Delete', params: pam, url: url).pgroup
+        url = url + '?eradicate=true'
+        disintegrate = Stoarray.new(headers: @headers, meth: 'Delete', params: {}, url: url).pgroup
         respond['response']['eradicate'] = {
           "response" => disintegrate['response']
         }
         respond['status']['eradicate'] = {
           "status" => disintegrate['status']
         }
-      else
-        respond
       end
       respond['status'].each do |key, val|
         error_state = true if val.any? { |status, code| code.to_i < 200 || code.to_i > 299 }
@@ -155,7 +162,7 @@ class Stoarray
       else
         response = {
           "response" =>
-            "SUCCESS: Refresh completed for #{source[0]} protection group.\n",
+            "SUCCESS: Pure refresh completed from #{source[0]} protection group.\n",
           "status" => 201
         }
       end
@@ -164,7 +171,7 @@ class Stoarray
     end
   end
 
-  def responder(response) # combine into one method? with error_text
+  def responder(response)
     response = {
       "response" => JSON.parse(response.body),
       "status" => response.code.to_i
@@ -173,8 +180,7 @@ class Stoarray
 
   def snap
     if @url.to_s =~ /snapshot/
-      response = @request.start { |http| http.request(@call) }
-      responder(response)
+      responder(make_call)
     else
       error_text("snap", @url.to_s, "snapshot")
     end
@@ -182,8 +188,7 @@ class Stoarray
 
   def volume
     if @url.to_s =~ /volume/
-      response = @request.start { |http| http.request(@call) }
-      responder(response)
+      responder(make_call)
     else
       error_text("volume", @url.to_s, "volume")
     end

data/lib/stoarray.rb

@@ -1,7 +1,5 @@
 require 'base64'
 require 'cgi'
 require 'json'
-require 'net/http'
-require 'net/https'
-require 'uri'
+require 'rest-client'
 require 'arraycalls'

data/lib/stoarray/version.rb

@@ -1,3 +1,3 @@
 class Stoarray
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/stoarray.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency deppy
   end
 
+  spec.add_runtime_dependency 'rest-client'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stoarray
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kody Wilson
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Interact with storage array api using Ruby
 email:
 - kodywilson@gmail.com
@@ -147,6 +161,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile