xclarity_client 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db726a2cff6799fb0a4b45f3b3f198fb1e6f7b1
-  data.tar.gz: 87aa0cd3480d190f491f8b7bffa9bb41b7b6290c
+  metadata.gz: 5f6fe01d2f0c546424c2b60568dac517bf577fb5
+  data.tar.gz: dd4a30bdaccb0a616f8c802d2a258b9126d426d6
 SHA512:
-  metadata.gz: 3c97e083577ea734fd44926e5d2d7bf343cb1e17414d2371824b751cea36fde1324a65f50ee247b831d7ee7bb8c4cf85b52009298214c022b4ba872455ec9556
-  data.tar.gz: 646ebe36c2b47d7cb61a222972f6f23359e39538c2b16f56ee5c79756a6bb23bcc04b67b61abd0a6b15f74743a8b9f4716f8ff0d2c3165e78616d32c8ed8cce2
+  metadata.gz: b71782c8a9d1f72ec4e8d4b4001d63305b4dda3830a9df8730028101b03e894965cbde6ed48e5bc06dc93b13141a9c622e746fa10ac4dc418f32fdeca4b13dab
+  data.tar.gz: a57f0f9881982d2ebeb7a9c2669cfdc4c08dd859aecbe62c4f3da0cad022f383af60828f4d19a75c29980f19f9b3ebb0692686b0b2ad4263e77321db8e9c577e

data/lib/xclarity_client.rb

@@ -7,6 +7,7 @@ require 'xclarity_client/configuration'
 require 'xclarity_client/client'
 require 'xclarity_client/xclarity_base'
 require 'xclarity_client/xclarity_resource'
+require 'xclarity_client/xclarity_management_mixin'
 require 'xclarity_client/virtual_appliance_management'
 require 'xclarity_client/node'
 require 'xclarity_client/node_management'

data/lib/xclarity_client/cabinet.rb

@@ -3,6 +3,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     BASE_URI = '/cabinet'.freeze
+    LIST_NAME = 'cabinetList'.freeze
 
     attr_accessor :cabinetName, :chassisList, :complexList, :height, :location, :nodeList,
                   :placeholderList, :room, :storageList, :switchList, :UUID

data/lib/xclarity_client/cabinet_management.rb

@@ -3,57 +3,15 @@ require 'json'
 module XClarityClient
   class CabinetManagement < XClarityBase
 
