solidfire_api 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd4c4ceeeb281e08951d3a17604e6c63cb26b81
-  data.tar.gz: a79ee13994f5dc19b0b702e832405d21e1294d11
+  metadata.gz: 7e24e28a0b3dbd6e7819577a63e314ca0292d905
+  data.tar.gz: 29cb47ffa9726237313b86d24d00244db8cfb2dd
 SHA512:
-  metadata.gz: 6156442bcf340e699a7b0ab3edbd310e530925e649f50e8d66c0b1c9a3625a88300e91ec2ce142ef5e8e57347bf8fce2e559efc68033912600dabfc3a939f3b1
-  data.tar.gz: 6ee8a856b9d487a56a66c11e644ff1bbe86a76fd86bf30d7a69310c98bdbc8614b32aba11e074a25f5105364d4775d4cb2b3ed2eca7392bb7ee2f6afe27573d3
+  metadata.gz: a93fc7ce2b85ae1e4ecf6e75959c99d9753df6f4c8d024eae821c87b30ffc2866cbe61846b7d785be268b4c13f71f563f41e49f9a1c91066de0eff6aceab2861
+  data.tar.gz: f5d9b335f4a4d377a83c6acc93e1f889599b6239c322c283157867737df106a4ddcf3f3038c036479992080810d93ee7c224e460cac917541937351b11a7fc52

data/lib/solidfire_api/version.rb

@@ -1,3 +1,3 @@
 module SolidfireApi
-  VERSION = '0.0.12'
+  VERSION = '0.1.0'
 end

data/lib/solidfire_api/volume.rb

@@ -1,51 +1,84 @@
 module Volume
-  
-## 
+
+##
   # list active volumes, return Array of Hash
   #
   # Arguments:
-  #   state: (String, active or deleted, default = active)
-  #   limit: (Integer, default = 1000)
+  #   name: (String, Volume name)
+  #   accountid: (integer, accountID)
+  #   enable512e: (boolean, default = true)
+  #   minIOPS: (integer, default = 100)
+  #   maxIOPS: (integer, default = 1000)
+  #   burstIOPS: (integer, default = 10000)
   #
-  def volumes_create()
+  def volumes_create(name, accountid, size, enable512e = true, minIOPS = 100, maxIOPS = 1000, burstIOPS = 10000)
     api_call = {
       :method => "CreateVolume",
       :params => {
-        :startVolumeID => 0,
-        :limit => limit
+        :name => name,
+        :accountID => accountid,
+        :totalSize => size,
+        :enable512e => enable512e,
+        :qos => {
+          :minIOPS => minIOPS,
+          :maxIOPS => maxIOPS,
+          :burstIOPS => burstIOPS
+        }
       }
     }
     answer = query_sf(api_call)
-    return answer["volumes"]
+    return answer["volumeID"]
   end
 
-  ## 
+  ##
   # list active volumes, return Array of Hash
   #
   # Arguments:
   #   state: (String, active or deleted, default = active)
+  #   startid: (Integer, default = 0)
   #   limit: (Integer, default = 1000)
+  #   accountid: (Integer, or Array of accountID)
+  #   name: (String, Volume name)
   #
-  def volumes_list(state = "active", limit = "1000")
-    case state
-    when "active"
+  def volumes_list(options = {})
+    state = options.fetch(:state, 'active')
+    startid = options.fetch(:startid, 0)
+    limit = options.fetch(:limit, 1000)
+    accounts = options.fetch(:accountid, nil)
+    name = options.fetch(:name, nil)
+    
+    if name
+      api_call = {
+        :method => "ListVolumes",
+        :params => {
+          :VolumeName => name,
+          :limit => 1
+        }
+      }
+    elsif accounts
+      accounts = [ accounts ] if accounts.class == String || Integer
       api_call = {
-        :method => "ListActiveVolumes",
+        :method => "ListVolumes",
         :params => {
-          :startVolumeID => 0,
+          :accounts => accounts,
           :limit => limit
         }
       }
