Merge pull request #577 from agrare/make_catalog_types_pluggable

Make Provider Catalog Types Pluggable
ManageIQ · Apr 9, 2020 · 3ee6b49 · 3ee6b49
2 parents d5ad16b + 6618048
commit 3ee6b49
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/app/models/manageiq/providers/openstack/cloud_manager.rb b/app/models/manageiq/providers/openstack/cloud_manager.rb
@@ -178,8 +178,8 @@ def supported_auth_types
     %w(default amqp ssh_keypair)
   end
 
-  def supported_catalog_types
-    %w(openstack)
+  def self.catalog_types
+    {"openstack" => N_("OpenStack")}
   end
 
   def supports_provider_id?

diff --git a/app/models/manageiq/providers/openstack/infra_manager.rb b/app/models/manageiq/providers/openstack/infra_manager.rb
@@ -99,8 +99,8 @@ def supports_authentication?(authtype)
     supported_auth_types.include?(authtype.to_s)
   end
 
-  def supported_catalog_types
-    %w(openstack)
+  def self.catalog_types
+    {"openstack" => N_("OpenStack")}
   end
 
   def self.event_monitor_class

diff --git a/spec/models/manageiq/providers/openstack/cloud_manager_spec.rb b/spec/models/manageiq/providers/openstack/cloud_manager_spec.rb
@@ -243,8 +243,8 @@
   context "catalog types" do
     let(:ems) { FactoryBot.create(:ems_openstack) }
 
-    it '#supported_catalog_types' do
-      expect(ems.supported_catalog_types).to eq(%w(openstack))
+    it '#catalog_types' do
+      expect(ems.catalog_types).to include("openstack")
     end
   end
 end
diff --git a/spec/models/manageiq/providers/openstack/infra_manager_spec.rb b/spec/models/manageiq/providers/openstack/infra_manager_spec.rb
@@ -148,8 +148,8 @@
   context "catalog types" do
     let(:ems) { FactoryBot.create(:ems_openstack_infra_with_authentication) }
 
-    it "#supported_catalog_types" do
-      expect(ems.supported_catalog_types).to eq(%w(openstack))
+    it "#catalog_types" do
+      expect(ems.catalog_types).to include("openstack")
     end
   end