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

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

Browse Source 
* Fix VR creation issue while creating VM on shared network using PVLAN

* Fix update guest networks
This commit is contained in:
Nicolas Vazquez 2019-11-21 03:04:14 -03:00 committed by Rohit Yadav
parent fc9a525adc
commit 80abb5a74b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -2057,6 +2057,11 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
// 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());
@ -2077,11 +2082,11 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
}
}
}
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;