Fixed billing with decreasing allocation change requests #171
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
|
Great work on catching this and apologies for the error in logic! The PR description does match the issue and the effects. The below conditional should be flipped to Can you add a new commit to this PR that introduces the fix and removes the |
|
@knikolla I've pushed up the bug fix. |
knikolla
changed the title
Due to an boolean statement, the SU hours for storage will not be correctly calculated when change requests (CRs) to quotas are involved. Our intention with CRs is that when an allocation's storage quota decreases, this decreased value becomes effective (for billing purposes) when the CR for it is created, not when the CR is approved (or the time at which the quota actually decreased). The aforementioned boolean statement would instead lead to undesired behavior.
knikolla
approved these changes
Aug 1, 2024
naved001
reviewed
Aug 2, 2024
src/coldfront_plugin_cloud/tests/unit/test_calculate_quota_unit_hours.py
Show resolved
Hide resolved
naved001
approved these changes
Aug 2, 2024
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.
Closes #170. I have introduced 3 test cases for storage billing with change requests (CR), 2 of which are intended to fail. The 3 test cases are:
The test cases involving decreasing the quota should fail, and demonstrates the bug that I will explain below.
From what I read in the billing code, our intention with CRs is that when an allocation's storage quota decreases, this decreased value becomes effective (for billing purposes) when the CR for it is created, not when the CR is approved (or the time at which the quota actually decreased). Due to this statement, this will not happen, but will lead to a more complicated undesired behavior.
With the current code, the first time the quota decreases, the decreased value becomes effective at the time it is changed. On subsequent instances when the quota decreases, one of two things could happen: