This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch 4.18-vm-autoscaling
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 10a905c731d AS server: get VM statistics only if vm is Running or
Migrating; replace fixedrate with fixeddelay; create dummy record when vm is
started
add 289a43f758f packaging: Uses rng-tools for entropy, not haveged for
cloudstack-management (#6775)
add 2ca164ac96b Quota custom tariffs (#5909)
new 11b5f409ca1 Merge remote-tracking branch 'apache/main' into
4.18-vm-autoscaling
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:
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../apache/cloudstack/usage/UsageUnitTypes.java | 52 +
.../cloudstack/usage/UsageUnitTypesTest.java | 53 +
debian/control | 2 +-
.../engine/subsystem/api/storage/SnapshotInfo.java | 6 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 -
.../engine/orchestration/VolumeOrchestrator.java | 3 +-
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 1 +
.../com/cloud/upgrade/dao/Upgrade41700to41800.java | 233 ++++
.../src/main/java/com/cloud/usage/UsageVO.java | 6 +
.../main/java/com/cloud/usage/dao/UsageDao.java | 5 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 86 +-
.../src/main/java/com/cloud/user/AccountVO.java | 4 +
.../java/com/cloud/vm/constants/VmDetails.java | 28 +-
.../datastore}/db/SnapshotDataStoreDaoImpl.java | 4 +-
...n-daos-between-management-and-usage-context.xml | 70 ++
.../spring-engine-schema-core-daos-context.xml | 41 +-
.../resources/META-INF/db/schema-41700to41800.sql | 88 ++
.../storage/motion/AncientDataMotionStrategy.java | 3 +-
.../src/test/resources/fakeDriverTestContext.xml | 2 +-
.../src/test/resources/storageContext.xml | 2 +-
.../db/SnapshotDataStoreDaoImplTest.java | 3 +-
.../main/java/com/cloud/utils/db/GenericDao.java | 2 +
.../java/com/cloud/utils/db/GenericDaoBase.java | 41 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 8 +
.../com/cloud/utils/db/GenericDaoBaseTest.java | 32 +
.../apache/cloudstack/quota/QuotaManagerImpl.java | 653 ++++++-----
.../activationrule/presetvariables/Account.java | 28 +-
.../presetvariables/BackupOffering.java | 33 +
.../presetvariables/ComputeOffering.java | 30 +-
.../presetvariables/ComputingResources.java | 56 +
.../activationrule/presetvariables/Domain.java | 30 +-
.../presetvariables/GenericPresetVariable.java | 52 +
.../quota/activationrule/presetvariables/Host.java | 30 +-
.../presetvariables/PresetVariableHelper.java | 653 +++++++++++
.../presetvariables/PresetVariables.java | 76 ++
.../activationrule/presetvariables/Resource.java | 38 +-
.../quota/activationrule/presetvariables/Role.java | 30 +-
.../activationrule/presetvariables/Storage.java | 34 +-
.../activationrule/presetvariables/Value.java | 188 ++++
.../cloudstack/quota/constant/QuotaConfig.java | 3 +
.../cloudstack/quota/constant/QuotaTypes.java | 52 +-
.../cloudstack/quota/dao/QuotaTariffDao.java | 4 +
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 77 +-
.../apache/cloudstack/quota/dao/VmTemplateDao.java | 28 +-
.../cloudstack/quota/dao/VmTemplateDaoImpl.java | 31 +-
.../apache/cloudstack/quota/vo/QuotaTariffVO.java | 98 +-
.../quota/spring-framework-quota-context.xml | 1 +
.../cloudstack/quota/QuotaManagerImplTest.java | 562 +++++++---
.../presetvariables/AccountTest.java | 30 +-
.../presetvariables/BackupOfferingTest.java | 36 +
.../presetvariables/ComputeOfferingTest.java | 29 +-
.../presetvariables/ComputingResourcesTest.java | 32 +-
.../activationrule/presetvariables/DomainTest.java | 29 +-
.../presetvariables/GenericPresetVariableTest.java | 73 ++
.../activationrule/presetvariables/HostTest.java | 30 +-
.../presetvariables/PresetVariableHelperTest.java | 1151 ++++++++++++++++++++
.../presetvariables/ResourceTest.java | 32 +-
.../activationrule/presetvariables/RoleTest.java | 30 +-
.../presetvariables/StorageTest.java | 31 +-
.../activationrule/presetvariables/ValueTest.java | 139 +++
.../cloudstack/quota/constant/QuotaTypesTest.java | 2 +-
.../cloudstack/quota/vo/QuotaTariffVOTest.java | 51 +
packaging/centos7/cloud.spec | 4 +-
packaging/centos8/cloud.spec | 4 +-
packaging/suse15/cloud.spec | 4 +-
.../api/command/QuotaTariffCreateCmd.java | 153 +++
.../api/command/QuotaTariffDeleteCmd.java | 77 ++
.../cloudstack/api/command/QuotaTariffListCmd.java | 33 +-
.../api/command/QuotaTariffUpdateCmd.java | 44 +-
.../api/response/QuotaResponseBuilder.java | 5 +
.../api/response/QuotaResponseBuilderImpl.java | 199 +++-
.../api/response/QuotaTariffResponse.java | 89 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 10 +-
.../api/command/QuotaTariffListCmdTest.java | 2 +-
.../api/command/QuotaTariffUpdateCmdTest.java | 2 +-
.../api/response/QuotaResponseBuilderImplTest.java | 238 ++--
.../kvm/storage/KVMStorageProcessor.java | 4 +-
server/src/main/java/com/cloud/api/ApiServer.java | 2 +-
.../cloud/storage/snapshot/SnapshotManager.java | 3 -
.../storage/snapshot/SnapshotManagerImpl.java | 4 +-
.../apache/cloudstack/snapshot/SnapshotHelper.java | 5 +-
.../java/com/cloud/user/MockUsageEventDao.java | 5 +
.../src/main/resources/usageApplicationContext.xml | 6 +
utils/pom.xml | 5 +
utils/src/main/java/com/cloud/utils/DateUtil.java | 2 +
.../cloudstack/utils/bytescale/ByteScaleUtils.java | 11 +
.../utils/jsinterpreter/JsInterpreter.java | 146 +++
.../ReflectionToStringBuilderUtils.java | 14 +
.../test/java/com/cloud/utils/UuidUtilsTest.java | 18 +-
.../utils/bytescale/ByteScaleUtilsTest.java | 9 +-
.../utils/jsinterpreter/JsInterpreterTest.java | 188 ++++
.../ReflectionToStringBuilderUtilsTest.java | 20 +
93 files changed, 5532 insertions(+), 1034 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/usage/UsageUnitTypes.java
create mode 100644
api/src/test/java/org/apache/cloudstack/usage/UsageUnitTypesTest.java
create mode 100644
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41700to41800.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
engine/schema/src/main/java/com/cloud/vm/constants/VmDetails.java (60%)
rename engine/{storage/src/main/java/org/apache/cloudstack/storage/image =>
schema/src/main/java/org/apache/cloudstack/storage/datastore}/db/SnapshotDataStoreDaoImpl.java
(99%)
create mode 100644
engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
create mode 100644
engine/schema/src/main/resources/META-INF/db/schema-41700to41800.sql
rename engine/storage/src/test/java/org/apache/cloudstack/storage/{image =>
datastore}/db/SnapshotDataStoreDaoImplTest.java (98%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Account.java
(60%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOffering.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOffering.java
(60%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResources.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Domain.java
(60%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariable.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Host.java
(60%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariables.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Resource.java
(54%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Role.java
(60%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Storage.java
(57%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VmTemplateDao.java
(59%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VmTemplateDaoImpl.java
(59%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/AccountTest.java
(62%)
create mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOfferingTest.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOfferingTest.java
(62%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
(56%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/DomainTest.java
(62%)
create mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariableTest.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/HostTest.java
(62%)
create mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
(57%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/RoleTest.java
(62%)
copy utils/src/test/java/com/cloud/utils/UuidUtilsTest.java =>
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/StorageTest.java
(56%)
create mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ValueTest.java
create mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/vo/QuotaTariffVOTest.java
create mode 100644
plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java
create mode 100644
plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffDeleteCmd.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreter.java
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreterTest.java
