From 3098db2b31f677b612b4ebecaa3f93cdb93b4423 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 16 Jun 2011 14:01:08 -0700
Subject: [PATCH] bug 9871: deployVm - check network's zone when do vm
 deployment status 9871: resolved fixed

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 4e2fef94e73..8a61eecb8cb 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2413,15 +2413,15 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
             sshPublicKey = pair.getPublicKey();
         }
 
-       // _accountMgr.checkAccess(caller, template);
-
         DataCenterDeployment plan = new DataCenterDeployment(zone.getId());
 
-        s_logger.debug("Allocating in the DB for vm");
-
         List<Pair<NetworkVO, NicProfile>> networks = new ArrayList<Pair<NetworkVO, NicProfile>>();
         short defaultNetworkNumber = 0;
         for (NetworkVO network : networkList) {
+            
+            if (network.getDataCenterId() != zone.getId()) {
+                throw new InvalidParameterValueException("Network id=" + network.getId() + " doesn't belong to zone " + zone.getId());
+            }
 
             if (network.isDefault()) {
                 defaultNetworkNumber++;
@@ -2469,6 +2469,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         if (isIso) {
             vm.setIsoId(template.getId());
         }
+        
+        s_logger.debug("Allocating in the DB for vm");
 
         if (_itMgr.allocate(vm, _templateDao.findById(template.getId()), offering, rootDiskOffering, dataDiskOfferings, networks, null, plan, hypervisorType, owner) == null) {
             return null;