This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch support-xen84-py3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from f1128a0b76a Merge branch '4.20' of
https://github.com/apache/cloudstack into support-xen84-py3
add 1adfaf90ade Smoke tests: Xenserver - Fix consistent failure noticed on
scale VM test (#10741)
add 12c077d7045 api,ui: multi arch improvements (#10289)
add 5d28e66b521 vTPM: support KVM and VMware (#10543)
add 5a5c8651332 Revert "Add the option to filter by host when retrieving
of unregistered VMs (#9925)" (#10647)
add 422264f0055 server: Don't specify ipv6 ranges for shared network
(#10746)
add 55c8138a1a7 test: fix test_certauthority_root.py (#10762)
add 07f4fc2e51d Fix smoke tests due to change in behavior of restore VM
(#10583)
add 9d263cd71b5 Network Usage event model adjustments (#10755)
add 9d9737ae040 smoke tests: Fix cluster DRS & non-strict host affinity
smoke test failures on XenServer / XCP-ng (#10761)
add 0785ba046e9 Merge branch '4.19' of
https://github.com/apache/cloudstack into 4.20
add 9f229600e6a Add new config (non-dynamic) for agent connections
monitor thread, and keep timeunit to secs (in sync with the earlier Wait
config) (#10525)
add 7f98ca19309 Merge branch '4.20' of
https://github.com/apache/cloudstack into support-xen84-py3
add cdf63583c4b fix test for xcp 8.3
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/cpu/CPU.java | 57 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 9 +
.../org/apache/cloudstack/api/ApiConstants.java | 7 +-
.../api/command/admin/cluster/ListClustersCmd.java | 12 +-
.../api/command/admin/host/ListHostsCmd.java | 10 +-
.../api/command/admin/router/ListRoutersCmd.java | 14 +-
.../command/admin/systemvm/ListSystemVMsCmd.java | 12 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 13 +-
.../api/response/DomainRouterResponse.java | 8 +
.../cloudstack/api/response/HostResponse.java | 8 +-
.../cloudstack/api/response/SystemVmResponse.java | 8 +
.../cloudstack/api/response/UserVmResponse.java | 14 +-
.../org/apache/cloudstack/query/QueryService.java | 4 +
api/src/test/java/com/cloud/cpu/CPUTest.java | 67 +++
debian/cloudstack-management.postinst | 2 +
.../java/com/cloud/vm/VirtualMachineManager.java | 4 +
.../main/java/com/cloud/agent/AgentManager.java | 4 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 24 +-
.../java/com/cloud/resource/ResourceManager.java | 12 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 47 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 16 +-
.../engine/orchestration/NetworkOrchestrator.java | 21 +-
.../orchestration/NetworkOrchestratorTest.java | 2 +-
engine/schema/pom.xml | 9 +
.../src/main/java/com/cloud/dc/dao/ClusterDao.java | 6 +-
.../main/java/com/cloud/dc/dao/ClusterDaoImpl.java | 26 +-
.../src/main/java/com/cloud/host/dao/HostDao.java | 5 +
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 42 +-
.../java/com/cloud/storage/dao/VMTemplateDao.java | 9 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 108 +++-
.../upgrade/SystemVmTemplateRegistration.java | 659 +++++++++++++--------
.../com/cloud/upgrade/dao/Upgrade42000to42010.java | 2 +-
.../storage/datastore/db/ImageStoreDao.java | 2 +-
.../storage/datastore/db/ImageStoreDaoImpl.java | 18 +-
.../apache/cloudstack/util/CPUArchConverter.java | 2 +-
.../resources/META-INF/db/schema-42000to42010.sql | 6 +
.../META-INF/db/views/cloud.domain_router_view.sql | 1 +
.../META-INF/db/views/cloud.user_vm_view.sql | 1 +
.../java/com/cloud/dc/dao/ClusterDaoImplTest.java | 40 ++
.../java/com/cloud/host/dao/HostDaoImplTest.java | 162 +++--
.../cloud/storage/dao/VMTemplateDaoImplTest.java | 189 ++++++
.../upgrade/SystemVmTemplateRegistrationTest.java | 427 +++++++++++++
engine/schema/templateConfig.sh | 8 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 8 +-
.../main/java/com/cloud/utils/db/SearchBase.java | 16 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 9 +-
packaging/el8/cloud.spec | 5 +
.../acl/DynamicRoleBasedAPIAccessChecker.java | 4 +-
.../kvm/resource/LibvirtComputingResource.java | 26 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 77 +++
.../kvm/resource/LibvirtComputingResourceTest.java | 24 +
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 11 +
.../com/cloud/agent/manager/MockAgentManager.java | 1 +
.../cloud/agent/manager/MockAgentManagerImpl.java | 2 +
.../com/cloud/resource/AgentRoutingResource.java | 3 +
.../com/cloud/resource/SimulatorDiscoverer.java | 4 +
.../main/java/com/cloud/simulator/MockHost.java | 2 +
.../main/java/com/cloud/simulator/MockHostVO.java | 11 +
.../hypervisor/vmware/VmwareDatacenterService.java | 7 +-
.../vmware/manager/VmwareManagerImpl.java | 258 +++-----
.../hypervisor/vmware/resource/VmwareResource.java | 57 ++
.../api/command/admin/zone/AddVmwareDcCmd.java | 12 +-
.../zone/ImportVsphereStoragePoliciesCmd.java | 11 +-
.../command/admin/zone/ListVmwareDcHostsCmd.java | 144 -----
.../api/command/admin/zone/ListVmwareDcItems.java | 29 -
.../api/command/admin/zone/ListVmwareDcVmsCmd.java | 52 +-
.../api/command/admin/zone/ListVmwareDcsCmd.java | 26 +-
.../admin/zone/ListVsphereStoragePoliciesCmd.java | 13 +-
...ListVsphereStoragePolicyCompatiblePoolsCmd.java | 2 +-
.../api/command/admin/zone/RemoveVmwareDcCmd.java | 6 +-
.../api/command/admin/zone/UpdateVmwareDcCmd.java | 8 +-
.../command/admin/zone/VmwareRequestResponse.java | 38 --
.../vmware/resource/VmwareResourceTest.java | 39 ++
.../version/KubernetesVersionManagerImpl.java | 15 +-
.../ListKubernetesSupportedVersionsCmd.java | 9 +
.../KubernetesSupportedVersionResponse.java | 12 +
.../version/KubernetesVersionManagerImplTest.java | 2 +
.../version/KubernetesVersionServiceTest.java | 1 +
.../lb/InternalLoadBalancerVMManagerImpl.java | 134 +++--
.../lb/InternalLoadBalancerVMManagerImplTest.java | 172 ++++++
.../main/java/com/cloud/api/ApiResponseHelper.java | 1 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 20 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 1 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 +
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 11 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 7 +
.../consoleproxy/ConsoleProxyManagerImpl.java | 118 ++--
.../java/com/cloud/network/NetworkServiceImpl.java | 14 +-
.../cloud/network/router/NetworkHelperImpl.java | 108 ++--
.../com/cloud/resource/ResourceManagerImpl.java | 12 +-
.../com/cloud/server/ManagementServerImpl.java | 20 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 82 +--
.../com/cloud/template/TemplateAdapterBase.java | 7 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 1 +
.../consoleproxy/ConsoleProxyManagerImplTest.java | 107 ++++
.../network/router/NetworkHelperImplTest.java | 119 +++-
.../SecondaryStorageManagerImpl.java | 69 ++-
.../SecondaryStorageManagerImplTest.java | 89 ++-
setup/db/create-schema-simulator.sql | 1 +
test/integration/smoke/test_certauthority_root.py | 36 +-
test/integration/smoke/test_cluster_drs.py | 13 +-
test/integration/smoke/test_dynamicroles.py | 1 -
test/integration/smoke/test_events_resource.py | 5 +-
test/integration/smoke/test_guest_os.py | 2 +-
test/integration/smoke/test_network_permissions.py | 15 +-
.../smoke/test_nonstrict_affinity_group.py | 10 +-
test/integration/smoke/test_scale_vm.py | 102 +++-
tools/marvin/setup.py | 2 +-
ui/src/components/view/InfoCard.vue | 3 +
ui/src/components/view/SearchView.vue | 11 +-
ui/src/config/section/compute.js | 5 +-
ui/src/config/section/image.js | 14 +-
ui/src/config/section/infra/clusters.js | 4 +-
ui/src/config/section/infra/hosts.js | 4 +-
ui/src/config/section/infra/routers.js | 6 +-
ui/src/config/section/infra/systemVms.js | 6 +-
ui/src/main.js | 4 +-
ui/src/utils/plugins.js | 12 +
ui/src/views/compute/DeployVM.vue | 18 +-
.../views/image/AddKubernetesSupportedVersion.vue | 15 +-
ui/src/views/image/RegisterOrUploadIso.vue | 15 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 15 +-
ui/src/views/image/UpdateISO.vue | 15 +-
ui/src/views/image/UpdateTemplate.vue | 15 +-
ui/src/views/infra/ClusterAdd.vue | 17 +-
ui/src/views/infra/zone/StaticInputsForm.vue | 1 +
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 16 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 2 +-
ui/src/views/tools/ManageInstances.vue | 1 -
ui/src/views/tools/SelectVmwareVcenter.vue | 66 +--
utils/src/main/java/com/cloud/utils/HttpUtils.java | 51 ++
.../java/com/cloud/utils/nio/NioConnection.java | 1 -
.../test/java/com/cloud/utils/HttpUtilsTest.java | 142 ++++-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 54 +-
.../vmware/mo/CustomFieldsManagerMO.java | 7 +-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 157 ++---
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 98 +--
.../hypervisor/vmware/mo/VirtualMachineMO.java | 626 +++++++++++++++----
.../cloud/hypervisor/vmware/util/VmwareClient.java | 22 +-
.../vmware/util/VmwareClientException.java | 33 --
140 files changed, 4030 insertions(+), 1747 deletions(-)
create mode 100644 api/src/test/java/com/cloud/cpu/CPUTest.java
create mode 100644
engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java
create mode 100644
engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
delete mode 100644
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java
delete mode 100644
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java
delete mode 100644
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/VmwareRequestResponse.java
create mode 100644
plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImplTest.java
create mode 100644
server/src/test/java/com/cloud/consoleproxy/ConsoleProxyManagerImplTest.java
delete mode 100644
vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClientException.java
