From 89d8a478e0536b73d9028f262c1d3b4f4f34b0ff Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Tue, 29 Jan 2013 17:59:03 -0700 Subject: [PATCH] Summary: Don't allow a vm to join a network if another VM of same name exists Submitted-by: Brian Angus Signed-off-by: Marcus Sorensen 1359507543 -0700 --- server/src/com/cloud/vm/UserVmManagerImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index e00da92ebab..d90b2660135 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -967,14 +967,11 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if(_networkModel.getNicInNetwork(vmInstance.getId(),network.getId()) != null){ s_logger.debug(vmInstance + " already in " + network + " going to add another NIC"); } else { - List nics = _nicDao.listByNetworkId(network.getId()); - for (NicVO netnic : nics) { - VMInstanceVO vm = _vmDao.findById(netnic.getInstanceId()); - if (vm != null) { - if (vm.getHostName().equals(vmInstance.getHostName())) { - throw new CloudRuntimeException(network + " already has a vm with host name: '" + vmInstance.getHostName() + "' vmId:" + vm.getId() + " " + vm); - } - } + //* get all vms hostNames in the network + List hostNames = _vmInstanceDao.listDistinctHostNames(network.getId()); + //* verify that there are no duplicates + if (hostNames.contains(vmInstance.getHostName())) { + throw new CloudRuntimeException(network + " already has a vm with host name: '" + vmInstance.getHostName()); } }