Quota enable config to user/domain scope by BryanMLima · Pull Request #6690 · apache/cloudstack

BryanMLima · 2022-08-30T14:44:19Z

Description

Currently, ACS only has the option to enable the Quota plugin globally. However, for some use cases having the plugin active to specific accounts and domains may be more interesting. Therefore, this PR aims to add this functionality through the quota config quota.account.enabled. Moreover, a new column was added to the quota summary section in the UI showing if the account has the plugin enabled. In the future, a filter will be added for accounts with the plugin enabled, disabled and for removed accounts.

Finally, for the config to be used in a domain scope, when it cannot be found at user level, it is required that the following global configurations are enabled: enable.account.settings.for.domain and enable.domain.settings.for.child.domain.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Screenshots (if appropriate):

List of accounts with the plugin enabled and disabled:

How Has This Been Tested?

This was tested in a local lab setting the quota.account.enabled to true and false to random accounts. In the quota summary section the accounts where correctly displayed: accounts with the plugin disabled had the (quota-disabled) string attached and accounts with the plugin enabled were normally displayed.

…bled

acs-robot · 2022-08-30T14:45:24Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-08-30T14:46:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-08-30T14:51:24Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6690 (SL-JID-2253)

codecov · 2022-08-30T15:30:51Z

Codecov Report

Merging #6690 (8a9d15d) into main (4a06363) will increase coverage by 0.00%.
The diff coverage is 50.00%.

❗ Current head 8a9d15d differs from pull request most recent head 553538c. Consider uploading reports for the commit 553538c to get more accurate results

@@            Coverage Diff            @@
##               main    #6690   +/-   ##
=========================================
  Coverage     10.84%   10.84%           
- Complexity     7095     7101    +6     
=========================================
  Files          2485     2485           
  Lines        245370   245387   +17     
  Branches      38319    38322    +3     
=========================================
+ Hits          26602    26614   +12     
- Misses       215500   215505    +5     
  Partials       3268     3268

Impacted Files	Coverage Δ
.../org/apache/cloudstack/quota/QuotaManagerImpl.java	`45.09% <0.00%> (-0.91%)`	⬇️
.../cloudstack/api/response/QuotaSummaryResponse.java	`0.00% <0.00%> (ø)`
.../org/apache/cloudstack/quota/QuotaServiceImpl.java	`35.86% <ø> (ø)`
...ache/cloudstack/quota/dao/QuotaAccountDaoImpl.java	`50.00% <88.88%> (+50.00%)`	⬆️
.../apache/cloudstack/quota/constant/QuotaConfig.java	`100.00% <100.00%> (ø)`
...org/apache/cloudstack/quota/vo/QuotaAccountVO.java	`76.31% <0.00%> (+2.63%)`	⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

JoaoJandre

CLGTM

Co-authored-by: dahn <daan.hoogland@gmail.com>

acs-robot · 2022-09-06T13:20:01Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-09-06T13:21:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-09-06T13:26:52Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6690 (SL-JID-2303)

DaanHoogland · 2022-09-06T14:04:10Z

@blueorangutan package

blueorangutan · 2022-09-06T14:05:03Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

sonarqubecloud · 2022-09-06T14:13:22Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

63.9% Coverage
0.0% Duplication

blueorangutan · 2022-09-06T14:43:05Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 4138

DaanHoogland · 2022-09-07T07:16:15Z

@blueorangutan test

blueorangutan · 2022-09-07T07:17:03Z

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2022-09-07T19:48:36Z

Trillian test result (tid-4833)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43715 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6690-t4833-kvm-centos7.zip
Smoke tests completed. 100 look OK, 1 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	`Failure`	640.10	test_kubernetes_clusters.py

github-actions · 2022-10-17T08:46:04Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

DaanHoogland · 2022-10-17T08:58:21Z

@BryanMLima can you look at the conflicts

acs-robot · 2022-10-21T17:16:33Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-10-21T17:17:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-10-21T17:23:04Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6690 (SL-JID-2543)

acs-robot · 2022-10-21T19:44:32Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-10-21T19:45:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-10-21T19:50:57Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6690 (SL-JID-2544)

acs-robot · 2022-10-25T14:04:02Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-10-25T14:05:04Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-10-25T14:10:41Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6690 (SL-JID-2564)

sonarqubecloud · 2022-10-25T15:04:01Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

22.9% Coverage
0.0% Duplication

DaanHoogland · 2022-10-26T06:40:36Z

@blueorangutan package

blueorangutan · 2022-10-26T06:41:03Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-10-26T07:23:29Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 4550

DaanHoogland · 2022-10-26T09:42:44Z

@blueorangutan test

