You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/09 12:00:13 UTC
[1/2] git commit: updated refs/heads/master to 9b669f0
Repository: cloudstack
Updated Branches:
refs/heads/master 8591383bc -> 9b669f064
CLOUDSTACK-7639: make cidr updation more efficient
check and update only when required
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit b879916f5c64ddbca8713852b2c0ac187e9be1ff)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b669f06
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b669f06
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b669f06
Branch: refs/heads/master
Commit: 9b669f0648a8190fb45871af2bfb8578cdc430a0
Parents: e1cbe6d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Mar 9 16:29:05 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Mar 9 16:30:08 2015 +0530
----------------------------------------------------------------------
.../com/cloud/network/vpc/NetworkACLItemCidrsDao.java | 2 ++
.../network/vpc/dao/NetworkACLItemCidrsDaoImpl.java | 11 +++++++++++
.../com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b669f06/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
index 5e49368..3b661fa 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
@@ -31,6 +31,8 @@ public interface NetworkACLItemCidrsDao extends GenericDao<NetworkACLItemCidrsVO
void persist(long networkACLItemId, List<String> cidrs);
+ void updateCidrs(long networkACLItemId, List<String> cidrs);
+
List<String> getCidrs(long networkACLItemId);
@DB
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b669f06/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
index 7c02f8b..4c2574e 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
@@ -64,6 +64,17 @@ public class NetworkACLItemCidrsDaoImpl extends GenericDaoBase<NetworkACLItemCid
txn.commit();
}
+ @Override
+ public void updateCidrs(long networkACLItemId, List<String> cidrs) {
+ List<String> oldCidrs = getCidrs(networkACLItemId);
+ if (!(oldCidrs.size() == cidrs.size() && oldCidrs.equals(cidrs))) {
+ SearchCriteria<NetworkACLItemCidrsVO> sc = cidrsSearch.create();
+ sc.setParameters("networkAclItemId", networkACLItemId);
+ remove(sc);
+ persist(networkACLItemId, cidrs);
+ }
+ }
+
/* (non-Javadoc)
* @see com.cloud.network.dao.NetworkAclItemCidrsDao#getCidrs(long)
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b669f06/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 88e00a1..201197c 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -93,7 +93,7 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
@Override
public boolean update(Long id, NetworkACLItemVO item) {
boolean result = super.update(id, item);
- saveCidrs(item, item.getSourceCidrList());
+ _networkACLItemCidrsDao.updateCidrs(item.getId(), item.getSourceCidrList());
return result;
}
[2/2] git commit: updated refs/heads/master to 9b669f0
Posted by bh...@apache.org.
CLOUDSTACK-7639: make cidrlist update when updateNetworkAclItem is called
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit b2b9de7fa39825e8ff111353619df4e5aece12e6)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1cbe6d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1cbe6d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1cbe6d1
Branch: refs/heads/master
Commit: e1cbe6d18ac8ad19d81d6dcafd2e31171eaf4554
Parents: 8591383
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Mar 9 15:39:50 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Mar 9 16:30:08 2015 +0530
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1cbe6d1/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 abd8bae..88e00a1 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -91,6 +91,13 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
}
@Override
+ public boolean update(Long id, NetworkACLItemVO item) {
+ boolean result = super.update(id, item);
+ saveCidrs(item, item.getSourceCidrList());
+ return result;
+ }
+
+ @Override
public boolean setStateToAdd(NetworkACLItemVO rule) {
SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create();
sc.setParameters("id", rule.getId());