From 5f3415d377423cede536cd92fdf81b02c807b8a6 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Fri, 25 Feb 2011 14:22:54 -0500
Subject: [PATCH] list systemonly direct network if zone is security group
 enabled

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

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 9f7107cde96..0aa1182b95a 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1670,7 +1670,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         SearchCriteria<NetworkVO> sc = sb.create();
 
         if (!isSystem) {
-            sc.setJoinParameters("networkOfferingSearch", "systemOnly", false);
+            if (zoneId != null) {
+                DataCenterVO dc = _dcDao.findById(zoneId);
+                if (dc != null && !dc.isSecurityGroupEnabled()) {
+                    sc.setJoinParameters("networkOfferingSearch", "systemOnly", false);
+                }
+            }
         } else {
             sc.setJoinParameters("networkOfferingSearch", "systemOnly", true);
             sc.setJoinParameters("zoneSearch", "networkType", NetworkType.Advanced.toString());