xclarity_client 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacb24cf31184be3d62d63db871a716c6b45cf5f
-  data.tar.gz: fb03557be00e92bb30ee3cf3184dc2645d82334c
+  metadata.gz: 266a40b1f827da05891126299803c352a393f7ed
+  data.tar.gz: c98d7e1948b6a8f32d8dbc47af2a744a5615b9f7
 SHA512:
-  metadata.gz: 2a0618e9dbf1e5470a784c22b45a0050d3d33fb147731a0ad0389d02d2d9a69e8a28b87e574d38ae8d5a3031c48341fc776d726a2a9c2b49b32c07cb7880ddf1
-  data.tar.gz: 9605213a3e326437561bf5a76fcfd84505fc949fe077af7a6aba3e28c0c1fc534bfc957a1951544e0746c079ab488c3c94a9bb2b3793dded282c6fbf520cdc91
+  metadata.gz: acf88004bb3707fb096a613a5c7e1a66d13bbfaaef6efc882093c3056655c913f4ea5923d20862bf2b660f1eb89ab216298f135e26620c7a906e43e4f5ecbad5
+  data.tar.gz: b49c59dcc5a1d5bb12d1be21f7db94ad1e970ac600a468719d11f785ae1116cbc3f5a295c75b47b4e1522d6bc2b4337d3679600554741b44a439e562e02094b1

data/lib/xclarity_client.rb

@@ -43,3 +43,9 @@ require 'xclarity_client/user'
 require 'xclarity_client/user_management'
 require 'xclarity_client/discover'
 require 'xclarity_client/client'
+
+require 'xclarity_client/error/authentication_error'
+require 'xclarity_client/error/connection_failed'
+require 'xclarity_client/error/connection_failed_unknown'
+require 'xclarity_client/error/connection_refused'
+require 'xclarity_client/error/hostname_unknown'

data/lib/xclarity_client/client.rb

@@ -202,6 +202,9 @@ module XClarityClient
                                                 excludeAttributes,
                                                 User)
     end
-  
+
+    def validate_configuration
+      XClarityBase.new(@connection, '/')
+    end
   end
 end

data/lib/xclarity_client/configuration.rb

@@ -1,9 +1,7 @@
-require 'securerandom'
-
 module XClarityClient
   class Configuration
 
-    attr_accessor :username, :password, :host, :csrf_token, :auth_type, :generated_token, :port, :verify_ssl
+    attr_accessor :username, :password, :host, :auth_type, :port, :verify_ssl
 
     def initialize(args)
 
@@ -24,8 +22,7 @@ module XClarityClient
       end
 
       $lxca_log.info "XClarityClient::Configuration initialize","Configuration built successfuly"
-      
-      @csrf_token ||= SecureRandom.base64(120) if @auth_type == 'token'
+
     end
 
     def self.default

data/lib/xclarity_client/error/authentication_error.rb

@@ -0,0 +1,10 @@
+module XClarityClient
+  module Error
+    class AuthenticationError < StandardError
+      def initialize(msg = nil)
+        msg = msg.nil? ? 'Invalid credentials for this host.' : msg
+        super(msg)
+      end
+    end
+  end
+end

data/lib/xclarity_client/error/connection_failed.rb

@@ -0,0 +1,10 @@
+module XClarityClient
+  module Error
+    class ConnectionFailed < StandardError
+      def initialize(msg = nil)
+        msg = msg.nil? ? 'Execution expired or invalid port.' : msg
+        super(msg)
+      end
+    end
+  end
+end

data/lib/xclarity_client/error/connection_failed_unknown.rb

@@ -0,0 +1,10 @@
+module XClarityClient
+  module Error
+    class ConnectionFailedUnknown < StandardError
+      def initialize(msg)
+        msg = "Connection failed, #{msg.nil? ? 'reason unknown' : msg}."
+        super(msg)
+      end
+    end
+  end
+end

data/lib/xclarity_client/error/connection_refused.rb

@@ -0,0 +1,10 @@
+module XClarityClient
+  module Error
+    class ConnectionRefused < StandardError
+      def initialize(msg = nil)
+        msg = msg.nil? ? 'Connection refused, invalid host.' : msg
+        super(msg)
+      end
+    end
+  end
+end

