Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix max method on empty array in chargeback storage report #16575

Merged
merged 3 commits into from Dec 1, 2017
Merged

Fix max method on empty array in chargeback storage report #16575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6757fe6
[].max is nil and we need 0
lpichler Dec 1, 2017
4ccd331
Set current date/time to be later then starting_date
lpichler Dec 1, 2017
71d629e
Spec cases when there are no VimPerformanceStates
lpichler Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/models/chargeback/consumption_with_rollups.rb
View file
Open in desktop
Expand Up @@ -37,7 +37,8 @@ def sum(metric, sub_metric = nil)
end

def max(metric, sub_metric = nil)
values(metric, sub_metric).max
values = values(metric, sub_metric)
values.present? ? values.max : 0
end

def avg(metric, sub_metric = nil)
Expand Down
14 changes: 13 additions & 1 deletion spec/models/chargeback/consumption_with_rollups_spec.rb
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
let!(:metric_rollup) { FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => starting_date + 1.hour, :resource => vm) }

before do
Timecop.travel(starting_date)
Timecop.travel(starting_date + 10.hours)
end

it "doesn't fail when there are no state data about disks" do
Expand All @@ -31,6 +31,18 @@
end
end

context "vim performance state records don't exist" do
before do
VimPerformanceState.destroy_all
end

it 'all chargeback calculations return 0' do
expect(consumption.send(:max, 'derived_vm_allocated_disk_storage', sub_metric)).to be_zero
expect(consumption.send(:avg, 'derived_vm_allocated_disk_storage', sub_metric)).to be_zero
expect(consumption.send(:sum, 'derived_vm_allocated_disk_storage', sub_metric)).to be_zero
end
end

after do
Timecop.return
end
Expand Down