From 7ea3c8933d733008469c81406fb41034d0f5beba Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 25 Jan 2012 09:56:58 -0800 Subject: [PATCH] bug 13305: don't allow to create ip forwarding rules when elasticIP is enabled for the network offering status 13305: resolved fixed Reviewed-by: Will Chan --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index cab099e170c..d303cb12b8d 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -272,6 +272,12 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager { Long domainId = ipAddress.getAllocatedInDomainId(); _networkMgr.checkIpForService(ipAddress, Service.StaticNat); + + Network network = _networkMgr.getNetwork(networkId); + NetworkOffering off = _configMgr.getNetworkOffering(network.getNetworkOfferingId()); + if (off.getElasticIp()) { + throw new InvalidParameterValueException("Can't create ip forwarding rules for the network where elasticIP service is enabled"); + } String dstIp = _networkMgr.getIpInNetwork(ipAddress.getAssociatedWithVmId(), networkId);