You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2014/03/11 15:27:07 UTC
[45/50] [abbrv] git commit: updated refs/heads/regionvpc to edf12eb
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/4192e162
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4192e162
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4192e162
Branch: refs/heads/regionvpc
Commit: 4192e1622b323c7ee427b235bbe62f0905fe9836
Parents: c0575aa
Author: Murali Reddy <mu...@gmail.com>
Authored: Mon Jan 27 14:55:36 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Tue Mar 11 19:51:08 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/4192e162/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 7a21c13..28dc03c 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -2208,7 +2208,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");
}