From b14cebbe6827e5eb988e75da86eb53b9fb9fbbed Mon Sep 17 00:00:00 2001 From: Vijayendra Bhamidipati Date: Fri, 13 Jul 2012 13:42:55 -0700 Subject: [PATCH] CS-15556: [NS Autoscale] System VMs not coming up in Basic zone EIP ELB offering Description: Removing a reference to user_vm table when populating a system VM id in an exception. Undoing change committed earlier as part of Bug CS-15217. --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 061dd4313fd..47308ec0e33 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -536,10 +536,9 @@ 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("user_vm", vmId, "vmId")); idList.add(new IdentityProxy(oldIP, oldIP.getId(), "oldipId")); 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 with specified oldipId", idList); + " as vm with id: " + vmId + " is already associated with ip with specified oldipId", idList); } // unassign old static nat rule s_logger.debug("Disassociating static nat for ip " + oldIP);