etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShutdownNetwork - added reservationContext parameter (contains account/callerUserId)

This commit is contained in:
alena 2011-02-17 15:13:51 -08:00
parent 74b464782e
commit 96ef94eb37
3 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/NetworkManager.java
View File

@ -138,9 +138,9 @@ public interface NetworkManager extends NetworkService {
<T extends VMInstanceVO> void prepareNicForMigration(VirtualMachineProfile<T> vm, DeployDestination dest);
void shutdownNetwork(long networkId);
void shutdownNetwork(long networkId, ReservationContext context);
boolean destroyNetwork(long networkId, long callerUserId);
boolean destroyNetwork(long networkId, ReservationContext context);
Network createNetwork(long networkOfferingId, String name, String displayText, Boolean isShared, Boolean isDefault, Long zoneId, String gateway, String cidr, String vlanId, String networkDomain, Account owner) throws ConcurrentOperationException, InsufficientCapacityException;
@ -175,7 +175,7 @@ public interface NetworkManager extends NetworkService {
boolean applyIpAssociations(Network network, boolean continueOnError) throws ResourceUnavailableException;
boolean deleteNetworkInternal(long networkId, long userId);
boolean deleteNetworkInternal(long networkId, ReservationContext context);
boolean isServiceSupported(long networkId, Network.Service service);

46
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -1100,7 +1100,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
s_logger.debug("Cleaning up because we're unable to implement network " + network);
network.setState(Network.State.Shutdown);
_networksDao.update(networkId, network);
shutdownNetwork(networkId);
shutdownNetwork(networkId, context);
}
_networksDao.releaseFromLockTable(networkId);
}
@ -1714,13 +1715,15 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
Long userId = UserContext.current().getCallerUserId();
Account caller = UserContext.current().getCaller();
Account caller = UserContext.current().getCaller();
// Verify network id
NetworkVO network = _networksDao.findById(networkId);
if (network == null) {
throw new InvalidParameterValueException("unable to find network " + networkId);
}
Account owner = _accountMgr.getAccount(network.getAccountId());
// Perform permission check
if (!_accountMgr.isAdmin(caller.getType())) {
@ -1728,22 +1731,25 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new PermissionDeniedException("Account " + caller.getAccountName() + " does not own network id=" + networkId + ", permission denied");
}
} else {
Account owner = _accountMgr.getAccount(network.getAccountId());
_accountMgr.checkAccess(caller, owner);
}
User callerUser = _accountMgr.getActiveUser(UserContext.current().getCallerUserId());
ReservationContext context = new ReservationContextImpl(null, null, callerUser, owner);
return deleteNetworkInternal(networkId, userId);
return deleteNetworkInternal(networkId, context);
}
@Override
@DB
public boolean deleteNetworkInternal(long networkId, long userId){
return this.destroyNetwork(networkId, userId);
public boolean deleteNetworkInternal(long networkId, ReservationContext context){
return this.destroyNetwork(networkId, context);
}
@Override
@DB
public void shutdownNetwork(long networkId) {
public void shutdownNetwork(long networkId, ReservationContext context) {
Transaction txn = Transaction.currentTxn();
txn.start();
NetworkVO network = _networksDao.lockRow(networkId, true);
@ -1766,18 +1772,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
s_logger.debug("Sending network shutdown to " + element);
}
User caller = null;
Account owner = _accountMgr.getAccount(network.getAccountId());
UserContext ctx = UserContext.current();
if (ctx == null) {
caller = _accountMgr.getSystemUser();
} else {
caller = _accountMgr.getActiveUser(ctx.getCallerUserId());
}
ReservationContext context = new ReservationContextImpl(null, null, caller, owner);
element.shutdown(network, context);
} catch (ResourceUnavailableException e) {
s_logger.warn("Unable to complete shutdown of the network due to element: " + element.getName(), e);
@ -1811,7 +1805,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
@DB
@Override
public boolean destroyNetwork(long networkId, long callerUserId) {
public boolean destroyNetwork(long networkId, ReservationContext context) {
NetworkVO network = _networksDao.findById(networkId);
if (network == null) {
s_logger.debug("Unable to find network with id: " + networkId);
@ -1819,7 +1813,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
// Shutdown network first
shutdownNetwork(networkId);
shutdownNetwork(networkId, context);
// get updated state for the network
network = _networksDao.findById(networkId);
@ -1869,7 +1863,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
txn.start();
guru.trash(network, _networkOfferingDao.findById(network.getNetworkOfferingId()), owner);
if (!deleteVlansInNetwork(network.getId(), callerUserId)) {
if (!deleteVlansInNetwork(network.getId(), context.getCaller().getId())) {
success = false;
s_logger.warn("Failed to delete network " + network + "; was unable to cleanup corresponding ip ranges");
} else {
@ -1952,7 +1946,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
for (Long networkId : shutdownList) {
try {
shutdownNetwork(networkId);
User caller = _accountMgr.getSystemUser();
Account owner = _accountMgr.getAccount(getNetwork(networkId).getAccountId());
ReservationContext context = new ReservationContextImpl(null, null, caller, owner);
shutdownNetwork(networkId, context);
} catch (Exception e) {
s_logger.warn("Unable to shutdown network: " + networkId);
}

7
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -99,6 +99,8 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.InstanceGroupVO;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.ReservationContextImpl;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
@ -884,7 +886,10 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
List<NetworkVO> networks = _networkDao.listByOwner(accountId);
if (networks != null) {
for (NetworkVO network : networks) {
if (!_networkMgr.deleteNetworkInternal(network.getId(), callerUserId)) {
ReservationContext context = new ReservationContextImpl(null, null, getActiveUser(callerUserId), account);
if (!_networkMgr.deleteNetworkInternal(network.getId(), context)) {
s_logger.warn("Unable to destroy network " + network + " as a part of account id=" + accountId +" cleanup.");
accountCleanupNeeded = true;
networksDeleted = false;