Skip to content

Commit

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

https://bugzilla.redhat.com/show_bug.cgi?id=1520613
  • Loading branch information
agrare authored and simaishi committed Dec 11, 2017
1 parent 5d3ad21 commit 48fd8e3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/openshift/container_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,8 @@ def create_project(project)
rescue KubeException => e
raise MiqException::MiqProvisionError, "Unexpected Exception while creating project: #{e}"
end

def supported_catalog_types
%w(generic_container_template).freeze
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
describe ManageIQ::Providers::Openshift::ContainerManager do
it "#supported_catalog_types" do
ems = FactoryGirl.create(:ems_openshift)
expect(ems.supported_catalog_types).to match_array(%w(generic_container_template))
end
end

0 comments on commit 48fd8e3

Please sign in to comment.