cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [16/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
Date Mon, 13 Oct 2014 04:41:33 GMT
Revert "CLOUDSTACK-7533: Wrong download URL is generated when using multiple SSVMs in a zone.
The public ip of the url would sometime point to the wrong ssvm when the url was created on
another one."

This reverts commit f3b5a6ebc70d5bfb2c77b6aa359d7eb79b4507e5.
Reverting since a better fix is available with CLOUDSTACK-6478

(cherry picked from commit 9e7fbae52fcbc2a99120d08158c6c99bdbd75b2c)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8c9f1dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8c9f1dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8c9f1dd

Branch: refs/heads/4.5
Commit: c8c9f1dd3a2c8f36a25560d872487c1d8d9d4102
Parents: 8ce829a
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Mon Oct 6 15:00:32 2014 -0700
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:29:00 2014 -0400

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8c9f1dd/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index ef74794..abc7cdb 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -48,6 +48,7 @@ import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
 import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
 import com.cloud.agent.api.UnregisterNicCommand;
 import com.cloud.agent.api.storage.CopyVolumeCommand;
+import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand;
 import com.cloud.agent.api.storage.CreateVolumeOVACommand;
 import com.cloud.agent.api.storage.PrepareOVAPackingCommand;
 import com.cloud.agent.api.to.DataObjectType;
@@ -393,8 +394,20 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru,
Co
             } else {
                 needDelegation = true;
             }
+        } else if (cmd instanceof CreateEntityDownloadURLCommand) {
+            DataTO srcData = ((CreateEntityDownloadURLCommand)cmd).getData();
+            if ((HypervisorType.VMware == srcData.getHypervisorType())) {
+                needDelegation = true;
+            }
+            if (srcData.getObjectType() == DataObjectType.VOLUME) {
+                VolumeObjectTO volumeObjectTO = (VolumeObjectTO)srcData;
+                if (Storage.ImageFormat.OVA == volumeObjectTO.getFormat()) {
+                    needDelegation = true;
+                }
+            }
         }
-        if(!needDelegation) {
+
+        if (!needDelegation) {
             return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
         }
         HostVO host = _hostDao.findById(hostId);


Mime
View raw message