Fix chargeback report when VM is destroyed #16598
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jrafanie
reviewed
Dec 5, 2017
spec/models/chargeback_vm_spec.rb
Outdated
| end | ||
|
|
||
| it "calculates allocated cpu cost and metric values" do | ||
| skip('this case is needs to be fixed in new chargeback') if Settings.new_chargeback |
jrafanie
reviewed
Dec 5, 2017
spec/models/chargeback_vm_spec.rb
Outdated
| @@ -190,6 +190,22 @@ | |||
|
|
|||
| subject { ChargebackVm.build_results_for_report_ChargebackVm(options).first.first } | |||
|
|
|||
| context 'when Vm(resource) is destroyed' do | |||
There was a problem hiding this comment.
Vm(resource) is hard to follow if you're not familiar with chargeback. Would when the Vm resource of a consumption is destroyed be better?
There was a problem hiding this comment.
yes, it sounds better to me 👍
|
Minor nitpicks but LGTM when fixed. |
hours_in_day changed because hours_in_day is calculated as: hours_in_day = end_of_day - [start_date(first_metric_rollup.timestamp), @vm1.created_on].compact.min and when @VM1 doesn't exist so we have to take into account that there is used start_date(first_metric_rollup.timestamp) which is set about few hours later then @vm1.created_on as was used before
lpichler
force-pushed
the
fix_chargeback_report_when_vm_destroyed
branch
from
2197e31 to
a9415f4
Compare
|
@jrafanie thanks, updated 👍 |
|
Checked commits lpichler/manageiq@a0e33b4~...a9415f4 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0 |
simaishi
pushed a commit
that referenced
this pull request
Dec 11, 2017
…_destroyed Fix chargeback report when VM is destroyed (cherry picked from commit 01cc0ea)
|
Gaprindashvili backport details: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix some cases when Vm is destroyed => then relation Vm - MetricRollup(thru MetricRollup#resource) is destroyed but chargeback report was counting with some attributes of the VM - which doesn't exist so I am adding here
trys.Error message
cc @gtanzillo
@miq-bot assign @jrafanie
@miq-bot add_label bug, chargeback, gaprindashvili/yes