When instance.name.flag is set to true, append user-supplied name with legacy prefix to VM name appears in vCenter.

kelveny · kelveny · commit 5143fe404bc8 · 2014-07-14T14:53:51.000-07:00
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
@@ -1829,8 +1829,10 @@ private Pair<String, String> composeVmNames(VirtualMachineTO vmSpec) {
         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 {
