From 1fe8ae4819206b9b7c6ee1282568047e6991cd88 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Fri, 5 Nov 2010 12:08:44 -0700
Subject: [PATCH] 7004,7011: fixing the return values issue which showed the
 same record 2 times; also fixing the checks for deploy vm from the api layer;
 and also fixing the tree returned to the UI status 7004,7011: resolved fixed

---
 .../src/com/cloud/server/ManagementServerImpl.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 36dc3ebbafd..bb4536dd592 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1827,8 +1827,17 @@ public class ManagementServerImpl implements ManagementServer {
         		//do nothing (public zone case)
         	}
         	else{
-        		if(!_domainDao.isChildDomain(ctxAccount.getDomainId(), domainId)){
-        			throw new PermissionDeniedException("Failed to deploy VM, invalid domain id (" + domainId + ") given.");
+        		//check if this account has the permission to deploy a vm in this domain
+        		if(ctxAccount != null){
+        			if((ctxAccount.getType() == Account.ACCOUNT_TYPE_NORMAL) || ctxAccount.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN){
+        				if(domainId == ctxAccount.getDomainId()){
+        					//user in same domain as dedicated zone
+        				}
+        				else if ((!_domainDao.isChildDomain(domainId,ctxAccount.getDomainId()))){
+        					//may need to revisit domain admin case for leaves
+        					throw new PermissionDeniedException("Failed to deploy VM, user does not have permission to deploy a vm within this dedicated private zone under domain id:"+domainId);
+        				}
+        			}
         		}
         	}
         }
@@ -2038,7 +2047,6 @@ public class ManagementServerImpl implements ManagementServer {
     			DomainVO localParent = domainRecord;
     			DomainVO immediateChild = null;
     			while(true){
-    				dcs.addAll(_dcDao.findZonesByDomainId(localParent.getId()));
     				//find immediate child domain
     				immediateChild = _domainDao.findImmediateChildForParent(localParent.getId());
     				if(immediateChild != null){