You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/07/19 08:59:33 UTC
[cloudstack] branch main updated (b5eebc4347a -> 6bb95c02006)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from b5eebc4347a Fix codecov github action (#7747)
add 981d74825a8 Add L2 networks to Zones with SG (#7719)
add d575cae3e3f server: allow migration of all VMs with local storage on KVM (#7656)
add 73a269e3b36 guarantee MAC uniqueness (#7634)
add 0aade286f5a proper storage construction (#6797)
add f32a63be602 Storage and volumes statistics tasks for StorPool primary storage (#7404)
new 6bb95c02006 Merge release branch 4.18 to main
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:
.../main/java/com/cloud/network/NetworkModel.java | 9 +-
.../api/command/user/network/CreateNetworkCmd.java | 4 +-
.../command/user/network/CreateNetworkCmdTest.java | 18 +-
.../entity/api/db/dao/EngineDataCenterDao.java | 8 -
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 26 ---
.../engine/orchestration/NetworkOrchestrator.java | 4 +-
.../main/java/com/cloud/dc/dao/DataCenterDao.java | 8 -
.../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 27 +--
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 3 -
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +-
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +-
.../java/com/cloud/utils/db/SequenceFetcher.java | 4 +-
.../cloud/hypervisor/hyperv/guru/HypervGuru.java | 6 +-
.../kvm/storage/KVMStoragePoolManager.java | 3 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 8 +-
.../cloud/network/vm/NetScalerVMManagerImpl.java | 2 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 42 ++++-
.../datastore/driver/StorPoolStatsCollector.java | 188 +++++++++++++++++++++
.../storage/datastore/util/StorPoolUtil.java | 12 ++
.../snapshot/StorPoolConfigurationManager.java | 12 +-
.../spring-storage-volume-storpool-context.xml | 3 +
.../java/com/cloud/network/NetworkModelImpl.java | 20 ++-
.../com/cloud/network/guru/ControlNetworkGuru.java | 6 +-
.../com/cloud/server/ManagementServerImpl.java | 3 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/CreateNetwork.vue | 2 +-
27 files changed, 323 insertions(+), 108 deletions(-)
create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolStatsCollector.java
[cloudstack] 01/01: Merge release branch 4.18 to main
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 6bb95c02006ad73925c7a1c7e6daa3d707bbfc66
Merge: b5eebc4347a f32a63be602
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Wed Jul 19 10:59:19 2023 +0200
Merge release branch 4.18 to main
* 4.18:
Storage and volumes statistics tasks for StorPool primary storage (#7404)
proper storage construction (#6797)
guarantee MAC uniqueness (#7634)
server: allow migration of all VMs with local storage on KVM (#7656)
Add L2 networks to Zones with SG (#7719)
.../main/java/com/cloud/network/NetworkModel.java | 9 +-
.../api/command/user/network/CreateNetworkCmd.java | 4 +-
.../command/user/network/CreateNetworkCmdTest.java | 18 +-
.../entity/api/db/dao/EngineDataCenterDao.java | 8 -
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 26 ---
.../engine/orchestration/NetworkOrchestrator.java | 4 +-
.../main/java/com/cloud/dc/dao/DataCenterDao.java | 8 -
.../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 27 +--
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 3 -
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +-
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +-
.../java/com/cloud/utils/db/SequenceFetcher.java | 4 +-
.../cloud/hypervisor/hyperv/guru/HypervGuru.java | 6 +-
.../kvm/storage/KVMStoragePoolManager.java | 3 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 8 +-
.../cloud/network/vm/NetScalerVMManagerImpl.java | 2 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 42 ++++-
.../datastore/driver/StorPoolStatsCollector.java | 188 +++++++++++++++++++++
.../storage/datastore/util/StorPoolUtil.java | 12 ++
.../snapshot/StorPoolConfigurationManager.java | 12 +-
.../spring-storage-volume-storpool-context.xml | 3 +
.../java/com/cloud/network/NetworkModelImpl.java | 20 ++-
.../com/cloud/network/guru/ControlNetworkGuru.java | 6 +-
.../com/cloud/server/ManagementServerImpl.java | 3 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/CreateNetwork.vue | 2 +-
27 files changed, 323 insertions(+), 108 deletions(-)
diff --cc engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
index 3c9b3e235a8,c52c690d8b5..22165641f7e
--- a/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
@@@ -87,10 -87,8 +87,10 @@@ public interface NicDao extends Generic
List<NicVO> listByVmIdAndKeyword(long instanceId, String keyword);
- NicVO findByInstanceIdAndMacAddress(long instanceId, String macAddress);
+ NicVO findByMacAddress(String macAddress);
+ NicVO findByNetworkIdAndMacAddressIncludingRemoved(long networkId, String mac);
+
List<NicVO> findNicsByIpv6GatewayIpv6CidrAndReserver(String ipv6Gateway, String ipv6Cidr, String reserverName);
NicVO findByIpAddressAndVmType(String ip, VirtualMachine.Type vmType);