cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [17/17] git commit: updated refs/heads/regionvpc to cf18fe1
Date Tue, 28 Jan 2014 09:26:48 GMT
in region level vpc, let the network/tier to be created in any zone of
the region


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

Branch: refs/heads/regionvpc
Commit: cf18fe1928fe2921adbac8b614309009657a8d36
Parents: 843a04c
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Mon Jan 27 14:55:36 2014 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Mon Jan 27 14:55:36 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf18fe19/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 1906bc5..78197c3 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -2190,7 +2190,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager,
VpcProvis
             networkDomain = vpc.getNetworkDomain();
         }
 
-        if (vpc.getZoneId() != zoneId) {
+        if (!vpc.isRegionLevelVpc() && vpc.getZoneId() != zoneId) {
             throw new InvalidParameterValueException("New network doesn't belong to vpc zone");
         }
 


Mime
View raw message