diff --git a/spec/factories/metric_rollup.rb b/spec/factories/metric_rollup.rb index 050607e9a01..4225d93b192 100644 --- a/spec/factories/metric_rollup.rb +++ b/spec/factories/metric_rollup.rb @@ -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 diff --git a/spec/models/chargeback_container_image_spec.rb b/spec/models/chargeback_container_image_spec.rb index 06a7accee05..a931fea3b85 100644 --- a/spec/models/chargeback_container_image_spec.rb +++ b/spec/models/chargeback_container_image_spec.rb @@ -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 } @@ -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, @@ -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, @@ -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, diff --git a/spec/models/chargeback_container_project_spec.rb b/spec/models/chargeback_container_project_spec.rb index 79d6e091df3..3883564ac4b 100644 --- a/spec/models/chargeback_container_project_spec.rb +++ b/spec/models/chargeback_container_project_spec.rb @@ -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 } @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) diff --git a/spec/models/chargeback_vm_spec.rb b/spec/models/chargeback_vm_spec.rb index 1a35e34eab6..1bd4ed91f51 100644 --- a/spec/models/chargeback_vm_spec.rb +++ b/spec/models/chargeback_vm_spec.rb @@ -9,14 +9,10 @@ end let(:hourly_rate) { 0.01 } let(:count_hourly_rate) { 1.00 } - let(:cpu_usagemhz_rate) { 50.0 } let(:cpu_count) { 1.0 } let(:memory_available) { 1000.0 } - let(:memory_used) { 100.0 } - let(:disk_usage_rate) { 100.0 } - let(:net_usage_rate) { 25.0 } - let(:vm_used_disk_storage) { 1.0 } let(:vm_allocated_disk_storage) { 4.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 } @@ -75,16 +71,8 @@ Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| [@vm1, @vm2].each do |vm| - vm.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, + vm.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data, :timestamp => time, - :cpu_usagemhz_rate_average => cpu_usagemhz_rate, - :derived_vm_numvcpus => cpu_count, - :derived_memory_available => memory_available, - :derived_memory_used => memory_used, - :disk_usage_rate_average => disk_usage_rate, - :net_usage_rate_average => net_usage_rate, - :derived_vm_used_disk_storage => vm_used_disk_storage.gigabytes, - :derived_vm_allocated_disk_storage => vm_allocated_disk_storage.gigabytes, :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, @@ -140,16 +128,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| - @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, + @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data, :timestamp => t, - :cpu_usagemhz_rate_average => cpu_usagemhz_rate, - :derived_vm_numvcpus => cpu_count, - :derived_memory_available => memory_available, - :derived_memory_used => memory_used, - :disk_usage_rate_average => disk_usage_rate, - :net_usage_rate_average => net_usage_rate, - :derived_vm_used_disk_storage => vm_used_disk_storage.gigabytes, - :derived_vm_allocated_disk_storage => vm_allocated_disk_storage.gigabytes, :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, @@ -433,16 +413,8 @@ def used_average_for(metric, hours_in_interval) @vm_tenant = FactoryGirl.create(:vm_vmware, :tenant_id => @tenant_child.id, :name => "test_vm_tenant") ["2012-08-31T07:00:00Z", "2012-08-31T08:00:00Z", "2012-08-31T09:00:00Z", "2012-08-31T10:00:00Z"].each do |t| @vm_tenant.metric_rollups << - FactoryGirl.create(:metric_rollup_vm_hr, + FactoryGirl.create(:metric_rollup_vm_hr, :with_data, :timestamp => t, - :cpu_usagemhz_rate_average => cpu_usagemhz_rate, - :derived_vm_numvcpus => cpu_count, - :derived_memory_available => memory_available, - :derived_memory_used => memory_used, - :disk_usage_rate_average => disk_usage_rate, - :net_usage_rate_average => net_usage_rate, - :derived_vm_used_disk_storage => vm_used_disk_storage.gigabytes, - :derived_vm_allocated_disk_storage => vm_allocated_disk_storage.gigabytes, :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, @@ -469,16 +441,8 @@ def used_average_for(metric, hours_in_interval) let(:options) { base_options.merge(:interval => 'monthly') } before do Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| - @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, + @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data, :timestamp => time, - :cpu_usagemhz_rate_average => cpu_usagemhz_rate, - :derived_vm_numvcpus => cpu_count, - :derived_memory_available => memory_available, - :derived_memory_used => memory_used, - :disk_usage_rate_average => disk_usage_rate, - :net_usage_rate_average => net_usage_rate, - :derived_vm_used_disk_storage => vm_used_disk_storage.gigabytes, - :derived_vm_allocated_disk_storage => vm_allocated_disk_storage.gigabytes, :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, @@ -869,18 +833,10 @@ 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 + before do Range.new(month_beginning, month_end, true).step_value(12.hours).each do |time| - @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, + @vm1.metric_rollups << FactoryGirl.create(:metric_rollup_vm_hr, :with_data, :timestamp => time, - :cpu_usagemhz_rate_average => cpu_usagemhz_rate, - :derived_vm_numvcpus => cpu_count, - :derived_memory_available => memory_available, - :derived_memory_used => memory_used, - :disk_usage_rate_average => disk_usage_rate, - :net_usage_rate_average => net_usage_rate, - :derived_vm_used_disk_storage => vm_used_disk_storage.gigabytes, - :derived_vm_allocated_disk_storage => vm_allocated_disk_storage.gigabytes, :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id,