This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 0b857def685 New feature: Import/Unamange DATA volume from storage pool
(#8808)
add 96ae479000a [Usage] Create network billing (#7236)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 4 ++
.../org/apache/cloudstack/usage/UsageTypes.java | 2 +
.../engine/orchestration/NetworkOrchestrator.java | 6 +++
.../{UsageVpcVO.java => UsageNetworksVO.java} | 43 +++++++++------
.../src/main/java/com/cloud/usage/UsageVO.java | 11 ++++
...ageVMInstanceDao.java => UsageNetworksDao.java} | 14 ++---
...geVpcDaoImpl.java => UsageNetworksDaoImpl.java} | 61 ++++++++++++----------
...n-daos-between-management-and-usage-context.xml | 1 +
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41900to41910.sql | 14 +++++
.../presetvariables/PresetVariableHelper.java | 22 ++++++++
.../activationrule/presetvariables/Value.java | 10 ++++
.../cloudstack/quota/constant/QuotaTypes.java | 1 +
.../quota/dao/{VpcDao.java => NetworkDao.java} | 4 +-
.../dao/{VpcDaoImpl.java => NetworkDaoImpl.java} | 8 ++-
.../presetvariables/PresetVariableHelperTest.java | 1 +
.../activationrule/presetvariables/ValueTest.java | 8 +++
.../java/com/cloud/network/NetworkServiceImpl.java | 12 ++++-
.../java/com/cloud/usage/UsageManagerImpl.java | 27 ++++++++++
...pcUsageParser.java => NetworksUsageParser.java} | 53 ++++++++++---------
20 files changed, 222 insertions(+), 81 deletions(-)
copy engine/schema/src/main/java/com/cloud/usage/{UsageVpcVO.java =>
UsageNetworksVO.java} (71%)
copy engine/schema/src/main/java/com/cloud/usage/dao/{UsageVMInstanceDao.java
=> UsageNetworksDao.java} (73%)
copy engine/schema/src/main/java/com/cloud/usage/dao/{UsageVpcDaoImpl.java =>
UsageNetworksDaoImpl.java} (67%)
copy
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{VpcDao.java =>
NetworkDao.java} (89%)
copy
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{VpcDaoImpl.java
=> NetworkDaoImpl.java} (68%)
copy usage/src/main/java/com/cloud/usage/parser/{VpcUsageParser.java =>
NetworksUsageParser.java} (57%)
