You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/08/08 07:34:15 UTC
git commit: updated refs/heads/master to aba50f8
Updated Branches:
refs/heads/master 9bce985f6 -> aba50f81c
CLOUDSTACK-4153. Guest vlan dedication is not working as expected in case of multiple physical networks.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aba50f81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aba50f81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aba50f81
Branch: refs/heads/master
Commit: aba50f81cff73c748a71cd8000512167329a7282
Parents: 9bce985
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Aug 8 10:51:23 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Aug 8 10:59:19 2013 +0530
----------------------------------------------------------------------
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/aba50f81/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 5736cef..51add20 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3046,7 +3046,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// For every guest vlan set the corresponding account guest vlan map id
List<Integer> finaVlanTokens = getVlanFromRange(accountGuestVlanMapVO.getGuestVlanRange());
for (int i = finaVlanTokens.get(0).intValue(); i <= finaVlanTokens.get(1).intValue(); i++) {
- List<DataCenterVnetVO> dataCenterVnet = _datacneter_vnet.findVnet(physicalNetwork.getDataCenterId(),((Integer)i).toString());
+ List<DataCenterVnetVO> dataCenterVnet = _datacneter_vnet.findVnet(physicalNetwork.getDataCenterId(),physicalNetworkId, ((Integer)i).toString());
dataCenterVnet.get(0).setAccountGuestVlanMapId(accountGuestVlanMapVO.getId());
_datacneter_vnet.update(dataCenterVnet.get(0).getId(), dataCenterVnet.get(0));
}