This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard dfebc09f947 Merge branch '4.19' into 4.19-dummy
discard 1770204568b do not merge
add 154566f914c Updating pom.xml version numbers for release 4.18.2.0
add 8a101fbbc11 Updating pom.xml version numbers for release
4.18.3.0-SNAPSHOT
add cadbb563afa Merge remote-tracking branch 'origin/4.18' into 4.19
add 5f8450f28f1 Add a shutdownhook to remove jobs owned by the process
(#8896)
add d4a5459a830 UI: Fix missing locale strings for Status widget (#8792)
add 7affbb1dacf protect against null-path (#8915)
add 78e07cff62d Merge release branch 4.18 to 4.19
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 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 f6802e91983 server: fix duplicated records for templates if there are
multiple zones (#8933)
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 0b857def685 New feature: Import/Unamange DATA volume from storage pool
(#8808)
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 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 e409c6d870a Fixup listing of serivce offering & storagepools with tags
(#8937)
add 80a8b80a9d5 Update volume's passphrase to null if diskOffering doesn't
support encryption (#8904)
add 08132acaa2f Fix restore VM with allocated root disk (#8977)
add b23ceefc7ea utils: cleanup MacAddress and MacAddressTest (#8988)
add 0e08a126dfd systemvm: add template_zone_ref record when add a new zone
with same hypervisor type (#8395)
add cec6ade257c change live migration API used on kvm (#8952)
add eead2710f81 explanatory error message on delete attempt of default
system offering (#8883)
add 9d5d4e55648 linstor: cleanup diskless nodes on disconnect (#8790)
add 3de1f8b4baf Merge remote-tracking branch 'origin/4.18' into 4.19
add f7b95cd8f06 UI: hide Cleanup/Expunge when delete a CloudManaged CKS
cluster (#8593)
add 027149487b5 Fix: Update rootdisksize detail on restore VM (#8981)
add c071e15a05b 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 (dfebc09f947)
\
N -- N -- N refs/heads/4.19-dummy (c071e15a05b)
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:
.github/workflows/ci.yml | 4 +-
.github/workflows/codecov.yml | 5 +-
.github/workflows/ui.yml | 3 +-
api/src/main/java/com/cloud/event/EventTypes.java | 10 +
.../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 | 5 +-
.../engine/orchestration/NetworkOrchestrator.java | 6 +
.../engine/orchestration/VolumeOrchestrator.java | 21 +-
.../orchestration/VolumeOrchestratorTest.java | 55 +-
.../upgrade/SystemVmTemplateRegistration.java | 11 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 11 +-
.../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 | 134 ++
.../main/java/com/cloud/usage/dao/UsageVpcDao.java | 29 +
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 131 ++
...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 +
.../storage/volume/VolumeServiceImpl.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 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 8 +-
.../hypervisor/kvm/resource/MigrateKVMAsync.java | 45 +-
.../LibvirtGetVolumesOnStorageCommandWrapper.java | 177 +++
.../wrapper/LibvirtMigrateCommandWrapper.java | 29 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 7 +-
.../kvm/resource/MigrateKVMAsyncTest.java | 83 ++
...bvirtGetVolumesOnStorageCommandWrapperTest.java | 158 +++
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 78 +-
.../hypervisor/vmware/resource/VmwareResource.java | 5 +-
plugins/network-elements/juniper-contrail/pom.xml | 6 -
plugins/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 +-
.../kvm/storage/LinstorStorageAdaptor.java | 147 ++-
.../storage/datastore/util/LinstorUtil.java | 19 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 49 +-
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 38 +-
.../java/com/cloud/network/NetworkModelImpl.java | 16 +
.../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 | 49 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 515 ++++++++
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
.../core/spring-server-core-managers-context.xml | 2 +
.../com/cloud/network/NetworkModelImplTest.java | 82 +-
.../template/HypervisorTemplateAdapterTest.java | 19 +-
.../VolumeImportUnmanageManagerImplTest.java | 622 +++++++++
services/secondary-storage/server/pom.xml | 2 +-
systemvm/debian/etc/logrotate.d/haproxy | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 14 +-
.../smoke/test_import_unmanage_volumes.py | 167 +++
test/integration/smoke/test_restore_vm.py | 108 ++
test/integration/smoke/test_vm_life_cycle.py | 6 +-
ui/public/locales/en.json | 17 +
ui/src/components/view/DetailSettings.vue | 14 +-
ui/src/components/widgets/Status.vue | 29 +-
ui/src/config/section/compute.js | 3 +
ui/src/config/section/tools.js | 9 +
ui/src/views/compute/KubernetesServiceTab.vue | 24 +-
ui/src/views/compute/ReinstallVm.vue | 18 +-
.../views/compute/wizard/NetworkConfiguration.vue | 2 +-
ui/src/views/tools/ManageVolumes.vue | 1379 ++++++++++++++++++++
.../java/com/cloud/usage/UsageManagerImpl.java | 68 +
.../cloud/usage/parser/NetworksUsageParser.java | 99 ++
.../com/cloud/usage/parser/VpcUsageParser.java | 94 ++
.../main/java/com/cloud/utils/net/MacAddress.java | 233 +---
.../java/com/cloud/utils/net/MacAddressTest.java | 14 +-
97 files changed, 6328 insertions(+), 448 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/MigrateKVMAsyncTest.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 test/integration/smoke/test_restore_vm.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
