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

CLOUDSTACK-6582: fixed network acl cidr issues

This commit is contained in:
Jayapal 2014-05-06 17:59:53 +02:00 committed by Daan Hoogland
parent 94415b80eb
commit 980eac607f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
View File

@ -115,7 +115,7 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
for(NetworkACLItemVO item :list) {
loadCidrs(item);
}
return listBy(sc);
return list;
}
@Override
@ -132,7 +132,9 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
sc.setParameters("aclId", aclId);
sc.setParameters("number", number);
NetworkACLItemVO vo = findOneBy(sc);
loadCidrs(vo);
if(vo != null) {
loadCidrs(vo);
}
return vo;
}

2
setup/db/db/schema-430to440.sql
View File

@ -1654,7 +1654,7 @@ CREATE TABLE `cloud`.`op_vpc_distributed_router_sequence_no` (
INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'NetworkOrchestrationService', 'router.aggregation.command.each.timeout', '3', 'timeout in seconds for each Virtual Router command being aggregated. The final aggregation command timeout would be determined by this timeout * commands counts ', '3') ON DUPLICATE KEY UPDATE category='Advanced';
CREATE TABLE `cloud`.`network_acl_item_cidr` (
CREATE TABLE `cloud`.`network_acl_item_cidrs` (
`id` bigint unsigned UNIQUE NOT NULL auto_increment,
`network_acl_item_id` bigint unsigned NOT NULL COMMENT 'Network ACL Item id',
`cidr` varchar(255) NOT NULL,