[Usage] Create network billing by SadiJr · Pull Request #7236 · apache/cloudstack · GitHub

Description

The usage of networks is not captured and saved by the Usage plugin, which makes it impossible to charge via the Quota plugin. The Usage plugin has been updated to record network events in the database. When a network is created, the event EVENT_NETWORK_CREATE is used; when a network is removed, the event EVENT_NETWORK_DELETE is used; and when a network is updated, the event EVENT_NETWORK_UPDATE is used. Also, this new type has the attributes value.state, value.id and value.name injected in the Quota plugin.

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

Bug Severity

BLOCKER
Critical
Major
Minor
Trivial

Screenshots (if appropriate):

How Has This Been Tested?

It was tested in a local lab:

I created and destroyed networks via UI;
Previously, ACS did not save any network events in Usage;
Now, ACS saves these events in Usage.

Codecov Report

Attention: Patch coverage is 13.06533% with 173 lines in your changes are missing coverage. Please review.

Project coverage is 29.90%. Comparing base (ffd5972) to head (2d9f0c4).
Report is 11 commits behind head on 4.19.

Files	Patch %	Lines
...java/com/cloud/usage/dao/UsageNetworksDaoImpl.java	3.03%	64 Missing ⚠️
...src/main/java/com/cloud/usage/UsageNetworksVO.java	7.31%	38 Missing ⚠️
...va/com/cloud/usage/parser/NetworksUsageParser.java	0.00%	37 Missing ⚠️
...rc/main/java/com/cloud/usage/UsageManagerImpl.java	0.00%	16 Missing ⚠️
...tionrule/presetvariables/PresetVariableHelper.java	8.33%	11 Missing ⚠️
.../schema/src/main/java/com/cloud/usage/UsageVO.java	0.00%	3 Missing ⚠️
api/src/main/java/com/cloud/event/EventTypes.java	0.00%	2 Missing ⚠️
...ck/quota/activationrule/presetvariables/Value.java	75.00%	1 Missing ⚠️
...ain/java/com/cloud/network/NetworkServiceImpl.java	88.88%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.19    #7236      +/-   ##
============================================
- Coverage     30.96%   29.90%   -1.06%     
+ Complexity    34304    33070    -1234     
============================================
  Files          5354     5359       +5     
  Lines        376105   376883     +778     
  Branches      54694    54833     +139     
============================================
- Hits         116454   112716    -3738     
- Misses       244336   249277    +4941     
+ Partials      15315    14890     -425

Flag	Coverage Δ
simulator-marvin-tests	23.36% <10.05%> (-1.45%)	⬇️
uitests	4.38% <ø> (-0.01%)	⬇️
unit-tests	16.56% <3.01%> (-0.03%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
10 Code Smells

1.4% Coverage
3.1% Duplication

CLGTM, not manually tested

SonarCloud Quality Gate failed.

0 Bugs 0 Vulnerabilities 0 Security Hotspots 10 Code Smells

1.4% Coverage 3.1% Duplication

@SadiJr 4 of those 10 code smells look more serious, can you look at those. I will review this later.

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

@SadiJr Could you please resolve the merge conflicts

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
10 Code Smells

1.4% Coverage
3.1% Duplication

@SadiJr for this one as well, we have to decide what to base this on and correct the upgrade path accordingly.

maybe undo this delete?

@DaanHoogland I think the file indentation is better by removing this line.

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

Co-authored-by: Henrique Sato <henriquesato2003@gmail.com>

This looks good to everyone. merging

boring-cyborg Bot added component:api component:networking component:orchestration component:quota component:usage-server labels Feb 15, 2023

github-actions Bot added the status:has-conflicts label Feb 21, 2023

github-actions Bot removed the status:has-conflicts label Feb 21, 2023

stephankruggg approved these changes Feb 24, 2023

View reviewed changes

github-actions Bot added the status:has-conflicts label Mar 6, 2023

github-actions Bot removed the status:has-conflicts label Mar 28, 2023

GutoVeronezi reviewed Apr 22, 2023

View reviewed changes

Comment thread framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java Resolved

JoaoJandre reviewed Apr 24, 2023

View reviewed changes

Comment thread usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java Resolved

DaanHoogland added this to the 4.19.0.0 milestone Jun 22, 2023

DaanHoogland reviewed Aug 23, 2023

View reviewed changes

Comment thread engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql Resolved

DaanHoogland closed this Sep 18, 2023

DaanHoogland reopened this Sep 18, 2023

DaanHoogland added the status:needs-testing label Sep 19, 2023

DaanHoogland reviewed Sep 19, 2023

View reviewed changes

github-actions Bot added the status:has-conflicts label Sep 28, 2023

github-actions Bot removed the status:has-conflicts label Oct 4, 2023

github-actions Bot added the status:has-conflicts label Oct 23, 2023

BryanMLima and others added 2 commits April 23, 2024 14:11

Add missing constraints

cbcf711

Co-authored-by: Henrique Sato <henriquesato2003@gmail.com>

Add primary key on schema

9c2669e

apache deleted a comment from kiranchavala Apr 24, 2024

apache deleted a comment from blueorangutan Apr 24, 2024

apache deleted a comment from BryanMLima Apr 24, 2024

apache deleted a comment from blueorangutan Apr 24, 2024

apache deleted a comment from BryanMLima Apr 24, 2024

apache deleted a comment from blueorangutan Apr 24, 2024

apache deleted a comment from BryanMLima Apr 24, 2024

apache deleted a comment from blueorangutan Apr 24, 2024

		DELETE FROM `cloud`.`snapshot_store_ref`
		WHERE store_role = "Primary" AND store_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);

[Usage] Create network billing by SadiJr · Pull Request #7236 · apache/cloudstack · GitHub

Repository navigation

[Usage] Create network billing - #7236

[Usage] Create network billing#7236DaanHoogland merged 15 commits intoapache:4.19apache/cloudstack:4.19from scclouds:usage-network-billingscclouds/cloudstack:usage-network-billingCopy head branch name to clipboard

Conversation

SadiJr commented Feb 15, 2023

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

codecov Bot commented Feb 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions Bot commented Feb 21, 2023

Uh oh!

sonarqubecloud Bot commented Feb 21, 2023

Uh oh!

stephankruggg left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Feb 24, 2023

Uh oh!

github-actions Bot commented Mar 6, 2023

Uh oh!

kiranchavala commented Mar 7, 2023

Uh oh!

sonarqubecloud Bot commented Mar 28, 2023

Uh oh!

DaanHoogland commented Mar 29, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaanHoogland Sep 19, 2023

Choose a reason for hiding this comment

Uh oh!

SadiJr Dec 12, 2023

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Sep 28, 2023

Uh oh!

DaanHoogland commented Apr 24, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

[Usage] Create network billing#7236
DaanHoogland merged 15 commits into
apache:4.19from
scclouds:usage-network-billing

codecov Bot commented Feb 15, 2023 •
edited
Loading