From 606bc6d99e9fa746f81fe8aecff12f34637fee75 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 24 Nov 2010 10:16:35 -0800 Subject: [PATCH] corresponding changes in the kvm resource --- .../com/cloud/agent/api/routing/SetFirewallRuleCommand.java | 6 +++--- .../resource/virtualnetwork/VirtualRoutingResource.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java b/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java index f10ecbf7117..d04e91ba8ff 100755 --- a/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java +++ b/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java @@ -98,9 +98,9 @@ public class SetFirewallRuleCommand extends RoutingCommand { return this.oldPrivatePort; } - public boolean isNat(){ - return this.nat; - } +// public boolean isNat(){ +// return this.nat; +// } public boolean isCreate() { return create; diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 8463db98a09..e63b83c7446 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -449,7 +449,7 @@ public class VirtualRoutingResource implements Manager { protected Answer execute(final SetFirewallRuleCommand cmd) { String args; - if(cmd.isNat()){ + if(cmd.getProtocol().toLowerCase().equals(NetUtils.NAT_PROTO)){ //1:1 NAT needs instanceip;publicip;domrip;op if(cmd.isCreate()) args = "-A";