xclarity_client 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a94d8c6370c78465f0607a7ea7d5dece6ac95d94
-  data.tar.gz: ce694e22536e0b68ee82ad13bc8e523a9e497b84
+  metadata.gz: 3de68cc1b07f9953dbefe5fda0b8b8e74df98f0a
+  data.tar.gz: 39e2effba3ca1815ec833c2a63ea36a1e8e03a3d
 SHA512:
-  metadata.gz: '09cb4cfa48391846096107de5f4989d20246d8bd0edae3735264f304cf3d4df1b7d884ba0f9ad3f74f456aa971d83f5885e7fb8e503213f4356e1f5c607b503f'
-  data.tar.gz: dbb35e325ad671c58f5431bec6d40577f4655a569008afd33b2df25d4a9866d05bd809767c137e962c37ae558699068ebf25d50ef9c4f8a2f027b10fe030152d
+  metadata.gz: fd9cdbe853931062976eb4ab76af736b258b5b2ce68900a131c1a93d95d1cc9c30bd8e4e333fbf6b2e0ff354ef45b01ca10b10334eb4e6dd537d45689c030195
+  data.tar.gz: 930d73b66b1e7548274b83101bfe44611327948bae00df63f413bde98d3025f6da70da8132e4d07b63bb5175011e83d8c8b835d35340346650dea13b749d649f

data/lib/xclarity_client/client.rb

@@ -35,6 +35,7 @@ module XClarityClient
     include XClarityClient::Mixins::UpdateRepoMixin
     include XClarityClient::Mixins::UpdateCompMixin
     include XClarityClient::Mixins::UserMixin
+    include XClarityClient::Mixins::ManagementServerMixin
 
     def initialize(config)
       @config = config

data/lib/xclarity_client/connection/connection.rb

@@ -3,6 +3,7 @@ require 'faraday-cookie_jar'
 require 'uri'
 require 'uri/https'
 require 'timeout'
+require 'pp'
 
 module XClarityClient
   #
@@ -11,7 +12,6 @@ module XClarityClient
   #
   class Connection
     HEADER_MESSAGE = 'XClarityClient::Connection'.freeze
-    #
     # @param [Hash] configuration - the data to create a connection with the LXCA
     # @option configuration [String] :host             the LXCA host
     # @option configuration [String] :username         the LXCA username
@@ -24,10 +24,10 @@ module XClarityClient
     #
     def initialize(configuration)
       @connection = build(configuration)
-      @timeout    = configuration.timeout
+      @connection_multipart = build(configuration, true)
+      @timeout = configuration.timeout
     end
 
-    #
     # Does a GET request to an LXCA endpoint
     #
     # @param [String] uri - endpoint to do the request
@@ -49,42 +49,42 @@ module XClarityClient
       Faraday::Response.new
     end
 
-    #
     # Does a POST request to an LXCA endpoint
     #
     # @param [String] uri - endpoint to do the request
     # @param [JSON] body  - json to be sent in request body
     #
-    def do_post(uri = '', body = '')
-      build_request(:post, uri, body)
+    def do_post(uri = '', body = '', multipart = false)
+      build_request(:post, uri, body, multipart)
     end
 
-    #
     # Does a PUT request to an LXCA endpoint
-    #
     # @param [String] uri - endpoint to do the request
     # @param [JSON] body  - json to be sent in request body
-    #
     def do_put(uri = '', body = '')
       build_request(:put, uri, body)
     end
 
-    #
     # Does a DELETE request to an LXCA endpoint
-    #
     # @param [String] uri - endpoint to do the request
-    #
     def do_delete(uri = '')
       build_request(:delete, uri)
     end
 
     private
 
-    def build_request(method, url, body = '')
-      @connection.send(method) do |request|
-        request.url(url)
-        request.headers['Content-Type'] = 'application/json'
-        request.body = body
+    def build_request(method, url, body = '', multipart = false)
+      if multipart == true
+        @connection_multipart.send(method) do |request|
+          request.url(url)
+          request.body = body
+        end
+      else
+        @connection.send(method) do |request|
+          request.url(url)
+          request.headers['Content-Type'] = 'application/json'
+          request.body = body
+        end
       end
     rescue Faraday::Error::ConnectionFailed => e
       header = HEADER_MESSAGE + " do_#{method}"
