You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/06 22:55:04 UTC
[2/2] git commit: updated refs/heads/master to aae1424
CLOUDSTACK-6582: fixed network acl cidr issues
Conflicts:
setup/db/db/schema-430to440.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aae1424f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aae1424f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aae1424f
Branch: refs/heads/master
Commit: aae1424f351acc312755104cb10a663492cdd149
Parents: 067e6b4
Author: Jayapal <ja...@apache.org>
Authored: Tue May 6 17:59:53 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue May 6 22:54:43 2014 +0200
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java | 6 ++++--
setup/db/db/schema-430to440.sql | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aae1424f/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
index c940247..abd8bae 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aae1424f/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 07791ed..99a3517 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -1653,7 +1653,9 @@ CREATE TABLE `cloud`.`op_vpc_distributed_router_sequence_no` (
UNIQUE `u_op_vpc_distributed_router_sequence_no_vpc_id`(`vpc_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-CREATE TABLE `cloud`.`network_acl_item_cidr` (
+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_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,