Merge pull request #9869 from agrare/prefer_provider_specific_service_templates_if_available

Use Provider specific Service Templates if available

Author: Fryguy

app/controllers/catalog_controller.rb

@@ -991,7 +991,7 @@ def class_service_template(prov_type)
     elsif prov_type.starts_with?('generic')
       prov_type.gsub(/(generic)(_.*)?/, 'service_template\2').classify.constantize
     else
-      ServiceTemplate
+      "ServiceTemplate#{prov_type.camelize}".safe_constantize || ServiceTemplate
     end
   end
 
@@ -1093,7 +1093,7 @@ def atomic_req_submit
            end
       common_st_record_vars(st)
       add_orchestration_template_vars(st)  if st.kind_of?(ServiceTemplateOrchestration)
-      add_configuration_script_vars(st)    if st.kind_of?(ServiceTemplateAutomation)
+      add_configuration_script_vars(st)    if st.kind_of?(ServiceTemplateAutomation) && !need_prov_dialogs?(@edit[:new][:st_prov_type])
       add_server_profile_template_vars(st) if @edit[:new][:st_prov_type] == 'cisco_intersight'
       st.service_type = "atomic"
 
@@ -1303,7 +1303,7 @@ def set_form_vars
     @available_catalogs = available_catalogs.sort # Get available catalogs with tenants and ancestors
     @additional_tenants = @edit[:new][:tenant_ids].map(&:to_s) # Get ids of selected Additional Tenants in the Tenants tree
     available_orchestration_templates if @record.kind_of?(ServiceTemplateOrchestration)
-    available_automation_managers     if @record.kind_of?(ServiceTemplateAutomation)
+    available_automation_managers     if @record.kind_of?(ServiceTemplateAutomation) && !need_prov_dialogs?(@record.prov_type)
     available_container_managers      if @record.kind_of?(ServiceTemplateContainerTemplate)
     fetch_zones
     @edit[:new][:zone_id] = @record.zone_id

spec/controllers/catalog_controller_spec.rb

@@ -1197,20 +1197,33 @@
     end
 
     context "with a ServiceTemplateAnsibleTower" do
-      let!(:ems_ansible_tower)     { FactoryBot.create(:provider_ansible_tower).automation_manager }
-      let(:record)                 { FactoryBot.create(:service_template_ansible_tower) }
+      let!(:ems_ansible_tower) { FactoryBot.create(:provider_ansible_tower).automation_manager }
+      let(:record) { FactoryBot.create(:service_template_ansible_tower, :prov_type => prov_type) }
 
-      it "sets available_managers" do
-        controller.send(:set_form_vars)
-        expect(controller.instance_variable_get(:@edit)[:new][:available_managers]).to eq([[ems_ansible_tower.name, ems_ansible_tower.id]])
+      context "with a generic_ provision type" do
+        let(:prov_type) { "generic_ansible_tower" }
+
+        it "sets available_managers" do
+          controller.send(:set_form_vars)
+          expect(controller.instance_variable_get(:@edit)[:new][:available_managers]).to eq([[ems_ansible_tower.name, ems_ansible_tower.id]])
+        end
+
+        context "with other automation managers" do
+          let!(:embedded_ansible) { FactoryBot.create(:provider_embedded_ansible).automation_manager }
+
+          it "doesn't include other automation managers" do
+            controller.send(:set_form_vars)
+            expect(controller.instance_variable_get(:@edit)[:new][:available_managers]).to eq([[ems_ansible_tower.name, ems_ansible_tower.id]])
+          end
+        end
       end
 
-      context "with other automation managers" do
-        let!(:embedded_ansible) { FactoryBot.create(:provider_embedded_ansible).automation_manager }
+      context "with a non-generic provision type" do
+        let(:prov_type) { "ansible_tower" }
 
-        it "doesn't include other automation managers" do
+        it "doesn't set available_managers" do
           controller.send(:set_form_vars)
-          expect(controller.instance_variable_get(:@edit)[:new][:available_managers]).to eq([[ems_ansible_tower.name, ems_ansible_tower.id]])
+          expect(controller.instance_variable_get(:@edit)[:new].keys).not_to include(:available_managers)
         end
       end
     end