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

Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Vijayendra Bhamidipati 2012-07-11 15:52:55 -07:00
parent f2c8a59983 9fe68fc4a9
commit 1e407f62ad
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -1204,7 +1204,6 @@ public class VpcManagerImpl implements VpcManager, Manager{
}
try {
gatewayVO.setState(VpcGateway.State.Deleting);
_vpcGatewayDao.update(gatewayVO.getId(), gatewayVO);
s_logger.debug("Marked gateway " + gatewayVO + " with state " + VpcGateway.State.Deleting);
//don't allow to remove gateway when there are static routes associated with it
@ -1213,7 +1212,9 @@ public class VpcManagerImpl implements VpcManager, Manager{
throw new CloudRuntimeException("Can't delete private gateway " + gatewayVO + " as it has " + routeCount +
" static routes applied. Remove the routes first");
}
gatewayVO.setState(VpcGateway.State.Deleting);
//1) delete the gateway on the backend
PrivateGateway gateway = getVpcPrivateGateway(gatewayId);
if (getVpcElement().deletePrivateGateway(gateway)) {
@ -1407,12 +1408,6 @@ public class VpcManagerImpl implements VpcManager, Manager{
throw new InvalidParameterValueException("Unable to find static route by id");
}
VpcGateway gateway = _vpcGatewayDao.findById(route.getVpcGatewayId());
if (gateway.getState() != VpcGateway.State.Ready) {
throw new InvalidParameterValueException("Gateway is not in the " + VpcGateway.State.Ready + " state: " + gateway.getState());
}
_accountMgr.checkAccess(caller, null, false, route);
markStaticRouteForRevoke(route, caller);