Quota custom tariffs by GutoVeronezi · Pull Request #5909 · apache/cloudstack

GutoVeronezi · 2022-01-29T01:23:10Z

Description

This PR solves issue #5891.

The main focus of this PR is to provide a flexible manner for operators to charge and bill their cloud resources. Issue #5891 has more details and flowcharts of all the mapped and affected/changed workflows.

The UI compatibility was not addressed in this PR. However, it's mapped to be the next steps.

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

How Has This Been Tested?

I added unit tests to several methods, tested the whole CRUD, and the usage calculation.

To test the usage calculation I created some activation rules based on the cases described in issue #5891 (doing minor changes, such as changing the UUID to be validated). Then, I manually calculated the results and verified if the output is the same as I obtained in ACS.

…ction

sureshanaparti · 2022-01-30T20:48:10Z

@blueorangutan package

blueorangutan · 2022-01-30T20:49:03Z

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2022-01-30T21:23:12Z

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

blueorangutan · 2022-10-12T19:55:05Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 4435

github-actions · 2022-10-13T01:58:40Z

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

DaanHoogland · 2022-10-13T07:31:45Z

@GutoVeronezi sorry, conflicts again. can you have a look?

blueorangutan · 2022-10-13T07:59:57Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 4447

GutoVeronezi · 2022-10-13T12:21:25Z

@DaanHoogland, conflicts solved, thanks.

@GutoVeronezi I think we are good to go, we have some lab problems but I'll rerun a test round when feasible. On question still: this functionality is completely hidden by default in the same way the original quota plugin was, is it?

Yes. The PR is an extension of the original Quota plugin, new APIs will be accessible only if the plugin is enabled, as well as existing APIs that were modified.

yadvr · 2022-10-13T13:50:36Z

