vipruby 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859fdc3d02ffb93a4a93bfdbe2abbf016d0725e0
-  data.tar.gz: 085f71d3e2dd1d028bf9de8b7d1b372b6016e2e4
+  metadata.gz: 15317c34b0912ee3bc01d0d2e3752d82242b6042
+  data.tar.gz: 598063f748d9a8cdfaf95cf3cf14d5abb334c26e
 SHA512:
-  metadata.gz: e81319d55113ee1e5aecd899fadb0c0713c62e1b7d7c8cbace98f2155c1322ad612b9006b9db585e4034132ef2af454d60ba6b62047e2c1aa0648a14da4f6f69
-  data.tar.gz: 95891fb9c1c89be9fa95fcc94346254f01ad85f9bc4ba44d1ea4d82ea252cf3f9376161db2c824215cecc10f2fef4ca6410781efc2da53274b5eb0d69e1db425
+  metadata.gz: 894605b03e863cb3383db649bc6a1cb0423cc4e2a3ffe1303aa80da0263dab1c08a25fe0f0b607ba47354f7ff05f262a090a8f5488424a7898a0b9f6b085c291
+  data.tar.gz: 970bb5aa34baf97873fcde5ad9db78c9672c71afaa9519611e3c9d6920ae3527bcf0b4be5c357aee8d2ddf0666f8ff3f564691fb4a53c0497319eb9bf1ed45ad

data/lib/vipruby.rb

@@ -1,29 +1,29 @@
-require 'rest_client'
+require 'rest-client'
 require 'json'
 
 class Vipruby
-  attr_accessor :tenant_uid, :auth_token, :base_url
+  attr_accessor :tenant_uid, :auth_token, :base_url, :verify_cert
   SSL_VERSION = 'TLSv1'
   
-  def initialize(base_url,user_name,password)
+  def initialize(base_url,user_name,password,verify_cert)
     #add condition later for trusted certs (This ignores)
-    #OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
     @base_url = base_url
+    @verify_cert = to_boolean(verify_cert)
     @auth_token = get_auth_token(user_name,password)
     @tenant_uid = get_tenant_uid['id']
   end
   
   def get_tenant_uid
-    JSON.parse(RestClient::Request.execute(method: :get,url: "#{base_url}/tenant",
+    JSON.parse(RestClient::Request.execute(method: :get,url: "#{@base_url}/tenant",
       headers: {:'X-SDS-AUTH-TOKEN' => @auth_token,
         accept: :json
       },
-      ssl_version: SSL_VERSION
+      verify_ssl: @verify_cert
       ))
   end
   
   def login(user_name,password)
-    RestClient::Request.execute(method: :get,url: "#{base_url}/login", user: user_name, password: password,ssl_version: SSL_VERSION)
+    RestClient::Request.execute(method: :get,url: "#{@base_url}/login", user: user_name, password: password,verify_ssl: FALSE)
   end
   
   def get_auth_token(user_name,password)
@@ -45,7 +45,7 @@ class Vipruby
   def add_initiators(initiators,host_href)
     initiators.each do |initiator|
       RestClient::Request.execute(method: :post,
-        url: "#{base_url}#{host_href}/initiators",
+        url: "#{@base_url}#{host_href}/initiators",
         ssl_version: SSL_VERSION,
         payload: initiator,
         headers: {
@@ -57,7 +57,7 @@ class Vipruby
   end
   
   def get_hosts
-    RestClient::Request.execute(method: :get,url: "#{base_url}/tenants/#{@tenant_uid}/hosts",
+    RestClient::Request.execute(method: :get,url: "#{@base_url}/tenants/#{@tenant_uid}/hosts",
       ssl_version: SSL_VERSION,
       headers: {
         :'X-SDS-AUTH-TOKEN' => @auth_token,
@@ -74,9 +74,9 @@ class Vipruby
     JSON.parse(find_vipr_object(hostname))['resource'].any?
   end
   
-  def find_vipr_object(search_hash)
+  def find_host_object(search_hash)
     RestClient::Request.execute(method: :get,
-      url: "#{base_url}/compute/hosts/search?name=#{search_hash}",
+      url: "#{@base_url}/compute/hosts/search?name=#{search_hash}",
       ssl_version: SSL_VERSION,
       headers: {
         :'X-SDS-AUTH-TOKEN' => @auth_token,
@@ -84,7 +84,11 @@ class Vipruby
       })
   end
   
-  private :login, :get_auth_token, :get_tenant_uid
+  def to_boolean(str)
+    str.downcase == 'true'
+  end
+  
+  private :login, :get_auth_token, :get_tenant_uid, :to_boolean
 end
 
 class Host

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: vipruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Craig J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -55,17 +55,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for EMC's ViPR