xclarity_client 0.4.1 → 0.5.2

data/lib/xclarity_client/scalable_complex.rb

@@ -5,8 +5,8 @@ module XClarityClient
     BASE_URI = '/scalableComplex'.freeze
     LIST_NAME = 'complex'.freeze
 
-    attr_accessor :properties, :_id, :location, :nodeCount, :orphanNodes,
-    :partition, :partitionCount, :uuid, :slots, :complexID
+    attr_accessor :complexID, :location, :nodeCount, :orphanNodes,
+                  :partition, :partitionCount, :uuid
 
 
     def initialize(attributes)

data/lib/xclarity_client/switch.rb

@@ -5,12 +5,13 @@ module XClarityClient
     BASE_URI = '/switches'.freeze
     LIST_NAME = 'switchList'.freeze
 
-    attr_accessor :properties, :_id, :accessState, :applyPending, :attachedNodes, :cmmDisplayName, :cmmHealthState, :entitleSerialNumber, :fans, :firmware, :hostname, :ipInterfaces,
-    :leds, :macAddresses, :machineType, :manufacturer, :manufacturerId, :ports, :productId, :productName, :protectedMode, :serialNumber, :type, :upTime, :uuid, :accessState,
-    :cmmHealthState, :excludedHealthState, :memoryUtilization, :model, :overallHealthState, :panicDump, :powerState, :savePending, :slots, :posID, :stackMode, :stackedMode,
-    :stackRole, :sysObjectID, :temperatureSensors, :userDescription, :vpdID, :contact, :cpuUtilization, :dataHandle, :description, :dnsHostnames, :domainName, :errorFields,
-    :FRU, :fruSerialNumber, :ipv4Addresses, :ipv6Addresses, :ipInterfaces, :manufacturingDate, :name, :resetReason, :uri, :backedBy, :partNumber, :parent, :powerAllocation
-
+    attr_accessor :accessState, :attachedNodes, :backedBy, :cmmDisplayName, :cmmHealthState,
+                  :dataHandle, :description, :dnsHostnames, :errorFields, :excludedHealthState,
+                  :firmware, :FRU, :fruSerialNumber, :hostname, :ipInterfaces, :ipv4Addresses,
+                  :ipv6Addresses, :leds, :macAddresses, :machineType, :manufacturer, :manufacturerId,
+                  :model, :name, :overallHealthState, :parent, :partNumber, :posID, :powerAllocation,
+                  :powerState, :productId, :productName, :protectedMode, :serialNumber, :slots,
+                  :stackMode, :type, :uri, :userDescription, :uuid, :vpdID
 
     def initialize(attributes)
       build_resource(attributes)

data/lib/xclarity_client/version.rb

@@ -1,3 +1,3 @@
 module XClarityClient
-  VERSION = "0.4.1"
+  VERSION = "0.5.2"
 end

data/lib/xclarity_client/virtual_appliance_management.rb

@@ -23,6 +23,7 @@ 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
     end
@@ -33,6 +34,7 @@ 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
     end
@@ -43,6 +45,7 @@ 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
     end
@@ -53,6 +56,7 @@ 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
     end
@@ -63,6 +67,7 @@ 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
     end

data/lib/xclarity_client/xclarity_base.rb

@@ -1,22 +1,31 @@
 require 'faraday'
 require 'json'
 require 'uri'
+require 'uri/https'
 
 module XClarityClient
   class XClarityBase
 
     token_auth = '/session'.freeze
-
     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
-      @conn = Faraday.new(url: conf.host + uri) do |faraday|
+      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                  # log requests to STDOUT -- This line, should be uncommented if you wanna inspect the URL Request
         faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
@@ -26,7 +35,7 @@ module XClarityClient
       response = authentication(conf) unless conf.auth_type != 'token'
       #TODO: What's to do with the response of authentication request?
       @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
 
@@ -34,14 +43,25 @@ module XClarityClient
 
     def connection(uri = "", opts = {})
       query = opts.size > 0 ? "?" + opts.map {|k, v| "#{k}=#{v}"}.join(",") : ""
-      @conn.get(uri + query)
+      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_put (uri="", request = {})
-      @conn.put do |req|
-        req.url uri
-        req.headers['Content-Type'] = 'application/json'
-        req.body = 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
 

data/lib/xclarity_client/xclarity_management_mixin.rb

