Merge pull request #17082 from lpichler/fix_service_uniqueness

Add uniqueness of service for generation chargeback report for SSUI
(cherry picked from commit c2f76b6)

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

app/models/service.rb

@@ -370,11 +370,11 @@ def self.queue_chargeback_reports(options = {})
   end
 
   def chargeback_report_name
-    "Chargeback-Vm-Monthly-#{name}"
+    "Chargeback-Vm-Monthly-#{name}-#{id}"
   end
 
   def generate_chargeback_report(options = {})
-    _log.info("Generation of chargeback report for service #{name} started...")
+    _log.info("Generation of chargeback report for service #{name} with #{id} started...")
     MiqReportResult.where(:name => chargeback_report_name).destroy_all
     report = MiqReport.new(chargeback_yaml)
     options[:report_sync] = true

spec/models/service_spec.rb

@@ -429,7 +429,7 @@
 
     describe "#chargeback_report_name" do
       it "creates chargeback report's name" do
-        expect(@service.chargeback_report_name).to eq "Chargeback-Vm-Monthly-Test_Service_1"
+        expect(@service.chargeback_report_name).to eq "Chargeback-Vm-Monthly-Test_Service_1-#{@service.id}"
       end
     end