loadCidrs Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e90d595d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e90d595d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e90d595d
Branch: refs/heads/acl-item-cidrs Commit: e90d595d3596ab710fc62f71b43ada6156e2b41e Parents: e7dacdf Author: Daan Hoogland <d...@onecht.net> Authored: Wed Feb 26 19:49:12 2014 +0100 Committer: Daan Hoogland <d...@onecht.net> Committed: Wed Feb 26 19:49:12 2014 +0100 ---------------------------------------------------------------------- .../src/com/cloud/network/vpc/NetworkACLItemVO.java | 5 +++++ .../network/vpc/dao/NetworkACLItemDaoImpl.java | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e90d595d/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..1317b6f 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java @@ -37,6 +37,11 @@ import com.cloud.utils.net.NetUtils; @Table(name = "network_acl_item") public class NetworkACLItemVO implements NetworkACLItem { + /** + * + */ + private static final long serialVersionUID = 2790623532888742060L; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e90d595d/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 b581d3e..c940247 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java @@ -84,6 +84,13 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long } @Override + public NetworkACLItemVO findById(Long id) { + NetworkACLItemVO item = super.findById(id); + loadCidrs(item); + return item; + } + + @Override public boolean setStateToAdd(NetworkACLItemVO rule) { SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create(); sc.setParameters("id", rule.getId()); @@ -104,7 +111,10 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long public List<NetworkACLItemVO> listByACL(long aclId) { SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create(); sc.setParameters("aclId", aclId); - + List<NetworkACLItemVO> list = listBy(sc); + for(NetworkACLItemVO item :list) { + loadCidrs(item); + } return listBy(sc); } @@ -121,7 +131,9 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create(); sc.setParameters("aclId", aclId); sc.setParameters("number", number); - return findOneBy(sc); + NetworkACLItemVO vo = findOneBy(sc); + loadCidrs(vo); + return vo; } @Override