@@ -95,32 +95,57 @@ module XClarityClient
       Faraday::Response.new
     end
 
-    def build(configuration)
-      header = HEADER_MESSAGE + ' build'
-      $lxca_log.info(header, 'Building the connection')
-
-      hostname = URI.parse(configuration.host)
-
-      url = URI::HTTPS.build({ :host     => hostname.scheme ? hostname.host : hostname.path,
-                               :port     => configuration.port.to_i,
-                               :query    => hostname.query,
-                               :fragment => hostname.fragment }).to_s
-      $lxca_log.info(header, "Creating connection to #{url}")
+    def create_connection(connection, configuration)
+      user_agent_label = configuration.user_agent_label
+      agent_label = user_agent_label.nil? ? "" : user_agent_label
+      header = "LXCA via Ruby Client/#{XClarityClient::VERSION}"
+      connection.headers[:user_agent] = header + agent_label
+      basic_auth = configuration.auth_type == 'basic_auth'
+      username = configuration.username
+      password = configuration.password
+      connection.basic_auth(username, password) if basic_auth
+      $lxca_log.info(header, 'Connection created Successfuly')
+      connection
+    end
 
-      connection = Faraday.new(url: url) do |faraday|
+    def create_faraday_multipart_obj(url, configuration)
+      Faraday.new(url: url) do |faraday|
+        faraday.request(:multipart) # multipart form data
         faraday.request(:url_encoded) # form-encode POST params
         faraday.response(:logger, $lxca_log.log) # log requests to log file
         faraday.use(:cookie_jar) if configuration.auth_type == 'token'
-        faraday.adapter(:httpclient) # make requests with HTTPClient
+        faraday.adapter(:net_http) # make requests with net_http
         faraday.ssl[:verify] = configuration.verify_ssl == 'PEER'
       end
+    end
 
-      connection.headers[:user_agent] = "LXCA via Ruby Client/#{XClarityClient::VERSION}" + (configuration.user_agent_label.nil? ? "" : " (#{configuration.user_agent_label})")
+    def create_faraday_obj(url, configuration)
+      Faraday.new(url: url) do |faraday|
+        faraday.request(:url_encoded) # form-encode POST params
+        faraday.response(:logger, $lxca_log.log) # log requests to log file
+        faraday.use(:cookie_jar) if configuration.auth_type == 'token'
+        faraday.adapter(:httpclient) # make request with httpclient
+        faraday.ssl[:verify] = configuration.verify_ssl == 'PEER'
+      end
+    end
 
-      connection.basic_auth(configuration.username, configuration.password) if configuration.auth_type == 'basic_auth'
-      $lxca_log.info(header, 'Connection created Successfuly')
+    def build_connection(url, configuration, multipart = false)
+      con_obj = create_faraday_multipart_obj(url, configuration) if multipart
+      con_obj = create_faraday_obj(url, configuration) unless multipart
+      create_connection(con_obj, configuration)
+    end
 
-      connection
+    def build(configuration, multipart = false)
+      header = HEADER_MESSAGE + ' build'
+      $lxca_log.info(header, 'Building the connection')
+      hostname = URI.parse(configuration.host)
+      host = hostname.scheme ? hostname.host : hostname.path
+      url = URI::HTTPS.build(:host     => host,
+                             :port     => configuration.port.to_i,
+                             :query    => hostname.query,
+                             :fragment => hostname.fragment).to_s
+      $lxca_log.info(header, "Creating connection to #{url}")
+      build_connection(url, configuration, multipart)
     end
   end
 end

data/lib/xclarity_client/endpoints/endpoints.rb

@@ -36,3 +36,4 @@ require 'xclarity_client/endpoints/hostplatform'
 require 'xclarity_client/endpoints/osimage'
 require 'xclarity_client/endpoints/remotefileserver'
 require 'xclarity_client/endpoints/compliance_policy'
+require 'xclarity_client/endpoints/management_server'

data/lib/xclarity_client/endpoints/management_server.rb

