From bf4e21f315a74871f352ff194adc768bb088c5c2 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 27 Oct 2011 14:22:41 -0700 Subject: [PATCH] NaaS: Destroy virtual router when cleanup=true at shutdown As we did in the restart() function. --- .../cloud/network/element/VirtualRouterElement.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index a0c067e6107..8bdbea51275 100644 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -357,8 +357,16 @@ public class VirtualRouterElement extends DhcpElement implements VirtualRouterEl } boolean result = true; for (DomainRouterVO router : routers) { - //FIXME - Sheng, for your redundant router you have to destroy the domR here if clenaup=true - just the way you did in restart() method result = result && _routerMgr.stop(router, false, context.getCaller(), context.getAccount()) != null; + if (cleanup) { + if (!result) { + s_logger.warn("Failed to stop virtual router element " + router + ", but would try to process clean up anyway."); + } + result = (_routerMgr.destroyRouter(router.getId()) != null); + if (!result) { + s_logger.warn("Failed to clean up virtual router element " + router); + } + } } return result; }