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.
This commit is contained in:
Vijayendra Bhamidipati 2012-07-13 13:42:55 -07:00
parent f0815df712
commit b14cebbe68
1 changed files with 1 additions and 2 deletions

View File

@ -536,10 +536,9 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
if (!reassignStaticNat) {
List<IdentityProxy> idList = new ArrayList<IdentityProxy>();
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);