This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit c379375c682 do not merge
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 eb6a15c4470 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 (c379375c682)
\
N -- N -- N refs/heads/4.19-dummy (eb6a15c4470)
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:
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/UserVmService.java | 5 +
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../api/command/admin/vm/ImportVmCmd.java | 25 +-
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 +-
.../cloudstack/api/response/HostResponse.java | 20 +-
.../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 +-
.../java/com/cloud/storage/StorageManager.java | 8 -
.../com/cloud/vm/VirtualMachineManagerImpl.java | 34 +-
.../engine/orchestration/NetworkOrchestrator.java | 28 +-
.../orchestration/NetworkOrchestratorTest.java | 120 ++++++
.../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 +
.../storage/datastore/db/PrimaryDataStoreDao.java | 7 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 33 ++
.../storage/volume/VolumeServiceImpl.java | 4 +-
.../cloudstack/backup/veeam/VeeamClient.java | 43 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 40 +-
.../kvm/resource/LibvirtComputingResource.java | 54 +++
.../LibvirtCheckConvertInstanceCommandWrapper.java | 57 +++
.../LibvirtConvertInstanceCommandWrapper.java | 162 +++++---
...virtCheckConvertInstanceCommandWrapperTest.java | 67 +++
.../LibvirtConvertInstanceCommandWrapperTest.java | 43 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 330 +++++++++++++--
.../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 +
.../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 | 2 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 15 +
.../configuration/ConfigurationManagerImpl.java | 88 ++--
.../AgentBasedConsoleProxyManager.java | 11 +-
.../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 | 3 +
.../router/VirtualNetworkApplianceManagerImpl.java | 9 +
.../java/com/cloud/storage/StorageManagerImpl.java | 1 -
.../secondary/SecondaryStorageVmManager.java | 12 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 10 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 2 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 291 +++++++++----
.../ConfigurationManagerImplTest.java | 69 +++-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 +
.../com/cloud/network/MockNetworkModelImpl.java | 4 +
.../java/com/cloud/network/NetworkModelTest.java | 12 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 5 +
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 26 +-
.../cluster/ClusterDrsServiceImplTest.java | 60 ++-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 43 +-
.../SecondaryStorageManagerImpl.java | 11 +
test/integration/component/test_ldap.py | 7 +-
test/integration/plugins/ldap/test_ldap.py | 20 +-
ui/public/locales/en.json | 5 +
ui/src/views/compute/DeployVM.vue | 14 +-
.../views/compute/wizard/TemplateIsoRadioGroup.vue | 3 +
ui/src/views/infra/HostInfo.vue | 8 +
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 6 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 31 +-
.../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 +-
94 files changed, 2832 insertions(+), 503 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/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolSnapshotDef.java