-    BASE_URI = '/cabinet'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, Cabinet::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body = {'cabinetList' => [body]} unless body.has_key? 'cabinetList'
-      body['cabinetList'].map do |cabinet|
-        Cabinet.new cabinet
-      end
-    end
-
-    def get_object_cabinet(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-                  get_object_cabinet_include_attributes(uuids, includeAttributes)
-                elsif not excludeAttributes.nil?
-                  get_object_cabinet_exclude_attributes(uuids, excludeAttributes)
-                elsif not uuids.nil?
-                  connection(BASE_URI + "/" + uuids.join(","))
-                else
-                  connection(BASE_URI)
-                end
-
-      body = JSON.parse(response.body)
-      body = {'cabinetList' => [body]} unless body.has_key? 'cabinetList'
-      body['cabinetList'].map do |cabinet|
-        Cabinet.new cabinet
-      end
-
+    def population(opts = {})
+      get_all_resources(Cabinet, opts)
     end
 
-    def get_object_cabinet_exclude_attributes(uuids, attributes)
-
-      response = if not uuids.nil?
-                  connection(BASE_URI + "/" + uuids.join(",") + "?excludeAttributes="+ attributes.join(","))
-                else
-                  connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-                end
-    end
-
-    def get_object_cabinet_include_attributes(uuids, attributes)
-      response = if not uuids.nil?
-                  connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes="+ attributes.join(","))
-                else
-                  connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-                end
-    end
   end
 end

data/lib/xclarity_client/canister.rb

@@ -3,6 +3,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     BASE_URI = '/canisters'.freeze
+    LIST_NAME = 'canisterList'.freeze
 
     attr_accessor :cmmDisplayName, :backedBy, :contact, :dataHandle,  :description,
       :firmware, :FRU, :domainName, :driveBays, :drives, :errorFields, :ipInterfaces, :powerStatus,

data/lib/xclarity_client/canister_management.rb

@@ -3,58 +3,15 @@ require 'json'
 module XClarityClient
   class CanisterManagement < XClarityBase
 
-    BASE_URI = '/canisters'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, Canister::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body = {'canisterList' => [body]} unless body.has_key? 'canisterList'
-      body['canisterList'].map do |canister|
-        Canister.new canister
-      end
-    end
-
-    def get_object_canisters(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-        get_object_canisters_include_attributes(uuids, includeAttributes)
-      elsif not excludeAttributes.nil?
-        get_object_canisters_exclude_attributes(uuids, excludeAttributes)
-      elsif not uuids.nil?
-        connection(BASE_URI + "/" + uuids)
-      else
-        connection(BASE_URI)
-      end
-
-      body = JSON.parse(response.body)
-      body = {'canisterList' => [body]} unless body.has_key? 'canisterList'
-      body['canisterList'].map do |canister|
-        Canister.new canister
-      end
-
+    def population(opts = {})
+      get_all_resources(Canister, opts)
     end
 
-    def get_object_canisters_exclude_attributes(uuids, attributes)
-
-      response = if not uuids.nil?
-        connection(BASE_URI + "/#{uuids}"+"?excludeAttributes=#{attributes.join(",")}")
-      else
-        connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-      end
-
-    end
-
-    def get_object_canisters_include_attributes(uuids, attributes)
-      response = if not uuids.nil?
-                   connection(BASE_URI + "/" + uuids + "?includeAttributes=" + attributes.join(","))
-                 else
-                   connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-                 end
-    end
   end
 end

data/lib/xclarity_client/chassi.rb

@@ -3,6 +3,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     BASE_URI = '/chassis'.freeze
+    LIST_NAME = 'chassisList'.freeze
 
     attr_accessor :properties, :_id, :accessState, :activationKeys, :activeAlerts, :backedBy, :bladeSlots,
     :cmmDisplayName, :cmmHealthState, :cmms, :cmmSlots, :complex, :contact, :dataHandle,

data/lib/xclarity_client/chassi_management.rb

@@ -3,61 +3,14 @@ require 'json'
 module XClarityClient
   class ChassiManagement < XClarityBase
 
-    BASE_URI = '/chassis'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, Chassi::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body = {'chassisList' => [body]} unless body.has_key? 'chassisList'
-      body['chassisList'].map do |chassi|
-        Chassi.new chassi
-      end
-    end
-
-    def discover_chassis
-      ChassiManagement.new(@connection).population
-    end
-
-    def get_object_chassis(uuids, includeAttributes, excludeAttributes)
-
-      if not includeAttributes.nil?
-        response = get_object_chassis_include_attributes(uuids, includeAttributes)
-      elsif not excludeAttributes.nil?
-        response = get_object_chassis_exclude_attributes(uuids, excludeAttributes)
-      elsif not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(","))
-      else
-        response = connection(BASE_URI)
-      end
-
-        body = JSON.parse(response.body) #rescue {}
-        body = {'chassisList' => [body]} unless body.has_key? 'chassisList'
-        body['chassisList'].map do |chassi|
-          Chassi.new chassi
-        end
-    end
-
-    private
-
-    def get_object_chassis_exclude_attributes(uuids, attributes)
-      if not uuids.nil?
-        response = connection(BASE_URI + "/#{uuids.join(",")}"+"?excludeAttributes=#{attributes.join(",")}")
-      else
-        response = connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-      end
-    end
-
-    def get_object_chassis_include_attributes(uuids, attributes)
-      if not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes=" + attributes.join(","))
-      else
-        response = connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-      end
+    def population(opts = {})
+      get_all_resources(Chassi, opts)
     end
 
   end

data/lib/xclarity_client/client.rb

@@ -5,85 +5,84 @@ module XClarityClient
       @connection = connection
     end
 
-    def discover_nodes
-      NodeManagement.new(@connection).population
+    def discover_nodes(opts = {})
+      NodeManagement.new(@connection).population opts
     end
 
-    def discover_scalableComplexes
-      ScalableComplexManagement.new(@connection).population
+    def discover_scalableComplexes(opts = {})
+      ScalableComplexManagement.new(@connection).population opts
     end
 
-    def discover_cabinet
-      CabinetManagement.new(@connection).population
+    def discover_cabinet(opts = {})
+      CabinetManagement.new(@connection).population opts
     end
 
     def fetch_cabinet(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      CabinetManagement.new(@connection).get_object_cabinet(uuids, includeAttributes, excludeAttributes)
+      CabinetManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Cabinet)
     end
 
-    def discover_canisters
-      CanisterManagement.new(@connection).population
+    def discover_canisters(opts = {})
+      CanisterManagement.new(@connection).population opts
     end
 
     def fetch_canisters(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      CanisterManagement.new(@connection).get_object_canisters(uuids, includeAttributes, excludeAttributes)
+      CanisterManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Canister)
     end
 
-    def discover_cmms
-      CmmManagement.new(@connection).population
+    def discover_cmms(opts = {})
+      CmmManagement.new(@connection).population opts
     end
 
     def fetch_cmms(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      CmmManagement.new(@connection).get_object_cmms(uuids, includeAttributes, excludeAttributes)
+      CmmManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Cmm)
     end
 
     def fetch_fans(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-
-      FanManagement.new(@connection).get_object_fans(uuids, includeAttributes, excludeAttributes)
+      FanManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Fan)
     end
 
-    def discover_fans
-      FanManagement.new(@connection).population
+    def discover_fans(opts = {})
+      FanManagement.new(@connection).population opts
     end
 
-    def discover_switches
-      SwitchManagement.new(@connection).population
+    def discover_switches(opts = {})
+      SwitchManagement.new(@connection).population opts
     end
 
-    def discover_fan_muxes
-      FanMuxManagement.new(@connection).population
+    def discover_fan_muxes(opts = {})
+      FanMuxManagement.new(@connection).population opts
     end
 
     def fetch_fan_muxes(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      FanMuxManagement.new(@connection).get_object_fan_muxes(uuids, includeAttributes, excludeAttributes)
+      FanMuxManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, FanMux)
     end
 
-    def discover_chassis
-      ChassiManagement.new(@connection).population
+    def discover_chassis(opts = {})
+      ChassiManagement.new(@connection).population opts
     end
 
-    def discover_power_supplies
-      PowerSupplyManagement.new(@connection).population
+    def discover_power_supplies(opts = {})
+      PowerSupplyManagement.new(@connection).population opts
     end
 
     def fetch_nodes(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      NodeManagement.new(@connection).get_object_nodes(uuids, includeAttributes, excludeAttributes)
+      NodeManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Node)
     end
 
     def fetch_chassis(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      ChassiManagement.new(@connection).get_object_chassis(uuids, includeAttributes, excludeAttributes)
+      ChassiManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Chassi)
     end
 
     def fetch_scalableComplexes(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      ScalableComplexManagement.new(@connection).get_object_scalableComplexes(uuids, includeAttributes, excludeAttributes)
+      ScalableComplexManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, ScalableComplex)
     end
 
     def fetch_switches(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      SwitchManagement.new(@connection).get_object_switches(uuids, includeAttributes, excludeAttributes)
+      SwitchManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, Switch)
     end
 
     def fetch_power_supplies(uuids = nil, includeAttributes = nil, excludeAttributes = nil)
-      PowerSupplyManagement.new(@connection).get_object_power_supplies(uuids, includeAttributes, excludeAttributes)
+      PowerSupplyManagement.new(@connection).get_object(uuids, includeAttributes, excludeAttributes, PowerSupply)
     end
   end
 end

data/lib/xclarity_client/cmm.rb

@@ -5,6 +5,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     BASE_URI = '/cmms'.freeze
+    LIST_NAME = 'cmmList'.freeze
 
     attr_accessor :_id, :properties, :accessState, :backedBy, :cmmDisplayName, :cmmHealthState, :dataHandle, :dnsHostnames, :domainName, :errorFields,
     :excludedHealthState, :firmware, :FRU, :fruSerialNumber, :hostConfig, :hostname, :ipInterfaces, :ipv4Addresses, :ipv6Addresses,

data/lib/xclarity_client/cmm_management.rb

@@ -3,58 +3,14 @@ require 'json'
 module XClarityClient
   class CmmManagement < XClarityBase
 
-    BASE_URI = '/cmms'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, Cmm::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body = {'cmmList' => [body]} unless body.has_key? 'cmmList'
-      body['cmmList'].map do |cmm|
-        Cmm.new cmm
-      end
-    end
-
-    def get_object_cmms(uuids, includeAttributes, excludeAttributes)
-
-      if not includeAttributes.nil?
-        response = get_object_cmms_include_attributes(uuids, includeAttributes)
-      elsif not excludeAttributes.nil?
-        response = get_object_cmms_exclude_attributes(uuids, excludeAttributes)
-      elsif not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(","))
-      else
-        response = connection(BASE_URI)
-      end
-
-
-        body = JSON.parse(response.body) #rescue {}
-        body = {'cmmList' => [body]} unless body.has_key? 'cmmList'
-        body['cmmList'].map do |cmm|
-          Cmm.new cmm
-        end
-    end
-
-    private
-
-    def get_object_cmms_exclude_attributes(uuids, attributes)
-      if not uuids.nil?
-        response = connection(BASE_URI + "/#{uuids.join(",")}"+"?excludeAttributes=#{attributes.join(",")}")
-      else
-        response = connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-      end
-    end
-
-    def get_object_cmms_include_attributes(uuids, attributes)
-      if not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes=" + attributes.join(","))
-      else
-        response = connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-      end
+    def population(opts = {})
+      get_all_resources(Cmm, opts)
     end
 
   end

