Merge pull request #34 from fdupont-redhat/bz1447754

Move create_service_provision_request into MiqAeServiceMethods for consistency
ManageIQ · Jun 12, 2017 · f650a66 · f650a66
2 parents f4bc749 + 2fd5605
commit f650a66
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service.rb b/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service.rb
@@ -94,11 +94,6 @@ def instantiate(uri)
       return nil
     end
 
-    def create_service_provision_request(svc_template, options = nil)
-      result = ar_object(svc_template).provision_request(@workspace.ae_user, options)
-      MiqAeServiceModelBase.wrap_results(result)
-    end
-
     def object(path = nil)
       obj = @workspace.get_obj_from_path(path)
       return nil if obj.nil?

diff --git a/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service_methods.rb b/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service_methods.rb
@@ -110,6 +110,11 @@ def self.create_automation_request(options, userid = "admin", auto_approve = fal
       MiqAeServiceModelBase.wrap_results(AutomationRequest.create_request(options, user, auto_approve))
     end
 
+    def self.create_service_provision_request(svc_template, options = nil)
+      result = svc_template.object_send(:provision_request, User.current_user, options)
+      MiqAeServiceModelBase.wrap_results(result)
+    end
+
     def self.drb_undumped(klass)
       _log.info "Entered: klass=#{klass.name}"
       klass.include(DRbUndumped) unless klass.ancestors.include?(DRbUndumped)

diff --git a/spec/engine/miq_ae_method_service/miq_ae_service_methods_spec.rb b/spec/engine/miq_ae_method_service/miq_ae_service_methods_spec.rb
@@ -162,5 +162,32 @@ def category_create_script
       ct.reload
       expect(ct.entries.collect(&:name).include?('fred')).to be_truthy
     end
+
+    context "#create_service_provision_request" do
+      let(:options) { {:fred => :flintstone} }
+      let(:svc_options) { {:dialog_style => "medium"} }
+      let(:user) { FactoryGirl.create(:user_with_group) }
+      let(:template) { FactoryGirl.create(:service_template_ansible_playbook) }
+      let(:miq_request) { FactoryGirl.create(:service_template_provision_request) }
+      let(:svc_template) do
+        MiqAeMethodService::MiqAeServiceServiceTemplate.find(template.id)
+      end
+      let(:workspace) do
+        double("MiqAeEngine::MiqAeWorkspaceRuntime",
+               :root               => options,
+               :persist_state_hash => {},
+               :ae_user            => user)
+      end
+      let(:miq_ae_service) { MiqAeMethodService::MiqAeService.new(workspace) }
+
+      it "create service request" do
+        allow(workspace).to receive(:disable_rbac)
+        allow(ServiceTemplate).to receive(:find).with(template.id).and_return(template)
+        expect(template).to receive(:provision_request).with(user, svc_options).and_return(miq_request)
+
+        result = miq_ae_service.execute(:create_service_provision_request, svc_template, svc_options)
+        expect(result).to be_kind_of(MiqAeMethodService::MiqAeServiceMiqRequest)
+      end
+    end
   end
 end
diff --git a/spec/miq_ae_service_spec.rb b/spec/miq_ae_service_spec.rb
@@ -208,32 +208,5 @@ module MiqAeServiceSpec
         end
       end
     end
-
-    context "#create_service_provision_request" do
-      let(:options) { {:fred => :flintstone} }
-      let(:svc_options) { {:dialog_style => "medium"} }
-      let(:user) { FactoryGirl.create(:user_with_group) }
-      let(:template) { FactoryGirl.create(:service_template_ansible_playbook) }
-      let(:miq_request) { FactoryGirl.create(:service_template_provision_request) }
-      let(:svc_template) do
-        MiqAeMethodService::MiqAeServiceServiceTemplate.find(template.id)
-      end
-      let(:workspace) do
-        double("MiqAeEngine::MiqAeWorkspaceRuntime",
-               :root               => options,
-               :persist_state_hash => {},
-               :ae_user            => user)
-      end
-      let(:miq_ae_service) { MiqAeService.new(workspace) }
-
-      it "create service request" do
-        allow(workspace).to receive(:disable_rbac)
-        expect(svc_template).to receive(:instance_variable_get).with('@object').and_return(template)
-        expect(template).to receive(:provision_request).with(user, svc_options).and_return(miq_request)
-
-        result = miq_ae_service.create_service_provision_request(svc_template, svc_options)
-        expect(result).to be_kind_of(MiqAeMethodService::MiqAeServiceMiqRequest)
-      end
-    end
   end
 end