cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [2/5] git commit: updated refs/heads/4.3 to 6a6ec64
Date Wed, 12 Mar 2014 22:19:01 GMT
CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars
(cherry picked from commit 454cac448d83b973d8cd337cf214b17e31828b93)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34435173
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34435173
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34435173

Branch: refs/heads/4.3
Commit: 34435173a789eb5a1385672fa10cda6332aa9ad8
Parents: 92b9951
Author: Daan Hoogland <dhoogland@schubergphilis.com>
Authored: Wed Mar 12 15:50:43 2014 +0100
Committer: Animesh Chaturvedi <animesh@apache.org>
Committed: Wed Mar 12 11:02:56 2014 -0700

----------------------------------------------------------------------
 .../src/com/cloud/network/vpc/NetworkACLItemVO.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34435173/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 46f84c9..f4b65b5 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
@@ -61,7 +61,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")
@@ -75,7 +75,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
     Action action;
 
     public NetworkACLItemVO() {
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
     }
 
     public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol,
@@ -85,11 +85,11 @@ public class NetworkACLItemVO implements NetworkACLItem {
         this.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;
@@ -181,7 +181,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
 
     @Override
     public String getUuid() {
-        return this.uuid;
+        return uuid;
     }
 
     @Override


Mime
View raw message