From c02266a9ebb932a42d84be69545eed3fe343c268 Mon Sep 17 00:00:00 2001 From: Oleg Barenboim <chessbyte@gmail.com> Date: Thu, 30 Mar 2017 11:29:35 -0400 Subject: [PATCH] Merge pull request #14543 from israel-hdez/remove_usage_of_deprecated_constants Stop using deprecated names of hawkular-client gem (cherry picked from commit f15a504cb08f09cb82ce43cd5664253690af75a3) https://bugzilla.redhat.com/show_bug.cgi?id=1446329 --- .../manageiq/providers/hawkular/datawarehouse_manager.rb | 2 +- app/models/manageiq/providers/hawkular/middleware_manager.rb | 4 ++-- .../providers/hawkular/middleware_manager/refresh_parser.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/manageiq/providers/hawkular/datawarehouse_manager.rb b/app/models/manageiq/providers/hawkular/datawarehouse_manager.rb index c6d8f26e917..4b106522093 100644 --- a/app/models/manageiq/providers/hawkular/datawarehouse_manager.rb +++ b/app/models/manageiq/providers/hawkular/datawarehouse_manager.rb @@ -46,7 +46,7 @@ def self.raw_connect(options) when :metrics ::Hawkular::Metrics::Client when :alerts - ::Hawkular::Alerts::AlertsClient + ::Hawkular::Alerts::Client else raise ArgumentError, "Client not found for [#{type}]" end diff --git a/app/models/manageiq/providers/hawkular/middleware_manager.rb b/app/models/manageiq/providers/hawkular/middleware_manager.rb index 9fec9e1db82..3f7c44f9394 100644 --- a/app/models/manageiq/providers/hawkular/middleware_manager.rb +++ b/app/models/manageiq/providers/hawkular/middleware_manager.rb @@ -17,7 +17,7 @@ class Hawkular::MiddlewareManager < ManageIQ::Providers::MiddlewareManager require_nested :Refresher include AuthenticationMixin - include ::HawkularUtilsMixin + include ::Hawkular::ClientUtils DEFAULT_PORT = 80 default_value_for :port, DEFAULT_PORT @@ -283,7 +283,7 @@ def self.raw_alerts_connect(hostname, port, username, password) :username => username, :password => password } - ::Hawkular::Alerts::AlertsClient.new(url, credentials) + ::Hawkular::Alerts::Client.new(url, credentials) end def add_middleware_datasource(ems_ref, hash) diff --git a/app/models/manageiq/providers/hawkular/middleware_manager/refresh_parser.rb b/app/models/manageiq/providers/hawkular/middleware_manager/refresh_parser.rb index 2da64a3be4f..b1f3dd7ac3f 100644 --- a/app/models/manageiq/providers/hawkular/middleware_manager/refresh_parser.rb +++ b/app/models/manageiq/providers/hawkular/middleware_manager/refresh_parser.rb @@ -1,7 +1,7 @@ module ManageIQ::Providers module Hawkular class MiddlewareManager::RefreshParser - include ::HawkularUtilsMixin + include ::Hawkular::ClientUtils def self.ems_inv_to_hashes(ems, options = nil) new(ems, options).ems_inv_to_hashes