This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch support-multi-vlan-guestnet
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from eb97acf2fbd deliver multi-VLAN trunk nics via libvirt vlan XML and
bridge fallback
add d1438623d3b Fix nic_network_map unique constraint blocking
re-association
add a7b6a8ec5e7 Deliver multi-VLAN trunk NICs on KVM via libvirt vlan XML
and bridge fallback
add bcb89ab26f0 Bill usage for a trunk nic's associated networks
add 3d27d897087 Expose trunk nic and associated-network info in NicResponse
add dd4ee2a6652 Add ApiConstants for NicResponse trunk fields
add c16a58d4241 Add multi-VLAN trunk NIC association service
add 88585ed91c4 Add EventTypes constants for the association service commit
add df74bd94d22 Support multi-VLAN trunk NICs at VM deploy time
add 3a7519db255 Fix static NAT lookup in disassociate guard
add 68d7771fd5c Fix VNF management nic trunkable via live associate API
add 485ad2652c6 Fix stale nic fields after changing its primary network
add 721bae1929d Clear multiNetwork flag when a nic's last trunk
association is removed
add 1a3ddfbe6cd Push DHCP entries to a trunk nic's associated networks
add 5088e0b55b8 Add KVM live migration support for multi-VLAN trunk NICs
(Phase 7)
add 79189c8d6a2 backup: remove the powered-off precondition for all backup
providers (#14094)
add 27722a5dd1b storage: KVM - enable RBD/Ceph volume encryption support
(#13556)
add b9a5977a2bb fix: use auth_client_required instead of removed
auth_supported for RBD (#13991)
add 90180340814 Add basic `.editorconfig` file to help maintain consistent
coding styles (#7562)
add 9030443eac5 SharedFS: fix NPE when accessing systemvm templates for
unsupported hypervisors (#13930)
add 2e450cbddf3 marvin: use pycryptodome instead of PyCrypt (#13594)
add a01fb0be34b server: copy template details to vm instance details when
import VM (#12793)
add e38b7a724b1 kvm: apply rbd_default_data_pool when creating volumes
from templates on RBD (#13361)
add 10037c85d61 Nas backup: Fix mount/unmount error handling and timeout
in LibvirtRestoreBackupCommandWrapper (#14006)
add cffa6e3603a backport: Incremental NAS backup support for KVM (#13074)
(#13877)
add a8c8c18e56a xenserver/xcpng: do not bypass secondary storage when copy
volumes between pools (#13750)
add 5812290da14 Merge remote-tracking branch 'apache/4.22'
add 602d9ec3e03 engine-schema: upgrade path for 24.0.0 (#14033)
add 0a5bf30af32 VMware to KVM: cold (VDDK) and warm (CBT) migration into
Ceph/RBD and Linstor, plus importVm adoption of existing RBD root volumes and
Linstor root/data volumes (#13656)
add 510d0ec3785 Revert "VMware to KVM: cold (VDDK) and warm (CBT)
migration into Ceph/RBD and Linstor, plus importVm adoption of existing RBD
root volumes and Linstor root/data volumes (#13656)"
add 1a48a87587c Add the ASF Allowlist check workflow (#14113)
add 01729b9903d Merge branch 'main' of github.com:apache/cloudstack into
support-multi-vlan-guestnet
No new revisions were added by this update.
Summary of changes:
.../environment.properties.in => .editorconfig | 13 +-
.../asf-allowlist-check.yml} | 27 +-
PendingReleaseNotes | 9 +
api/src/main/java/com/cloud/event/EventTypes.java | 8 +
api/src/main/java/com/cloud/host/Host.java | 1 +
.../main/java/com/cloud/network/NetworkModel.java | 8 +
.../java/com/cloud/network/NetworkService.java | 29 +
.../java/com/cloud/resource/ResourceService.java | 2 +-
api/src/main/java/com/cloud/storage/Storage.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../admin/network/AssociateNetworkToNicCmd.java | 160 ++++
.../admin/network/ChangeNicPrimaryNetworkCmd.java | 124 +++
.../network/DisassociateNetworkFromNicCmd.java | 123 +++
.../api/command/user/vm/BaseDeployVMCmd.java | 157 ++++
.../api/response/NicNetworkMapResponse.java | 137 ++++
.../cloudstack/api/response/NicResponse.java | 24 +
.../storage/template/VnfTemplateManager.java | 15 +
.../api/command/user/vm/DeployVMCmdTest.java | 93 +++
.../java/com/cloud/agent/api/MigrateCommand.java | 29 +
.../cloud/agent/api/PrepareForMigrationAnswer.java | 11 +
.../agent/api/UpdateNicVlanMembershipAnswer.java | 14 +-
...nd.java => UpdateNicVlanMembershipCommand.java} | 39 +-
.../cloud/agent/api/VlanTrunkMigrationHelper.java | 87 ++
.../java/com/cloud/vm/VirtualMachineManager.java | 4 +
.../service/NetworkOrchestrationService.java | 3 +
.../cloud/deploy/DeploymentPlanningManager.java | 2 +
.../main/java/com/cloud/event/UsageEventUtils.java | 57 ++
.../java/com/cloud/event/UsageEventUtilsTest.java | 212 +++++
.../com/cloud/vm/VirtualMachineManagerImpl.java | 38 +-
.../engine/orchestration/NetworkOrchestrator.java | 36 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 157 ++++
.../orchestration/NetworkOrchestratorTest.java | 95 +++
engine/schema/pom.xml | 14 +
.../main/java/com/cloud/event/UsageEventVO.java | 2 +-
.../java/com/cloud/host/dao/HostDetailsDao.java | 4 +
.../com/cloud/host/dao/HostDetailsDaoImpl.java | 11 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 20 +-
.../com/cloud/usage/UsageNetworkOfferingVO.java | 17 +
.../cloud/usage/dao/UsageNetworkOfferingDao.java | 6 +
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 37 +-
.../java/com/cloud/vm/dao/NicNetworkMapDao.java | 2 +
.../com/cloud/vm/dao/NicNetworkMapDaoImpl.java | 8 +
.../resources/META-INF/db/schema-42300to2400.sql | 7 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 53 ++
.../upgrade/SystemVmTemplateRegistrationTest.java | 37 +
engine/schema/templateConfig.sh | 75 +-
engine/schema/test_templateConfig.sh | 112 +++
.../storage/motion/AncientDataMotionStrategy.java | 8 +
.../motion/StorageSystemDataMotionStrategy.java | 13 +
.../motion/AncientDataMotionStrategyTest.java | 15 +
.../cloudstack/backup/NASBackupProvider.java | 42 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 160 +++-
.../kvm/resource/LibvirtComputingResource.java | 19 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 27 +-
.../cloud/hypervisor/kvm/resource/VifDriver.java | 6 +
.../wrapper/LibvirtMigrateCommandWrapper.java | 149 ++++
.../wrapper/LibvirtPlugNicCommandWrapper.java | 3 +-
.../LibvirtPostMigrationCommandWrapper.java | 20 +
.../LibvirtPrepareForMigrationCommandWrapper.java | 16 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 32 +-
.../LibvirtRestoreBackupCommandWrapper.java | 46 +-
.../wrapper/LibvirtStartCommandWrapper.java | 3 +-
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 35 +-
...virtUpdateNicVlanMembershipCommandWrapper.java} | 36 +-
.../hypervisor/kvm/storage/KVMPhysicalDisk.java | 4 +-
.../kvm/storage/KVMStorageProcessor.java | 27 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 160 +++-
.../cloudstack/utils/qemu/QemuImageOptions.java | 11 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 56 +-
.../apache/cloudstack/utils/qemu/QemuObject.java | 1 +
.../apache/cloudstack/utils/rbd/RbdEncryption.java | 294 +++++++
.../kvm/resource/BridgeVifDriverTest.java | 142 +++-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 17 +-
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 98 +++
.../LibvirtPostMigrationCommandWrapperTest.java | 47 ++
...bvirtPrepareForMigrationCommandWrapperTest.java | 17 +-
.../LibvirtRestoreBackupCommandWrapperTest.java | 113 ++-
.../kvm/storage/KVMPhysicalDiskTest.java | 6 +-
.../kvm/storage/KVMStorageProcessorTest.java | 22 +
.../cloudstack/utils/rbd/RbdEncryptionTest.java | 166 ++++
.../apache/cloudstack/veeam/api/dto/Version.java | 6 +-
.../cloudstack/veeam/api/dto/VersionTest.java | 34 +
.../lifecycle/StorageVmSharedFSLifeCycle.java | 5 +-
.../lifecycle/StorageVmSharedFSLifeCycleTest.java | 101 ++-
.../storage/motion/LinstorDataMotionStrategy.java | 17 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 17 +-
scripts/installer/export-templates.sh | 18 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 49 ++
.../main/java/com/cloud/api/ApiResponseHelper.java | 5 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 22 +
.../deploy/DeploymentPlanningManagerImpl.java | 92 ++-
.../java/com/cloud/network/NetworkModelImpl.java | 27 +
.../java/com/cloud/network/NetworkServiceImpl.java | 603 +++++++++++++-
.../network/lb/LoadBalancingRulesManagerImpl.java | 64 +-
.../cloud/network/router/CommandSetupHelper.java | 62 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 52 +-
.../com/cloud/resource/ResourceManagerImpl.java | 4 +-
.../com/cloud/server/ManagementServerImpl.java | 8 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 138 +++-
.../java/com/cloud/vm/UserVmStateListener.java | 6 +-
.../cloudstack/backup/BackupManagerImpl.java | 4 -
.../storage/template/VnfTemplateManagerImpl.java | 27 +
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 5 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 135 +++
.../com/cloud/network/MockNetworkModelImpl.java | 6 +
.../com/cloud/network/NetworkModelImplTest.java | 55 ++
.../com/cloud/network/NetworkServiceImplTest.java | 905 +++++++++++++++++++++
.../lb/LoadBalancingRulesManagerImplTest.java | 18 +-
.../network/router/CommandSetupHelperTest.java | 130 +++
.../cloud/resource/MockResourceManagerImpl.java | 2 +-
.../com/cloud/server/ManagementServerImplTest.java | 13 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 126 +++
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 22 +
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 6 +
.../template/VnfTemplateManagerImplTest.java | 20 +
.../java/com/cloud/usage/UsageManagerImpl.java | 79 +-
.../java/com/cloud/usage/UsageManagerImplTest.java | 150 ++++
.../nicira/nvp/plugin/NiciraNvpApiVersion.java | 2 +-
.../apache/cloudstack/utils/CloudStackVersion.java | 106 ++-
.../cloudstack/utils/CloudStackVersionTest.java | 75 +-
120 files changed, 6723 insertions(+), 428 deletions(-)
copy agent/conf/environment.properties.in => .editorconfig (83%)
copy .github/{ISSUE_TEMPLATE/feature_request.yml =>
workflows/asf-allowlist-check.yml} (61%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/AssociateNetworkToNicCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/ChangeNicPrimaryNetworkCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/DisassociateNetworkFromNicCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/NicNetworkMapResponse.java
copy
plugins/network-elements/brocade-vcs/src/main/java/com/cloud/agent/api/DeleteNetworkAnswer.java
=> core/src/main/java/com/cloud/agent/api/UpdateNicVlanMembershipAnswer.java
(79%)
copy core/src/main/java/com/cloud/agent/api/{UnPlugNicCommand.java =>
UpdateNicVlanMembershipCommand.java} (69%)
create mode 100644
core/src/main/java/com/cloud/agent/api/VlanTrunkMigrationHelper.java
create mode 100644
engine/components-api/src/test/java/com/cloud/event/UsageEventUtilsTest.java
create mode 100755 engine/schema/test_templateConfig.sh
copy
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtUpdateVmNicCommandWrapper.java
=> LibvirtUpdateNicVlanMembershipCommandWrapper.java} (57%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/rbd/RbdEncryption.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/rbd/RbdEncryptionTest.java
