Skip to content

Commit

Permalink
Merge pull request #13240 from lpichler/use_default_values_for_metric…
Browse files Browse the repository at this point in the history 
…_rollup_in_chargeback_specs

Use default values for metric rollup in chargeback specs
  • Loading branch information
@chrisarcand
chrisarcand committed Dec 19, 2016
2 parents 8ed93d7 + 906129f commit 08521d6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 110 deletions.
1 change: 1 addition & 0 deletions spec/factories/metric_rollup.rb
View file
Expand Up @@ -2,6 +2,7 @@
factory :metric_rollup do
timestamp { Time.now.utc }
trait :with_data do
cpu_usage_rate_average 50.0
cpu_usagemhz_rate_average 50.0
derived_vm_numvcpus 1.0
derived_memory_available 1000.0
Expand Down
27 changes: 3 additions & 24 deletions spec/models/chargeback_container_image_spec.rb
View file
@@ -1,11 +1,6 @@
describe ChargebackContainerImage do
let(:base_options) { {:interval_size => 1, :end_interval_offset => 0, :ext_options => {:tz => 'Pacific Time (US & Canada)'} } }
let(:hourly_rate) { 0.01 }
let(:cpu_usage_rate) { 50.0 }
let(:cpu_count) { 1.0 }
let(:memory_available) { 1000.0 }
let(:memory_used) { 100.0 }
let(:net_usage_rate) { 25.0 }
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 }
Expand Down Expand Up @@ -45,15 +40,9 @@
let(:options) { base_options.merge(:interval => 'daily', :entity_id => @project.id, :tag => nil) }

before do

["2012-08-31T07:00:00Z", "2012-08-31T08:00:00Z", "2012-08-31T09:00:00Z", "2012-08-31T10:00:00Z"].each do |t|
@container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => t,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name,
Expand Down Expand Up @@ -90,13 +79,8 @@
let(:options) { base_options.merge(:interval => 'monthly', :entity_id => @project.id, :tag => nil) }
before do
Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time|
@container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => time,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name,
Expand Down Expand Up @@ -136,13 +120,8 @@
ChargebackRate.set_assignments(:compute, [{ :cb_rate => @cbr, :label => [@label, "container_image"] }])

Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time|
@container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@container.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => time,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name,
Expand Down
40 changes: 5 additions & 35 deletions spec/models/chargeback_container_project_spec.rb
View file
@@ -1,11 +1,6 @@
describe ChargebackContainerProject do
let(:base_options) { {:interval_size => 1, :end_interval_offset => 0, :ext_options => {:tz => 'Pacific Time (US & Canada)'} } }
let(:hourly_rate) { 0.01 }
let(:cpu_usage_rate) { 50.0 }
let(:cpu_count) { 1.0 }
let(:memory_available) { 1000.0 }
let(:memory_used) { 100.0 }
let(:net_usage_rate) { 25.0 }
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 }
Expand Down Expand Up @@ -45,13 +40,8 @@ def used_average_for(metric, hours_in_interval)

before do
["2012-08-31T07:00:00Z", "2012-08-31T08:00:00Z", "2012-08-31T09:00:00Z", "2012-08-31T10:00:00Z"].each do |t|
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => t,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name)
Expand Down Expand Up @@ -139,13 +129,8 @@ def used_average_for(metric, hours_in_interval)
let(:options) { base_options.merge(:interval => 'monthly', :entity_id => @project.id, :tag => nil) }
before do
Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time|
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => time,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name)
Expand Down Expand Up @@ -234,13 +219,8 @@ def used_average_for(metric, hours_in_interval)
let(:options) { base_options.merge(:interval => 'monthly', :entity_id => nil, :tag => '/managed/environment/prod') }
before do
Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time|
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => time,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name)
Expand Down Expand Up @@ -272,13 +252,8 @@ def used_average_for(metric, hours_in_interval)
let(:options) { base_options.merge(:interval => 'monthly', :entity_id => nil, :provider_id => 'all', :groupby_tag => 'environment') }
before do
Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time|
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => time,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "environment/prod",
:resource_name => @project.name)
Expand Down Expand Up @@ -311,13 +286,8 @@ def used_average_for(metric, hours_in_interval)
let(:options) { base_options.merge(:interval => 'monthly', :entity_id => @project.id, :tag => nil) }
before do
Range.new(month_beginning, month_end, true).step_value(24.hours).each do |time|
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr,
@project.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data,
:timestamp => time,
:cpu_usage_rate_average => cpu_usage_rate,
:derived_vm_numvcpus => cpu_count,
:derived_memory_available => memory_available,
:derived_memory_used => memory_used,
:net_usage_rate_average => net_usage_rate,
:parent_ems_id => ems.id,
:tag_names => "",
:resource_name => @project.name)
Expand Down

0 comments on commit 08521d6

Please sign in to comment.