Merge pull request #74 from lfu/go_method_call_via_api

Changes for generic object method calls via REST API.
ManageIQ · Oct 4, 2017 · 7d0268f · 7d0268f
2 parents 19843aa + 16fe96e
commit 7d0268f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/lib/miq_automation_engine/engine/miq_ae_engine/miq_ae_workspace_runtime.rb b/lib/miq_automation_engine/engine/miq_ae_engine/miq_ae_workspace_runtime.rb
@@ -45,8 +45,8 @@ def self.clear_stored_workspace
     def self.instantiate(uri, user, attrs = {})
       User.current_user = user
       workspace = MiqAeWorkspaceRuntime.new(attrs)
-      workspace.instantiate(uri, user, nil)
       self.current = workspace
+      workspace.instantiate(uri, user, nil)
       workspace
     rescue MiqAeException
     ensure

diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_generic_object.rb b/lib/miq_automation_engine/service_models/miq_ae_service_generic_object.rb
@@ -17,7 +17,9 @@ def remove_from_service(service)
     private
 
     def ae_user_identity
-      @ae_user = MiqAeEngine::DrbRemoteInvoker.workspace.ae_user
+      workspace = MiqAeEngine::MiqAeWorkspaceRuntime.current || MiqAeEngine::DrbRemoteInvoker.workspace
+      raise 'Workspace not found when running generic object' unless workspace
+      @ae_user = workspace.ae_user
       ar_method { @object.ae_user_identity(@ae_user, @ae_user.current_group, @ae_user.current_tenant) }
     end
 

diff --git a/spec/service_models/miq_ae_service_generic_object_spec.rb b/spec/service_models/miq_ae_service_generic_object_spec.rb
@@ -34,23 +34,38 @@ module MiqAeServiceGenericObjectSpec
     end
 
     describe "call method on generic object" do
-      before do
-        allow(MiqAeEngine::DrbRemoteInvoker).to receive('workspace').and_return(workspace)
+      shared_examples_for "calls into automate" do
+        it "runs successfully" do
+          options = {
+            :object_type   => "GenericObject",
+            :object_id     => go.id,
+            :instance_name => "GenericObject",
+            :user_id       => user.id,
+            :miq_group_id  => user.current_group.id,
+            :tenant_id     => user.current_tenant.id,
+            :attrs         => {:method_name => method_name}
+          }
+          svc_obj = MiqAeMethodService::MiqAeServiceGenericObject.find(go.id)
+          expect(MiqAeEngine).to receive('deliver').with(options).and_return(workspace)
+
+          svc_obj.send(method_name)
+        end
+      end
+
+      context "from Drb method" do
+        before do
+          allow(MiqAeEngine::DrbRemoteInvoker).to receive('workspace').and_return(workspace)
+        end
+
+        it_behaves_like "calls into automate"
       end
 
-      it "calls into automate" do
-        options = { :object_type   => "GenericObject",
-                    :object_id     => go.id,
-                    :instance_name => "GenericObject",
-                    :user_id       => user.id,
-                    :miq_group_id  => user.current_group.id,
-                    :tenant_id     => user.current_tenant.id,
-                    :attrs         => {:method_name => method_name}
-                  }
-        svc_obj = MiqAeMethodService::MiqAeServiceGenericObject.find(go.id)
-        expect(MiqAeEngine).to receive('deliver').with(options).and_return(workspace)
-
-        svc_obj.send(method_name)
+      context "from workspace engine" do
+        before do
+          allow(MiqAeEngine::MiqAeWorkspaceRuntime).to receive('current').and_return(workspace)
+        end
+
+        it_behaves_like "calls into automate"
       end
     end