@@ -0,0 +1,5 @@
+module XClarityClient
+  class ManagementServer < Endpoints::XclarityEndpoint
+    BASE_URI = '/managementServer/updates'.freeze
+  end
+end

data/lib/xclarity_client/mixins/management_server_mixin.rb

@@ -0,0 +1,40 @@
+module XClarityClient
+  #
+  # Exposes ManagementServerManagement features
+  #
+  module Mixins::ManagementServerMixin
+    def get_management_server_updates_info(key = nil)
+      obj = ManagementServerManagement.new(@config)
+      obj.get_management_server_updates_info(key)
+    end
+
+    def delete_management_server_updates(fixids)
+      return "parameter 'fixids' should be array" unless fixids.kind_of?(Array)
+      obj = ManagementServerManagement.new(@config)
+      obj.delete_management_server_updates(fixids)
+    end
+
+    def download_management_server_updates(fixids)
+      return "parameter 'fixids' should be array" unless fixids.kind_of?(Array)
+      obj = ManagementServerManagement.new(@config)
+      obj.download_management_server_updates(fixids)
+    end
+
+    def apply_management_server_updates(fixids)
+      return "parameter 'fixids' should be array" unless fixids.kind_of?(Array)
+      obj = ManagementServerManagement.new(@config)
+      obj.apply_management_server_updates(fixids)
+    end
+
+    def refresh_management_server_updates_catalog
+      obj = ManagementServerManagement.new(@config)
+      obj.refresh_management_server_updates_catalog
+    end
+
+    def import_management_server_updates(files)
+      return "parameter 'files' should be array" unless files.kind_of?(Array)
+      obj = ManagementServerManagement.new(@config)
+      obj.import_management_server_updates(files)
+    end
+  end
+end

data/lib/xclarity_client/mixins/mixins.rb

@@ -38,3 +38,4 @@ require 'xclarity_client/mixins/manage_request_mixin'
 require 'xclarity_client/mixins/update_repo_mixin'
 require 'xclarity_client/mixins/update_comp_mixin'
 require 'xclarity_client/mixins/user_mixin'
+require 'xclarity_client/mixins/management_server_mixin'

data/lib/xclarity_client/services/management_server_management.rb

@@ -0,0 +1,87 @@
+require 'json'
+require 'pathname'
+require 'pp'
+
+module XClarityClient
+  # ManagementServerManagement class
+  class ManagementServerManagement < Services::XClarityService
+    manages_endpoint ManagementServer
+
+    private
+
+    def start_management_server_updates_import_job(file_type_dict, files, jobid)
+      url = "/files/#{ManagementServer::BASE_URI}?action=import&jobid=#{jobid}"
+      index = 0
+      payload = {}
+      files.each do |file_name|
+        type = file_type_dict[File.extname(file_name)]
+        key = 'file_' + (index += 1).to_s
+        payload[key.to_sym] = Faraday::UploadIO.new(file_name, type)
+      end
+      @connection.do_post(url, payload, true)
+    end
+
+    def populate_payload_files(files, file_type_dict)
+      payload_files = []
+      index = 0
+      files.each do |file|
+        name = File.basename(file)
+        payload_file = { :index => index += 1, :name => name.strip,
+                         :type => file_type_dict[File.extname(name)].strip,
+                         :size => File.size?(file) }
+        payload_files.push(payload_file)
+      end
+      payload_files
+    end
+
+    public
+
+    def get_management_server_updates_info(key = nil)
+      base_url = ManagementServer::BASE_URI
+      url = key.nil? ? base_url : "#{base_url}?key=#{key}"
+      msg = "input key=#{key}"
+      $lxca_log.info(self.class.to_s + ' ' + __method__.to_s, msg)
+      @connection.do_get(url)
+    end
+
+    def download_management_server_updates(fixids)
+      url = "#{ManagementServer::BASE_URI}?action=acquire"
+      opts = { :fixids => fixids }
+      request_body = JSON.generate(opts)
+      @connection.do_post(url, request_body)
+    end
+
+    def import_management_server_updates(files)
+      url = "#{ManagementServer::BASE_URI}?action=import"
+      file_type_dict = { '.txt' => 'text/plain', '.xml' => 'text/xml',
+                         '.chg' => 'application/octet-stream',
+                         '.tgz' => 'application/x-compressed' }
+      payload_files = populate_payload_files(files, file_type_dict)
+      request_body = JSON.generate(:files => payload_files)
+      response = @connection.do_post(url, request_body)
+      jobid = JSON.parse(response.body).to_hash['jobid']
+      $lxca_log.info(self.class.to_s + ' ' + __method__.to_s, "jobid: #{jobid}")
+      start_management_server_updates_import_job(file_type_dict, files, jobid)
+    end
+
+    def apply_management_server_updates(fixids)
+      url = "#{ManagementServer::BASE_URI}?action=apply"
+      opts = { :fixids => fixids }
+      request_body = JSON.generate(opts)
+      @connection.do_put(url, request_body)
+    end
+
+    def delete_management_server_updates(fixids)
+      fixids = fixids.join(',')
+      url = "#{ManagementServer::BASE_URI}/#{fixids}"
+      @connection.do_delete(url)
+    end
+
+    def refresh_management_server_updates_catalog
+      url = "#{ManagementServer::BASE_URI}?action=refresh"
+      opts = { :mts => ['lxca'] }
+      request_body = JSON.generate(opts)
+      @connection.do_post(url, request_body)
+    end
+  end
+end

