Merge pull request #16769 from tinaafitz/quota_mixin_service_template…

…_fix

Fix check_quota(:active_provisions) for Service MiqRequest invalid service_template.
(cherry picked from commit 8aa881f)

https://bugzilla.redhat.com/show_bug.cgi?id=1534589

app/models/mixins/miq_provision_quota_mixin.rb

@@ -320,6 +320,7 @@ def vm_quota_values(pr, result)
  end
 
  def service_quota_values(request, result)
+ return unless request.service_template
  request.service_template.service_resources.each do |sr|
  if request.service_template.service_type == 'composite'
  bundle_quota_values(sr, result)

spec/models/service_template_provision_request_quota_spec.rb

@@ -104,6 +104,12 @@ def create_service_bundle(user, items, options = {})
  context "active_provisions_by_tenant," do
  let(:quota_method) { :active_provisions_by_tenant }
  it_behaves_like "check_quota"
+
+ it "invalid service_template does not raise error" do
+ requests = load_queue
+ requests.first.update_attributes(:service_template => nil)
+ expect { request.check_quota(quota_method) }.not_to raise_error
+ end
  end
 
  context "active_provisions_by_group," do