CLOUDSTACK-8110. VM name in vCenter should be VM's DisplayName if global config 'vm.instancename.flag' is set.

Likitha Shetty · sanjaytripathi · commit 51ee90074d5b · 2014-12-23T11:42:26.000+05:30
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
@@ -1834,10 +1834,8 @@ private String[] syncDiskChain(DatacenterMO dcMo, VirtualMachineMO vmMo, Virtual
     private Pair<String, String> composeVmNames(VirtualMachineTO vmSpec) {
         String vmInternalCSName = vmSpec.getName();
         String vmNameOnVcenter = vmSpec.getName();
-        if (vmSpec.getType() == VirtualMachine.Type.User && _instanceNameFlag && vmSpec.getHostName() != null) {
-            String[] tokens = vmInternalCSName.split("-");
-            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());
+        if (_instanceNameFlag && vmSpec.getHostName() != null) {
+            vmNameOnVcenter = vmSpec.getHostName();
         }
         return new Pair<String, String>(vmInternalCSName, vmNameOnVcenter);
     }

Original file line number	Diff line number	Diff line change
`@@ -1834,10 +1834,8 @@ private String[] syncDiskChain(DatacenterMO dcMo, VirtualMachineMO vmMo, Virtual`
`1834`	`1834`	`private Pair<String, String> composeVmNames(VirtualMachineTO vmSpec) {`
`1835`	`1835`	`String vmInternalCSName = vmSpec.getName();`
`1836`	`1836`	`String vmNameOnVcenter = vmSpec.getName();`
`1837`		`- if (vmSpec.getType() == VirtualMachine.Type.User && _instanceNameFlag && vmSpec.getHostName() != null) {`
`1838`		`- String[] tokens = vmInternalCSName.split("-");`
`1839`		`- assert (tokens.length >= 3); // vmInternalCSName has format i-x-y-<instance.name>`
`1840`		`- vmNameOnVcenter = String.format("%s-%s-%s-%s", tokens[0], tokens[1], tokens[2], vmSpec.getHostName());`
	`1837`	`+ if (_instanceNameFlag && vmSpec.getHostName() != null) {`
	`1838`	`+ vmNameOnVcenter = vmSpec.getHostName();`
`1841`	`1839`	`}`
`1842`	`1840`	`return new Pair<String, String>(vmInternalCSName, vmNameOnVcenter);`
`1843`	`1841`	`}`