From 4699d91f4e65235e6f5ca649149e61f269280597 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 4 Feb 2011 15:53:02 -0800
Subject: [PATCH] bug 8399: dhcp owner is System in Basic zone setup and for
 Direct zone wide network status 8399: resolved fixed

---
 .../network/router/VirtualNetworkApplianceManagerImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 6c3abcf0956..a5edca9d472 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -811,6 +811,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
     public DomainRouterVO deployDhcp(Network guestNetwork, DeployDestination dest, Account owner, Map<Param, Object> params) throws InsufficientCapacityException,
             StorageUnavailableException, ConcurrentOperationException, ResourceUnavailableException {
         long dcId = dest.getDataCenter().getId();
+        
+        NetworkOffering offering = _networkOfferingDao.findByIdIncludingRemoved(guestNetwork.getNetworkOfferingId());
+        if (offering.isSystemOnly() || guestNetwork.isShared()) {
+            owner = _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM);
+        }
 
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Starting a dhcp for network configurations: dhcp=" + guestNetwork + " in " + dest);