apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.18'

Browse Source
This commit is contained in:
Rohit Yadav 2023-09-26 14:43:23 +05:30
commit 30e34ef310
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -28,6 +28,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -3516,7 +3517,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
setRestartRequired(network, restartRequired); setRestartRequired(network, restartRequired);
return status; return status;
} else if (livePatch) { } else if (livePatch) {
List<DomainRouterVO> domainRouters = routerDao.listByNetworkAndRole(network.getId(), VirtualRouter.Role.VIRTUAL_ROUTER, VirtualRouter.Role.INTERNAL_LB_VM); List<DomainRouterVO> 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) { for (DomainRouterVO router: domainRouters) {
try { try {
VMInstanceVO instanceVO = _vmDao.findById(router.getId()); VMInstanceVO instanceVO = _vmDao.findById(router.getId());

2
server/src/main/java/com/cloud/user/AccountManagerImpl.java
View File

@ -3259,7 +3259,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
_userDetailsDao.update(userDetailVO.getId(), userDetailVO); _userDetailsDao.update(userDetailVO.getId(), userDetailVO);
} }
} catch (CloudTwoFactorAuthenticationException e) { } 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())) { if (userDetailVO != null && userDetailVO.getValue().equals(UserAccountVO.Setup2FAstatus.ENABLED.name())) {
disableTwoFactorAuthentication(userAccountId, caller, owner); disableTwoFactorAuthentication(userAccountId, caller, owner);
} }