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:03 UTC
[1/2] git commit: updated refs/heads/master to aae1424
Repository: cloudstack
Updated Branches:
refs/heads/master c9a09f548 -> aae1424f3
CLOUDSTACK-6582: cidr field removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/067e6b49
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/067e6b49
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/067e6b49
Branch: refs/heads/master
Commit: 067e6b49337b37a566d88d9f8b897e4f52be14a0
Parents: c9a09f5
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue May 6 17:44:54 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue May 6 22:49:37 2014 +0200
----------------------------------------------------------------------
.../com/cloud/network/vpc/NetworkACLItemVO.java | 42 ++++++++------------
1 file changed, 16 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/067e6b49/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
index 0d2897d..6eb9cb0 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
@@ -16,9 +16,10 @@
// under the License.
package com.cloud.network.vpc;
-import java.util.ArrayList;
import java.util.Date;
+import java.util.LinkedList;
import java.util.List;
+import java.util.StringTokenizer;
import java.util.UUID;
import javax.persistence.Column;
@@ -29,6 +30,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import javax.persistence.Transient;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.net.NetUtils;
@@ -76,8 +78,11 @@ public class NetworkACLItemVO implements NetworkACLItem {
@Enumerated(value = EnumType.STRING)
TrafficType trafficType;
- @Column(name = "cidr", length = 2048)
- String sourceCidrs;
+ // This is a delayed load value. If the value is null,
+ // then this field has not been loaded yet.
+ // Call the NetworkACLItem dao to load it.
+ @Transient
+ List<String> sourceCidrs;
@Column(name = "uuid")
String uuid;
@@ -113,32 +118,12 @@ public class NetworkACLItemVO implements NetworkACLItem {
}
public void setSourceCidrList(List<String> sourceCidrs) {
- if (sourceCidrs == null) {
- this.sourceCidrs = null;
- } else {
- StringBuilder sb = new StringBuilder();
- for (String cidr : sourceCidrs) {
- if (sb.length() != 0) {
- sb.append(",");
- }
- sb.append(cidr);
- }
- this.sourceCidrs = sb.toString();
- }
+ this.sourceCidrs = sourceCidrs;
}
@Override
public List<String> getSourceCidrList() {
- if (sourceCidrs == null || sourceCidrs.isEmpty()) {
- return null;
- } else {
- List<String> cidrList = new ArrayList<String>();
- String[] cidrs = sourceCidrs.split(",");
- for (String cidr : cidrs) {
- cidrList.add(cidr);
- }
- return cidrList;
- }
+ return sourceCidrs;
}
@Override
@@ -239,7 +224,12 @@ public class NetworkACLItemVO implements NetworkACLItem {
}
public void setSourceCidrs(String sourceCidrs) {
- this.sourceCidrs = sourceCidrs;
+ List<String> srcCidrs = new LinkedList<String>();
+ StringTokenizer st = new StringTokenizer(sourceCidrs,",;");
+ while(st.hasMoreTokens()) {
+ srcCidrs.add(st.nextToken());
+ }
+ this.sourceCidrs = srcCidrs;
}
public void setNumber(int number) {
[2/2] git commit: updated refs/heads/master to aae1424
Posted by da...@apache.org.
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,