From b6d05345bd2820316215fdee8a8777f109495903 Mon Sep 17 00:00:00 2001 From: Martin Slemr Date: Wed, 28 Mar 2018 12:18:57 +0200 Subject: [PATCH] Makes http_proxy_uri class method Instance method uses new class method, which is needed by provider validation. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1552114 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1559019 --- app/models/manageiq/providers/base_manager.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/manageiq/providers/base_manager.rb b/app/models/manageiq/providers/base_manager.rb index 8f963edb5f3..dafd2667b22 100644 --- a/app/models/manageiq/providers/base_manager.rb +++ b/app/models/manageiq/providers/base_manager.rb @@ -25,7 +25,11 @@ def refresher end def http_proxy_uri - VMDB::Util.http_proxy_uri(emstype.try(:to_sym)) || VMDB::Util.http_proxy_uri + self.class.http_proxy_uri + end + + def self.http_proxy_uri + VMDB::Util.http_proxy_uri(ems_type.try(:to_sym)) || VMDB::Util.http_proxy_uri end def self.default_blacklisted_event_names