Updated Branches: refs/heads/multiple-vpcs-again [created] 7681cf7dd
add networkofferid to search network for Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7681cf7d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7681cf7d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7681cf7d Branch: refs/heads/multiple-vpcs-again Commit: 7681cf7dd6e76e09051bff2e36b799c8204cb69c Parents: b6d448d Author: Daan Hoogland <[email protected]> Authored: Thu Sep 19 16:25:24 2013 +0200 Committer: Daan Hoogland <[email protected]> Committed: Thu Sep 19 16:25:24 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7681cf7d/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 06c9526..52520d4 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3869,7 +3869,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { //check if we need to create guest network Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, - networkOwnerId, pNtwk.getDataCenterId(), null); + networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId); if (privateNetwork == null) { //create Guest network privateNetwork = _networkMgr.createGuestNetwork(ntwkOff.getId(), networkName, displayText, gateway, cidr, uriString,
