From 38292fcd0234b2efacc1eb7d15805e241486a53a Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 17 Nov 2010 12:57:53 -0800 Subject: [PATCH] bug 6929: we prevent upgrading of a router with a SO different from the type it was created with (eg. prevent a virtual offfering being upgraded to direct) status 6929: resolved fixed --- .../src/com/cloud/network/router/DomainRouterManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java index 0afd68fe3b7..f0443872ab3 100644 --- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java +++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java @@ -691,8 +691,8 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute ServiceOfferingVO currentServiceOffering = _serviceOfferingDao.findById(router.getServiceOfferingId()); if (!currentServiceOffering.getGuestIpType().equals(newServiceOffering.getGuestIpType())) { - throw new InvalidParameterValueException("Can't upgrade, due to new newtowrk type: " + newServiceOffering.getGuestIpType() + " is different from " + - "curruent network type: " + currentServiceOffering.getGuestIpType()); + throw new InvalidParameterValueException("Can't upgrade router, due to the new network type: " + newServiceOffering.getGuestIpType() + " being different from " + + "current network type: " + currentServiceOffering.getGuestIpType()); } if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) { throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + newServiceOffering.getGuestIpType() + " is different from " +