data/lib/xclarity_client/services/remote_access_management.rb

@@ -1,15 +1,17 @@
 require 'json'
 
 module XClarityClient
-  class RemoteAccessManagement < XClarityBase
+  class RemoteAccessManagement
 
     def initialize(conf)
-      super(conf, RemoteAccess::BASE_URI)
+      @connection = XClarityClient::Connection.new(conf)
     end
 
     def remote_control(uuid)
       raise 'UUID must not be blank' if uuid.nil? || uuid.empty?
-      con = connection("#{RemoteAccess::BASE_URI}/remoteControl" , {:uuid => uuid})
+      con = @connection.do_get(
+        "#{RemoteAccess::BASE_URI}/remoteControl", :query => { :uuid => uuid }
+      )
 
       unless con.success?
         $lxca_log.error "XClarityClient::RemoteAccessManagement remote_control", "Request failed"
@@ -54,4 +56,4 @@ module XClarityClient
       })
     end
   end
-end
+end

data/lib/xclarity_client/services/services.rb

@@ -39,3 +39,4 @@ require 'xclarity_client/services/update_repo_management'
 require 'xclarity_client/services/update_comp_management'
 require 'xclarity_client/services/user_management'
 require 'xclarity_client/services/virtual_appliance_management'
+require 'xclarity_client/services/management_server_management'

data/lib/xclarity_client/services/virtual_appliance_management.rb

@@ -1,5 +1,5 @@
 module XClarityClient
-  class VirtualApplianceManagement < XClarityBase
+  class VirtualApplianceManagement
 
     BASE_URI          = '/aicc'.freeze
     NETWORK_URI       = '/network'.freeze
@@ -10,12 +10,11 @@ module XClarityClient
     SUBSCRIPTIONS_URI = '/subscriptions'.freeze
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      @connection = XClarityClient::Connection.new(conf)
     end
 
     def configuration_settings
-      response = connection
-      response
+      @connection.do_get(BASE_URI)
     end
 
     def configuration_settings=()
@@ -24,8 +23,8 @@ module XClarityClient
     def ip_enablement_state
       uri = BASE_URI+NETWORK_URI+IPDISABLE_URI
       $lxca_log.info "XclarityClient::VirtualApplianceManagement ip_enablement_state", "Action has been sent to #{uri}"
-      response = connection(uri)
-      response
+
+      @connection.do_get(uri)
     end
 
     def ip_enablement_state=()
@@ -35,8 +34,8 @@ module XClarityClient
     def host_settings
       uri = BASE_URI+NETWORK_URI+IPDISABLE_URI
       $lxca_log.info "XclarityClient::VirtualApplianceManagement host_settings", "Action has been sent to #{uri}"
-      response = connection(uri)
-      response
+
+      @connection.do_get(uri)
     end
 
     def host_settings=()
