From b3e4c6d6dc9bf57aa880ab100a76027b2a12053d Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Tue, 22 Jul 2014 09:48:20 +0530
Subject: [PATCH] CLOUDSTACK-7150. [VMware] Global config 'vm.instancename' is
 not honored. If global config 'vm.instancename' is set to true, VM name in
 vCenter should be '<instance_name>-<vm_hostname>'.

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

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 7b73b19e34d..0c4ab20a195 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
@@ -1832,7 +1832,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
             vmInternalCSName = vmSpec.getName();
             if (_instanceNameFlag == true) {
                 String[] tokens = vmInternalCSName.split("-");
-                vmNameOnVcenter = String.format("%s-%s-%s", tokens[0], tokens[1], vmSpec.getHostName());
+                assert (tokens.length >= 3); // vmInternalCSName has format i-x-y-<instance.name>
+                vmNameOnVcenter = String.format("%s-%s-%s-%s", tokens[0], tokens[1], tokens[2], vmSpec.getHostName());
             }
             else
                 vmNameOnVcenter = vmSpec.getName();