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

[shwstppr]

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

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

commit 4b7fa4e63060842ce4d9eac74c0f66988a83fe9a
Merge: 270fc19 d47e273
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Mon May 24 16:43:53 2021 +0530

    Merge remote-tracking branch 'apache/4.15'
    
    Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>

 api/src/main/java/com/cloud/host/Status.java       |  3 ++
 api/src/main/java/com/cloud/vm/VirtualMachine.java |  3 ++
 .../template/GetUploadParamsForTemplateCmd.java    |  2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  9 +++++
 .../hypervisor/vmware/resource/VmwareResource.java | 46 ++--------------------
 .../main/java/com/cloud/api/ApiResponseHelper.java |  2 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  7 ++++
 ui/public/locales/en.json                          |  2 +
 ui/src/components/view/DetailSettings.vue          | 11 ++++--
 ui/src/views/network/VpcTab.vue                    |  2 +-
 ui/src/views/network/VpcTiersTab.vue               | 26 ++++++++----
 11 files changed, 57 insertions(+), 56 deletions(-)

diff --cc server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 9510e28,0bbc022..5c5ba55
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@@ -1449,14 -1448,9 +1449,14 @@@ public class ApiResponseHelper implemen
                      vmResponse.setHostName(host.getName());
                      
vmResponse.setHypervisor(host.getHypervisorType().toString());
                  }
 +            } else if (vm.getLastHostId() != null) {
 +                Host lastHost = ApiDBUtils.findHostById(vm.getLastHostId());
 +                if (lastHost != null) {
 +                    
vmResponse.setHypervisor(lastHost.getHypervisorType().toString());
 +                }
              }
  
-             if (vm.getType() == Type.SecondaryStorageVm || vm.getType() == 
Type.ConsoleProxy) {
+             if (VirtualMachine.systemVMs.contains(vm.getType())) {
                  Host systemVmHost = 
ApiDBUtils.findHostByTypeNameAndZoneId(vm.getDataCenterId(), vm.getHostName(),
                          Type.SecondaryStorageVm.equals(vm.getType()) ? 
Host.Type.SecondaryStorageVM : Host.Type.ConsoleProxy);
                  if (systemVmHost != null) {
diff --cc ui/src/views/network/VpcTiersTab.vue
index 9c512b7,ffa4477..de2153b
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@@ -538,9 -524,13 +543,16 @@@ export default 
          this.fetchLoading = false
        })
      },
 +    handleNetworkOfferingChange (networkOfferingId) {
 +      this.selectedNetworkOffering = this.networkOfferings.filter(offering => 
offering.id === networkOfferingId)[0]
 +    },
+     handleNetworkAclChange (aclId) {
+       if (aclId) {
+         this.selectedNetworkAcl = this.networkAclList.filter(acl => acl.id 
=== aclId)[0]
+       } else {
+         this.selectedNetworkAcl = {}
+       }
+     },
      closeModal () {
        this.$emit('close-action')
      },