From 2571dd77134c2149a5a7f69c13ca044043c85fb6 Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Fri, 10 Jan 2014 14:18:59 -0800 Subject: [PATCH] CLOUDSTACK-5829: listvms should return the diskoffering id when deployed with an iso --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index d5b8c8c9684..82332b731b2 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3525,10 +3525,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } protected boolean sendCommandsToRouter(final VirtualRouter router, Commands cmds) throws AgentUnavailableException { - /*if(!checkRouterVersion(router)){ + if(!checkRouterVersion(router)){ s_logger.debug("Router requires upgrade. Unable to send command to router:" + router.getId()); throw new CloudRuntimeException("Unable to send command. Upgrade in progress. Please contact administrator."); - }*/ + } Answer[] answers = null; try { answers = _agentMgr.send(router.getHostId(), cmds);