From 63cd66beb0ff380ee6575f7943f493ce980d441e Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 19 Apr 2011 18:26:45 -0700
Subject: [PATCH] Fixed the bug in listNetworks when isSystem parameter was
 ignored if it was specified along with account/domainId parameter

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

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 7b25d0c66c4..4fd0c773a05 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1819,7 +1819,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
                 if (isShared == null || isShared) {
                     List<NetworkVO> allNetworks = _networksDao.listNetworksBy(true);
                     for (NetworkVO network : allNetworks) {
-                        if (!isNetworkAvailableInDomain(network.getId(), domainId)) {
+                        NetworkOffering offering = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
+                        if (!isNetworkAvailableInDomain(network.getId(), domainId) || offering.isSystemOnly()) {
                             avoidNetworks.add(network.getId());
                         } else {
                             allowedSharedNetworks.add(network.getId());
@@ -1836,6 +1837,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         if (domainId != null && accountName == null) {
             List<NetworkVO> allNetworks = _networksDao.listNetworksBy(true);
             for (NetworkVO network : allNetworks) {
+
                 if (!isNetworkAvailableInDomain(network.getId(), domainId)) {
                     avoidNetworks.add(network.getId());
                 }