From bbe59f08b460a87da928d480eb7499202d1d9c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= Date: Tue, 13 Dec 2016 16:01:15 +0100 Subject: [PATCH] Refactor hours_in_month to let statement --- .../models/chargeback_container_image_spec.rb | 9 ++-- .../chargeback_container_project_spec.rb | 33 +++++-------- spec/models/chargeback_vm_spec.rb | 49 +++++++++---------- 3 files changed, 39 insertions(+), 52 deletions(-) diff --git a/spec/models/chargeback_container_image_spec.rb b/spec/models/chargeback_container_image_spec.rb index ec48b733a67..0b19e5359e1 100644 --- a/spec/models/chargeback_container_image_spec.rb +++ b/spec/models/chargeback_container_image_spec.rb @@ -9,6 +9,7 @@ let(:ts) { Time.now.in_time_zone(Metric::Helper.get_time_zone(options[:ext_options])) } let(:month_beginning) { ts.beginning_of_month.utc } let(:month_end) { ts.end_of_month.utc } + let(:hours_in_month) { Time.days_in_month(month_beginning.month, month_beginning.year) * 24 } before do MiqRegion.seed @@ -89,8 +90,6 @@ context "Monthly" do let(:options) { base_options.merge(:interval => 'monthly', :entity_id => @project.id, :tag => nil) } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -127,7 +126,7 @@ } it "fixed_compute" do # .to be_within(0.01) is used since theres a float error here - expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * @hours_in_month) + expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * hours_in_month) end end @@ -137,8 +136,6 @@ @image.docker_labels << @label ChargebackRate.set_assignments(:compute, [{ :cb_rate => @cbr, :label => [@label, "container_image"] }]) - @hours_in_month = Time.days_in_month(month_beginning.month, month_end.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -175,7 +172,7 @@ } it "fixed_compute" do # .to be_within(0.01) is used since theres a float error here - expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * @hours_in_month) + expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * hours_in_month) end end end diff --git a/spec/models/chargeback_container_project_spec.rb b/spec/models/chargeback_container_project_spec.rb index 7cd0cf69e8c..3fe57379bf6 100644 --- a/spec/models/chargeback_container_project_spec.rb +++ b/spec/models/chargeback_container_project_spec.rb @@ -9,6 +9,7 @@ let(:ts) { Time.now.in_time_zone(Metric::Helper.get_time_zone(options[:ext_options])) } let(:month_beginning) { ts.beginning_of_month.utc } let(:month_end) { ts.end_of_month.utc } + let(:hours_in_month) { Time.days_in_month(month_beginning.month, month_beginning.year) * 24 } before do MiqRegion.seed @@ -138,8 +139,6 @@ def used_average_for(metric, hours_in_interval) context "Monthly" do let(:options) { base_options.merge(:interval => 'monthly', :entity_id => @project.id, :tag => nil) } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -171,9 +170,9 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save - metric_used = used_average_for(:cpu_usage_rate_average, @hours_in_month) + metric_used = used_average_for(:cpu_usage_rate_average, hours_in_month) expect(subject.cpu_cores_used_metric).to be_within(0.01).of(metric_used) - expect(subject.cpu_cores_used_cost).to be_within(0.01).of(metric_used * hourly_rate * @hours_in_month) + expect(subject.cpu_cores_used_cost).to be_within(0.01).of(metric_used * hourly_rate * hours_in_month) end it "memory" do @@ -189,9 +188,9 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save - metric_used = used_average_for(:derived_memory_used, @hours_in_month) + metric_used = used_average_for(:derived_memory_used, hours_in_month) expect(subject.memory_used_metric).to be_within(0.01).of(metric_used) - expect(subject.memory_used_cost).to be_within(0.01).of(metric_used * hourly_rate * @hours_in_month) + expect(subject.memory_used_cost).to be_within(0.01).of(metric_used * hourly_rate * hours_in_month) end it "net io" do @@ -207,9 +206,9 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save - metric_used = used_average_for(:net_usage_rate_average, @hours_in_month) + metric_used = used_average_for(:net_usage_rate_average, hours_in_month) expect(subject.net_io_used_metric).to be_within(0.01).of(metric_used) - expect(subject.net_io_used_cost).to be_within(0.01).of(metric_used * hourly_rate * @hours_in_month) + expect(subject.net_io_used_cost).to be_within(0.01).of(metric_used * hourly_rate * hours_in_month) end let(:cbt) { FactoryGirl.create(:chargeback_tier, @@ -227,7 +226,7 @@ def used_average_for(metric, hours_in_interval) it "fixed_compute" do # .to be_within(0.01) is used since theres a float error here - expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * @hours_in_month) + expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * hours_in_month) expect(subject.fixed_compute_metric).to eq(@metric_size) end end @@ -235,8 +234,6 @@ def used_average_for(metric, hours_in_interval) context "tagged project" do let(:options) { base_options.merge(:interval => 'monthly', :entity_id => nil, :tag => '/managed/environment/prod') } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -266,17 +263,15 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save - metric_used = used_average_for(:cpu_usage_rate_average, @hours_in_month) + metric_used = used_average_for(:cpu_usage_rate_average, hours_in_month) expect(subject.cpu_cores_used_metric).to be_within(0.01).of(metric_used) - expect(subject.cpu_cores_used_cost).to be_within(0.01).of(metric_used * hourly_rate * @hours_in_month) + expect(subject.cpu_cores_used_cost).to be_within(0.01).of(metric_used * hourly_rate * hours_in_month) end end context "group results by tag" do let(:options) { base_options.merge(:interval => 'monthly', :entity_id => nil, :provider_id => 'all', :groupby_tag => 'environment') } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -306,9 +301,9 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save - metric_used = used_average_for(:cpu_usage_rate_average, @hours_in_month) + metric_used = used_average_for(:cpu_usage_rate_average, hours_in_month) expect(subject.cpu_cores_used_metric).to be_within(0.01).of(metric_used) - expect(subject.cpu_cores_used_cost).to be_within(0.01).of(metric_used * hourly_rate * @hours_in_month) + expect(subject.cpu_cores_used_cost).to be_within(0.01).of(metric_used * hourly_rate * hours_in_month) expect(subject.tag_name).to eq('Production') end end @@ -316,8 +311,6 @@ def used_average_for(metric, hours_in_interval) context "ignore empty metrics in fixed_compute" do let(:options) { base_options.merge(:interval => 'monthly', :entity_id => @project.id, :tag => nil) } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(24.hours).each do |time| @project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -359,7 +352,7 @@ def used_average_for(metric, hours_in_interval) it "fixed_compute" do # .to be_within(0.01) is used since theres a float error here - expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * @hours_in_month) + expect(subject.fixed_compute_1_cost).to be_within(0.01).of(hourly_rate * hours_in_month) expect(subject.fixed_compute_metric).to eq(@metric_size / 2) end end diff --git a/spec/models/chargeback_vm_spec.rb b/spec/models/chargeback_vm_spec.rb index d6128f097cd..3ec00f1cd9d 100644 --- a/spec/models/chargeback_vm_spec.rb +++ b/spec/models/chargeback_vm_spec.rb @@ -20,6 +20,7 @@ let(:ts) { Time.now.in_time_zone(Metric::Helper.get_time_zone(options[:ext_options])) } let(:month_beginning) { ts.beginning_of_month.utc } let(:month_end) { ts.end_of_month.utc } + let(:hours_in_month) { Time.days_in_month(month_beginning.month, month_beginning.year) * 24 } before do MiqRegion.seed @@ -467,8 +468,6 @@ def used_average_for(metric, hours_in_interval) context "Monthly" do let(:options) { base_options.merge(:interval => 'monthly') } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -521,10 +520,10 @@ def used_average_for(metric, hours_in_interval) cbrd.save expect(subject.cpu_allocated_metric).to eq(cpu_count) - used_metric = used_average_for(:cpu_usagemhz_rate_average, @hours_in_month) + used_metric = used_average_for(:cpu_usagemhz_rate_average, hours_in_month) expect(subject.cpu_used_metric).to be_within(0.01).of(used_metric) - expect(subject.cpu_used_cost).to be_within(0.01).of(used_metric * hourly_rate * @hours_in_month) - expect(subject.cpu_allocated_cost).to be_within(0.01).of(cpu_count * count_hourly_rate * @hours_in_month) + expect(subject.cpu_used_cost).to be_within(0.01).of(used_metric * hourly_rate * hours_in_month) + expect(subject.cpu_allocated_cost).to be_within(0.01).of(cpu_count * count_hourly_rate * hours_in_month) end let(:fixed_rate) { 10.0 } @@ -559,15 +558,15 @@ def used_average_for(metric, hours_in_interval) cbrd.save expect(subject.cpu_allocated_metric).to eq(cpu_count) - used_metric = used_average_for(:cpu_usagemhz_rate_average, @hours_in_month) + used_metric = used_average_for(:cpu_usagemhz_rate_average, hours_in_month) expect(subject.cpu_used_metric).to be_within(0.01).of(used_metric) - fixed = fixed_rate * @hours_in_month - variable = cpu_count * count_hourly_rate * @hours_in_month + fixed = fixed_rate * hours_in_month + variable = cpu_count * count_hourly_rate * hours_in_month expect(subject.cpu_allocated_cost).to be_within(0.01).of(fixed + variable) - fixed = fixed_rate * @hours_in_month - variable = used_metric * hourly_rate * @hours_in_month + fixed = fixed_rate * hours_in_month + variable = used_metric * hourly_rate * hours_in_month expect(subject.cpu_used_cost).to be_within(0.01).of(fixed + variable) end @@ -599,13 +598,13 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save expect(subject.memory_allocated_metric).to eq(memory_available) - used_metric = used_average_for(:derived_memory_used, @hours_in_month) + used_metric = used_average_for(:derived_memory_used, hours_in_month) expect(subject.memory_used_metric).to be_within(0.01).of(used_metric) expect(subject.memory_metric).to eq(subject.memory_allocated_metric + subject.memory_used_metric) - memory_allocated_cost = memory_available * hourly_rate * @hours_in_month + memory_allocated_cost = memory_available * hourly_rate * hours_in_month expect(subject.memory_allocated_cost).to be_within(0.01).of(memory_allocated_cost) - expect(subject.memory_used_cost).to be_within(0.01).of(used_metric * hourly_rate * @hours_in_month) + expect(subject.memory_used_cost).to be_within(0.01).of(used_metric * hourly_rate * hours_in_month) expect(subject.memory_cost).to eq(subject.memory_allocated_cost + subject.memory_used_cost) end @@ -624,10 +623,10 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save - used_metric = used_average_for(:disk_usage_rate_average, @hours_in_month) + used_metric = used_average_for(:disk_usage_rate_average, hours_in_month) expect(subject.disk_io_used_metric).to be_within(0.01).of(used_metric) - expect(subject.disk_io_used_cost).to be_within(0.01).of(used_metric * hourly_rate * @hours_in_month) + expect(subject.disk_io_used_cost).to be_within(0.01).of(used_metric * hourly_rate * hours_in_month) end it "net io" do @@ -644,9 +643,9 @@ def used_average_for(metric, hours_in_interval) ) cbrd.chargeback_tiers = [cbt] cbrd.save - used_metric = used_average_for(:net_usage_rate_average, @hours_in_month) + used_metric = used_average_for(:net_usage_rate_average, hours_in_month) expect(subject.net_io_used_metric).to be_within(0.01).of(used_metric) - expect(subject.net_io_used_cost).to be_within(0.01).of(used_metric * hourly_rate * @hours_in_month) + expect(subject.net_io_used_cost).to be_within(0.01).of(used_metric * hourly_rate * hours_in_month) end let(:hourly_fixed_rate) { 10 } @@ -683,14 +682,14 @@ def used_average_for(metric, hours_in_interval) cbrd.save expect(subject.storage_allocated_metric).to eq(vm_allocated_disk_storage.gigabytes) - used_metric = used_average_for(:derived_vm_used_disk_storage, @hours_in_month) + used_metric = used_average_for(:derived_vm_used_disk_storage, hours_in_month) expect(subject.storage_used_metric).to be_within(0.01).of(used_metric) expect(subject.storage_metric).to eq(subject.storage_allocated_metric + subject.storage_used_metric) - expected_value = hourly_fixed_rate * @hours_in_month + expected_value = hourly_fixed_rate * hours_in_month expect(subject.storage_allocated_cost).to be_within(0.01).of(expected_value) - expected_value = hourly_fixed_rate * @hours_in_month + expected_value = hourly_fixed_rate * hours_in_month expect(subject.storage_used_cost).to be_within(0.01).of(expected_value) expect(subject.storage_cost).to eq(subject.storage_allocated_cost + subject.storage_used_cost) end @@ -726,13 +725,13 @@ def used_average_for(metric, hours_in_interval) cbrd.chargeback_tiers = [cbt] cbrd.save expect(subject.storage_allocated_metric).to eq(vm_allocated_disk_storage.gigabytes) - used_metric = used_average_for(:derived_vm_used_disk_storage, @hours_in_month) + used_metric = used_average_for(:derived_vm_used_disk_storage, hours_in_month) expect(subject.storage_used_metric).to be_within(0.01).of(used_metric) expect(subject.storage_metric).to eq(subject.storage_allocated_metric + subject.storage_used_metric) - expected_value = vm_allocated_disk_storage * count_hourly_rate * @hours_in_month + expected_value = vm_allocated_disk_storage * count_hourly_rate * hours_in_month expect(subject.storage_allocated_cost).to be_within(0.01).of(expected_value) - expected_value = used_metric / 1.gigabytes * count_hourly_rate * @hours_in_month + expected_value = used_metric / 1.gigabytes * count_hourly_rate * hours_in_month expect(subject.storage_used_cost).to be_within(0.01).of(expected_value) expect(subject.storage_cost).to eq(subject.storage_allocated_cost + subject.storage_used_cost) end @@ -867,8 +866,6 @@ def used_average_for(metric, hours_in_interval) context "Group by tags" do let(:options) { base_options.merge(:interval => 'monthly', :groupby_tag => 'environment') } before do - @hours_in_month = Time.days_in_month(month_beginning.month, month_beginning.year) * 24 - Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => time, @@ -921,7 +918,7 @@ def used_average_for(metric, hours_in_interval) cbrd.save expect(subject.cpu_allocated_metric).to eq(cpu_count) - used_metric = used_average_for(:cpu_usagemhz_rate_average, @hours_in_month) + used_metric = used_average_for(:cpu_usagemhz_rate_average, hours_in_month) expect(subject.cpu_used_metric).to be_within(0.01).of(used_metric) expect(subject.tag_name).to eq('Production') end