data/lib/xclarity_client/configuration.rb

@@ -6,6 +6,7 @@ module XClarityClient
     attr_accessor :username, :password, :host, :csrf_token, :auth_type, :generated_token, :verify_ssl
 
     def initialize(args)
+      puts "::> #{args}"
 
       args.each { |key, value| send("#{key}=", value) }
 
@@ -20,5 +21,14 @@ module XClarityClient
 
       @csrf_token ||= SecureRandom.base64(120) if @auth_type == 'token'
     end
+
+    def self.default
+      new({
+        :username   => ENV['LXCA_USERNAME'],
+        :password   => ENV['LXCA_PASSWORD'],
+        :host       => ENV['LXCA_HOST'],
+        :verify_ssl => ENV['LXCA_VERIFY_SSL'] != "NONE"
+      })
+    end
   end
 end

data/lib/xclarity_client/fan.rb

@@ -3,6 +3,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     BASE_URI = '/fans'.freeze
+    LIST_NAME = 'fanList'.freeze
 
     attr_accessor :cmmDisplayName, :cmmHealthState, :dataHandle, :firmware, :FRU,
     :fruSerialNumber, :hardwareRevision, :manufacturer, :manufacturerId,

data/lib/xclarity_client/fan_management.rb

@@ -3,81 +3,15 @@ require 'json'
 module XClarityClient
   class FanManagement < XClarityBase
 