blueorangutan · 2022-10-26T09:43:03Z

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2022-10-26T20:43:59Z

Trillian test result (tid-5205)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 38339 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6690-t5205-kvm-centos7.zip
Smoke tests completed. 104 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland · 2022-10-27T06:43:46Z

@GutoVeronezi , I trust all your comments have been met?

GutoVeronezi · 2022-10-27T11:48:45Z

@DaanHoogland, yes, they have been met.

I will merge this one based on the packaging and tests results (#6690 (comment) and #6690 (comment)) and on the approvals.

BryanMLima added 4 commits August 29, 2022 18:11

Add quota plugin to accout/domain scope

66dc3a8

Add check in quota usage calculation to skip accounts with quota disa…

d1f939e

…bled

Set quota config enabled default to true

16c746b

Fix if condition

9266ecb

boring-cyborg Bot added component:quota component:UI labels Aug 30, 2022

DaanHoogland reviewed Aug 31, 2022

View reviewed changes

Comment thread framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java Outdated

JoaoJandre approved these changes Sep 2, 2022

View reviewed changes

Update condition to use primitive boolean expression

52cc004

Co-authored-by: dahn <daan.hoogland@gmail.com>

DaanHoogland approved these changes Sep 8, 2022

View reviewed changes

GutoVeronezi reviewed Sep 9, 2022

View reviewed changes

Comment thread framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java Outdated

Comment thread framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java

Comment thread ui/src/config/section/plugin/quota.js Outdated

github-actions Bot added the status:has-conflicts label Oct 17, 2022

Merge branch 'main' into quota-plugin-per-account

6b044eb

github-actions Bot removed the status:has-conflicts label Oct 21, 2022

BryanMLima added 2 commits October 21, 2022 13:51

Remove unused var

ede7d2f

Add quota state as a column in the Quota Summary view

d36038d

Remove trailling spaces

8a9d15d

DaanHoogland reviewed Oct 23, 2022

View reviewed changes

Comment thread framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java Outdated

Address review

553538c

stephankruggg approved these changes Oct 27, 2022

View reviewed changes

DaanHoogland added this to the 4.18.0.0 milestone Oct 27, 2022

GutoVeronezi approved these changes Oct 27, 2022

View reviewed changes

GutoVeronezi merged commit f580a8d into apache:main Oct 27, 2022

BryanMLima mentioned this pull request Feb 17, 2023

Fix Quota plugin state on QuotaSummaryResponse #7257

Merged

12 tasks

Conversation

BryanMLima commented Aug 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

acs-robot commented Aug 30, 2022

Uh oh!

blueorangutan commented Aug 30, 2022

Uh oh!

blueorangutan commented Aug 30, 2022

Uh oh!

codecov Bot commented Aug 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

JoaoJandre left a comment

Choose a reason for hiding this comment

Uh oh!

acs-robot commented Sep 6, 2022

Uh oh!

blueorangutan commented Sep 6, 2022

Uh oh!

blueorangutan commented Sep 6, 2022

Uh oh!

DaanHoogland commented Sep 6, 2022

Uh oh!

blueorangutan commented Sep 6, 2022

Uh oh!

sonarqubecloud Bot commented Sep 6, 2022

Uh oh!

blueorangutan commented Sep 6, 2022

Uh oh!

DaanHoogland commented Sep 7, 2022

Uh oh!

blueorangutan commented Sep 7, 2022

Uh oh!

blueorangutan commented Sep 7, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 17, 2022

Uh oh!

DaanHoogland commented Oct 17, 2022

Uh oh!

acs-robot commented Oct 21, 2022

Uh oh!

blueorangutan commented Oct 21, 2022

Uh oh!

blueorangutan commented Oct 21, 2022

Uh oh!

acs-robot commented Oct 21, 2022

Uh oh!

blueorangutan commented Oct 21, 2022

Uh oh!

blueorangutan commented Oct 21, 2022

Uh oh!

Uh oh!

acs-robot commented Oct 25, 2022

Uh oh!

blueorangutan commented Oct 25, 2022

Uh oh!

blueorangutan commented Oct 25, 2022

Uh oh!

sonarqubecloud Bot commented Oct 25, 2022

Uh oh!

DaanHoogland commented Oct 26, 2022

Uh oh!

blueorangutan commented Oct 26, 2022

Uh oh!

blueorangutan commented Oct 26, 2022

Uh oh!

DaanHoogland commented Oct 26, 2022

Uh oh!

BryanMLima commented Aug 30, 2022 •

edited

Loading

codecov Bot commented Aug 30, 2022 •

edited

Loading