cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to d58c0c4
Date Tue, 04 Jun 2013 08:54:38 GMT
Updated Branches:
  refs/heads/master ba2687c23 -> d58c0c4d1


Cloudstack-2736 [Multiple_IP_Ranges] Failed to deploy vm with IP address from new CIDR

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>


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

Branch: refs/heads/master
Commit: d58c0c4d1145345ad66c73924eab8f3f5703552d
Parents: ba2687c
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Tue Jun 4 12:37:06 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Tue Jun 4 14:19:57 2013 +0530

----------------------------------------------------------------------
 .../router/VirtualNetworkApplianceManagerImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d58c0c4d/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index f7e77f3..e0ff157 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2796,7 +2796,13 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
                         for (VlanVO vlan : vlanList) {
                             vlanDbIdList.add(vlan.getId());
                         }
-                        routerPublicIP = _networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(),
vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(),
null, false);
+                        if (dc.getNetworkType() == NetworkType.Basic) {
+                            routerPublicIP = _networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(),
vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(),
null, false);
+                        }
+                        else {
+                            routerPublicIP = _networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(),
null, caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(), null, false);
+                        }
+
                         routerAliasIp = routerPublicIP.getAddress().addr();
                     }
                 }


Mime
View raw message