-    BASE_URI = '/fans'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, Fan::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-
-      body = JSON.parse(response.body)
-      body = {'fanList' => [body]} unless body.has_key? 'fanList'
-      body['fanList'].map do |fan|
-        Fan.new fan
-      end
-    end
-
-    def get_object_fans(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-                  get_object_fans_include_attributes(uuids, includeAttributes)
-                elsif not excludeAttributes.nil?
-                  get_object_fans_exclude_attributes(uuids, excludeAttributes)
-                elsif not uuids.nil?
-                  response = connection(BASE_URI + "/" + uuids)
-                  body = JSON.parse(response.body)
-                  body = {'fanList' => [body]} unless body.has_key? 'fanList'
-                  body['fanList'].map do |fan|
-                    Fan.new fan
-                  end
-                else
-                  response = connection(BASE_URI)
-                  body = JSON.parse(response.body)
-                  body = {'fanList' => [body]} unless body.has_key? 'fanList'
-                  body['fanList'].map do |fan|
-                    Fan.new fan
-                  end
-                end
+    def population(opts = {})
+      get_all_resources(Fan, opts)
     end
 
-    def get_object_fans_exclude_attributes(uuids, attributes)
-
-      response = if not uuids.nil?
-                  response = connection(BASE_URI + "/" + uuids + "?excludeAttributes="+ attributes.join(","))
-                  body = JSON.parse(response.body)
-                  body = {'fanList' => [body]} unless body.has_key? 'fanList'
-                  body['fanList'].map do |fan|
-                    Fan.new fan
-                  end
-                else
-                  response = connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-                  body = JSON.parse(response.body)
-                  body = {'fanList' => [body]} unless body.has_key? 'fanList'
-                  body['fanList'].map do |fan|
-                    Fan.new fan
-                  end
-                end
-    end
-
-    def get_object_fans_include_attributes(uuids, attributes)
-      response = if not uuids.nil?
-                  response = connection(BASE_URI + "/" + uuids + "?includeAttributes="+ attributes.join(","))
-                  body = JSON.parse(response.body)
-                  body = {'fanList' => [body]} unless body.has_key? 'fanList'
-                  body['fanList'].map do |fan|
-                    Fan.new fan
-                  end
-                else
-                  response = connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-                  body = JSON.parse(response.body)
-                  body = {'fanList' => [body]} unless body.has_key? 'fanList'
-                  body['fanList'].map do |fan|
-                    Fan.new fan
-                  end
-                end
-    end
   end
 end

data/lib/xclarity_client/fan_mux.rb

@@ -2,7 +2,8 @@ module XClarityClient
   class FanMux
     include XClarityClient::Resource
 
-    BASE_URI = '/fan_muxes'.freeze
+    BASE_URI = '/fanMuxes'.freeze
+    LIST_NAME = 'fanMuxList'.freeze
 
     attr_accessor :cmmDisplayName, :cmmHealthState, :dataHandle, :description, :FRU,
       :fruSerialNumber, :hardwareRevision, :leds, :machineType, :manufacturer, :manufactureDate,

data/lib/xclarity_client/fan_mux_management.rb

@@ -3,80 +3,15 @@ require 'json'
 module XClarityClient
   class FanMuxManagement < XClarityBase
 
-    BASE_URI = '/fanMuxes'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, FanMux::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-      body['fanMuxList'].map do |fan_mux|
-        FanMux.new fan_mux
-      end
-    end
-
-    def get_object_fan_muxes(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-                  get_object_fan_muxes_include_attributes(uuids, includeAttributes)
-                elsif not excludeAttributes.nil?
-                  get_object_fan_muxes_exclude_attributes(uuids, excludeAttributes)
-                elsif not uuids.nil?
-                  response = connection(BASE_URI + "/" + uuids.join(","))
-                  body = JSON.parse(response.body)
-                  body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-                  body['fanMuxList'].map do |fan_mux|
-                    FanMux.new fan_mux
-                  end
-                else
-                  response = connection(BASE_URI)
-                  body = JSON.parse(response.body)
-                  body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-                  body['fanMuxList'].map do |fan_mux|
-                    FanMux.new fan_mux
-                  end
-                end
+    def population(opts = {})
+      get_all_resources(FanMux, opts)
     end
 
-    def get_object_fan_muxes_exclude_attributes(uuids, attributes)
-
-      response = if not uuids.nil?
-              response =  connection(BASE_URI + "/" + uuids.join(",") + "?excludeAttributes="+ attributes.join(","))
-                          body = JSON.parse(response.body)
-                          body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-                          body['fanMuxList'].map do |fan_mux|
-                            FanMux.new fan_mux
-                          end
-                else
-              response =  connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-                          body = JSON.parse(response.body)
-                          body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-                          body['fanMuxList'].map do |fan_mux|
-                            FanMux.new fan_mux
-                          end
-                end
-    end
-
-    def get_object_fan_muxes_include_attributes(uuids, attributes)
-      if not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes="+ attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-        body['fanMuxList'].map do |fan_mux|
-          FanMux.new fan_mux
-        end
-      else
-        response = connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'fanMuxList' => [body]} unless body.has_key? 'fanMuxList'
-        body['fanMuxList'].map do |fan_mux|
-          FanMux.new fan_mux
-        end
-      end
-    end
   end
 end

data/lib/xclarity_client/node.rb

@@ -3,6 +3,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     BASE_URI = '/nodes'.freeze
+    LIST_NAME = 'nodeList'.freeze
 
     attr_accessor :properties,:_uuid, :accessState, :activationKeys, :uuid, :addinCardSlots, :addinCards, :vnicMode, :productName, :arch, :backedBy, :bladeState_health, :bootMode,
       :bootOrder, :canisters, :canisterSlots, :cmmDisplayName, :cmmHealthState, :complexID, :dataHandle, :dnsHostnames, :domainName, :bladeState, :bladeState_string,

data/lib/xclarity_client/node_management.rb

@@ -4,59 +4,15 @@ require 'uuid'
 module XClarityClient
   class NodeManagement < XClarityBase
 
-    BASE_URI = '/nodes'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, Node::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body['nodeList'].map do |node|
-        Node.new node
-      end
-    end
-
-    def get_object_nodes(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-                  get_object_nodes_include_attributes(uuids, includeAttributes)
-                elsif not excludeAttributes.nil?
-                  get_object_nodes_exclude_attributes(uuids, excludeAttributes)
-                elsif not uuids.nil?
-                  connection(BASE_URI + "/" + uuids.join(","))
-                else
-                  connection(BASE_URI)
-                end
-
-      body = JSON.parse(response.body)
-      body = {'nodeList' => [body]} unless body.has_key? 'nodeList'
-      body['nodeList'].map do |node|
-        Node.new node
-      end
-
+    def population(opts = {})
+      get_all_resources(Node, opts)
     end
 
-    def get_object_nodes_exclude_attributes(uuids, attributes)
-      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
-
-      response = if not uuids.nil?
-                  connection(BASE_URI + "/" + uuids.join(",") + "?excludeAttributes="+ attributes.join(","))
-                else
-                  connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-                end
-    end
-
-    def get_object_nodes_include_attributes(uuids, attributes)
-      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
-
-      response = if not uuids.nil?
-                  connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes="+ attributes.join(","))
-                else
-                  connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-                end
-    end
   end
 end

data/lib/xclarity_client/power_supply.rb

@@ -2,7 +2,8 @@ module XClarityClient
   class PowerSupply
     include XClarityClient::Resource
 
-    BASE_URI = '/power_supplies'.freeze
+    BASE_URI = '/powerSupplies'.freeze
+    LIST_NAME = 'powerSupplyList'.freeze
 
     attr_accessor :properties, :_id, :cmmDisplayName, :cmmHealthState, :dataHandle,
     :description, :firmware, :FRU, :fruSerialNumber, :hardwareRevision, :inputVoltageMax,

data/lib/xclarity_client/power_supply_management.rb

@@ -2,88 +2,16 @@ require 'json'
 
 module XClarityClient
   class PowerSupplyManagement < XClarityBase
-    BASE_URI = '/powerSupplies'.freeze
 
-    def initialize(conf)
-      super(conf, BASE_URI)
-    end
-
-    def population
-      response = connection(BASE_URI)
-
-      body = JSON.parse(response.body)
-      body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-      body['powerSupplyList'].map do |power_supply|
-        PowerSupply.new power_supply
-      end
-    end
-
-    def get_object_power_supplies(uuids, includeAttributes, excludeAttributes)
-      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
+    include XClarityClient::ManagementMixin
 
-      response = nil
-      if not includeAttributes.nil?
-        response = get_object_power_supplies_include_attributes(uuids, includeAttributes)
-      elsif not excludeAttributes.nil?
-        response = get_object_power_supplies_exclude_attributes(uuids, excludeAttributes)
-      elsif not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(","))
-        body = JSON.parse(response.body)
-        body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-        body['powerSupplyList'].map do |power_supply|
-          PowerSupply.new power_supply
-        end
-      else
-        response = connection(BASE_URI)
-        body = JSON.parse(response.body)
-        body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-        body['powerSupplyList'].map do |power_supply|
-          PowerSupply.new power_supply
-        end
-      end
+    def initialize(conf)
+      super(conf, PowerSupply::BASE_URI)
     end
 
-    def get_object_power_supplies_exclude_attributes(uuids, attributes)
-      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
-
-      response = nil
-      if not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(",") + "?excludeAttributes="+ attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-        body['powerSupplyList'].map do |power_supply|
-          PowerSupply.new power_supply
-        end
-      else
-        response = connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-        body['powerSupplyList'].map do |power_supply|
-          PowerSupply.new power_supply
-        end
-      end
+    def population(opts = {})
+      get_all_resources(PowerSupply, opts)
     end
 
-    def get_object_power_supplies_include_attributes(uuids, attributes)
-      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
-
-      response = nil
-      if not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes="+ attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-        body['powerSupplyList'].map do |power_supply|
-          PowerSupply.new power_supply
-        end
-
-      else
-        response = connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'powerSupplyList' => [body]} unless body.has_key? 'powerSupplyList'
-        body['powerSupplyList'].map do |power_supply|
-          PowerSupply.new power_supply
-        end
-      end
-    end
   end
 end

