[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.16'

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 194bf6ead96a8fbc13028081974a56a821b131ab
Merge: bf70566 4a1ebb3
Author: Wei Zhou <we...@apache.org>
AuthorDate: Thu Feb 3 20:42:34 2022 +0100

    Merge remote-tracking branch 'apache/4.16'

 .../cloud/hypervisor/HypervisorCapabilities.java   |   2 +
 .../java/com/cloud/server/ManagementService.java   |   3 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   1 +
 .../config/UpdateHypervisorCapabilitiesCmd.java    |  30 ++-
 .../response/HypervisorCapabilitiesResponse.java   |  15 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   3 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   2 +-
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |   1 +
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |  19 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   3 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |  19 +-
 .../com/cloud/server/ManagementServerImpl.java     |  41 ++-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |  15 +-
 .../component/test_hypervisor_capabilities.py      | 289 +++++++++++++++++++++
 tools/marvin/marvin/lib/base.py                    |   5 +
 15 files changed, 407 insertions(+), 41 deletions(-)

diff --cc api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 94e6a7d,b2afa1d..49444d5
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@@ -592,8 -589,8 +592,9 @@@ public class ApiConstants 
      public static final String LIVE_MIGRATE = "livemigrate";
      public static final String MIGRATE_ALLOWED = "migrateallowed";
      public static final String MIGRATE_TO = "migrateto";
 +    public static final String AUTO_MIGRATE = "automigrate";
      public static final String GUID = "guid";
+     public static final String VM_SNAPSHOT_ENABELD = "vmsnapshotenabled";
      public static final String VSWITCH_TYPE_GUEST_TRAFFIC = "guestvswitchtype";
      public static final String VSWITCH_TYPE_PUBLIC_TRAFFIC = "publicvswitchtype";
      public static final String VSWITCH_NAME_GUEST_TRAFFIC = "guestvswitchname";