This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch fix-assign-vm-1
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 277fee17ea3 use AtomicBoolean
add c1923a2dcb3 test: cleanup test_guest_os.py for multiple execution
(#10818)
add c45ed060982 test: fix test_hostha_simulator.py and
test_outofbandmanagement.py (#10815)
add 2674da2ee9e Nas BnR: Fix for restore not working correctly (#10785)
add f4ca7064b70 Add search bar on rules of roles (#10822)
add 7e2aa0efe42 engine/schema: create default network offering for vpc
tier with conserve_mode=1 for fresh installation (#10744)
add c453aaea2cf ui: improve metrics api use in list views (#9825)
add 17e062a3813 StorPool notify libvirt when volume is resized (#10775)
add 919c9797cc8 server: prevent duplicate HA works and alerts (#10624)
add f0838cdd309 [VMware] Update vlans with proper range before creating
port group for dvSwitch (#10708)
add 696bc50f3ba Backport #9888 to 4.19: Fix Usage inconsistencies (#10712)
add 751a0ad5598 UI workaround for the inconsistent formatting of
listVirtualMachinesUsageHistory (#10824)
add ea32a1a71aa server: fetch IP of VMs on L2 networks (#10431)
add 0a090f48533 cleanup call on super (#10807)
add e68abcd85de xenserver: destroy halted vm on expunge (#10833)
add a21f912be3d Merge branch '4.19' of
https://github.com/apache/cloudstack into 4.20
add 04731b06182 fix logger
add 1d46506c044 Merge branch '4.20' of
https://github.com/apache/cloudstack into fix-assign-vm-1
No new revisions were added by this update.
Summary of changes:
.../com/cloud/agent/api/GetVmIpAddressCommand.java | 8 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 13 ++-
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../java/com/cloud/usage/dao/UsageNetworksDao.java | 2 +
.../com/cloud/usage/dao/UsageNetworksDaoImpl.java | 17 ++++
.../main/java/com/cloud/usage/dao/UsageVpcDao.java | 4 +
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 18 ++++
.../resources/META-INF/db/schema-42000to42010.sql | 3 +
.../LibvirtGetVmIpAddressCommandWrapper.java | 57 +++++++++----
.../LibvirtRestoreBackupCommandWrapper.java | 16 ++--
.../LibvirtGetVmIpAddressCommandWrapperTest.java | 3 +
.../java/com/cloud/hypervisor/XenServerGuru.java | 9 ++
.../xenbase/CitrixCleanupVMCommandWrapper.java | 78 ++++++++++++++++++
.../wrapper/xenbase/CitrixRequestWrapperTest.java | 2 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 57 +++++++------
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 35 ++++++--
.../java/com/cloud/ha/dao/HighAvailabilityDao.java | 3 +
.../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 13 +++
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 21 +++--
.../cloud/ha/HighAvailabilityManagerImplTest.java | 2 -
.../component/test_affinity_groups_projects.py | 17 ++--
test/integration/smoke/test_guest_os.py | 21 +++--
test/integration/smoke/test_hostha_simulator.py | 2 +-
test/integration/smoke/test_outofbandmanagement.py | 2 +-
tools/marvin/marvin/lib/base.py | 15 +++-
ui/public/locales/en.json | 1 +
ui/public/locales/pt_BR.json | 1 +
ui/src/components/view/StatsTab.vue | 2 +-
ui/src/config/router.js | 1 -
ui/src/config/section/compute.js | 3 +-
ui/src/config/section/infra/clusters.js | 4 +-
ui/src/config/section/infra/hosts.js | 8 +-
ui/src/config/section/infra/zones.js | 4 +-
ui/src/views/AutogenView.vue | 7 +-
ui/src/views/iam/RolePermissionTab.vue | 28 ++++++-
.../java/com/cloud/usage/UsageManagerImpl.java | 95 +++++++++++++++++-----
.../src/main/java/com/cloud/utils/StringUtils.java | 92 ++++++++++++++++++++-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 22 +++--
.../vmware/mo/HypervisorHostHelperTest.java | 56 ++++++++++++-
39 files changed, 600 insertions(+), 144 deletions(-)
create mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java
