Skip to content

Commit

Permalink
Merge pull request #35 from mkanoor/supported_catalog_types
Browse files Browse the repository at this point in the history
Added supported_catalog_types
(cherry picked from commit 8288913)

https://bugzilla.redhat.com/show_bug.cgi?id=1520613
  • Loading branch information
agrare authored and simaishi committed Dec 11, 2017
1 parent 871aa85 commit f51a64d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/google/cloud_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions spec/models/manageiq/providers/google/cloud_manager_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f51a64d

Please sign in to comment.