@@ -1,8 +1,12 @@
 module XClarityClient
   module ManagementMixin
     def get_all_resources (resource, opts = {})
+      $lxca_log.info "XclarityClient::ManagementMixin get_all_resources", "Sending request to #{resource} resource"
+
       response = connection(resource::BASE_URI, opts)
 
+      $lxca_log.info "XclarityClient::ManagementMixin get_all_resources", "Response received from #{resource::BASE_URI}"
+      
       return [] unless response.success?
 
       body = JSON.parse(response.body)
@@ -15,6 +19,8 @@ module XClarityClient
 
     def get_object(uuids, includeAttributes, excludeAttributes, resource)
 
+      $lxca_log.info "XclarityClient::ManagementMixin get_object", "Sending request to #{resource} resource"
+
       uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
 
       response = if not includeAttributes.nil?
@@ -39,6 +45,8 @@ module XClarityClient
 
     def get_object_with_include_attributes(uuids, attributes, resource)
 
+      $lxca_log.info "XclarityClient::ManagementMixin get_object_with_include", "Sending request to #{resource} resource including the following attributes: #{attributes.join(",")}"
+
       uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
 
       response = if not uuids.nil?
@@ -51,6 +59,8 @@ module XClarityClient
 
     def get_object_with_exclude_attributes(uuids, attributes, resource)
 
+      $lxca_log.info "XclarityClient::ManagementMixin get_object_with_include", "Sending request to #{resource} resource excluding the following attributes: #{attributes.join(",")}"
+
       uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
 
       response = if not uuids.nil?
@@ -78,7 +88,8 @@ module XClarityClient
         else
           filter += "?type=#{opts["type"]}"
         end
-        connection(resource::BASE_URI + filter)
+      $lxca_log.info "XclarityClient::ManagementMixin get_object_with_include", "Sending request to #{resource} resource using the following filter: #{filter}"
+      connection(resource::BASE_URI + filter)
       end
 
       return [] unless response.success?

data/xclarity_client.gemspec

@@ -6,11 +6,11 @@ require 'xclarity_client/version'
 Gem::Specification.new do |spec|
   spec.name          = "xclarity_client"
   spec.version       = XClarityClient::VERSION
-  spec.authors       = ["Julian Cheal"]
-  spec.email         = ["jcheal@redhat.com"]
+  spec.authors       = ["Manasa Rao","Rodney H. Brown"]
+  spec.email         = ["mrao@lenovo.com","rbrown4@lenovo.com"]
 
-  spec.summary       = %q{Lenovo XClairty API Client}
-  spec.homepage      = "https://github.com/juliancheal/xclarity_client"
+  spec.summary       = %q{Lenovo XClarity API Client}
+  spec.homepage      = "https://github.com/lenovo/xclarity_client"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~> 2.1.0"
   spec.add_dependency             "faraday", "~> 0.9.2"
   spec.add_dependency             "uuid", "~> 2.3.8"
+  spec.add_dependency             "faker", "~> 1.8.3"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: xclarity_client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
-- Julian Cheal
+- Manasa Rao
+- Rodney H. Brown
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,9 +109,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: 
 email:
-- jcheal@redhat.com
+- mrao@lenovo.com
+- rbrown4@lenovo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -141,6 +157,7 @@ files:
 - docs/apib/squisher.rb
 - docs/apib/switches.apib
 - example/simple.rb
+- lib/utils/logger.rb
 - lib/xclarity_client.rb
 - lib/xclarity_client/cabinet.rb
 - lib/xclarity_client/cabinet_management.rb
@@ -152,6 +169,7 @@ files:
 - lib/xclarity_client/cmm.rb
 - lib/xclarity_client/cmm_management.rb
 - lib/xclarity_client/configuration.rb
+- lib/xclarity_client/discover.rb
 - lib/xclarity_client/event.rb
 - lib/xclarity_client/event_management.rb
 - lib/xclarity_client/fan.rb
@@ -172,7 +190,7 @@ files:
 - lib/xclarity_client/xclarity_management_mixin.rb
 - lib/xclarity_client/xclarity_resource.rb
 - xclarity_client.gemspec
-homepage: https://github.com/juliancheal/xclarity_client
+homepage: https://github.com/lenovo/xclarity_client
 licenses: []
 metadata: {}
 post_install_message: 
@@ -194,5 +212,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Lenovo XClairty API Client
+summary: Lenovo XClarity API Client
 test_files: []