From 5d225057bc5b0dc34ff7c360bdb387c9dce372e8 Mon Sep 17 00:00:00 2001
From: Koushik Das <Koushik.Das@citrix.com>
Date: Mon, 3 Sep 2012 19:24:01 +0530
Subject: [PATCH] CS-16171 : Cannot attach ISO on VMware VM due to Invalid
 datastore path error Handled upgrade scenario where data store already exists
 in vCenter Reviewed-by: Murali

---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 85715eac4f6..b77825cd8ef 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3327,7 +3327,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
 
             // TODO, check if iso is already attached, or if there is a previous
             // attachment
-            String storeName = getSecondaryDatastoreUUID(storeUrl).replace("-", "");
+            DatastoreMO secondaryDsMo = new DatastoreMO(getServiceContext(), morSecondaryDs);
+            String storeName = secondaryDsMo.getName();
             String isoDatastorePath = String.format("[%s] %s%s", storeName, isoStorePathFromRoot, isoFileName);
 
             if (cmd.isAttach()) {