Merge pull request #1201 from lgalis/add_vapp_orchestration_type_to_list

Add VMWare vApp type to the Create Orchestration Template type list
ManageIQ · Apr 28, 2017 · 5f982cf · 5f982cf
2 parents 70ba36c + b6dd115
commit 5f982cf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/views/catalog/_ot_add.html.haml b/app/views/catalog/_ot_add.html.haml
@@ -35,7 +35,8 @@
                        options_for_select({"Amazon CloudFormation" => "OrchestrationTemplateCfn",
                                            "OpenStack Heat" => "OrchestrationTemplateHot",
                                            "Microsoft Azure" => "OrchestrationTemplateAzure",
-                                           "VNF" => "OrchestrationTemplateVnfd",},
+                                           "VNF" => "OrchestrationTemplateVnfd",
+                                           "VMWare vApp" => "ManageIQ::Providers::Vmware::CloudManager::OrchestrationTemplate"},
                                           @edit[:new][:type]),
                        :class => "selectpicker")
           :javascript

diff --git a/spec/views/catalog/_ot_add.html.haml_spec.rb b/spec/views/catalog/_ot_add.html.haml_spec.rb
@@ -0,0 +1,13 @@
+describe "catalog/_ot_add.html.haml" do
+  before do
+    set_controller_for_view("catalog")
+    set_controller_for_view_to_be_nonrestful
+    @edit = {:new => {}}
+    assign(:sb, :active_accordion => 'ot_accord')
+  end
+
+  it "the orchestration type dropdown includes the vApp type" do
+    render
+    expect(rendered).to include('VMWare vApp')
+  end
+end