Calculate total for hours of exitstence in metering reports

ManageIQ · Mar 1, 2018 · 17b989b · 17b989b
1 parent 65d2667
commit 17b989b
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 5 deletions.
diff --git a/app/models/metering_container_image.rb b/app/models/metering_container_image.rb
@@ -10,6 +10,7 @@ def self.report_col_options
     {
       "cpu_cores_allocated_metric" => {:grouping => [:total]},
       "cpu_cores_used_metric"      => {:grouping => [:total]},
+      "existence_hours_metric"     => {:grouping => [:total]},
       "fixed_compute_metric"       => {:grouping => [:total]},
       "memory_allocated_metric"    => {:grouping => [:total]},
       "memory_used_metric"         => {:grouping => [:total]},

diff --git a/app/models/metering_container_project.rb b/app/models/metering_container_project.rb
@@ -8,11 +8,12 @@ class MeteringContainerProject < ChargebackContainerProject
 
   def self.report_col_options
     {
-      "cpu_cores_used_metric" => {:grouping => [:total]},
-      "fixed_compute_metric"  => {:grouping => [:total]},
-      "memory_used_metric"    => {:grouping => [:total]},
-      "metering_used_metric"  => {:grouping => [:total]},
-      "net_io_used_metric"    => {:grouping => [:total]},
+      "cpu_cores_used_metric"  => {:grouping => [:total]},
+      "existence_hours_metric" => {:grouping => [:total]},
+      "fixed_compute_metric"   => {:grouping => [:total]},
+      "memory_used_metric"     => {:grouping => [:total]},
+      "metering_used_metric"   => {:grouping => [:total]},
+      "net_io_used_metric"     => {:grouping => [:total]},
     }
   end
 

diff --git a/app/models/metering_vm.rb b/app/models/metering_vm.rb
@@ -11,6 +11,7 @@ def self.report_col_options
       "cpu_allocated_metric"     => {:grouping => [:total]},
       "cpu_used_metric"          => {:grouping => [:total]},
       "disk_io_used_metric"      => {:grouping => [:total]},
+      "existence_hours_metric"   => {:grouping => [:total]},
       "fixed_compute_metric"     => {:grouping => [:total]},
       "memory_allocated_metric"  => {:grouping => [:total]},
       "memory_used_metric"       => {:grouping => [:total]},

diff --git a/spec/models/metering_container_image_spec.rb b/spec/models/metering_container_image_spec.rb
@@ -59,4 +59,21 @@
       expect(subject.cpu_cores_allocated_metric).to eq(@container.limit_memory_bytes / 1.megabytes)
     end
   end
+
+  let(:report_col_options) do
+    {
+      "cpu_cores_allocated_metric" => {:grouping => [:total]},
+      "cpu_cores_used_metric"      => {:grouping => [:total]},
+      "existence_hours_metric"     => {:grouping => [:total]},
+      "fixed_compute_metric"       => {:grouping => [:total]},
+      "memory_allocated_metric"    => {:grouping => [:total]},
+      "memory_used_metric"         => {:grouping => [:total]},
+      "metering_used_metric"       => {:grouping => [:total]},
+      "net_io_used_metric"         => {:grouping => [:total]},
+    }
+  end
+
+  it 'sets grouping settings for all related columns' do
+    expect(described_class.report_col_options).to eq(report_col_options)
+  end
 end
diff --git a/spec/models/metering_container_project_spec.rb b/spec/models/metering_container_project_spec.rb
@@ -64,4 +64,19 @@
       expect(subject.net_io_used_metric).to eq(net_usage_rate_average * count_of_metric_rollup)
     end
   end
+
+  let(:report_col_options) do
+    {
+      "cpu_cores_used_metric"  => {:grouping => [:total]},
+      "existence_hours_metric" => {:grouping => [:total]},
+      "fixed_compute_metric"   => {:grouping => [:total]},
+      "memory_used_metric"     => {:grouping => [:total]},
+      "metering_used_metric"   => {:grouping => [:total]},
+      "net_io_used_metric"     => {:grouping => [:total]},
+    }
+  end
+
+  it 'sets grouping settings for all related columns' do
+    expect(described_class.report_col_options).to eq(report_col_options)
+  end
 end
diff --git a/spec/models/metering_vm_spec.rb b/spec/models/metering_vm_spec.rb
@@ -133,4 +133,24 @@
   it 'lists proper attributes' do
     expect(described_class.attribute_names).to match_array(allowed_attributes)
   end
+
+  let(:report_col_options) do
+    {
+      "cpu_allocated_metric"     => {:grouping => [:total]},
+      "cpu_used_metric"          => {:grouping => [:total]},
+      "disk_io_used_metric"      => {:grouping => [:total]},
+      "existence_hours_metric"   => {:grouping => [:total]},
+      "fixed_compute_metric"     => {:grouping => [:total]},
+      "memory_allocated_metric"  => {:grouping => [:total]},
+      "memory_used_metric"       => {:grouping => [:total]},
+      "metering_used_metric"     => {:grouping => [:total]},
+      "net_io_used_metric"       => {:grouping => [:total]},
+      "storage_allocated_metric" => {:grouping => [:total]},
+      "storage_used_metric"      => {:grouping => [:total]},
+    }
+  end
+
+  it 'sets grouping settings for all related columns' do
+    expect(described_class.report_col_options).to eq(report_col_options)
+  end
 end