Skip to content

Fix VR creation issue while creating VM on shared network using PVLAN #3653

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
Nov 21, 2019
+9 −4
Merged

Fix VR creation issue while creating VM on shared network using PVLAN #3653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce1ce89
Fix VR creation issue while creating VM on shared network using PVLAN
nvazquez Oct 29, 2019
5832577
Fix update guest networks
nvazquez Nov 5, 2019
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
13 changes: 9 additions & 4 deletions server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2057,6 +2057,11 @@ public boolean finalizeStart(final VirtualMachineProfile profile, final long hos
// Get guest networks info
final List<Network> guestNetworks = new ArrayList<Network>();

final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer) cmds.getAnswer("getDomRVersion");
router.setTemplateVersion(versionAnswer.getTemplateVersion());
router.setScriptsVersion(versionAnswer.getScriptsVersion());
_routerDao.persist(router, guestNetworks);

final List<? extends Nic> routerNics = _nicDao.listByVmId(profile.getId());
for (final Nic nic : routerNics) {
final Network network = _networkModel.getNetwork(nic.getNetworkId());
Expand All @@ -2077,11 +2082,11 @@ public boolean finalizeStart(final VirtualMachineProfile profile, final long hos
}
}
}

if (result) {
final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer) cmds.getAnswer("getDomRVersion");
router.setTemplateVersion(versionAnswer.getTemplateVersion());
router.setScriptsVersion(versionAnswer.getScriptsVersion());
_routerDao.persist(router, guestNetworks);
for (Network guestNetwork : guestNetworks) {
_routerDao.addRouterToGuestNetwork(router, guestNetwork);
}
}

return result;
Expand Down