[EUWE] Chargebacks for SCVMM (rollup-less) [2/2] #13554
Commits on Jan 18, 2017
-
Drop hours_in_interval public interface
of ChargebackRateDetail. (cherry picked from commit ae27ca5)
-
Drop @hours_in_interval instance variable on ChargebackRateDetail
ChargebackRateDetail object should not know anything about some interval. It should just maintain the logic to calculate the cost. The @hours_in_interval is a function of given consumption slice. Moreover, there is a problem with @hours_in_interval -- the interval can be for instance one week, and the rate can be monthly, then we divide monthly cost by week. B@ng! (cherry picked from commit 09cecec)
-
Fix calculation inaccurancy when report period is not month
When calculation hourly_rate for ChargebackRateDetail with monthly rate, we had assumed that lenght of report interval was good indicator of hours in month. This is however truth only for monthly reports. For example, assume monthly rate of $4 for fixed compute. On monthly report we charge correctly $4 (the hourly_rate is ($4 / 1.month). On weekly report, however we charge $4 per each week, as we assume that hourly_rate is ($4 / 1.week). (cherry picked from commit c3d3e85)
-
Split test cases for hourly rate
(cherry picked from commit 4f7e02c) Conflicts: spec/models/chargeback_rate_detail_spec.rb
-
Spec for monthly rate and weekly consumption slice combination
(cherry picked from commit 3bfff04)
-
Use let instead of class variable @admin
The before branch is run many many times again and again creating admin user for no good. (cherry picked from commit e9b9e30) Conflicts: spec/models/chargeback_vm_spec.rb
-
Extract user instance var to let(:user) clause
(cherry picked from commit 2ac95eb)
-
Do not use @options, use let(:options) instead
(cherry picked from commit a300e10)
-
Define constants using let method
(cherry picked from commit d8dafb4) Conflicts: spec/models/chargeback_container_project_spec.rb spec/models/chargeback_vm_spec.rb
-
Refactor: extract timestamp calculation
(cherry picked from commit d5817ba)
-
Do not create dozen of metric_rollups with hardcoded timestamp
This code was definititelly meant to be written this way. (cherry picked from commit 385e8d2)
-
Refactor hours_in_month to let statement
(cherry picked from commit bbe59f0) Conflicts: spec/models/chargeback_vm_spec.rb
-
Refactor: extract @ems to let statement
(cherry picked from commit 5cc0a3c) Conflicts: spec/models/chargeback_container_project_spec.rb spec/models/chargeback_vm_spec.rb
-
Refactor: Extract starting date
and fix related rubocop (cherry picked from commit f870d3c)
-
Specs: should charge after the given time passed
(cherry picked from commit 73c99b9)
-
Do not charge for hours that are yet to come
For variable_rate, we charge only that much that has been consumed. Perhaps I'll end the service tmrw, I should not be charged in advanced. https://bugzilla.redhat.com/show_bug.cgi?id=1402072 (cherry picked from commit c94a8fb)
-
Do not hardcode time value, they should be relative report_run_time
Otherwise, nobody will ever understand why we have them. Now each file includes single hardcoded datetime and everything else is relative to it. Think about it. That's actually meaning of the specs prescription. The hardcoded values were hardcoded to be relative to other hc values. (cherry picked from commit 4609f3c) Conflicts: spec/models/chargeback_container_image_spec.rb spec/models/chargeback_container_project_spec.rb spec/models/chargeback_vm_spec.rb
-
Specs: Fixed rate should charge only past hours
https://bugzilla.redhat.com/show_bug.cgi?id=1402072 (cherry picked from commit 3a678bb)
-
Specs: resources should be created before their consumption
We are gonna change code to charge only for consumption since the resource creation time. First, we need to make sure all our test subject have proper created_on timestamp. (cherry picked from commit e2d0561) Conflicts: spec/models/chargeback_container_project_spec.rb
-
Do not charge for hours before resource creation
(cherry picked from commit 1317470)
-
Charge SCVMM's vm only until it is retired.
(cherry picked from commit 41e9832)
-
Do not yield consumption unless it represent real consumption
When resource did not exist in given interval (day, week, month) we will not yield Consumption object into the chargeback engine. As a result the report won't contain rows with zero consumption. (cherry picked from commit 166896f)
-
