Updated Branches: refs/heads/master fc7489a28 -> 6d7674982
CLOUDSTACK-4979: fix hostName for VmWare vms to follow the same logic Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d767498 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d767498 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d767498 Branch: refs/heads/master Commit: 6d7674982afcd636542f5591b77f704f0b42b379 Parents: fc7489a Author: Alena Prokharchyk <[email protected]> Authored: Wed Nov 6 15:56:04 2013 -0800 Committer: Alena Prokharchyk <[email protected]> Committed: Wed Nov 6 16:16:25 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d767498/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 2c1343a..9e69962 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2732,10 +2732,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir long id = _vmDao.getNextInSequence(Long.class, "id"); - if (hostName != null) { - // Check is hostName is RFC compliant - checkNameForRFCCompliance(hostName); - } + String instanceName = null; String uuidName = UUID.randomUUID().toString(); @@ -2744,16 +2741,20 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (displayName != null) { hostName = displayName; } else { - hostName = uuidName; + hostName = generateHostName(uuidName); } } } else { if (hostName == null) { //Generate name using uuid and instance.name global config - hostName = _configDao.getValue(Config.InstanceName.key()) + "-" + uuidName; + hostName = generateHostName(uuidName); } } - + + if (hostName != null) { + // Check is hostName is RFC compliant + checkNameForRFCCompliance(hostName); + } instanceName = VirtualMachineName.getVmName(id, owner.getId(), _instance); // Check if VM with instanceName already exists. @@ -2825,6 +2826,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir return vm; } + private String generateHostName(String uuidName) { + return _instance + "-" + uuidName; + } + private UserVmVO commitUserVm(final DataCenter zone, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner, final Long diskOfferingId, final Long diskSize, final String userData, final HypervisorType hypervisor, final Account caller, final Boolean isDisplayVmEnabled, final String keyboard, final long accountId,
