Skip to content

Commit

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

https://bugzilla.redhat.com/show_bug.cgi?id=1520613
  • Loading branch information
agrare authored and simaishi committed Dec 11, 2017
1 parent 7d17258 commit 44e46e8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/amazon/cloud_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ def supports_authentication?(authtype)
supported_auth_types.include?(authtype.to_s)
end

def supported_catalog_types
%w(amazon).freeze
end

#
# Operations
#
Expand Down
5 changes: 5 additions & 0 deletions spec/models/manageiq/providers/amazon/cloud_manager_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
expect(described_class.description).to eq('Amazon EC2')
end

it "#supported_catalog_types" do
ems = FactoryGirl.create(:ems_amazon)
expect(ems.supported_catalog_types).to eq(%w(amazon))
end

it "does not create orphaned network_manager" do
ems = FactoryGirl.create(:ems_amazon)
same_ems = ExtManagementSystem.find(ems.id)
Expand Down

0 comments on commit 44e46e8

Please sign in to comment.