From 70713043cfde5f71febaab649d1a0268e155ea65 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Tue, 31 Jul 2012 10:37:47 -0700
Subject: [PATCH] VPC: CS-15774 - VPC and guest networks of VPC should belong
 to the same zone

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index e022ea38efb..3f088e6daf7 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2866,6 +2866,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         if (networkDomain == null) {
             networkDomain = vpc.getNetworkDomain();
         }
+        
+        if (vpc.getZoneId() != zoneId) {
+            throw new InvalidParameterValueException("New network doesn't belong to vpc zone", null);
+        }
+        
         //1) Validate if network can be created for VPC
         _vpcMgr.validateGuestNtkwForVpc(_configMgr.getNetworkOffering(ntwkOffId), cidr, networkDomain, owner, vpc, null, gateway);
         //2) Create network