@@ -46,8 +45,8 @@ module XClarityClient
     def network_interface_settings(interface)
       uri = BASE_URI+NETWORK_URI+INTERFACES_URI+"/#{interface}"
       $lxca_log.info "XclarityClient::VirtualApplianceManagement network_interface_settings", "Action has been sent to #{uri}"
-      response = connection(uri)
-      response
+
+      @connection.do_get(uri)
     end
 
     def host_settings=()
@@ -57,8 +56,8 @@ module XClarityClient
     def route_settings
       uri = BASE_URI+NETWORK_URI+ROUTES_URI
       $lxca_log.info "XclarityClient::VirtualApplianceManagement route_settings", "Action has been sent to #{uri}"
-      response = connection(uri)
-      response
+
+      @connection.do_get(uri)
     end
 
     def route_settings=()
@@ -68,14 +67,12 @@ module XClarityClient
     def subscriptions
       uri = BASE_URI+SUBSCRIPTIONS_URI
       $lxca_log.info "XclarityClient::VirtualApplianceManagement subscriptions", "Action has been sent to #{uri}"
-      response = connection(uri)
-      response
+
+      @connection.do_get(uri)
     end
 
     def subscriptions=()
 
     end
-
-
   end
 end

data/lib/xclarity_client/version.rb

@@ -1,3 +1,3 @@
 module XClarityClient
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/xclarity_client/xclarity_credentials_validator.rb

@@ -1,11 +1,11 @@
 require 'json'
 
 module XClarityClient
-  class XClarityCredentialsValidator < XClarityBase
+  class XClarityCredentialsValidator
     BASE_URI = '/sessions'.freeze
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      @connection = XClarityClient::Connection.new(conf)
       @configuration = conf
     end
 
@@ -33,19 +33,16 @@ module XClarityClient
     end
 
     def build_session(conf)
-      @response = @conn.post do |request|
-      request.headers['Content-Type'] = 'application/json'
-      request.body = { :UserId => conf.username,
-                       :password => conf.password }.to_json
-      end
+      @response = @connection.do_post(BASE_URI, {
+        :UserId => conf.username,
+        :password => conf.password
+      }.to_json)
+
       raise Faraday::Error::ConnectionFailed unless @response.success?
     end
 
     def close_session(id_session)
-      @conn.delete do |request|
-        request.url "#{BASE_URI}/#{id_session}"
-        request.headers['Content-Type'] = 'application/json'
-      end
+      @connection.do_delete("#{BASE_URI}/#{id_session}")
     end
   end
 end

data/lib/xclarity_client.rb

@@ -8,7 +8,6 @@ end
 require 'xclarity_client/errors/errors'
 
 require 'xclarity_client/configuration'
-require 'xclarity_client/xclarity_base'
 require 'xclarity_client/xclarity_credentials_validator'
 require 'xclarity_client/discover'
 require 'xclarity_client/endpoints/endpoints'

data/xclarity_client.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency('bundler', '>= 1.12')
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "apib-mock_server", "~> 1.0.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xclarity_client
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Manasa Rao
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
@@ -245,6 +245,7 @@ files:
 - lib/xclarity_client/endpoints/hostplatform.rb
 - lib/xclarity_client/endpoints/job.rb
 - lib/xclarity_client/endpoints/manage_request.rb
+- lib/xclarity_client/endpoints/management_server.rb
 - lib/xclarity_client/endpoints/node.rb
 - lib/xclarity_client/endpoints/osimage.rb
 - lib/xclarity_client/endpoints/persisted_result.rb
@@ -284,6 +285,7 @@ files:
 - lib/xclarity_client/mixins/host_platform_mixin.rb
 - lib/xclarity_client/mixins/job_mixin.rb
 - lib/xclarity_client/mixins/manage_request_mixin.rb
+- lib/xclarity_client/mixins/management_server_mixin.rb
 - lib/xclarity_client/mixins/mixins.rb
 - lib/xclarity_client/mixins/node_mixin.rb
 - lib/xclarity_client/mixins/os_image_mixin.rb
@@ -318,6 +320,7 @@ files:
 - lib/xclarity_client/services/hostplatform_management.rb
 - lib/xclarity_client/services/job_management.rb
 - lib/xclarity_client/services/manage_request_management.rb
