From a5536d40c00d8f1275654aefd9f0409c229a5eb8 Mon Sep 17 00:00:00 2001 From: Vijayendra Bhamidipati Date: Thu, 23 Aug 2012 14:53:35 -0700 Subject: [PATCH] CS-16155: InterVlan - UI - Error Message returned on enabling Static NAT is confusing to the User Reviewed-by: Vijay Description: Rewording exception message to avoid confusion. --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 2acfd94fdb6..6fc8ae625f3 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -544,10 +544,10 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { if (!reassignStaticNat) { List idList = new ArrayList(); idList.add(new IdentityProxy(ipAddress, ipAddress.getId(), "ipId")); - idList.add(new IdentityProxy(oldIP, oldIP.getId(), "curIpId")); + idList.add(new IdentityProxy(oldIP, oldIP.getId(), "currentIpId")); idList.add(new IdentityProxy("vm_instance", vmId, "vmId")); throw new InvalidParameterValueException("Failed to enable static nat for the ip address with specified ipId" + - " as vm with specified vmId is already associated with ip specified as curIpId", idList); + " as vm with specified vmId is already associated with specified currentIpId", idList); } // unassign old static nat rule s_logger.debug("Disassociating static nat for ip " + oldIP);