From 7fda6306b8a1c6f108dc651d7bbf69f2eea15691 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 20 Jun 2012 10:36:59 -0700 Subject: [PATCH] VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command) --- .../cloud/network/element/VpcVirtualRouterElement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java index 794503b12a2..b4462db8f42 100644 --- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java @@ -189,6 +189,16 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc throw new ResourceUnavailableException("Can't find at least one running router!", DataCenter.class, network.getDataCenterId()); } + for (VirtualRouter router : routers) { + //Add router to guest network if needed + if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) { + if (!_vpcRouterMgr.addVpcRouterToGuestNetwork(router, network, false)) { + throw new CloudRuntimeException("Failed to add VPC router " + router + " to guest network " + network); + } else { + s_logger.debug("Successfully added VPC router " + router + " to guest network " + network); + } + } + } } return true;