This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from a6f3560152b fix log4j to log4j2 issue (#8966)
add 96ae479000a [Usage] Create network billing (#7236)
add 6def370f4a2 test: fix unknown parameter hostid in
test_vm_life_cycle.py (#8948)
add 4ffeec6ba45 vpc: create vpc tiers with dns server of vpc instead of
zone (#8621)
add 5f6acca049e packaging: move contrail network plugin to noredist (#8932)
add 0514caedd6a Merge release branch 4.18 to 4.19
new 0af923e6181 Merge branch '4.19'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 4 ++
.../org/apache/cloudstack/usage/UsageTypes.java | 2 +
client/pom.xml | 14 ++---
.../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} | 63 ++++++++++++----------
...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 +++
plugins/network-elements/juniper-contrail/pom.xml | 6 ---
plugins/pom.xml | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 12 ++++-
.../com/cloud/network/NetworkModelImplTest.java | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 6 +--
.../java/com/cloud/usage/UsageManagerImpl.java | 27 ++++++++++
...pcUsageParser.java => NetworksUsageParser.java} | 53 +++++++++---------
25 files changed, 235 insertions(+), 100 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} (63%)
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%)
