xclarity_client 0.6.0 → 0.6.1

data/docs/apib/switches.apib

@@ -1594,3 +1594,7 @@ FORMAT: 1A
 + Response 404
 + Response 409
 + Response 500
+
+# PUT /switches/1B33D6D13F267A614567A897DC784F00
+
++ Response 200 (application/json)

data/lib/xclarity_client.rb

@@ -9,11 +9,10 @@ require 'xclarity_client/errors/errors'
 
 require 'xclarity_client/configuration'
 require 'xclarity_client/xclarity_base'
-require 'xclarity_client/xclarity_power_management_mixin'
 require 'xclarity_client/xclarity_credentials_validator'
 require 'xclarity_client/discover'
-require 'xclarity_client/client'
-require 'xclarity_client/schemas'
-
 require 'xclarity_client/endpoints/endpoints'
 require 'xclarity_client/services/services'
+require 'xclarity_client/mixins/mixins'
+require 'xclarity_client/client'
+require 'xclarity_client/schemas'

data/lib/xclarity_client/client.rb

@@ -1,351 +1,45 @@
 module XClarityClient
+  #
+  # Facade that exposes the lib features
+  #
   class Client
-    include XClarityClient::PowerManagementMixin
-
-    def initialize(connection)
-      @connection = connection
-    end
-
-    def discover_nodes(opts = {})
-      NodeManagement.new(@connection).population opts
-    end
-
-    def discover_aicc(opts = {})
-      AiccManagement.new(@connection).population opts
-    end
-
-    def discover_scalableComplexes(opts = {})
-      ScalableComplexManagement.new(@connection).population opts
-    end
-
-    def discover_cabinet(opts = {})
-      CabinetManagement.new(@connection).population opts
-    end
-
-    def fetch_cabinet(uuids = nil,
-                      includeAttributes = nil,
-                      excludeAttributes = nil)
-      CabinetManagement.new(@connection).get_object(uuids,
-                                                    includeAttributes,
-                                                    excludeAttributes)
-    end
-
-    def discover_canisters(opts = {})
-      CanisterManagement.new(@connection).population opts
-    end
-
-    def fetch_canisters(uuids = nil,
-                        includeAttributes = nil,
-                        excludeAttributes = nil)
-      CanisterManagement.new(@connection).get_object(uuids,
-                                                     includeAttributes,
-                                                     excludeAttributes)
-    end
-
-    def discover_cmms(opts = {})
-      CmmManagement.new(@connection).population opts
-    end
-
-    def fetch_cmms(uuids = nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      CmmManagement.new(@connection).get_object(uuids,
-                                                includeAttributes,
-                                                excludeAttributes)
-    end
-
-    def fetch_fans(uuids = nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      FanManagement.new(@connection).get_object(uuids,
-                                                includeAttributes,
-                                                excludeAttributes)
-    end
-
-    def discover_fans(opts = {})
-      FanManagement.new(@connection).population opts
-    end
-
-    def discover_switches(opts = {})
-      SwitchManagement.new(@connection).population opts
-    end
-
-    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(uuids,
-                                                   includeAttributes,
-                                                   excludeAttributes)
-    end
-
-    def discover_chassis(opts = {})
-      ChassiManagement.new(@connection).population opts
-    end
-
-    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(uuids,
-                                                 includeAttributes,
-                                                 excludeAttributes)
-    end
-
-    def fetch_chassis(uuids = nil,
-                      includeAttributes = nil,
-                      excludeAttributes = nil)
-      ChassiManagement.new(@connection).get_object(uuids,
-                                                   includeAttributes,
-                                                   excludeAttributes)
-    end
-
-    def fetch_scalableComplexes(uuids = nil,
-                                includeAttributes = nil,
-                                excludeAttributes = nil)
-      ScalableComplexManagement.new(@connection).get_object(uuids,
-                                                            includeAttributes,
-                                                            excludeAttributes)
-    end
-
-    def fetch_switches(uuids = nil,
-                       includeAttributes = nil,
-                       excludeAttributes = nil)
-      SwitchManagement.new(@connection).get_object(uuids,
-                                                   includeAttributes,
-                                                   excludeAttributes)
-    end
-
-    def fetch_power_supplies(uuids = nil,
-                             includeAttributes = nil,
-                             excludeAttributes = nil)
-      PowerSupplyManagement.new(@connection).get_object(uuids,
-                                                        includeAttributes,
-                                                        excludeAttributes)
-    end
-
-    def discover_events
-      EventManagement.new(@connection).population
-    end
-
-    def fetch_events(opts = {})
-      EventManagement.new(@connection).get_object_with_opts(opts, Event)
-    end
-
-    def blink_loc_led(uuid = '')
-      NodeManagement.new(@connection).set_loc_led_state(uuid, 'Blinking')
-    end
-
-    def turn_on_loc_led(uuid = '')
-      NodeManagement.new(@connection).set_loc_led_state(uuid, 'On')
-    end
-
-    def turn_off_loc_led(uuid = '')
-      NodeManagement.new(@connection).set_loc_led_state(uuid, 'Off')
-    end
-
-    def fetch_ffdc(uuids = nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      FfdcManagement.new(@connection).get_object(uuids,
-                                                includeAttributes,
-                                                excludeAttributes)
-    end
-
-    def discover_jobs(opts = {})
-      JobManagement.new(@connection).population opts
-    end
-
-    def fetch_jobs(ids = nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      JobManagement.new(@connection).get_object_with_id(ids,
-                                                includeAttributes,
-                                                excludeAttributes)
-    end
-
-    def cancel_job(id = '')
-      JobManagement.new(@connection).cancel_job(id)
-    end
-
-    def delete_job(id = '')
-      JobManagement.new(@connection).delete_job(id)
-    end
-
-    def get_job(job_id = "")
-        JobManagement.new(@connection).get_job(job_id)
-    end
-
-    def discover_update_repo(opts = {})
-      UpdateRepoManagement.new(@connection).population opts
-    end
-
-    def discover_users(opts = {})
-      UserManagement.new(@connection).population
-    end
-
-    def fetch_users(ids = nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      UserManagement.new(@connection).get_object_with_id(ids,
-                                                includeAttributes,
-                                                excludeAttributes)
-    end
-
-    def change_user_password(current_password, new_password)
-      UserManagement.new(@connection).change_password(current_password, new_password)
-    end
-
-    def fetch_config_target(ids=nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      ConfigTargetManagement.new(@connection).get_object_with_id(ids,
-                                                        includeAttributes,
-                                                        excludeAttributes)
-    end
-
-    def fetch_config_profile(ids=nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      ConfigProfileManagement.new(@connection).get_object_with_id(ids,
-                                                        includeAttributes,
-                                                        excludeAttributes)
-    end
-
-    def discover_config_profile
-      ConfigProfileManagement.new(@connection).population
-    end
-
-    def rename_config_profile(id='', name='')
-      ConfigProfileManagement.new(@connection).rename_config_profile(id,
-						      name)
-    end
-
-    def activate_config_profile(id='', endpoint_uuid='', restart='')
-      ConfigProfileManagement.new(@connection).activate_config_profile(id,
-							endpoint_uuid,
-							restart)
-    end
-
-    def unassign_config_profile(id='', powerDown='',resetImm='',force='')
-      ConfigProfileManagement.new(@connection).unassign_config_profile(id,
-							powerDown,
-							resetImm,
-							force)
-    end
-
-    def delete_config_profile(id='')
-      ConfigProfileManagement.new(@connection).delete_config_profile(id)
-    end
-
-    def fetch_config_pattern(ids=nil,
-                   includeAttributes = nil,
-                   excludeAttributes = nil)
-      ConfigPatternManagement.new(@connection).get_object_with_id(ids,
-                                                        includeAttributes,
-                                                        excludeAttributes)
-    end
-
-    def discover_config_pattern
-      ConfigPatternManagement.new(@connection).population
-    end
-
-    def export_config_pattern(id='')
-      ConfigPatternManagement.new(@connection).export(id)
-    end
-
-    def deploy_config_pattern(id='',endpoints=nil,restart='',etype='')
-      ConfigPatternManagement.new(@connection).deploy_config_pattern(id,
-						      endpoints,
-                                                      restart,
-                                                      etype)
-    end
-
-    def import_config_pattern(config_pattern = {})
-      ConfigPatternManagement.new(@connection).import_config_pattern(config_pattern)
+    include XClarityClient::Mixins::AiccMixin
+    include XClarityClient::Mixins::CabinetMixin
+    include XClarityClient::Mixins::CanisterMixin
+    include XClarityClient::Mixins::ChassiMixin
+    include XClarityClient::Mixins::CmmMixin
+    include XClarityClient::Mixins::CompliancePolicyMixin
+    include XClarityClient::Mixins::ConfigPatternMixin
+    include XClarityClient::Mixins::ConfigProfileMixin
+    include XClarityClient::Mixins::ConfigTargetMixin
+    include XClarityClient::Mixins::DiscoverMixin
+    include XClarityClient::Mixins::DiscoverRequestMixin
+    include XClarityClient::Mixins::EventMixin
+    include XClarityClient::Mixins::FanMixin
+    include XClarityClient::Mixins::FanMuxMixin
+    include XClarityClient::Mixins::FfdcMixin
+    include XClarityClient::Mixins::GlobalSettingMixin
+    include XClarityClient::Mixins::HostPlatformMixin
+    include XClarityClient::Mixins::JobMixin
+    include XClarityClient::Mixins::NodeMixin
+    include XClarityClient::Mixins::OsImageMixin
+    include XClarityClient::Mixins::PersistedResultMixin
+    include XClarityClient::Mixins::PowerSupplyMixin
+    include XClarityClient::Mixins::RemoteAccessMixin
+    include XClarityClient::Mixins::RemoteFileServerMixin
+    include XClarityClient::Mixins::ScalableComplexMixin
+    include XClarityClient::Mixins::StorageMixin
+    include XClarityClient::Mixins::SwitchMixin
+    include XClarityClient::Mixins::UnmanageRequestMixin
+    include XClarityClient::Mixins::UpdateRepoMixin
+    include XClarityClient::Mixins::UserMixin
+
+    def initialize(config)
+      @config = config
     end
 
     def validate_configuration
-      XClarityCredentialsValidator.new(@connection).validate
-    end
-
-    def discover_manageable_devices(ip_addresses)
-      DiscoverRequestManagement.new(@connection).discover_manageable_devices(ip_addresses)
-    end
-
-    def discover_devices_by_slp
-      DiscoveryManagement.new(@connection).population
+      XClarityCredentialsValidator.new(@config).validate
     end
-
-    def monitor_discover_request(job_id)
-      DiscoverRequestManagement.new(@connection).monitor_discover_request(job_id)
-    end
-
-    def fetch_unmanage_request(job_id)
-      UnmanageRequestManagement.new(@connection).fetch_unmanage_request(job_id)
-    end
-
-    def unmanage_discovered_devices(endpoints, force)
-      UnmanageRequestManagement.new(@connection).unmanage_discovered_devices(endpoints, force)
-    end
-
-    def fetch_compliance_policies
-      PersistedResultManagement.new(@connection).population
-    end
-
-    def remote_control(uuid)
-      RemoteAccessManagement.new(@connection).remote_control uuid
-    end
-
-    def get_remotefileserver_profiles
-      RemoteFileServerManagement.new(@connection).population
-    end
-
-    def create_remotefileserver_profile(opts = {})
-      RemoteFileServerManagement.new(@connection).create_remotefileserver_profile(opts)
-    end
-
-    def delete_remotefileserver_profile(serverId = "")
-      RemoteFileServerManagement.new(@connection).delete_remotefileserver_profile(serverId)
-    end
-
-    def get_remotefileserver_profile(serverId = "")
-      RemoteFileServerManagement.new(@connection).get_remotefileserver_profile(serverId)
-    end
-
-    def import_osimage(serverId = "", path = "")
-      OsImageManagement.new(@connection).import_osimage(serverId, path)
-    end
-
-    def get_osimages
-        OsImageManagement.new(@connection).population
-    end
-
-    def get_hostplatforms
-      HostPlatformManagement.new(@connection).population
-    end
-
-    def get_osimage_deployment_status(uuid = "")
-      HostPlatformManagement.new(@connection).get_osimage_deployment_status(uuid)
-    end
-
-    def deploy_osimage(opts = [])
-      HostPlatformManagement.new(@connection).deploy_osimage(opts)
-    end
-
-    def get_globalsettings
-      GlobalSettingManagement.new(@connection).population
-    end
-
-    def set_globalsettings(opts = {})
-      GlobalSettingManagement.new(@connection).set_globalsettings(opts)
-    end
-
   end
 end

data/lib/xclarity_client/connection/connection.rb

@@ -29,8 +29,8 @@ module XClarityClient
     # @param [String] uri - endpoint to do the request
     # @param [Hash] query - params to query the endpoint resources
     #
-    def do_get(uri = "", query = "")
-      url_query = query.size > 0 ? "?" + query.map {|k, v| "#{k}=#{v}"}.join(",") : ""
+    def do_get(uri = "", query = {})
+      url_query = query.size > 0 ? "?" + query.map {|k, v| "#{k}=#{v}"}.join("&") : ""
       @connection.get(uri + url_query)
     rescue Faraday::Error::ConnectionFailed => e
       $lxca_log.error "XClarityClient::XclarityBase connection", "Error trying to send a GET to #{uri + url_query}"
@@ -115,4 +115,4 @@ module XClarityClient
       connection
     end
   end
-end
+end

data/lib/xclarity_client/endpoints/compliance_policy.rb

@@ -0,0 +1,19 @@
+module XClarityClient
+  class CompliancePolicy < Endpoints::XclarityEndpoint
+
+    BASE_URI = '/compliancePolicies'.freeze
+    LIST_NAME = 'updatePolicyList'.freeze
+    SUB_URIS = {
+      applicableFirmware: "#{BASE_URI}/applicableFirmware",
+      persistedResult: "#{BASE_URI}/persistedResult",
+      compareResult: "#{BASE_URI}/compareResult"
+    }
+
+    attr_accessor :policies, :id, :inUse, :lastModified, :name, :updateRule, :userDefined,
+                  :description, :details, :componentTypes, :applicableFirmware,
+                  :machineType, :uuid, :jobid, :percentage, :result, :endpointCompliant,
+                  :message, :status, :targetFirmware, :taskid, :all, :chassis, :cmms,
+                  :racklist, :rackswitchlist, :storagelist, :switches, :xITEs, :message,
+                  :success, :messages, :explanation, :recovery, :text
+  end
+end