data/lib/xclarity_client/scalable_complex.rb

@@ -2,7 +2,8 @@ module XClarityClient
   class ScalableComplex
     include XClarityClient::Resource
 
-    BASE_URI = '/scalable_complexes'.freeze
+    BASE_URI = '/scalableComplex'.freeze
+    LIST_NAME = 'complex'.freeze
 
     attr_accessor :properties, :_id, :location, :nodeCount, :orphanNodes,
     :partition, :partitionCount, :uuid, :slots, :complexID

data/lib/xclarity_client/scalable_complex_management.rb

@@ -3,81 +3,15 @@ require 'json'
 module XClarityClient
   class ScalableComplexManagement < XClarityBase
 
-    BASE_URI = '/scalableComplex'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
+      super(conf, ScalableComplex::BASE_URI)
     end
 
-    def population
-      response = connection(BASE_URI)
-      body = JSON.parse(response.body)
-      body = {'complex' => [body]} unless body.has_key? 'complex'
-      body['complex'].map do |scalableComplex|
-        ScalableComplex.new scalableComplex
-      end
+    def population(opts = {})
+      get_all_resources(ScalableComplex, opts)
     end
 
-    def get_object_scalableComplexes(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-        get_object_scalableComplexes_include_attributes(uuids, includeAttributes)
-      elsif not excludeAttributes.nil?
-        get_object_scalableComplexes_exclude_attributes(uuids, excludeAttributes)
-      elsif not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids)
-        body = JSON.parse(response.body)
-        body = {'complex' => [body]} unless body.has_key? 'complex'
-        body['complex'].map do |scalableComplex|
-          ScalableComplex.new scalableComplex
-        end
-      else
-        response = connection(BASE_URI)
-        body = JSON.parse(response.body)
-        body = {'complex' => [body]} unless body.has_key? 'complex'
-        body['complex'].map do |scalableComplex|
-          ScalableComplex.new scalableComplex
-        end
-      end
-
-    end
-
-    def get_object_scalableComplexes_exclude_attributes(uuids, attributes)
-
-      if not uuids.nil?
-        response = connection(BASE_URI + "/" + uuids +"?excludeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'complex' => [body]} unless body.has_key? 'complex'
-        body['complex'].map do |scalableComplex|
-          ScalableComplex.new scalableComplex
-        end
-      else
-        response = connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'complex' => [body]} unless body.has_key? 'complex'
-        body['complex'].map do |scalableComplex|
-          ScalableComplex.new scalableComplex
-        end
-      end
-
-    end
-
-    def get_object_scalableComplexes_include_attributes(uuids, attributes)
-      if not uuids.nil?
-        response =  connection(BASE_URI + "/" + uuids + "?includeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'complex' => [body]} unless body.has_key? 'complex'
-        body['complex'].map do |scalableComplex|
-          ScalableComplex.new scalableComplex
-        end
-      else
-        response = connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-        body = JSON.parse(response.body)
-        body = {'complex' => [body]} unless body.has_key? 'complex'
-        body['complex'].map do |scalableComplex|
-          ScalableComplex.new scalableComplex
-        end
-      end
-    end
   end
 end

data/lib/xclarity_client/switch.rb

@@ -3,6 +3,7 @@ module XClarityClient
     include XClarityClient::Resource
 
     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,

data/lib/xclarity_client/switch_management.rb

@@ -2,58 +2,15 @@ require 'json'
 
 module XClarityClient
   class SwitchManagement < XClarityBase
-
-    BASE_URI = '/switches'.freeze
+    include XClarityClient::ManagementMixin
 
     def initialize(conf)
-      super(conf, BASE_URI)
-    end
-
-    def population
-      response = connection(BASE_URI)
-      body = JSON.parse(response.body)
-      body = {'switchList' => [body]} unless body.has_key? 'switchList'
-      body['switchList'].map do |switch|
-        Switch.new switch
-      end
+      super(conf, Switch::BASE_URI)
     end
 
-    def get_object_switches(uuids, includeAttributes, excludeAttributes)
-
-      response = if not includeAttributes.nil?
-        get_object_switches_include_attributes(uuids, includeAttributes)
-      elsif not excludeAttributes.nil?
-        get_object_switches_exclude_attributes(uuids, excludeAttributes)
-      elsif not uuids.nil?
-        connection(BASE_URI + "/" + uuids.join(","))
-      else
-        connection(BASE_URI)
-      end
-
-      body = JSON.parse(response.body)
-      body = {'switchList' => [body]} unless body.has_key? 'switchList'
-      body['switchList'].map do |switch|
-        Switch.new switch
-      end
-
+    def population(opts = {})
+      get_all_resources(Switch, opts)
     end
 
-    def get_object_switches_exclude_attributes(uuids, attributes)
-
-      response = if not uuids.nil?
-        connection(BASE_URI + "/#{uuids.join(",")}"+"?excludeAttributes=#{attributes.join(",")}")
-      else
-        connection(BASE_URI + "?excludeAttributes=" + attributes.join(","))
-      end
-
-    end
-
-    def get_object_switches_include_attributes(uuids, attributes)
-      response = if not uuids.nil?
-        connection(BASE_URI + "/" + uuids.join(",") + "?includeAttributes=" + attributes.join(","))
-      else
-        connection(BASE_URI + "?includeAttributes=" + attributes.join(","))
-      end
-    end
   end
 end

data/lib/xclarity_client/version.rb

@@ -1,3 +1,3 @@
 module XClarityClient
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

data/lib/xclarity_client/xclarity_base.rb

@@ -18,7 +18,7 @@ module XClarityClient
       #Building configuration
       @conn = Faraday.new(url: conf.host + uri) 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.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
         faraday.ssl[:verify] = conf.verify_ssl == 'PEER'
       end
@@ -32,8 +32,9 @@ module XClarityClient
 
     private
 
-    def connection(uri = "", options = {})
-      @conn.get(uri)
+    def connection(uri = "", opts = {})
+      query = opts.size > 0 ? "?" + opts.map {|k, v| "#{k}=#{v}"}.join(",") : ""
+      @conn.get(uri + query)
     end
 
     def authentication(conf)

data/lib/xclarity_client/xclarity_management_mixin.rb

@@ -0,0 +1,65 @@
+module XClarityClient
+  module ManagementMixin
+
+
+    def get_all_resources (resource, opts = {})
+      response = connection(resource::BASE_URI, opts)
+
+      return [] unless response.success?
+      
+      body = JSON.parse(response.body)
+      body = {resource::LIST_NAME => [body]} unless body.has_key? resource::LIST_NAME
+      body[resource::LIST_NAME].map do |resource_params|
+        resource.new resource_params
+      end
+    end
+
+    def get_object(uuids, includeAttributes, excludeAttributes, resource)
+
+      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
+
+      response = if not includeAttributes.nil?
+        get_object_with_include_attributes(uuids, includeAttributes, resource)
+      elsif not excludeAttributes.nil?
+        get_object_with_exclude_attributes(uuids, excludeAttributes, resource)
+      elsif not uuids.nil?
+        connection(resource::BASE_URI + "/" + uuids.join(","))
+      else
+        connection(resource::BASE_URI)
+      end
+
+      return [] unless response.success?
+
+      body = JSON.parse(response.body)
+      body = {resource::LIST_NAME => [body]} unless body.has_key? resource::LIST_NAME
+      body[resource::LIST_NAME].map do |resource_params|
+        resource.new resource_params
+      end
+    end
+
+    def get_object_with_include_attributes(uuids, attributes, resource)
+
+      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
+
+      response = if not uuids.nil?
+        connection(resource::BASE_URI + "/" + uuids.join(",") + "?includeAttributes=" + attributes.join(","))
+      else
+        connection(resource::BASE_URI + "?includeAttributes=" + attributes.join(","))
+      end
+
+    end
+
+    def get_object_with_exclude_attributes(uuids, attributes, resource)
+
+      uuids.reject! { |uuid| UUID.validate(uuid).nil? } unless uuids.nil?
+
+      response = if not uuids.nil?
+        connection(resource::BASE_URI + "/#{uuids.join(",")}"+"?excludeAttributes=#{attributes.join(",")}")
+      else
+        connection(resource::BASE_URI + "?excludeAttributes=" + attributes.join(","))
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xclarity_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Julian Cheal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,7 @@ files:
 - lib/xclarity_client/version.rb
 - lib/xclarity_client/virtual_appliance_management.rb
 - lib/xclarity_client/xclarity_base.rb
+- lib/xclarity_client/xclarity_management_mixin.rb
 - lib/xclarity_client/xclarity_resource.rb
 - xclarity_client.gemspec
 homepage: https://github.com/juliancheal/xclarity_client