etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7174. [VMware] Recreating System VMs fails if global config 'vm.instancename' is set to true. 

Append VM's name in vCenter with the hostname only for User VMs.
This commit is contained in:
Likitha Shetty 2014-07-24 13:02:57 +05:30
parent 6d1d445542
commit 786285ab54
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -1826,21 +1826,13 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
// Pair<internal CS name, vCenter display name>
private Pair<String, String> composeVmNames(VirtualMachineTO vmSpec) {
String vmInternalCSName = null;
String vmNameOnVcenter = null;
if (vmSpec.getHostName() != null) {
vmInternalCSName = vmSpec.getName();
if (_instanceNameFlag == true) {
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());
}
else
vmNameOnVcenter = vmSpec.getName();
} else {
vmNameOnVcenter = vmInternalCSName = vmSpec.getName();
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());
}
return new Pair<String, String>(vmInternalCSName, vmNameOnVcenter);
}