+- lib/xclarity_client/services/management_server_management.rb
 - lib/xclarity_client/services/mixins/endpoint_manager_mixin.rb
 - lib/xclarity_client/services/mixins/list_name_interpreter_mixin.rb
 - lib/xclarity_client/services/mixins/power_action_sender_mixin.rb
@@ -340,7 +343,6 @@ files:
 - lib/xclarity_client/services/xclarity_management_mixin.rb
 - lib/xclarity_client/services/xclarity_service.rb
 - lib/xclarity_client/version.rb
-- lib/xclarity_client/xclarity_base.rb
 - lib/xclarity_client/xclarity_credentials_validator.rb
 - xclarity_client.gemspec
 homepage: https://github.com/lenovo/xclarity_client
@@ -362,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Lenovo XClarity API Client

data/lib/xclarity_client/xclarity_base.rb

@@ -1,88 +0,0 @@
-require 'faraday'
-require 'faraday-cookie_jar'
-require 'uri'
-require 'uri/https'
-
-module XClarityClient
-  class XClarityBase
-
-    attr_reader :conn
-
-    def initialize(conf, uri)
-      connection_builder(conf, uri)
-    end
-
-    def connection_builder(conf, uri)
-      $lxca_log.info "XClarityClient::XClarityBase connection_builder", "Building the url"
-      #Building configuration
-      hostname = URI.parse(conf.host)
-      url = URI::HTTPS.build({ :host     => hostname.scheme ? hostname.host : hostname.path,
-                               :port     => conf.port.to_i,
-                               :path     => uri,
-                               :query    => hostname.query,
-                               :fragment => hostname.fragment }).to_s
-
-      $lxca_log.info "XClarityClient::XClarityBase connection_builder", "Creating connection to #{url}"
-
-      @conn = Faraday.new(url: url) do |faraday|
-        faraday.request  :url_encoded             # form-encode POST params
-        faraday.response :logger, $lxca_log.log   # 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
-
-      @conn.headers[:user_agent] = "LXCA via Ruby Client/#{XClarityClient::VERSION}" + (conf.user_agent_label.nil? ? "" : " (#{conf.user_agent_label})")
-      @conn.basic_auth(conf.username, conf.password) if conf.auth_type == 'basic_auth'
-      $lxca_log.info "XClarityClient::XclarityBase connection_builder", "Connection created Successfuly"
-      @conn
-    end
-
-    private
-
-    def connection(uri = "", opts = {})
-      query = opts.size > 0 ? "?" + opts.map {|k, v| "#{k}=#{v}"}.join(",") : ""
-      begin
-        @conn.get(uri + query)
-      rescue Faraday::Error::ConnectionFailed => e
-        $lxca_log.error "XClarityClient::XclarityBase connection", "Error trying to send a GET to #{uri + query}"
-        Faraday::Response.new
-      end
-    end
-
-    def do_post(uri="", request = {})
-      begin
-        @conn.post do |req|
-          req.url uri
-          req.headers['Content-Type'] = 'application/json'
-          req.body = request
-        end
-      rescue Faraday::Error::ConnectionFailed => e
-        $lxca_log.error "XClarityClient::XclarityBase do_post", "Error trying to send a POST to #{uri}"
-        $lxca_log.error "XClarityClient::XclarityBase do_post", "Request sent: #{request}"
-        Faraday::Response.new
-      end
-    end
-
-    def do_put (uri="", request = {})
-      begin
-        @conn.put do |req|
-          req.url uri
-          req.headers['Content-Type'] = 'application/json'
-          req.body = request
-        end
-      rescue Faraday::Error::ConnectionFailed => e
-        $lxca_log.error "XClarityClient::XclarityBase do_put", "Error trying to send a PUT to #{uri}"
-        $lxca_log.error "XClarityClient::XclarityBase do_put", "Request sent: #{request}"
-        Faraday::Response.new
-      end
-    end
-
-    def do_delete (uri="")
-      @conn.delete do |req|
-        req.url uri
-        req.headers['Content-Type'] = 'application/json'
-      end
-    end
-  end
-end