From 951ba04cf0eae3f48207306f0035a2292b55506d Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Mon, 25 Sep 2023 11:04:23 -0400 Subject: [PATCH 1/2] VR live patching: Allow live patch of VPC VRs even if networks are in allocated / shutdown state (#7958) --- .../engine/orchestration/NetworkOrchestrator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 82e13b5c5b8..11e27de8e99 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -28,6 +28,7 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.concurrent.Executors; @@ -3516,7 +3517,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra setRestartRequired(network, restartRequired); return status; } else if (livePatch) { - List domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM); + List domainRouters; + if (Objects.nonNull(network.getVpcId())) { + domainRouters = routerDao.listByVpcId(network.getVpcId()); + } else { + domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM); + } for (DomainRouterVO router: domainRouters) { try { VMInstanceVO instanceVO = _vmDao.findById(router.getId()); From ef742210b5d05c064253eb6b0bcf76d282572a33 Mon Sep 17 00:00:00 2001 From: Fabricio Duarte Date: Tue, 26 Sep 2023 03:59:11 -0300 Subject: [PATCH 2/2] Fix 2FA becoming enabled when the user inputs the wrong code during setup (#7972) --- server/src/main/java/com/cloud/user/AccountManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java index 44711b20e51..3684657faec 100644 --- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java +++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java @@ -3259,7 +3259,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M _userDetailsDao.update(userDetailVO.getId(), userDetailVO); } } catch (CloudTwoFactorAuthenticationException e) { - UserDetailVO userDetailVO = _userDetailsDao.findDetail(userAccountId, "2FAsetupComplete"); + UserDetailVO userDetailVO = _userDetailsDao.findDetail(userAccountId, UserDetailVO.Setup2FADetail); if (userDetailVO != null && userDetailVO.getValue().equals(UserAccountVO.Setup2FAstatus.ENABLED.name())) { disableTwoFactorAuthentication(userAccountId, caller, owner); }