From e6080436cf0a6bdc53a9cbb0f9e94e989d280b13 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 10 Jan 2012 12:16:37 -0800 Subject: [PATCH] bug 12926: fixed regression in enableStaticNat code introduced by preserve ip fix --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 125f4002ff6..ee0cec3f8fe 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -377,7 +377,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { throw new InvalidParameterValueException("Failed to enable static nat for the ip address id=" + ipId + " as vm id=" + vmId + " is already associated with ip id=" + ip.getId()); } - _networkMgr.checkIpForService(ip, Service.StaticNat); + _networkMgr.checkIpForService(ipAddress, Service.StaticNat); ipAddress.setOneToOneNat(true); ipAddress.setAssociatedWithVmId(vmId);