This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a change to branch dummy in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 8fc887ef75f donot merge add f6ceeab3b3a server: Enforce strict host tag check (#9017) add ae3fa5d0de3 Add configuration to limit the number of rows deleted from vm_stats (#8740) add 097359bef9e plugins/shutdown: fix triggerShutdown scheduling and response (#9276) add 5ab23cd9c97 Timeout config to copy the disks of remote KVM instance while importing the instance from an external host (#9213) add ded7b4dbe5a test: fix test failure on ubuntu 24.04: "top: unknown option 'n'" (#9262) add 083ac069ca4 fix assignvm template permission check (#8886) add 60f234c682d remove Project Template Permissions inhibition (#9196) add 0c422aca767 server: fix additional zones cannot be removed (#9261) add 674495b162b Fixup startVM on simulator (#9199) add 313a165e62b server: add global setting consoleproxy.sslEnabled (#8809) add 9055610034b Remove duplicate network state checks before shutdown network (#8462) add 59e9ab9efee Fix volume response for service offering with disk offering (#9273) add 7e00678691e set isSystem for SVM IPs (#9281) add f4612c51ec4 libvirtstorage: Make sure netfs storage was really mounted (#8887) add 6a518e29b74 Allow deletion of external managed cks nodes (#9183) add c17aa0d9ada Import Remote KVM VM logging improvements (#9284) add f792684b9c4 Support migration of VM imported from a remote host (#9259) add f944d4c61d1 debian: add cpu-checker to debian/control (#9263) add 3e30283500f Fix migration from local storage to NFS in KVM (#8909) add 8b07b66f145 Fix volume snapshot of encrypted NFS/StorPool volume (#8873) add de266a4cb85 api,server: allow updating hypervisor capabilities with hypervisor and version (#8475) add 4d6df586da2 engine-schema: fix options for host.allocators.order config (#8733) add fcfa3713373 kvm: support Rocky/RHEL/OL/Alma in the same cluster (#8641) add 42e71175d77 Merge remote-tracking branch 'origin/4.18' into 4.19 add 6ee66033596 Updates to HPE-Primera and Pure FlashArray Drivers to use Host-based VLUN Assignments (#8889) add 620ed164d8b VMware: Improve error messaging / logs when starting non-user VMs, and secondary storage not available or doesn't have enough capacity (#9207) add 3923f80c225 Merge branch '4.19' add a709458784d donot 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 (8fc887ef75f) \ N -- N -- N refs/heads/dummy (a709458784d) 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 | 1 + .../config/UpdateHypervisorCapabilitiesCmd.java | 14 + .../admin/vm/ImportUnmanagedInstanceCmd.java | 8 +- .../apache/cloudstack/vm/UnmanagedVMsManager.java | 9 + .../com/cloud/agent/api/CheckVolumeAnswer.java | 1 - .../com/cloud/agent/api/CheckVolumeCommand.java | 1 - .../cloud/agent/api/CopyRemoteVolumeAnswer.java | 1 - .../cloud/agent/api/CopyRemoteVolumeCommand.java | 5 +- .../com/cloud/agent/api/GetRemoteVmsAnswer.java | 2 +- .../com/cloud/agent/api/GetRemoteVmsCommand.java | 2 +- .../agent/api/GetUnmanagedInstancesAnswer.java | 2 +- .../agent/api/GetUnmanagedInstancesCommand.java | 2 +- debian/control | 2 +- .../engine/orchestration/NetworkOrchestrator.java | 12 +- .../engine/orchestration/VolumeOrchestrator.java | 9 +- .../orchestration/NetworkOrchestratorTest.java | 272 +++++----- .../src/main/java/com/cloud/host/HostVO.java | 46 +- .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 12 + .../src/main/java/com/cloud/vm/dao/VmStatsDao.java | 6 +- .../main/java/com/cloud/vm/dao/VmStatsDaoImpl.java | 22 +- .../storage/datastore/db/ImageStoreDaoImpl.java | 2 +- .../resources/META-INF/db/schema-41900to41910.sql | 5 + .../src/test/java/com/cloud/host/HostVOTest.java | 53 +- .../motion/StorageSystemDataMotionStrategy.java | 370 ++++++++------ .../KvmNonManagedStorageSystemDataMotionTest.java | 8 +- .../StorageSystemDataMotionStrategyTest.java | 71 --- .../manager/ImageStoreProviderManagerImpl.java | 2 +- .../main/java/com/cloud/utils/db/GenericDao.java | 8 + .../java/com/cloud/utils/db/GenericDaoBase.java | 6 + .../model/impl/DefaultModuleDefinitionSet.java | 4 +- .../acl/DynamicRoleBasedAPIAccessChecker.java | 4 +- .../acl/ProjectRoleBasedApiAccessChecker.java | 8 +- .../kvm/resource/LibvirtComputingResource.java | 41 +- .../LibvirtCopyRemoteVolumeCommandWrapper.java | 17 +- .../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 21 +- .../LibvirtMigrateVolumeCommandWrapper.java | 18 +- .../kvm/storage/FiberChannelAdapter.java | 28 ++ .../kvm/storage/KVMStorageProcessor.java | 72 ++- .../kvm/storage/LibvirtStorageAdaptor.java | 20 +- .../kvm/storage/MultipathSCSIAdapterBase.java | 262 ++++------ .../kvm/storage/KVMStorageProcessorTest.java | 66 +-- .../com/cloud/agent/manager/MockVmManagerImpl.java | 79 ++- .../vmware/manager/VmwareManagerImpl.java | 13 +- .../hypervisor/vmware/resource/VmwareResource.java | 19 +- .../cluster/KubernetesServiceHelperImpl.java | 3 + .../cluster/KubernetesServiceHelperImplTest.java | 20 +- .../cloudstack/shutdown/ShutdownManagerImpl.java | 5 +- plugins/storage/volume/adaptive/README.md | 41 ++ .../storage/datastore/adapter/ProviderAdapter.java | 22 +- .../datastore/adapter/ProviderAdapterFactory.java | 4 + .../datastore/adapter/ProviderVolumeNamer.java | 1 - .../driver/AdaptiveDataStoreDriverImpl.java | 222 ++++++--- .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java | 11 +- .../AdaptivePrimaryDatastoreAdapterFactoryMap.java | 4 + .../provider/AdaptivePrimaryHostListener.java | 2 + .../adapter/flasharray/FlashArrayAdapter.java | 274 +++++----- .../flasharray/FlashArrayAdapterFactory.java | 5 + ...lashArrayVolumePod.java => FlashArrayHost.java} | 29 +- .../adapter/flasharray/FlashArrayVolume.java | 4 +- .../adapter/flasharray/FlashArrayVolumePod.java | 17 +- .../datastore/adapter/primera/PrimeraAdapter.java | 201 ++++---- .../adapter/primera/PrimeraAdapterFactory.java | 5 + .../datastore/adapter/primera/PrimeraHost.java} | 35 +- ...aVolumeLink.java => PrimeraHostDescriptor.java} | 24 +- .../datastore/adapter/primera/PrimeraHostset.java | 44 +- .../{PrimeraVolumeLink.java => PrimeraPort.java} | 24 +- ...PrimeraCpgSAGrowth.java => PrimeraPortPos.java} | 31 +- .../PrimeraVolumeCopyRequestParameters.java | 2 +- .../primera/PrimeraVolumePromoteRequest.java | 5 +- .../StorPoolBackupSnapshotCommandWrapper.java | 63 ++- .../cloudstack/oauth2/OAuth2UserAuthenticator.java | 5 + scripts/storage/multipath/copyVolume.sh | 2 +- .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 7 +- .../configuration/ConfigurationManagerImpl.java | 2 + .../AgentBasedConsoleProxyManager.java | 2 +- .../java/com/cloud/consoleproxy/AgentHookBase.java | 2 +- .../cloud/consoleproxy/ConsoleProxyManager.java | 3 + .../consoleproxy/ConsoleProxyManagerImpl.java | 4 +- .../consoleproxy/StaticConsoleProxyManager.java | 2 +- .../deploy/DeploymentPlanningManagerImpl.java | 5 +- .../kvm/discoverer/LibvirtServerDiscoverer.java | 18 +- .../com/cloud/network/guru/PublicNetworkGuru.java | 2 +- .../com/cloud/server/ManagementServerImpl.java | 52 +- .../main/java/com/cloud/server/StatsCollector.java | 12 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 43 +- .../com/cloud/template/TemplateManagerImpl.java | 7 +- .../src/main/java/com/cloud/vm/UserVmManager.java | 33 ++ .../main/java/com/cloud/vm/UserVmManagerImpl.java | 68 ++- .../apache/cloudstack/snapshot/SnapshotHelper.java | 4 +- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 29 +- .../discoverer/LibvirtServerDiscovererTest.java | 54 ++ .../java/com/cloud/server/StatsCollectorTest.java | 8 +- .../java/com/cloud/user/MockUsageEventDao.java | 5 + .../java/com/cloud/vm/UserVmManagerImplTest.java | 40 ++ test/integration/smoke/test_service_offerings.py | 2 +- test/integration/smoke/test_vm_strict_host_tags.py | 552 +++++++++++++++++++++ tools/marvin/marvin/config/test_data.py | 19 +- tools/marvin/marvin/lib/base.py | 3 +- ui/src/views/compute/DeployVM.vue | 2 + .../main/java/com/cloud/utils/ssh/SshHelper.java | 8 +- 100 files changed, 2477 insertions(+), 1242 deletions(-) copy plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/{FlashArrayVolumePod.java => FlashArrayHost.java} (84%) copy plugins/storage/volume/{flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayVolumeSource.java => primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/PrimeraHost.java} (65%) copy plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/{PrimeraVolumeLink.java => PrimeraHostDescriptor.java} (76%) copy plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/{PrimeraVolumeLink.java => PrimeraPort.java} (75%) copy plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/{PrimeraCpgSAGrowth.java => PrimeraPortPos.java} (68%) create mode 100644 server/src/test/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscovererTest.java create mode 100644 test/integration/smoke/test_vm_strict_host_tags.py