etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 13041: in Basic zone just restart all exising domRs in the zone during the networkRestart, don't try to create a new one 

status 13041: resolved fixed
reviewed-by: Sheng Yang
This commit is contained in:
Alena Prokharchyk 2012-02-16 14:57:19 -08:00
parent 6d8a11c74b
commit ebe664cff2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1197,11 +1197,17 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
}
List<DomainRouterVO> routers;
Long podId = null;
if (isPodBased) {
Pod pod = dest.getPod();
if (pod != null) {
podId = pod.getId();
}
}
if (publicNetwork) {
routers = _routerDao.listByNetworkAndRole(guestNetwork.getId(), Role.VIRTUAL_ROUTER);
} else {
if (isPodBased) {
podId = dest.getPod().getId();
if (isPodBased && podId != null) {
routers = _routerDao.listByNetworkAndPodAndRole(guestNetwork.getId(), podId, Role.VIRTUAL_ROUTER);
plan = new DataCenterDeployment(dcId, podId, null, null, null, null);
} else {
@ -1224,7 +1230,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
}
/* If old network is redundant but new is single router, then routers.size() = 2 but routerCount = 1 */
if (routers.size() >= routerCount) {
if (routers.size() >= routerCount || (isPodBased && podId == null)) {
return routers;
}