This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 4dcaeb1ab91 do not merge
add 49d244f2513 [Usage] Create VPC billing (#7235)
add 21182dabcd8 Update netty version for compatibility/staying current
(#8945)
add c081f60427d server: Fix null pointer exception in restore VM (#8930)
add 6502dde8c33 field enlarged and db upgrade (#8675)
add 7b57480d601 Merge remote-tracking branch 'apache/4.19' into main
add bf9fdaddbd2 Fix build errors due to log4j 2.x changes
add 582249c1f72 Fix permission to manipulate VMs and templates settings
through UI (#8778)
add 5a52ca78ae5 kvm: export sysinfo for arm64 domains for cloud-init to
work (#8940)
add 405aac38bc9 linstor: Only set allow-two-primaries if resource is
already in use (#8802)
add 0577b0ac8ef server: add logs to public ip allocation attempt (#8239)
add 0fa71f56966 Merge remote-tracking branch 'origin/4.18' into 4.19
add 93d4816ee8e Merge remote-tracking branch 'origin/4.19'
add 2ca3be41f7d Fix spelling in code comments (#8866)
add 865da730e55 log sanitation on output of jobs (#8890)
add f6802e91983 server: fix duplicated records for templates if there are
multiple zones (#8933)
add c31aebc1886 Merge release branch 4.19 to main
add 66c10bf42fd logger issues
add 6c24ff90985 pre-commit autoupdate (#8867)
add 0de469ab731 Infra25725 add codecov token to workflow (#8960)
add 65f57124f5d UI: ignore error when list public ips for CKS clusters on
Shared network (#8489)
add 80adf5ead10 Merge release branch 4.18 to 4.19
add 65eef59e0bd Merge release branch 4.19 to main
add 0b857def685 New feature: Import/Unamange DATA volume from storage pool
(#8808)
add a358c9a4102 Merge release branch 4.19 to main
add 1efce77ead1 sanatise trace logging of async jobs (#8892)
add 4fe2b66e9db add bernardodemarco to .asf.yaml collaborators (#8965)
add e330d76a72d Log4j2 refactor cloud engine orchestration module (#8742)
add 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
add 0af923e6181 Merge branch '4.19'
add 27124c10319 Add ability to set cpu.threadspercore similar to existing
cpu.corespersocket (#8850)
add 3b0e6ac90c0 VR: fix dnmasq misconfiguration if there are multiple IP
ranges in a shared network (#8741)
add 77df9ad4d78 codecov: fix Github action workflow
add 5745674da5f Merge remote-tracking branch 'origin/4.18' into 4.19
add 4c27574570d .github: fix codecov action configuration
add 836ef9ec709 Merge remote-tracking branch 'origin/4.19'
add 0af87f2d1f3 do not merge
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 (4dcaeb1ab91)
\
N -- N -- N refs/heads/dummy (0af87f2d1f3)
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:
.asf.yaml | 1 +
.github/workflows/ci.yml | 3 +-
.github/workflows/codecov.yml | 5 +-
.github/workflows/ui.yml | 3 +-
.pre-commit-config.yaml | 4 +-
api/src/main/java/com/cloud/event/EventTypes.java | 10 +
.../main/java/com/cloud/vm/VmDetailConstants.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../api/command/admin/volume/ImportVolumeCmd.java | 165 +++
.../admin/volume/ListVolumesForImportCmd.java | 93 ++
.../command/admin/volume/UnmanageVolumeCmd.java | 127 ++
.../api/response/VolumeForImportResponse.java | 176 +++
.../volume/VolumeImportUnmanageService.java | 46 +
.../storage/volume/VolumeOnStorageTO.java | 130 ++
.../org/apache/cloudstack/usage/UsageTypes.java | 4 +
.../command/admin/volume/ImportVolumeCmdTest.java | 83 ++
.../admin/volume/ListVolumesForImportCmdTest.java | 58 +
.../admin/volume/UnmanageVolumeCmdTest.java | 70 +
.../api/response/VolumeForImportResponseTest.java | 77 ++
.../storage/volume/VolumeOnStorageTOTest.java | 84 ++
client/pom.xml | 14 +-
.../cloud/agent/api/GetVolumesOnStorageAnswer.java | 42 +
.../agent/api/GetVolumesOnStorageCommand.java | 55 +
.../agent/api/GetVolumesOnStorageAnswerTest.java | 73 ++
.../agent/api/GetVolumesOnStorageCommandTest.java | 41 +
.../service/VolumeOrchestrationService.java | 3 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 80 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 227 ++--
.../cloud/agent/manager/ClusteredAgentAttache.java | 30 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 310 ++---
.../cloud/agent/manager/ConnectedAgentAttache.java | 2 +-
.../cloud/agent/manager/DirectAgentAttache.java | 58 +-
.../cloud/agent/manager/SynchronousListener.java | 9 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 573 ++++----
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 66 +-
.../java/com/cloud/vm/VmWorkJobDispatcher.java | 22 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 4 +-
.../engine/orchestration/DataMigrationUtility.java | 6 +-
.../engine/orchestration/NetworkOrchestrator.java | 374 +++---
.../engine/orchestration/StorageOrchestrator.java | 14 +-
.../engine/orchestration/VolumeOrchestrator.java | 160 +--
.../orchestration/VolumeOrchestratorTest.java | 55 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 8 +-
.../main/java/com/cloud/usage/UsageNetworksVO.java | 143 ++
.../src/main/java/com/cloud/usage/UsageVO.java | 11 +
.../src/main/java/com/cloud/usage/UsageVpcVO.java | 130 ++
.../java/com/cloud/usage/dao/UsageNetworksDao.java | 31 +
.../com/cloud/usage/dao/UsageNetworksDaoImpl.java | 136 ++
.../main/java/com/cloud/usage/dao/UsageVpcDao.java | 29 +
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 129 ++
...n-daos-between-management-and-usage-context.xml | 2 +
.../spring-engine-schema-core-daos-context.xml | 2 +
.../resources/META-INF/db/schema-41900to41910.sql | 33 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 2 +-
.../presetvariables/PresetVariableHelper.java | 44 +
.../activationrule/presetvariables/Value.java | 10 +
.../cloudstack/quota/constant/QuotaTypes.java | 2 +
.../apache/cloudstack/quota/dao/NetworkDao.java | 23 +
.../cloudstack/quota/dao/NetworkDaoImpl.java | 27 +
.../org/apache/cloudstack/quota/dao/VpcDao.java | 23 +
.../apache/cloudstack/quota/dao/VpcDaoImpl.java | 23 +
.../presetvariables/PresetVariableHelperTest.java | 2 +
.../activationrule/presetvariables/ValueTest.java | 8 +
.../kvm/resource/LibvirtComputingResource.java | 41 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 5 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 16 +-
.../LibvirtGetVolumesOnStorageCommandWrapper.java | 177 +++
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 7 +-
.../kvm/resource/LibvirtCpuTopologyTest.java | 94 ++
.../kvm/resource/LibvirtDomainXMLParserTest.java | 7 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 13 +
...bvirtGetVolumesOnStorageCommandWrapperTest.java | 158 +++
plugins/network-elements/juniper-contrail/pom.xml | 6 -
plugins/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 +-
.../kvm/storage/LinstorStorageAdaptor.java | 33 +-
.../storage/datastore/util/LinstorUtil.java | 19 +
.../ldap/LdapDirectoryServerConnectionTest.java | 4 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 1 +
.../com/cloud/network/IpAddressManagerImpl.java | 34 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 12 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 8 +-
.../cloud/template/HypervisorTemplateAdapter.java | 8 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 13 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 516 ++++++++
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
.../core/spring-server-core-managers-context.xml | 2 +
.../com/cloud/network/NetworkModelImplTest.java | 2 +-
.../template/HypervisorTemplateAdapterTest.java | 19 +-
.../VolumeImportUnmanageManagerImplTest.java | 622 +++++++++
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 9 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 12 +-
.../component/test_multiple_nic_support.py | 44 +-
.../smoke/test_import_unmanage_volumes.py | 167 +++
test/integration/smoke/test_vm_life_cycle.py | 6 +-
ui/public/locales/en.json | 17 +
ui/src/components/view/DetailSettings.vue | 14 +-
ui/src/config/section/tools.js | 9 +
ui/src/views/compute/KubernetesServiceTab.vue | 24 +-
.../views/compute/wizard/NetworkConfiguration.vue | 2 +-
ui/src/views/tools/ManageVolumes.vue | 1379 ++++++++++++++++++++
.../java/com/cloud/usage/UsageManagerImpl.java | 52 +
.../cloud/usage/parser/NetworksUsageParser.java | 100 ++
.../com/cloud/usage/parser/VpcUsageParser.java | 95 ++
106 files changed, 6614 insertions(+), 1322 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ImportVolumeCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesForImportCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VolumeForImportResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageService.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/volume/VolumeOnStorageTO.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/ImportVolumeCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesForImportCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/response/VolumeForImportResponseTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/storage/volume/VolumeOnStorageTOTest.java
create mode 100644
core/src/main/java/com/cloud/agent/api/GetVolumesOnStorageAnswer.java
create mode 100644
core/src/main/java/com/cloud/agent/api/GetVolumesOnStorageCommand.java
create mode 100644
core/src/test/java/com/cloud/agent/api/GetVolumesOnStorageAnswerTest.java
create mode 100644
core/src/test/java/com/cloud/agent/api/GetVolumesOnStorageCommandTest.java
create mode 100644
engine/schema/src/main/java/com/cloud/usage/UsageNetworksVO.java
create mode 100644 engine/schema/src/main/java/com/cloud/usage/UsageVpcVO.java
create mode 100644
engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDao.java
create mode 100644
engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java
create mode 100644
engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDao.java
create mode 100644
engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/NetworkDao.java
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/NetworkDaoImpl.java
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VpcDao.java
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VpcDaoImpl.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtCpuTopologyTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapperTest.java
create mode 100644
server/src/main/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageManagerImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageManagerImplTest.java
create mode 100644 test/integration/smoke/test_import_unmanage_volumes.py
create mode 100644 ui/src/views/tools/ManageVolumes.vue
create mode 100644
usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java
create mode 100644
usage/src/main/java/com/cloud/usage/parser/VpcUsageParser.java
