Skip to content

Commit 951ba04

Browse files
authored
VR live patching: Allow live patch of VPC VRs even if networks are in allocated / shutdown state (#7958)
1 parent 3071ad6 commit 951ba04

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.LinkedList;
2929
import java.util.List;
3030
import java.util.Map;
31+
import java.util.Objects;
3132
import java.util.Set;
3233
import java.util.UUID;
3334
import java.util.concurrent.Executors;
@@ -3516,7 +3517,12 @@ public boolean restartNetwork(final Long networkId, final Account callerAccount,
35163517
setRestartRequired(network, restartRequired);
35173518
return status;
35183519
} else if (livePatch) {
3519-
List<DomainRouterVO> domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM);
3520+
List<DomainRouterVO> domainRouters;
3521+
if (Objects.nonNull(network.getVpcId())) {
3522+
domainRouters = routerDao.listByVpcId(network.getVpcId());
3523+
} else {
3524+
domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM);
3525+
}
35203526
for (DomainRouterVO router: domainRouters) {
35213527
try {
35223528
VMInstanceVO instanceVO = _vmDao.findById(router.getId());

0 commit comments

Comments
 (0)