This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch clvm-enhancements
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 55a104d5f49 fix a few issues
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 a17bff9ba87 ui: fix webhook filters listing (#13068)
add 1e512ab9c65 Skip QemuImgTest when libvirt native library cannot load
(#13086)
add 96ca1b2a7c1 Add option to control MAC address reuse for VR public NICs
(#13001)
add cbc1ae73880 Bump the github-actions-dependencies group across 1
directory with 9 updates (#13042)
add f6efda50d2f Update .asf.yaml: Add ingox as collaborator(#12058)
add 4425ee42348 Remove unnecessary if-else branch in template permission
validation (#12683)
add 72b99a3f8ce Make resource deletion safer with name confirmation
(#13104)
add 519715e81a6 Fix id in listguestosmapping search (#13082)
add 5b9a3d7d320 linstor: Fix a file handle resource leak opening
template.properties (#13091)
add 89d915493fb Fix NPE on external/unmanaged instance import using custom
offerings (#12884)
add a127a26ebd3 Fix Revert Instance to Snapshot with custom service
offering (#12885)
add 2eef7aa9a27 adding default deny keys also when there are no other keys
add 3e688b01978 Merge tag '4.22.0.1' into 4.22
add ddcc0c889d7 Don't delete volume on store if it is not created or
doesn't exist on it (#13111)
add 4359198904c KVM Host HA improvements - Fix to not cancel VM HA items
when Host HA inspection in progress, and some code improvements (#13088)
add a4a52c96659 Merge branch '4.22'
add 111122558f7 Merge branch 'main' of
https://github.com/apache/cloudstack into clvm-enhancements
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 1 +
.github/workflows/ci.yml | 2 +-
.github/workflows/codecov.yml | 2 +-
.github/workflows/codeql-analysis.yml | 6 +-
.github/workflows/daily-repo-status.lock.yml | 62 +-
.github/workflows/docker-cloudstack-simulator.yml | 2 +-
.github/workflows/issue-triage-agent.lock.yml | 62 +-
.github/workflows/merge-conflict-checker.yml | 2 +-
.github/workflows/ui.yml | 4 +-
.../agent/manager/allocator/HostAllocator.java | 33 -
.../java/com/cloud/deploy/DeploymentPlanner.java | 2 +-
api/src/main/java/com/cloud/ha/Investigator.java | 16 +-
api/src/main/java/com/cloud/network/Network.java | 2 +
.../java/com/cloud/network/NetworkProfile.java | 5 +
api/src/main/java/com/cloud/network/vpc/Vpc.java | 2 +
.../java/com/cloud/network/vpc/VpcService.java | 4 +-
.../org/apache/cloudstack/api/ApiConstants.java | 13 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 9 +-
.../command/admin/ha/ConfigureHAForHostCmd.java | 1 +
.../admin/host/FindHostsForMigrationCmd.java | 2 +-
.../api/command/admin/host/ListHostsCmd.java | 2 +-
.../api/command/user/network/CreateNetworkCmd.java | 9 +
.../api/command/user/network/UpdateNetworkCmd.java | 9 +
.../api/command/user/vpc/CreateVPCCmd.java | 9 +
.../api/command/user/vpc/UpdateVPCCmd.java | 9 +
.../cloudstack/api/response/NetworkResponse.java | 8 +
.../cloudstack/api/response/VpcResponse.java | 8 +
.../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 +-
.../api/command/user/vpc/UpdateVPCCmdTest.java | 2 +-
client/pom.xml | 5 -
.../com/cloud/agent/api/CheckOnHostAnswer.java | 3 +-
.../com/cloud/agent/api/CheckOnHostCommand.java | 10 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 9 -
.../service/NetworkOrchestrationService.java | 5 +
.../java/com/cloud/ha/HighAvailabilityManager.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 18 -
.../engine/orchestration/NetworkOrchestrator.java | 24 +-
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 4 +-
.../main/java/com/cloud/network/dao/NetworkVO.java | 13 +
.../src/main/java/com/cloud/network/vpc/VpcVO.java | 12 +
.../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 | 14 +
.../cloud_usage.quota_usage_view.sql} | 26 +-
.../storage/volume/VolumeServiceImpl.java | 25 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 6 +
.../extensions/manager/ExtensionsManagerImpl.java | 14 +-
.../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 ---
.../main/java/com/cloud/ha/HypervInvestigator.java | 6 +-
.../main/java/com/cloud/ha/KVMInvestigator.java | 87 +--
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 11 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 33 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 65 +-
.../kvm/resource/KVMHAVMActivityChecker.java | 6 +-
.../kvm/resource/LibvirtComputingResource.java | 6 +-
.../wrapper/LibvirtCheckOnHostCommandWrapper.java | 16 +-
...CheckVMActivityOnStoragePoolCommandWrapper.java | 4 +-
.../kvm/storage/IscsiAdmStoragePool.java | 4 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 71 +-
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 36 +-
.../hypervisor/kvm/storage/MultipathSCSIPool.java | 6 +-
.../hypervisor/kvm/storage/ScaleIOStoragePool.java | 4 +-
.../org/apache/cloudstack/kvm/ha/KVMHAConfig.java | 23 +-
.../apache/cloudstack/kvm/ha/KVMHAProvider.java | 7 +-
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 198 +++---
.../kvm/resource/LibvirtComputingResourceTest.java | 2 +-
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 2 +-
.../java/com/cloud/ha/SimulatorInvestigator.java | 4 +-
.../main/java/com/cloud/ha/VmwareInvestigator.java | 2 +-
plugins/pom.xml | 2 -
.../kvm/storage/LinstorStorageAdaptor.java | 4 +-
.../hypervisor/kvm/storage/LinstorStoragePool.java | 14 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 30 +-
.../LinstorPrimaryDataStoreDriverImplTest.java | 109 +++
.../kvm/storage/StorPoolStoragePool.java | 10 +-
scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 4 +-
.../manager/allocator/impl/BaseAllocator.java | 90 +++
.../manager/allocator/impl/FirstFitAllocator.java | 546 ++++++---------
.../manager/allocator/impl/RandomAllocator.java | 132 ++++
.../manager/allocator/impl/TestingAllocator.java | 21 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 8 +
.../com/cloud/api/dispatch/ParamProcessWorker.java | 5 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 9 +-
.../deploy/DeploymentPlanningManagerImpl.java | 22 +-
.../com/cloud/ha/CheckOnAgentInvestigator.java | 2 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 136 ++--
server/src/main/java/com/cloud/ha/KVMFencer.java | 11 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 2 +-
.../java/com/cloud/ha/UserVmDomRInvestigator.java | 2 +-
.../java/com/cloud/ha/XenServerInvestigator.java | 4 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 31 +-
.../cloud/network/router/NetworkHelperImpl.java | 122 ++--
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 16 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 3 +-
.../com/cloud/server/ManagementServerImpl.java | 14 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 24 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 7 +
.../java/org/apache/cloudstack/ha/HAManager.java | 7 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 72 +-
.../apache/cloudstack/ha/HAResourceCounter.java | 6 +-
.../cloudstack/ha/task/ActivityCheckTask.java | 6 +-
.../org/apache/cloudstack/ha/task/BaseHATask.java | 2 +-
.../deployment/RouterDeploymentDefinition.java | 6 +-
.../deployment/VpcRouterDeploymentDefinition.java | 7 +-
.../spring-server-allocator-context.xml | 3 +
.../manager/allocator/impl/BaseAllocatorTest.java | 219 ++++++
.../allocator/impl/FirstFitAllocatorTest.java | 760 ++++++++++++++++-----
.../allocator/impl/RandomAllocatorTest.java | 332 +++++++++
.../cloud/ha/HighAvailabilityManagerImplTest.java | 5 +-
.../com/cloud/network/NetworkServiceImplTest.java | 50 +-
.../network/router/NetworkHelperImplTest.java | 288 +++++++-
.../com/cloud/network/vpc/VpcManagerImplTest.java | 10 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 10 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 2 +-
test/integration/smoke/test_vm_strict_host_tags.py | 2 +-
ui/public/locales/en.json | 3 +
ui/public/locales/pt_BR.json | 1 +
ui/src/components/view/ListView.vue | 2 +-
ui/src/components/view/WebhookFiltersTab.vue | 3 +-
ui/src/config/section/network.js | 30 +-
ui/src/config/section/project.js | 1 +
ui/src/views/AutogenView.vue | 50 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 22 +-
ui/src/views/network/CreateVpc.vue | 20 +-
ui/src/views/network/UpdateNetwork.vue | 28 +-
ui/src/views/network/VpnCustomerGateway.vue | 20 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 2 +-
.../cloudstack/utils/redfish/RedfishClient.java | 14 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 4 +
179 files changed, 4346 insertions(+), 2059 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
