Reapply #439 fix

ManageIQ · Oct 18, 2018 · b00873a · b00873a
1 parent b515b28
commit b00873a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/content/automate/ManageIQ/Transformation/TransformationThrottler.class/__methods__/utils.rb b/content/automate/ManageIQ/Transformation/TransformationThrottler.class/__methods__/utils.rb
@@ -67,7 +67,7 @@ def self.launch(handle = $evm)
                 :namespace     => NAMESPACE,
                 :class_name    => CLASS_NAME,
                 :instance_name => throttler_type(handle),
-                :user_id       => 1,
+                :user_id       => handle.vmdb(:user).find_by(:userid => 'admin').id,
                 :attrs         => { :ttl => throttler_ttl(handle) }
               },
               'admin',

diff --git a/.../automate/ManageIQ/Transformation/TransformationThrottler.class/__methods__/utils_spec.rb b/.../automate/ManageIQ/Transformation/TransformationThrottler.class/__methods__/utils_spec.rb
@@ -84,6 +84,7 @@
     end
   end
 
+  let(:svc_vmdb_handle_user) { MiqAeMethodService::MiqAeServiceUser }
   let(:svc_vmdb_handle_request) { MiqAeMethodService::MiqAeServiceAutomationRequest }
   let(:svc_vmdb_handle_conversion_host) { MiqAeMethodService::MiqAeServiceConversionHost }
   let(:svc_vmdb_handle_transformation_task) { MiqAeMethodService::MiqAeServiceServiceTemplateTransformationPlanTask }
@@ -111,9 +112,11 @@
     svc_model_automation_request_3.set_option(:class_name, 'TransformationThrottler')
     svc_model_automation_request_3.set_option(:instance_name, 'Invalid')
 
+    allow(ae_service).to receive(:vmdb).with(:user).and_return(svc_vmdb_handle_user)
     allow(ae_service).to receive(:vmdb).with(:miq_request).and_return(svc_vmdb_handle_request)
-    allow(ae_service).to receive(:vmdb).with(:service_template_transformation_plan_task).and_return(svc_vmdb_handle_transformation_task)
     allow(ae_service).to receive(:vmdb).with(:conversion_host).and_return(svc_vmdb_handle_conversion_host)
+    allow(ae_service).to receive(:vmdb).with(:service_template_transformation_plan_task).and_return(svc_vmdb_handle_transformation_task)
+
     allow(svc_vmdb_handle_conversion_host).to receive(:all).and_return([svc_model_conversion_host_1, svc_model_conversion_host_2, svc_model_conversion_host_3])
     allow(svc_model_transformation_task_1).to receive(:transformation_destination).with(svc_model_src_cluster).and_return(svc_model_dst_cluster)
     allow(svc_model_conversion_host_1).to receive(:ext_management_system).and_return(svc_model_dst_ems_1)
@@ -215,13 +218,14 @@
 
   context "#launch" do
     it "with default values" do
+      user_admin = FactoryGirl.create(:user, :userid => 'admin')
       expect(ae_service).to receive(:execute).with(
         :create_automation_request,
         {
           :namespace     => 'Transformation/StateMachines',
           :class_name    => 'TransformationThrottler',
           :instance_name => 'Default',
-          :user_id       => 1,
+          :user_id       => user_admin.id,
           :attrs         => { :ttl => 3600 }
         },
         'admin',