You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/05 11:20:05 UTC
[1/2] git commit: updated refs/heads/4.4 to 4104136
Repository: cloudstack
Updated Branches:
refs/heads/4.4 37bd82aa1 -> 410413606
CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d99fc38
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d99fc38
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d99fc38
Branch: refs/heads/4.4
Commit: 0d99fc38f53786d912365eba9bfaa9a832fc1159
Parents: 37bd82a
Author: Rajesh Battala <ra...@citrix.com>
Authored: Mon Apr 28 16:27:15 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 5 11:17:48 2014 +0200
----------------------------------------------------------------------
.../resource/virtualnetwork/VirtualRoutingResource.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d99fc38/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 0a7aa26..a8986a3 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -780,8 +780,14 @@ public class VirtualRoutingResource {
String dev = "eth" + nic.getDeviceId();
String netmask = NetUtils.getSubNet(routerGIP, nic.getNetmask());
-
- String args = " -C";
+ String args = "";
+ if(cmd.isAdd() == false) {
+ //pass the argument to script to delete the network
+ args +=" -D ";
+ } else {
+ // pass create option argument if the ip needs to be added to eth device
+ args +=" -C ";
+ }
args += " -M " + nic.getMac();
args += " -d " + dev;
args += " -i " + routerGIP;
[2/2] git commit: updated refs/heads/4.4 to 4104136
Posted by da...@apache.org.
Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare command got changed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/41041360
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/41041360
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/41041360
Branch: refs/heads/4.4
Commit: 41041360623ada3c3e733a6c61e313b0726910e7
Parents: 0d99fc3
Author: Rajesh Battala <ra...@citrix.com>
Authored: Mon May 5 13:30:57 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 5 11:19:47 2014 +0200
----------------------------------------------------------------------
.../agent/resource/virtualnetwork/VirtualRoutingResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/41041360/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 a8986a3..7bb6f5e 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -783,10 +783,10 @@ public class VirtualRoutingResource {
String args = "";
if(cmd.isAdd() == false) {
//pass the argument to script to delete the network
- args +=" -D ";
+ args +=" -D";
} else {
// pass create option argument if the ip needs to be added to eth device
- args +=" -C ";
+ args +=" -C";
}
args += " -M " + nic.getMac();
args += " -d " + dev;