From f51a64d229326ed7429906114c46bee450386125 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Mon, 11 Dec 2017 13:03:55 -0500 Subject: [PATCH] Merge pull request #35 from mkanoor/supported_catalog_types Added supported_catalog_types (cherry picked from commit 8288913717c76c1c55663984d0b45af6f4b308db) https://bugzilla.redhat.com/show_bug.cgi?id=1520613 --- app/models/manageiq/providers/google/cloud_manager.rb | 4 ++++ .../manageiq/providers/google/cloud_manager_spec.rb | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/app/models/manageiq/providers/google/cloud_manager.rb b/app/models/manageiq/providers/google/cloud_manager.rb index c744717d..b0f8a238 100644 --- a/app/models/manageiq/providers/google/cloud_manager.rb +++ b/app/models/manageiq/providers/google/cloud_manager.rb @@ -45,6 +45,10 @@ def supported_auth_types %w(auth_key) end + def supported_catalog_types + %w(google) + end + # TODO(lwander) determine if user wants to use OAUTH or a service account def missing_credentials?(_type = {}) false diff --git a/spec/models/manageiq/providers/google/cloud_manager_spec.rb b/spec/models/manageiq/providers/google/cloud_manager_spec.rb index 712d8cbe..d62ddb64 100644 --- a/spec/models/manageiq/providers/google/cloud_manager_spec.rb +++ b/spec/models/manageiq/providers/google/cloud_manager_spec.rb @@ -110,4 +110,12 @@ end end end + + context 'catalog types' do + let(:ems) { FactoryGirl.create(:ems_google) } + + it "#supported_google_types" do + expect(ems.supported_catalog_types).to eq(%w(google)) + end + end end