You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2013/06/24 11:22:18 UTC
[4/6] git commit: updated refs/heads/master-6-17-stable to 4f75062
CLOUDSTACK-1578 kvm:Egress default policy configurable using network offering on kvm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/95ee2854
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/95ee2854
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/95ee2854
Branch: refs/heads/master-6-17-stable
Commit: 95ee2854a84a102d7375b12e5bf51c196d4c07ba
Parents: 50724d4
Author: Jayapal <ja...@apache.org>
Authored: Thu Jun 20 16:32:11 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Mon Jun 24 14:30:23 2013 +0530
----------------------------------------------------------------------
.../resource/virtualnetwork/VirtualRoutingResource.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95ee2854/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index dae1c85..4f0ccec 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -224,6 +224,7 @@ public class VirtualRoutingResource implements Manager {
results[i] = "Failed";
}
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+ String egressDefault = cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
if (routerIp == null) {
return new SetFirewallRulesAnswer(cmd, false, results);
@@ -239,6 +240,13 @@ public class VirtualRoutingResource implements Manager {
if (trafficType == FirewallRule.TrafficType.Egress){
command.add("-E");
+ if (egressDefault.equals("true")) {
+ command.add("-P ", "1");
+ } else if (egressDefault.equals("System")) {
+ command.add("-P ", "2");
+ } else {
+ command.add("-P ", "0");
+ }
}
StringBuilder sb = new StringBuilder();