Merge pull request #14543 from israel-hdez/remove_usage_of_deprecated…

…_constants Stop using deprecated names of hawkular-client gem (cherry picked from commit f15a504) https://bugzilla.redhat.com/show_bug.cgi?id=1446329
ManageIQ · Apr 27, 2017 · c02266a · c02266a
1 parent c466029
commit c02266a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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