You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/04/26 11:40:00 UTC
git commit: updated refs/heads/master to 318c7f2
Updated Branches:
refs/heads/master 3a9001bfb -> 318c7f2af
CLOUDSTACK-1794 Throwing error when configuring egress rules for shared networks
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/318c7f2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/318c7f2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/318c7f2a
Branch: refs/heads/master
Commit: 318c7f2af0a664c057ec1ed057ccaad608339f62
Parents: 3a9001b
Author: Jayapal <ja...@citrix.com>
Authored: Fri Apr 26 14:28:02 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Fri Apr 26 15:09:41 2013 +0530
----------------------------------------------------------------------
.../network/firewall/FirewallManagerImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/318c7f2a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index 080f7b0..4ad8868 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -27,6 +27,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.network.dao.*;
import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -56,10 +57,6 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkModel;
import com.cloud.network.NetworkRuleApplier;
-import com.cloud.network.dao.FirewallRulesCidrsDao;
-import com.cloud.network.dao.FirewallRulesDao;
-import com.cloud.network.dao.IPAddressDao;
-import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.element.FirewallServiceProvider;
import com.cloud.network.element.NetworkACLServiceProvider;
import com.cloud.network.element.PortForwardingServiceProvider;
@@ -127,6 +124,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Inject
ResourceTagDao _resourceTagDao;
@Inject
+ NetworkDao _networkDao;
+ @Inject
VpcManager _vpcMgr;
@Inject List<FirewallServiceProvider> _firewallElements;
@@ -150,6 +149,11 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Override
public FirewallRule createEgressFirewallRule(FirewallRule rule) throws NetworkRuleConflictException {
Account caller = UserContext.current().getCaller();
+
+ Network network = _networkDao.findById(rule.getNetworkId());
+ if (network.getGuestType() == Network.GuestType.Shared) {
+ throw new InvalidParameterValueException("Egress firewall rules are not supported for " + network.getGuestType() + " networks");
+ }
return createFirewallRule(null, caller, rule.getXid(), rule.getSourcePortStart(),
rule.getSourcePortEnd(), rule.getProtocol(), rule.getSourceCidrList(), rule.getIcmpCode(),