From 367cd8dfc9a2eec82815ada784d4b448ce3b7f12 Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 30 Dec 2010 16:56:43 -0800 Subject: [PATCH] bug 7780: Assign vm to the group during vm deploy if "group" parameter is specified status 7780: resolved fixed --- server/src/com/cloud/vm/UserVmManagerImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 3a0b7801ad3..4003bf6b5de 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2112,6 +2112,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager String accountName = cmd.getAccountName(); Long domainId = cmd.getDomainId(); List networkList = cmd.getNetworkIds(); + String group = cmd.getGroup(); Account owner = _accountDao.findActiveAccount(accountName, domainId); if (owner == null) { @@ -2299,6 +2300,19 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager _usageEventDao.persist(usageEvent); _accountMgr.incrementResourceCount(accountId, ResourceType.user_vm); + + //Assign instance to the group + try{ + if (group != null) { + boolean addToGroup = addInstanceToGroup(Long.valueOf(id), group); + if (!addToGroup) { + throw new CloudRuntimeException("Unable to assing Vm to the group " + group); + } + } + } catch (Exception ex) { + throw new CloudRuntimeException("Unable to assing Vm to the group " + group); + } + return vm; }