From 336235e5e3d4612aa14f458c225c3c18f73c99b4 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 20 Jun 2011 09:22:00 -0700 Subject: [PATCH] bug 10359: don't allow system network deletion status 10359: resolved fixed --- server/src/com/cloud/network/NetworkManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f7c9e23b83b..6611d273bd8 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1956,6 +1956,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (network == null) { throw new InvalidParameterValueException("unable to find network " + networkId); } + + //don't allow to delete system network + NetworkOffering offering = _networkOfferingDao.findByIdIncludingRemoved(network.getNetworkOfferingId()); + if (offering.isSystemOnly()) { + throw new InvalidParameterValueException("Network id=" + networkId + " is system and can't be removed"); + } Account owner = _accountMgr.getAccount(network.getAccountId());