CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1dc2bbdc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1dc2bbdc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1dc2bbdc
Branch: refs/heads/distributedrouter Commit: 1dc2bbdc37faa9cb007c3e0446efc078255f3f76 Parents: 8937434 Author: Daan Hoogland <[email protected]> Authored: Wed Mar 12 15:50:43 2014 +0100 Committer: Daan Hoogland <[email protected]> Committed: Wed Mar 12 15:50:43 2014 +0100 ---------------------------------------------------------------------- .../src/com/cloud/network/vpc/NetworkACLItemVO.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1dc2bbdc/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 24ec1b9..8031b00 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java @@ -71,7 +71,7 @@ public class NetworkACLItemVO implements NetworkACLItem { @Enumerated(value = EnumType.STRING) TrafficType trafficType; - @Column(name = "cidr") + @Column(name = "cidr", length = 2048) String sourceCidrs; @Column(name = "uuid") @@ -88,20 +88,20 @@ public class NetworkACLItemVO implements NetworkACLItem { protected boolean display = true; public NetworkACLItemVO() { - this.uuid = UUID.randomUUID().toString(); + uuid = UUID.randomUUID().toString(); } public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, long aclId, List<String> sourceCidrs, Integer icmpCode, Integer icmpType, TrafficType trafficType, Action action, int number) { - this.sourcePortStart = portStart; - this.sourcePortEnd = portEnd; + sourcePortStart = portStart; + sourcePortEnd = portEnd; this.protocol = protocol; this.aclId = aclId; - this.state = State.Staged; + state = State.Staged; this.icmpCode = icmpCode; this.icmpType = icmpType; setSourceCidrList(sourceCidrs); - this.uuid = UUID.randomUUID().toString(); + uuid = UUID.randomUUID().toString(); this.trafficType = trafficType; this.action = action; this.number = number; @@ -191,7 +191,7 @@ public class NetworkACLItemVO implements NetworkACLItem { @Override public String getUuid() { - return this.uuid; + return uuid; } @Override