data/lib/xclarity_client/error/hostname_unknown.rb

@@ -0,0 +1,10 @@
+module XClarityClient
+  module Error
+    class HostnameUnknown < StandardError
+      def initialize(msg = nil)
+        msg = msg.nil? ? 'Connection failed, hostname unknown.' : msg
+        super(msg)
+      end
+    end
+  end
+end

data/lib/xclarity_client/version.rb

@@ -1,3 +1,3 @@
 module XClarityClient
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/xclarity_client/xclarity_base.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'faraday-cookie_jar'
 require 'json'
 require 'uri'
 require 'uri/https'
@@ -6,9 +7,8 @@ require 'uri/https'
 module XClarityClient
   class XClarityBase
 
-    token_auth = '/session'.freeze
     attr_reader :conn
-    
+
     def initialize(conf, uri)
       connection_builder(conf, uri)
     end
@@ -28,12 +28,13 @@ module XClarityClient
       @conn = Faraday.new(url: url) do |faraday|
         faraday.request  :url_encoded             # form-encode POST params
         faraday.response :logger                  # log requests to STDOUT -- This line, should be uncommented if you wanna inspect the URL Request
+        faraday.use :cookie_jar if conf.auth_type == 'token'
         faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
         faraday.ssl[:verify] = conf.verify_ssl == 'PEER'
       end
 
-      response = authentication(conf) unless conf.auth_type != 'token'
-      #TODO: What's to do with the response of authentication request?
+      authentication(conf) if conf.auth_type == 'token'
+
       @conn.basic_auth(conf.username, conf.password) if conf.auth_type == 'basic_auth'
       $lxca_log.info "XClarityClient::XclarityBase connection_builder", "Connection created Successfuly"
       @conn
@@ -74,13 +75,27 @@ module XClarityClient
 
     def authentication(conf)
       response = @conn.post do |request|
-        request.url '/session'
+        request.url '/sessions'
         request.headers['Content-Type'] = 'application/json'
         request.body = {:UserId => conf.username,
-                        :password => conf.password,
-                        :heartBeatEnabled => true,
-                        :maxLostHeartBeats => 3,
-                        :csrf => conf.csrf_token}.to_json
+                        :password => conf.password}.to_json
+      end
+      if not response.success?
+        raise Faraday::Error::ConnectionFailed
+      end
+
+    rescue => err
+      cause = err.cause.to_s.downcase
+      if cause.include?('connection refused')
+        raise XClarityClient::Error::ConnectionRefused
+      elsif cause.include?('name or service not known')
+        raise XClarityClient::Error::HostnameUnknown
+      elsif response.nil?
+        raise XClarityClient::Error::ConnectionFailed
+      elsif response.status == 403
+        raise XClarityClient::Error::AuthenticationError
+      else
+        raise XClarityClient::Error::ConnectionFailedUnknown.new("status #{response.status}")
       end
     end
   end

data/xclarity_client.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "apib-mock_server", "~> 1.0.3"
   spec.add_development_dependency "webmock", "~> 2.1.0"
   spec.add_dependency             "faraday", "~> 0.9.2"
+  spec.add_dependency             "faraday-cookie_jar", "~> 0.0.6"
   spec.add_dependency             "uuid", "~> 2.3.8"
   spec.add_dependency             "faker", "~> 1.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xclarity_client
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Manasa Rao
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: faraday-cookie_jar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,11 @@ files:
 - lib/xclarity_client/cmm_management.rb
 - lib/xclarity_client/configuration.rb
 - lib/xclarity_client/discover.rb
+- lib/xclarity_client/error/authentication_error.rb
+- lib/xclarity_client/error/connection_failed.rb
+- lib/xclarity_client/error/connection_failed_unknown.rb
+- lib/xclarity_client/error/connection_refused.rb
+- lib/xclarity_client/error/hostname_unknown.rb
 - lib/xclarity_client/event.rb
 - lib/xclarity_client/event_management.rb
 - lib/xclarity_client/fan.rb