From 271cf92ab7f58b19dbdae056ce35144d31f0604f Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony.xu@citrix.com>
Date: Wed, 29 May 2013 16:27:08 -0700
Subject: [PATCH] allow subdomain access parent domain's network

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 3 +++
 server/src/com/cloud/network/NetworkModelImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 70cb14f1f07..b92ef4b7dfa 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1544,6 +1544,9 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
                         finalizeServicesAndProvidersForNetwork(offering, plan.getPhysicalNetworkId())));
 
                 if (domainId != null && aclType == ACLType.Domain) {
+    		    if (subdomainAccess == null ) {
+                        subdomainAccess = true;
+         	    }
                     _networksDao.addDomainToNetwork(id, domainId, subdomainAccess);
                 }
 
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index f6bd646a91d..6b63eadd4b2 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1673,7 +1673,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
         if (networkDomainMap.subdomainAccess) {
             Set<Long> parentDomains = _domainMgr.getDomainParentIds(domainId);
 
-            if (parentDomains.contains(domainId)) {
+            if (parentDomains.contains(networkDomainId)) {
                 return true;
             }
         }