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 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 allNetworks = _networksDao.listNetworksBy(true); for (NetworkVO network : allNetworks) { + if (!isNetworkAvailableInDomain(network.getId(), domainId)) { avoidNetworks.add(network.getId()); }