Skip to content

VR: Send VM password to all Running VRs in network/vpc #3903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Feb 28, 2020
Merged

VR: Send VM password to all Running VRs in network/vpc #3903

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd06e68
Minor change
Feb 21, 2020
308b214
Return result on failure
ravening Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,18 +702,32 @@ public boolean savePassword(final Network network, final NicProfile nic, final V

// If any router is running then send save password command otherwise
// save the password in DB
boolean savePasswordResult = true;
boolean isVrRunning = false;
Comment thread
GabrielBrascher marked this conversation as resolved.
for (final VirtualRouter router : routers) {
if (router.getState() == State.Running) {
final boolean result = networkTopology.savePasswordToRouter(network, nic, uservm, router);
if (result) {
// Explicit password reset, while VM hasn't generated a password yet.
final UserVmVO userVmVO = _userVmDao.findById(vm.getId());
userVmVO.setUpdateParameters(false);
_userVmDao.update(userVmVO.getId(), userVmVO);
if (!result) {
s_logger.error("Unable to save password for VM " + vm.getInstanceName() +
" on router " + router.getInstanceName());
return false;
}
return result;
isVrRunning = true;
savePasswordResult = savePasswordResult && result;
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache Feb 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ravening it seems savePasswordResult is not needed any more, because it is always true.

}
}

// return the result only if one of the vr is running
if (isVrRunning) {
if (savePasswordResult) {
// Explicit password reset, while VM hasn't generated a password yet.
final UserVmVO userVmVO = _userVmDao.findById(vm.getId());
userVmVO.setUpdateParameters(false);
_userVmDao.update(userVmVO.getId(), userVmVO);
}
return savePasswordResult;
}

final String password = (String) uservm.getParameter(VirtualMachineProfile.Param.VmPassword);
final String password_encrypted = DBEncryptionUtil.encrypt(password);
final UserVmVO userVmVO = _userVmDao.findById(vm.getId());
Expand Down