From 5143fe404bc82dfe42b832c661b4e98a0d9ebfa8 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Mon, 14 Jul 2014 14:45:21 -0700
Subject: [PATCH] When instance.name.flag is set to true, append user-supplied
 name with legacy prefix to VM name appears in vCenter.

---
 .../cloud/hypervisor/vmware/resource/VmwareResource.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 15eeb13bcd3..f1f307bc8c0 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1829,8 +1829,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
         String vmNameOnVcenter = null;
         if (vmSpec.getHostName() != null) {
             vmInternalCSName = vmSpec.getName();
-            if (_instanceNameFlag == true)
-                vmNameOnVcenter = vmSpec.getHostName();
+            if (_instanceNameFlag == true) {
+                String[] tokens = vmInternalCSName.split("-");
+                vmNameOnVcenter = String.format("%s-%s-%s", tokens[0], tokens[1], vmSpec.getHostName());
+            }
             else
                 vmNameOnVcenter = vmSpec.getName();
         } else {