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

no idea how these files were not committed

This commit is contained in:
Alex Huang 2010-09-15 18:00:43 -07:00
parent 84179cd561
commit e283bc7f05
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/vm/NetworkConcierge.java
View File

@ -11,7 +11,7 @@ import com.cloud.utils.component.Adapter;
/** /**
* NetworkConcierge reserves network settings for a VM based * NetworkConcierge reserves network settings for a VM based
* on the NetworkCharacteristics given. A Concierge must * on the NetworkCharacteristics given. A concierge must
* return a unique name so we know to call it to release * return a unique name so we know to call it to release
* the reservation. * the reservation.
* *

6
core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java
View File

@ -33,7 +33,7 @@ public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long>
if (accountId != null) { if (accountId != null) {
sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId); sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
} }
List<InstanceGroupVO> vmGroups = listActiveBy(sc); List<InstanceGroupVO> vmGroups = listBy(sc);
return ((vmGroups != null) && !vmGroups.isEmpty()); return ((vmGroups != null) && !vmGroups.isEmpty());
} }
@ -42,7 +42,7 @@ public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long>
SearchCriteria<InstanceGroupVO> sc = AccountIdNameSearch.create(); SearchCriteria<InstanceGroupVO> sc = AccountIdNameSearch.create();
sc.setParameters("accountId", accountId); sc.setParameters("accountId", accountId);
sc.setParameters("groupName", name); sc.setParameters("groupName", name);
return findOneActiveBy(sc); return findOneBy(sc);
} }
@Override @Override
@ -56,6 +56,6 @@ public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long>
public List<InstanceGroupVO> listByAccountId(long id) { public List<InstanceGroupVO> listByAccountId(long id) {
SearchCriteria<InstanceGroupVO> sc = AccountSearch.create(); SearchCriteria<InstanceGroupVO> sc = AccountSearch.create();
sc.setParameters("account", id); sc.setParameters("account", id);
return listActiveBy(sc); return listBy(sc);
} }
} }

4
core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java
View File

@ -35,14 +35,14 @@ public class InstanceGroupVMMapDaoImpl extends GenericDaoBase<InstanceGroupVMMap
public List<InstanceGroupVMMapVO> listByInstanceId(long vmId) { public List<InstanceGroupVMMapVO> listByInstanceId(long vmId) {
SearchCriteria<InstanceGroupVMMapVO> sc = ListByVmId.create(); SearchCriteria<InstanceGroupVMMapVO> sc = ListByVmId.create();
sc.setParameters("instanceId", vmId); sc.setParameters("instanceId", vmId);
return listActiveBy(sc); return listBy(sc);
} }
@Override @Override
public List<InstanceGroupVMMapVO> listByGroupId(long groupId) { public List<InstanceGroupVMMapVO> listByGroupId(long groupId) {
SearchCriteria<InstanceGroupVMMapVO> sc = ListByGroupId.create(); SearchCriteria<InstanceGroupVMMapVO> sc = ListByGroupId.create();
sc.setParameters("groupId", groupId); sc.setParameters("groupId", groupId);
return listActiveBy(sc); return listBy(sc);
} }
@Override @Override

4
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -842,7 +842,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
if (s_logger.isDebugEnabled()) if (s_logger.isDebugEnabled())
s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
Map<String, Object> context = createProxyInstance2(dataCenterId); Map<String, Object> context = createProxyInstance(dataCenterId);
long proxyVmId = (Long) context.get("proxyVmId"); long proxyVmId = (Long) context.get("proxyVmId");
if (proxyVmId == 0) { if (proxyVmId == 0) {
@ -881,7 +881,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
if (s_logger.isDebugEnabled()) if (s_logger.isDebugEnabled())
s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
Map<String, Object> context = createProxyInstance2(dataCenterId); Map<String, Object> context = createProxyInstance(dataCenterId);
long proxyVmId = (Long) context.get("proxyVmId"); long proxyVmId = (Long) context.get("proxyVmId");
if (proxyVmId == 0) { if (proxyVmId == 0) {