Merge remote-tracking branch 'origin/4.13' into 4.14

This commit is contained in:
Rohit Yadav 2020-06-17 07:38:14 +05:30
commit c94315545f

View File

@ -1755,6 +1755,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
return true;
}
restartVPCNetworks(vpcId, callerAccount, callerUser, cleanUp);
s_logger.debug("Starting VPC " + vpc + " as a part of VPC restart process without cleanup");
if (!startVpc(vpcId, false)) {
s_logger.warn("Failed to start vpc as a part of VPC " + vpc + " restart process");
@ -1771,6 +1773,15 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
}
}
private void restartVPCNetworks(long vpcId, Account callerAccount, User callerUser, boolean cleanUp) throws InsufficientCapacityException, ResourceUnavailableException {
List<? extends Network> networks = _ntwkModel.listNetworksByVpc(vpcId);
for (Network network: networks) {
if (network.isRestartRequired()) {
_ntwkMgr.restartNetwork(network.getId(), callerAccount, callerUser, cleanUp);
}
}
}
@Override
public List<PrivateGateway> getVpcPrivateGateways(final long vpcId) {
final List<VpcGatewayVO> gateways = _vpcGatewayDao.listByVpcIdAndType(vpcId, VpcGateway.Type.Private);