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

return only domains in Active state to the API

This commit is contained in:
Alena Prokharchyk 2011-11-30 13:56:21 -08:00
parent 7eddef60fe
commit dc9efbb46e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
View File

@ -677,7 +677,6 @@ public class ElasticLoadBalancerManagerImpl implements
NetworkVO network = getNetworkToDeployLb(ipId);
IPAddressVO ipAddr = _ipAddressDao.findById(ipId);
long networkId = network.getId();
LoadBalancer result = null;
try {

2
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -586,7 +586,7 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb, caller.getCaller());
if (result == null){
result = createLoadBalancer(lb, openFirewall);
result = createLoadBalancer(lb, openFirewall);
}
if(result == null){
throw new CloudRuntimeException("Failed to create load balancer rule: "+lb.getName());

12
server/src/com/cloud/user/DomainManagerImpl.java
View File

@ -342,6 +342,7 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ);
sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE);
sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
SearchCriteria<DomainVO> sc = sb.create();
@ -366,6 +367,9 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
if (path != null) {
sc.setParameters("path", "%" + path + "%");
}
//return only Active domains to the API
sc.setParameters("state", Domain.State.Active);
return _domainDao.search(sc, searchFilter);
}
@ -398,12 +402,12 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
domainId = null;
}
List<DomainVO> domainList = searchForDomainChildren(searchFilter, domainId, domainName, keyword, path);
List<DomainVO> domainList = searchForDomainChildren(searchFilter, domainId, domainName, keyword, path, true);
return domainList;
}
private List<DomainVO> searchForDomainChildren(Filter searchFilter, Long domainId, String domainName, Object keyword, String path) {
private List<DomainVO> searchForDomainChildren(Filter searchFilter, Long domainId, String domainName, Object keyword, String path, boolean listActiveOnly) {
SearchCriteria<DomainVO> sc = _domainDao.createSearchCriteria();
if (keyword != null) {
@ -426,6 +430,10 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
sc.addAnd("path", SearchCriteria.Op.LIKE, path + "%");
}
if (listActiveOnly) {
sc.addAnd("state", SearchCriteria.Op.EQ, Domain.State.Active);
}
return _domainDao.search(sc, searchFilter);
}
}