diff --git a/spec/support/quota_helper.rb b/spec/support/quota_helper.rb index c2941439d65..911ae2dd2f5 100644 --- a/spec/support/quota_helper.rb +++ b/spec/support/quota_helper.rb @@ -194,7 +194,7 @@ def build_generic_ansible_tower_service_item end def build_vmware_service_item - options = {:src_vm_id => @vm_template.id, :requester => @user}.merge(vmware_requested_quota_values) + options = {:src_vm_id => @vm_template.id, :requester_id => @user.id}.merge(vmware_requested_quota_values) model = {"vmware_service_item" => {:type => 'atomic', :prov_type => 'vmware', :request => options}} @@ -206,7 +206,7 @@ def build_google_service_item @small_flavor = FactoryGirl.create(:flavor_google, :ems_id => @ems.id, :cloud_subnet_required => false, :cpus => 1, :cpu_cores => 1, :memory => 1024) - options = {:src_vm_id => @vm_template.id, :requester => @user}.merge(google_requested_quota_values) + options = {:src_vm_id => @vm_template.id, :requester_id => @user.id}.merge(google_requested_quota_values) model = {"google_service_item" => {:type => 'atomic', :prov_type => 'google', :request => options}} diff --git a/spec/support/service_template_helper.rb b/spec/support/service_template_helper.rb index 31f2dc896cd..2906604cdd7 100644 --- a/spec/support/service_template_helper.rb +++ b/spec/support/service_template_helper.rb @@ -6,6 +6,10 @@ def build_service_template_tree(hash) build_all_composites(hash) end + def get_user(options) + options[:requester] || User.find(options[:requester_id]) + end + def build_all_atomics(hash) hash.each do |name, value| next unless value[:type] == "atomic" @@ -19,7 +23,7 @@ def build_all_atomics(hash) options ||= {} options[:dialog] = {} mprt = FactoryGirl.create(:miq_provision_request_template, - :requester => options[:requester], + :requester => get_user(options), :src_vm_id => options[:src_vm_id], :options => options) add_st_resource(item, mprt)