Merge branch 'NotInstantiated' into 'master'

Allow NotInstantiated volume attach vcenter vm

See merge request zstackio/zstack!2385

Author: gitlab

storage/src/main/java/org/zstack/storage/volume/VolumeBase.java

@@ -1119,21 +1119,17 @@ private List<VmInstanceVO> getCandidateVmForAttaching(String accountUuid) {
                     .param("vmType", VmInstanceConstant.USER_VM_TYPE)
                     .param("hvTypes", hvTypes);
         } else if (self.getStatus() == VolumeStatus.NotInstantiated) {
-            //not support vmtx volume temporarily, so filter ESX vm when volume is NotInstantiated.
             sql = SQL.New("select vm" +
                     " from VmInstanceVO vm, PrimaryStorageClusterRefVO ref, PrimaryStorageEO ps, PrimaryStorageCapacityVO capacity" +
                     " where "+ (vmUuids == null ? "" : " vm.uuid in (:vmUuids) and") +
                     " vm.state in (:vmStates)" +
                     " and vm.type = :vmType" +
-                    " and vm.hypervisorType <> :hvType" +
                     " and vm.clusterUuid = ref.clusterUuid" +
                     " and capacity.uuid = ps.uuid" +
                     " and capacity.availableCapacity > :volumeSize" +
                     " and ref.primaryStorageUuid = ps.uuid" +
                     " and ps.state in (:psState)" +
                     " group by vm.uuid")
-                    //TODO:  this is a dirty fix, delete it when VMWare support DataVolume
-                    .param("hvType", "ESX")
                     .param("volumeSize", self.getSize())
                     .param("vmType", VmInstanceConstant.USER_VM_TYPE)
                     .param("psState", PrimaryStorageState.Enabled);