@GutoVeronezi when the plugin is disabled (I'm assuming by default it is disabled) - does that disable any initialisation of JS inteterpretor/processing code?

@blueorangutan package

blueorangutan · 2022-10-13T13:51:11Z

@rohityadavcloud 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-13T14:34:37Z

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

GutoVeronezi · 2022-10-13T16:58:02Z

@GutoVeronezi when the plugin is disabled (I'm assuming by default it is disabled) - does that disable any initialisation of JS inteterpretor/processing code?
@blueorangutan package

Yes. The interpreter is initialized and destroyed each processing round; therefore, if the plugin is disabled, there will not be processing and the interpreter will not be initialized.

blueorangutan · 2022-10-13T16:59:03Z

@GutoVeronezi a Jenkins job has been kicked to build packages. It will be bundled with

Yes. The interpreter is initialized and destroyed each processing round; therefore, if the plugin is disabled, there will not be processing and the interpreter will not be initialized. SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2022-10-13T17:30:15Z

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

DaanHoogland · 2022-10-14T09:31:24Z

@blueorangutan test

blueorangutan · 2022-10-14T09:32:03Z

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

blueorangutan · 2022-10-14T21:11:38Z

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

Test	Result	Time (s)	Test File
test_02_upgrade_kubernetes_cluster	`Failure`	496.45	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	571.55	test_kubernetes_clusters.py

DaanHoogland · 2022-10-17T08:02:59Z

given that regression tests are ok and the author is the sole stakeholder in this, I'm merging.

PR #5909 was created before the announce of release 4.17.1.0 and the changes in the databases were addressed in the 4.17.0.0 -> 4.18.0.0 migration path. However, #5909 was merged after 4.17.1.0 releasing, with the original migration path. This PR intends to fix the migration path of PR #5909. Co-authored-by: GutoVeronezi <daniel@scclouds.com.br>

GutoVeronezi added 25 commits January 27, 2022 17:14

Rename method getDescription to a proper name (getUsageTypeDescription)
2eb091a

SQL to add columns to cloud_usage.quota_tariff and changes in VO
d20ed75

Script to convert quota tariffs to new paradigm
0231918

Refactor GenericDaoBase#searchAndCount
4cbc384

Create method to overload ReflectionToStringBuilderUtils#reflectColle…
b95bd9a
…ction

Create method in SearchCriteria to set parameter only if it is not null
16d6628

Refactor API quotaTariffList
43b5139

Refactor API quotaTariffUpdate
6b2e595

Create API quotaTariffCreate
7d4fd49

Allow ASCII non-printable characters in activationrule
7f96b09

Add UUID to API arg validators
8650066

Create API quotaTariffDelete
848ab59

Create enum for usage unit types
5ea36bb

Create config for activationrule's timeout
e914f4b

Create facade to JS interpreter
6b0bd9b

Add unimplemented methods to MockUsageEventDao
6e713a5

Add tests to QuotaTariffVO
5c39945

Move SnapshotDataStoreDaoImpl to right path
270798c

Prepare POMs to inject management DAOs into usage
0d72274

Move config BackupSnapshotAfterTakingSnapshot to SnapshotInfo
4dc7468

Add tests to QuotaResponseBuilderImpl
e3489ed

Create preset variables to inject into activation rules
48af923

Refactor usage calculation
a74de9d

Fix build erros
c0cdddc

Add "removed" to API quotaTariffList's result
d70634a

apache deleted a comment from blueorangutan Jan 31, 2022

github-actionsBot added the status:has-conflicts label Oct 13, 2022

Merge remote-tracking branch 'apache-github/main' into HEAD
ef50b0b

github-actionsBot removed the status:has-conflicts label Oct 13, 2022

DaanHoogland merged commit 2ca164a into apache:mainOct 17, 2022

weizhouapache reviewed Nov 8, 2022
View reviewed changes

Comment threadutils/src/main/java/org/apache/cloudstack/utils/bytescale/ByteScaleUtils.java

GutoVeronezi mentioned this pull request Nov 8, 2022
Fix typos and improve javadocs on ByteScaleUtils #6877
Merged
10 tasks

GutoVeronezi mentioned this pull request Nov 29, 2022
Fix migration path of PR #5909 #6927
Merged
10 tasks

GutoVeronezi mentioned this pull request Jan 31, 2023
Adjusts/fixes in quota tariff APIs #7146
Merged
10 tasks

kiranchavala mentioned this pull request Apr 5, 2023
Fixed the Description coloumn in the UI for Quota traffic page #7402
Merged
12 tasks

JoaoJandre mentioned this pull request May 2, 2023
Flexible tags for hosts and storage pools #7489
Merged
12 tasks

BryanMLima mentioned this pull request Dec 18, 2023
[Quota] Add API to list preset variables #8372
Merged
8 tasks

bernardodemarco mentioned this pull request Jun 17, 2024
Improvements to quota tariffs APIs and UI #9225
Merged
8 tasks

BryanMLima mentioned this pull request Dec 12, 2024
Guest OS rules #10098
Merged
9 tasks

bernardodemarco mentioned this pull request Feb 19, 2025
No method to apply quota on storage tags #10382
Closed

Uh oh!

Conversation

GutoVeronezi commented Jan 29, 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

How Has This Been Tested?

Uh oh!

sureshanaparti commented Jan 30, 2022

Uh oh!

blueorangutan commented Jan 30, 2022

Uh oh!

blueorangutan commented Jan 30, 2022

Uh oh!

blueorangutan commented Oct 12, 2022

Uh oh!

github-actionsBot commented Oct 13, 2022

Uh oh!

DaanHoogland commented Oct 13, 2022

Uh oh!

blueorangutan commented Oct 13, 2022

Uh oh!

GutoVeronezi commented Oct 13, 2022

Uh oh!

yadvr commented Oct 13, 2022

Uh oh!

blueorangutan commented Oct 13, 2022

Uh oh!

blueorangutan commented Oct 13, 2022

Uh oh!

GutoVeronezi commented Oct 13, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blueorangutan commented Oct 13, 2022

Uh oh!

blueorangutan commented Oct 13, 2022

Uh oh!

DaanHoogland commented Oct 14, 2022

Uh oh!

blueorangutan commented Oct 14, 2022

Uh oh!

blueorangutan commented Oct 14, 2022

Uh oh!

DaanHoogland commented Oct 17, 2022

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

GutoVeronezi commented Jan 29, 2022•
edited
Loading

GutoVeronezi commented Oct 13, 2022•
edited
Loading