This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard c5fe3ac7318 4.21/main Health Check, please don't merge this!
add 6f4445c5c1b Add offering preset variables for `Network` and `VPC`
Quota tariffs (#11810)
add e2c13da4197 Remove UUID parse from param processing workflow (#13065)
add 089eb36e471 Linstor: fix create volume from snapshot on primary
storage (#13043)
add a73cc9a22c0 Improve Quota Statement (#10506)
add c45596cca3e Refactor of Allocator classes (#9074)
add c07f1fd5d29 Number of running and stopped VMs as preset variables for
`Network` type Quota tariffs (#11689)
add 0b169920f34 make dh group 31 default, support 22-24+31 (#12764)
add ffebe8eaa64 Fix bulk power state query missing VM lifecycle state
field (#13027)
add 92d82989e32 Correction of the user responsible for the event (#13066)
add 1f5dba9bd2d Release reserved storage resources on VM deployment
failure (#13048)
add 8906aa1d460 Merge branch '4.22'
add 7b42bab62ca 4.21/main Health Check, please don't merge this!
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c5fe3ac7318)
\
N -- N -- N refs/heads/healthcheck-main (7b42bab62ca)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../agent/manager/allocator/HostAllocator.java | 33 -
.../java/com/cloud/deploy/DeploymentPlanner.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 6 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 9 +-
.../admin/host/FindHostsForMigrationCmd.java | 2 +-
.../api/command/admin/host/ListHostsCmd.java | 2 +-
.../org/apache/cloudstack/context/CallContext.java | 6 +-
.../CreateIpv4SubnetForGuestNetworkCmdTest.java | 2 +-
.../network/CreateIpv4SubnetForZoneCmdTest.java | 2 +-
.../network/DedicateIpv4SubnetForZoneCmdTest.java | 2 +-
.../DeleteIpv4SubnetForGuestNetworkCmdTest.java | 2 +-
.../network/DeleteIpv4SubnetForZoneCmdTest.java | 2 +-
.../ReleaseDedicatedIpv4SubnetForZoneCmdTest.java | 2 +-
.../network/UpdateIpv4SubnetForZoneCmdTest.java | 2 +-
.../bgp/ChangeBgpPeersForNetworkCmdTest.java | 2 +-
.../network/bgp/ChangeBgpPeersForVpcCmdTest.java | 2 +-
.../admin/network/bgp/CreateBgpPeerCmdTest.java | 2 +-
.../admin/network/bgp/DedicateBgpPeerCmdTest.java | 2 +-
.../admin/network/bgp/DeleteBgpPeerCmdTest.java | 2 +-
.../bgp/ReleaseDedicatedBgpPeerCmdTest.java | 2 +-
.../admin/network/bgp/UpdateBgpPeerCmdTest.java | 2 +-
.../storage/DownloadImageStoreObjectCmdTest.java | 2 +-
.../admin/volume/UnmanageVolumeCmdTest.java | 2 +-
.../api/command/test/CreateSnapshotCmdTest.java | 2 +-
.../api/command/test/UpdateConditionCmdTest.java | 2 +-
.../routing/DeleteRoutingFirewallRuleCmdTest.java | 2 +-
client/pom.xml | 5 -
.../java/com/cloud/vm/VirtualMachineManager.java | 9 -
.../com/cloud/vm/VirtualMachineManagerImpl.java | 18 -
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 4 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 9 +-
...n-daos-between-management-and-usage-context.xml | 2 +
.../spring-engine-schema-core-daos-context.xml | 2 -
.../META-INF/db/schema-42200to42210-cleanup.sql | 6 +
.../resources/META-INF/db/schema-42210to42300.sql | 10 +
.../cloud_usage.quota_usage_view.sql} | 26 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 6 +
.../presetvariables/PresetVariableHelper.java | 44 +-
...icPresetVariable.java => ResourceCounting.java} | 28 +-
.../activationrule/presetvariables/Value.java | 33 +
...otaCreditsDao.java => QuotaTariffUsageDao.java} | 13 +-
.../quota/dao/QuotaTariffUsageDaoImpl.java | 56 ++
.../cloudstack/quota/dao/QuotaUsageJoinDao.java | 14 +-
.../quota/dao/QuotaUsageJoinDaoImpl.java | 94 +++
.../cloudstack/quota/vo/QuotaTariffUsageVO.java | 86 +++
.../{QuotaUsageVO.java => QuotaUsageJoinVO.java} | 100 +--
.../cloudstack/quota/vo/QuotaUsageResourceVO.java | 45 +-
.../quota/spring-framework-quota-context.xml | 4 +-
.../presetvariables/PresetVariableHelperTest.java | 158 +++++
.../cloudstack/api/command/QuotaStatementCmd.java | 74 +-
.../api/response/QuotaResponseBuilder.java | 5 +-
.../api/response/QuotaResponseBuilderImpl.java | 325 ++++++---
.../QuotaStatementItemResourceResponse.java | 61 ++
.../api/response/QuotaStatementItemResponse.java | 69 +-
.../api/response/QuotaStatementResponse.java | 65 +-
.../org/apache/cloudstack/quota/QuotaService.java | 4 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 30 +-
.../api/command/QuotaStatementCmdTest.java | 23 +-
.../api/response/QuotaResponseBuilderImplTest.java | 199 ++++++
.../cloudstack/quota/QuotaServiceImplTest.java | 10 +-
plugins/host-allocators/random/pom.xml | 30 -
.../manager/allocator/impl/RandomAllocator.java | 196 ------
.../host-allocator-random/module.properties | 18 -
.../spring-host-allocator-random-context.xml | 34 -
.../allocator/impl/RandomAllocatorTest.java | 80 ---
plugins/pom.xml | 2 -
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 30 +-
.../LinstorPrimaryDataStoreDriverImplTest.java | 109 +++
.../manager/allocator/impl/BaseAllocator.java | 90 +++
.../manager/allocator/impl/FirstFitAllocator.java | 546 ++++++---------
.../manager/allocator/impl/RandomAllocator.java | 132 ++++
.../manager/allocator/impl/TestingAllocator.java | 21 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 5 +-
.../deploy/DeploymentPlanningManagerImpl.java | 22 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 3 +-
.../com/cloud/server/ManagementServerImpl.java | 10 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 24 +-
.../spring-server-allocator-context.xml | 3 +
.../manager/allocator/impl/BaseAllocatorTest.java | 219 ++++++
.../allocator/impl/FirstFitAllocatorTest.java | 760 ++++++++++++++++-----
.../allocator/impl/RandomAllocatorTest.java | 332 +++++++++
test/integration/smoke/test_vm_strict_host_tags.py | 2 +-
ui/src/views/network/VpnCustomerGateway.vue | 20 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 2 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 4 +
86 files changed, 3029 insertions(+), 1402 deletions(-)
copy
engine/schema/src/main/resources/META-INF/db/{procedures/cloud.idempotent_create_unique_index.sql
=> views/cloud_usage.quota_usage_view.sql} (58%)
copy
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/{GenericPresetVariable.java
=> ResourceCounting.java} (62%)
copy
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{QuotaCreditsDao.java
=> QuotaTariffUsageDao.java} (73%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaTariffUsageDaoImpl.java
copy
engine/schema/src/main/java/com/cloud/usage/dao/UsageVMSnapshotOnPrimaryDao.java
=>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageJoinDao.java
(70%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageJoinDaoImpl.java
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaTariffUsageVO.java
copy
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/{QuotaUsageVO.java
=> QuotaUsageJoinVO.java} (61%)
copy utils/src/main/java/com/cloud/utils/exception/ExceptionProxyObject.java
=>
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaUsageResourceVO.java
(62%)
create mode 100644
plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaStatementItemResourceResponse.java
delete mode 100644 plugins/host-allocators/random/pom.xml
delete mode 100644
plugins/host-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
delete mode 100644
plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties
delete mode 100644
plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml
delete mode 100644
plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
create mode 100644
server/src/main/java/com/cloud/agent/manager/allocator/impl/BaseAllocator.java
create mode 100644
server/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
create mode 100644
server/src/test/java/com/cloud/agent/manager/allocator/impl/BaseAllocatorTest.java
create mode 100644
server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