-    when "deleted"
+    else
       api_call = {
-        :method => "ListDeletedVolumes",
-        :params => {}
+        :method => "ListVolumes",
+        :params => {
+          :VolumeStatus => state,
+          :startVolumeID => startid,
+          :limit => limit
+        }
       }
     end
+
     answer = query_sf(api_call)
     return answer["volumes"]
   end
-  
+
   ##
   # return volume performance metrics as Hash
   #
@@ -81,25 +114,25 @@ module Volume
     answer = query_sf(api_call)
     return answer
   end
-    
+
   ##
   # Return volumes list per account
-  # 
+  #
   # Arguments:
   #   accountid: (Integer)
-  # 
+  #
   def volumes_for_account(accountid)
     api_call = {
       :method => "ListVolumesForAccount",
       :params => {
-        :volumeID => accountid
+        :accountID => accountid
       }
     }
     answer = query_sf(api_call)
     return answer
-  end 
-  
-  
+  end
+
+
   def volumes_stats_by_account()
     api_call = {
       :method => "ListVolumeStatsByAccount",
@@ -108,5 +141,5 @@ module Volume
     }
     answer = query_sf(api_call)
     return answer
-  end 
+  end
 end

data/lib/solidfire_api/volume_access_group.rb

@@ -2,7 +2,7 @@
 # Volume Access Group api calls
 #
 module VolumeAccessGroup
-  
+
 
   ##
   # list VolumeAccessGroups
@@ -40,27 +40,50 @@ module VolumeAccessGroup
     answer = query_sf(api_call)
     return answer["volumeAccessGroupID"]
   end
-  
+
   ##
-  # Add iSCSI initiator to VolumeAccessGroup
+  # Add iSCSI initiator(s) to VolumeAccessGroup
   #
   # Arguments: 
-  #   initiator: (String)
+  #   initiator: (String or Array)
   #   group_id: (Integer)
   #
   # Require Admin credential
   #
   def vag_add_initiator(initiator, group_id)
+    initiator = [ initiator ] if initiator.class == String
     api_call = {
       :method => "AddInitiatorsToVolumeAccessGroup",
       :params => {
         :volumeAccessGroupID => group_id,
-        :initiators => [ initiator ]
+        :initiators => initiator
+      }
+    }
+    answer = query_sf(api_call)
+    return answer
+  end
+
+  ##
+  # Remove iSCSI initiator(s) from VolumeAccessGroup
+  #
+  # Arguments: 
+  #   initiator: (String or Array)
+  #   group_id: (Integer)
+  #
+  # Require Admin credential
+  #
+  def vag_remove_initiator(initiator, group_id)
+    initiator = [ initiator ] if initiator.class == String
+    api_call = {
+      :method => "RemoveInitiatorsFromVolumeAccessGroup",
+      :params => {
+        :volumeAccessGroupID => group_id,
+        :initiators => initiator
       }
     }
     answer = query_sf(api_call)
     return answer
-  end    
+  end
 
   ##
   # Add Volume to VolumeAccessGroup
@@ -72,25 +95,26 @@ module VolumeAccessGroup
   # Require Admin credential
   #
   def vag_add_volume_id(volume_id, group_id)
+    volume_id = [ volume_id ] if volume_id.class == String
     api_call = {
       :method => "AddVolumesToVolumeAccessGroup",
       :params => {
         :volumeAccessGroupID => group_id,
-        :volumes => [ volume_id ]
+        :volumes => volume_id
       }
     }
     answer = query_sf(api_call)
     return answer
-  end   
-  
+  end
+
   ##
   # Add Volume to VolumeAccessGroup using names
   #
   #
   def vag_add_volume(volume_name, vag_name)
-    volume_id = volumes_list().select {|s| s["name"] == volume_name }.first["volumeID"]
+    volume_id = volumes_list(name: volume_name).first["volumeID"]
     vag_id = vag_list().select {|s| s["name"] == vag_name }.first["volumeAccessGroupID"]
     vag_add_volume_id(volume_id, vag_id)
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidfire_api
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Pierre-Luc Dion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler