This is an automated email from the ASF dual-hosted git repository.
vishesh pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 3a0c3125916 fix build error with FiberChannelAdapter after
forward-merge
add 4eb43651e2d Ability to specify NFS mount options while adding a
primary storage and modify them on a pre-existing primary storage (#8947)
add 7f0d9a03045 [Veeam] Check for failures in the restore process (#7224)
add 6d7c042bc1d Accept a role ID on linking an account to LDAP (#8236)
add 2bf36ef9353 DRS: Ensure the destination host is part of the same
cluster (#9245)
add dc74d5ba888 Let network guru decide if ipv6 cidr size can't be equal
to 64 (#9289)
add 4f85c3fd231 Honour listall param for list templates api (#9300)
add ae4b6d3b6c4 CKS/calico: set arp_ignore and arp_announce to 0 in k8s
controller/nodes (#9186)
add 121839277b9 UI: ignore error host is already in the database when
create a zone (#9231)
add 6c06e85c803 Temporarily backup StorPool volume before expunge (#8843)
add f7f7013ed02 Added ostypeid in the snapshot response (#9150)
add 52247c57bb9 agent: reconnect after waiting 5 seconds (#9258)
add 7a8066d3cad server: fix resource count updated unmanage vm (#8169)
add b22315db85e server: event for HA vm start (#9202)
add 22cd00ffb17 veeam: fix issues with PreSetup and DVS and Solidfire
(#9256)
add 53faf0f66a5 xenserver: attach regular iso with configdrive (#9216)
add 23f8856c7d4 Update AssignToLoadBalancerRuleCmd.java (#9306)
add 46f672563eb Improve migration of external VMware VMs into KVM cluster
(#8815)
add a4e9d7f21a7 Change vm.stats.remove.batch.size to
delete.batch.query.size & allow delete of volume_stats in batches (#9283)
add a5c8bb3bfc3 server: apply rules when VR of Domain VPC is recreated
(#8354)
add d4446ee09dc Revert listAll behaviour for templates (#9309)
add 646c894ec68 Fix for race when automatically assigning IP to Vms (#9240)
add c7f1ba5b8ee server: refactor listNetworks api database retrievals
(#9184)
add 65753755379 extract host from websocket to add route (#8922)
add 94503e687ca UI: improve ux and fix some minor bugs (#9307)
add 351de5fabd9 engine/orchestration: Update overcommit ratio during live
VM migration (#9178)
add 6b25ed7a027 prevent an NPE on an uninitialised TemplateObject (#8898)
add 644f3a3f48f Add, Delete Storage Pool commands should be able execute
on a host in maintenance (#9301)
add 983f164c57f Fixed src datastore on copy check for PowerFlex/ScaleIO
storage driver (#9310)
add bcbf152a052 Merge branch '4.18' into 4.19
new 90fe1d5fdcc Merge branch '4.19'
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:
agent/src/main/java/com/cloud/agent/Agent.java | 6 +
.../cloud/agent/properties/AgentProperties.java | 2 +-
.../com/cloud/agent/api/to/RemoteInstanceTO.java | 29 +-
api/src/main/java/com/cloud/host/Host.java | 1 +
.../java/com/cloud/hypervisor/HypervisorGuru.java | 33 +-
.../main/java/com/cloud/network/NetworkModel.java | 2 +
.../network/VirtualNetworkApplianceService.java | 9 +
.../java/com/cloud/network/guru/NetworkGuru.java | 3 +
api/src/main/java/com/cloud/vm/NicProfile.java | 8 +
api/src/main/java/com/cloud/vm/UserVmService.java | 5 +
.../java/com/cloud/vm/VirtualMachineProfile.java | 4 +
.../org/apache/cloudstack/api/ApiConstants.java | 4 +
.../api/command/admin/vm/ImportVmCmd.java | 25 +-
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 +-
.../cloudstack/api/response/HostResponse.java | 20 +-
.../api/response/StoragePoolResponse.java | 12 +
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 21 +
.../apache/cloudstack/vm/UnmanagedVMsManager.java | 31 ++
.../cloudstack/api/response/HostResponseTest.java | 8 +-
.../agent/api/CheckConvertInstanceAnswer.java | 30 +-
...mmand.java => CheckConvertInstanceCommand.java} | 28 +-
.../cloud/agent/api/ConvertInstanceCommand.java | 30 +-
.../cloud/agent/api/ModifyStoragePoolCommand.java | 4 +
.../java/com/cloud/resource/ResourceManager.java | 2 +
.../java/com/cloud/storage/StorageManager.java | 13 +-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 2 +
.../java/com/cloud/agent/manager/AgentAttache.java | 7 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 74 ++--
.../engine/orchestration/NetworkOrchestrator.java | 124 ++++--
.../orchestration/NetworkOrchestratorTest.java | 119 ++++++
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 +
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 31 ++
.../com/cloud/storage/dao/SnapshotDetailsDao.java | 3 +
.../cloud/storage/dao/SnapshotDetailsDaoImpl.java | 33 ++
.../main/java/com/cloud/storage/dao/VolumeDao.java | 2 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 7 +
.../java/com/cloud/storage/dao/VolumeStatsDao.java | 6 +-
.../com/cloud/storage/dao/VolumeStatsDaoImpl.java | 22 +-
.../storage/datastore/db/PrimaryDataStoreDao.java | 6 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 34 +-
.../storage/image/TemplateDataFactoryImpl.java | 3 +
.../storage/image/store/TemplateObject.java | 8 +
.../datastore/provider/DefaultHostListener.java | 10 +-
.../storage/volume/VolumeServiceImpl.java | 4 +-
.../cloudstack/backup/veeam/VeeamClient.java | 43 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 40 +-
.../kvm/resource/LibvirtComputingResource.java | 54 +++
.../kvm/resource/LibvirtStoragePoolDef.java | 131 ++++--
.../kvm/resource/LibvirtStoragePoolXMLParser.java | 21 +-
.../LibvirtCheckConvertInstanceCommandWrapper.java | 57 +++
.../LibvirtConvertInstanceCommandWrapper.java | 161 +++++---
.../kvm/storage/LibvirtStorageAdaptor.java | 55 ++-
.../kvm/resource/LibvirtStoragePoolDefTest.java | 43 +-
.../resource/LibvirtStoragePoolXMLParserTest.java | 10 +-
...virtCheckConvertInstanceCommandWrapperTest.java | 67 +++
.../LibvirtConvertInstanceCommandWrapperTest.java | 43 +-
.../kvm/storage/LibvirtStorageAdaptorTest.java | 91 ++++
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 331 +++++++++++++--
.../com/cloud/hypervisor/guru/VMwareGuruTest.java | 459 +++++++++++++++++++++
.../xenserver/resource/CitrixResourceBase.java | 26 +-
.../wrapper/xenbase/CitrixStopCommandWrapper.java | 4 +-
.../main/resources/conf/k8s-control-node-add.yml | 11 +
.../src/main/resources/conf/k8s-control-node.yml | 11 +
.../src/main/resources/conf/k8s-node.yml | 11 +
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 12 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 21 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 2 +-
.../storage/datastore/api/StorPoolSnapshotDef.java | 98 +++++
.../driver/StorPoolPrimaryDataStoreDriver.java | 87 +++-
.../datastore/driver/StorPoolStatsCollector.java | 111 ++++-
.../storage/datastore/util/StorPoolUtil.java | 41 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 9 +-
.../snapshot/StorPoolConfigurationManager.java | 12 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 26 +-
.../api/command/LinkAccountToLdapCmd.java | 17 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 3 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 13 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 15 +
.../configuration/ConfigurationManagerImpl.java | 99 +++--
.../AgentBasedConsoleProxyManager.java | 9 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 17 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 11 +
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 50 ++-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 15 +-
.../java/com/cloud/network/NetworkModelImpl.java | 2 +
.../java/com/cloud/network/NetworkServiceImpl.java | 212 +++++-----
.../com/cloud/network/guru/GuestNetworkGuru.java | 1 +
.../router/VirtualNetworkApplianceManagerImpl.java | 25 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 9 +
.../main/java/com/cloud/server/StatsCollector.java | 12 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 88 +++-
.../cloud/storage/StoragePoolAutomationImpl.java | 18 +-
.../secondary/SecondaryStorageVmManager.java | 12 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 10 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 2 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 290 +++++++++----
.../ConfigurationManagerImplTest.java | 105 ++++-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 +
.../com/cloud/network/MockNetworkModelImpl.java | 4 +
.../java/com/cloud/network/NetworkModelTest.java | 12 +-
.../cloud/resource/MockResourceManagerImpl.java | 6 +
.../com/cloud/storage/StorageManagerImplTest.java | 177 +++++++-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 5 +
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 26 +-
.../cluster/ClusterDrsServiceImplTest.java | 60 ++-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 43 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 11 +-
.../SecondaryStorageManagerImpl.java | 11 +
.../maint/test_primary_storage_nfsmountopts_kvm.py | 184 +++++++++
test/integration/component/test_ldap.py | 7 +-
test/integration/plugins/ldap/test_ldap.py | 20 +-
ui/public/locales/en.json | 18 +-
ui/src/components/view/InfoCard.vue | 5 +-
ui/src/components/widgets/CopyLabel.vue | 10 +-
ui/src/config/section/infra/primaryStorages.js | 5 +-
ui/src/views/AutogenView.vue | 6 +-
ui/src/views/compute/DeployVM.vue | 6 +-
.../views/compute/wizard/TemplateIsoRadioGroup.vue | 3 +
ui/src/views/infra/AddPrimaryStorage.vue | 14 +
ui/src/views/infra/HostInfo.vue | 8 +
ui/src/views/infra/UpdatePrimaryStorage.vue | 195 +++++++++
ui/src/views/infra/network/IpRangesTabPublic.vue | 63 +--
ui/src/views/infra/zone/ZoneWizard.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 9 +
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 7 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 4 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 31 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 5 +
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 7 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 116 +++++-
.../hypervisor/vmware/util/VmwareContext.java | 7 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 11 +-
135 files changed, 4253 insertions(+), 809 deletions(-)
copy
plugins/network-elements/bigswitch/src/main/java/com/cloud/agent/api/BcfAnswer.java
=> core/src/main/java/com/cloud/agent/api/CheckConvertInstanceAnswer.java (60%)
copy core/src/main/java/com/cloud/agent/api/{ChangeAgentCommand.java =>
CheckConvertInstanceCommand.java} (68%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConvertInstanceCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConvertInstanceCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptorTest.java
create mode 100644
plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolSnapshotDef.java
create mode 100644
test/integration/component/maint/test_primary_storage_nfsmountopts_kvm.py
create mode 100644 ui/src/views/infra/UpdatePrimaryStorage.vue
