Calculate quota using service dialogs overrides. #203
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
|
@miq-bot assign @gmcculloug |
|
@tinaafitz Please review |
billfitzgerald0120
force-pushed
the
quota_overrides
branch
from
e62c97e
to
b11a333
Compare
Changed requested method to use dialog overrides in quota calculations. Modified requested method to calculate quota based on dialog values for: number_of_sockets, cores_per_socket, number_of_cpus, vm_memory and storage. This can be tested by using service dialogs using these values. https://bugzilla.redhat.com/show_bug.cgi?id=1497912 Testing Create a service using service dialog overrides values for the above values. You can use one or more override values. Order the service, change some values and run. Note: We are honoring number_of_vms in a service dialog but not using number_of_vms in quota calculations. Doing quota calculations for number_of_vms in a service dialog will be in a followup PR. I am including screenshots of a dialog using some values.
billfitzgerald0120
force-pushed
the
quota_overrides
branch
from
b11a333
to
53f0acd
Compare
|
@billfitzgerald0120 Looks good. |
|
@mkanoor Please review. |
|
@mkanoor bump |
mkanoor
reviewed
Dec 21, 2017
|
|
||
| def recalculate_number_of_cpus(resource, override_number_of_sockets, override_cores_per_socket) | ||
| $evm.log(:info, "Recalculating the number_of_cpus resource: #{resource} override_number_of_sockets: #{override_number_of_sockets} override_cores_per_socket: #{override_cores_per_socket}") | ||
| if override_number_of_sockets.positive? && override_cores_per_socket.positive? |
There was a problem hiding this comment.
@billfitzgerald0120 Is the positive check because a user can enter a negative value or is it to protect from a user not entering any value and it stays nil?
There was a problem hiding this comment.
It is to protect from an user not entering a value
billfitzgerald0120
force-pushed
the
quota_overrides
branch
from
f69c6aa
to
7f37213
Compare
|
@tinaafitz Fixed rubocop warning, Please Review |
mkanoor
reviewed
Apr 18, 2018
| :memory => get_total_requested(options_hash, :vm_memory), | ||
| :cpu => get_total_requested(options_hash, :number_of_cpus), | ||
| :vms => get_total_requested(options_hash, :number_of_vms)} | ||
| @total_vms = get_total_requested(options_hash, :number_of_vms) |
There was a problem hiding this comment.
@billfitzgerald0120
Can we just use a total_vms as a local variable and default it to 1 for reconfigure request if its missing.
…rastructure. If you specify number_of_vms in a dialog override, the changes will multiple this value by memory, storage and number_of_cpus for quota value. If you are requesting 1gb of memory, 1gb of storage and 1 cpu and override number_of_vms to 3, quota will now check for 3gb of memory, 3gb of storage, 3 cpus and 3 vms. Modified a test and added a new test. Fixed rubocop warning. Changed total_vms to a local variable.
billfitzgerald0120
force-pushed
the
quota_overrides
branch
from
7f37213
to
8585d8c
Compare
|
Checked commits billfitzgerald0120/manageiq-content@53f0acd~...8585d8c with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
|
@mkanoor Changed total_vms to a local variable, please review. |
|
@billfitzgerald0120 https://bugzilla.redhat.com/show_bug.cgi?id=1497912 is already CLOSED/CURRENTRELEASE. Does this PR fix a different BZ? |
|
@miq-bot add_label gaprindashvili/yes |
simaishi
pushed a commit
that referenced
this pull request
May 21, 2018
Calculate quota using service dialogs overrides. (cherry picked from commit daf5f50) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536677
|
Gaprindashvili backport details: |
simaishi
pushed a commit
that referenced
this pull request
May 22, 2018
Calculate quota using service dialogs overrides. (cherry picked from commit daf5f50) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1489507
|
Fine 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.
Changed requested method to use dialog overrides in quota calculations.
Modified requested method to calculate quota based on dialog values for:
number_of_sockets, cores_per_socket, number_of_cpus, vm_memory and storage.
This can be tested by using service dialogs using these values.
https://bugzilla.redhat.com/show_bug.cgi?id=1497912https://bugzilla.redhat.com/show_bug.cgi?id=1456819
Testing
Create a service using service dialog overrides values for the above values.
You can use one or more override values.
Order the service, change some values and run.
Note: Latest commit added quota calculations for number_of_vms in a service dialog for Infrastructure.
I am including screenshots of a dialog using some values.
