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.

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

Fix displaying 'CPU' and 'CPU Cores' when creating chargeback rate #3621

Conversation

hstastna
Copy link

@hstastna hstastna commented Mar 14, 2018

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1521113

Done:

  • fix displaying CPU Cores instead of Cpu Cores under the Group column for
    Allocated CPU Cores/Used CPU Cores, when creating a new chargeback rate
  • fix displaying CPU instead of Cpu under the Group column for Allocated CPU Count/Used CPU,
    when adding a new tier (row under the CPU Group), when creating a new chargeback rate
  • similarly for Disk I/O (which changes to Disk Io when adding a new tier and we don't want this)
  • similarly for Network I/O (-> Net Io).

Note: I used the same way (and working!) of displaying a group in the table as it is in more other places, for example:
https://github.com/ManageIQ/manageiq-ui-classic/blob/master/app/views/chargeback/_cb_rate_edit_table.html.haml#L33
https://github.com/ManageIQ/manageiq-ui-classic/blob/master/app/views/chargeback/_cb_rate_show.html.haml#L41
so I consider the code (2nd commit in this PR) more consistent than it was before

Note 2: We create new Compute or Storage chargeback rates under Cloud Intel > Chargeback > Rates accordion.


Before:
Displaying Cpu Cores:
cpu_cores_before
Displaying Cpu, Disk Io, Net Io, after adding a new tier:
cpu_bad

After:
Displaying CPU Cores:
cpu_cores_after
Displaying CPU, Disk I/O, Network I/O, after adding a new tier:
cpu_fixed

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1521113

Fix displaying 'CPU Cores' instead of 'Cpu Cores' under the Group column for
Allocated CPU Cores and Used CPU Cores, when creating a new chargeback rate.
@miq-bot miq-bot added the wip label Mar 14, 2018
@hstastna
Copy link
Author

@miq-bot add_label bug

@miq-bot miq-bot added the bug label Mar 14, 2018
Fix displaying 'CPU' instead of 'Cpu' under the Group column for Allocated CPU Count/Used CPU,
when adding a new tier (row under the CPU Group), when creating a new chargeback rate.
Similarly, fix also displaying 'Disk I/O' (not 'Disk Io') and 'Network I/O' (not 'Net Io').
@miq-bot
Copy link
Member

miq-bot commented Mar 14, 2018

Checked commits hstastna/manageiq-ui-classic@86e109a~...5047a9e with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. ⭐

@hstastna hstastna changed the title [WIP] Fix displaying 'CPU' and 'CPU Cores' when creating chargeback rate Fix displaying 'CPU' and 'CPU Cores' when creating chargeback rate Mar 14, 2018
@hstastna
Copy link
Author

@miq-bot remove_label wip

@miq-bot miq-bot removed the wip label Mar 14, 2018
@mzazrivec mzazrivec self-assigned this Mar 15, 2018
@mzazrivec mzazrivec added this to the Sprint 82 Ending Mar 26, 2018 milestone Mar 15, 2018
@mzazrivec mzazrivec merged commit 60ed31f into ManageIQ:master Mar 15, 2018
simaishi pushed a commit that referenced this pull request Mar 16, 2018
…U_chargeback_rate

Fix displaying 'CPU' and 'CPU Cores' when creating chargeback rate
(cherry picked from commit 60ed31f)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1557388
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit 3a3b2692ce05720e8ba3fac7380b807690678524
Author: Milan Zázrivec <mzazrivec@redhat.com>
Date:   Thu Mar 15 10:22:08 2018 +0100

    Merge pull request #3621 from hstastna/Inconsistent_capitalization_CPU_chargeback_rate
    
    Fix displaying 'CPU' and 'CPU Cores' when creating chargeback rate
    (cherry picked from commit 60ed31f56c498a6996aaff2bd21d297ef4661c32)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1557388

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants