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

CLOUDSTACK-8073 load cidrs on create response

This commit is contained in:
Daan Hoogland 2014-12-15 15:58:42 +01:00
parent 2f2ff4bfc0
commit 02feb0180a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -201,6 +201,7 @@ import com.cloud.network.security.SecurityGroupManager;
import com.cloud.network.security.SecurityGroupVO;
import com.cloud.network.security.dao.SecurityGroupDao;
import com.cloud.network.vpc.NetworkACL;
import com.cloud.network.vpc.NetworkACLItemCidrsDao;
import com.cloud.network.vpc.StaticRouteVO;
import com.cloud.network.vpc.VpcGatewayVO;
import com.cloud.network.vpc.VpcManager;
@ -357,6 +358,7 @@ public class ApiDBUtils {
static ConfigurationDao s_configDao;
static ConsoleProxyDao s_consoleProxyDao;
static FirewallRulesCidrsDao s_firewallCidrsDao;
static NetworkACLItemCidrsDao s_networkACLItemCidrsDao;
static VMInstanceDao s_vmDao;
static ResourceLimitService s_resourceLimitMgr;
static ProjectService s_projectMgr;
@ -524,6 +526,8 @@ public class ApiDBUtils {
@Inject
private FirewallRulesCidrsDao firewallCidrsDao;
@Inject
private NetworkACLItemCidrsDao networkACLItemCidrsDao;
@Inject
private VMInstanceDao vmDao;
@Inject
private ResourceLimitService resourceLimitMgr;
@ -692,6 +696,7 @@ public class ApiDBUtils {
s_configDao = configDao;
s_consoleProxyDao = consoleProxyDao;
s_firewallCidrsDao = firewallCidrsDao;
s_networkACLItemCidrsDao = networkACLItemCidrsDao;
s_vmDao = vmDao;
s_resourceLimitMgr = resourceLimitMgr;
s_projectMgr = projectMgr;
@ -1241,6 +1246,10 @@ public class ApiDBUtils {
return s_firewallCidrsDao.getSourceCidrs(id);
}
public static List<String> findNetworkAclItemSourceCidrs(long id) {
return s_networkACLItemCidrsDao.getCidrs(id);
}
public static Account getProjectOwner(long projectId) {
return s_projectMgr.getProjectOwner(projectId);
}

3
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -2349,7 +2349,8 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setEndPort(Integer.toString(aclItem.getSourcePortEnd()));
}
response.setCidrList(StringUtils.join(aclItem.getSourceCidrList(), ","));
List<String> cidrs = ApiDBUtils.findNetworkAclItemSourceCidrs(aclItem.getId());
response.setCidrList(StringUtils.join(cidrs, ","));
response.setTrafficType(aclItem.getTrafficType().toString());