You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/07/03 23:34:54 UTC
[1/2] git commit: updated refs/heads/master to b59b1b4
Updated Branches:
refs/heads/master d8560281a -> b59b1b4c9
fix marvin when deploy vmware setup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/810c64e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/810c64e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/810c64e3
Branch: refs/heads/master
Commit: 810c64e38772719cba1c7e5cb4578c9e8c6a8d6d
Parents: d856028
Author: Edison Su <su...@gmail.com>
Authored: Tue Jul 2 11:13:11 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Wed Jul 3 14:34:33 2013 -0700
----------------------------------------------------------------------
tools/marvin/marvin/deployDataCenter.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/810c64e3/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index d704375..ac96d09 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -67,7 +67,8 @@ specify a valid config file" % cfgFile)
if clusters is None:
return
- if vmwareDc:
+ if vmwareDc is not None:
+ vmwareDc.zoneid = zoneId
self.addVmWareDataCenter(vmwareDc)
for cluster in clusters:
[2/2] git commit: updated refs/heads/master to b59b1b4
Posted by ed...@apache.org.
fix can't find host ip address on Mac OS
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b59b1b4c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b59b1b4c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b59b1b4c
Branch: refs/heads/master
Commit: b59b1b4c9341eb1a71845eb144426bd1bb7e9cca
Parents: 810c64e
Author: Edison Su <su...@gmail.com>
Authored: Tue Jul 2 15:19:32 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Wed Jul 3 14:34:37 2013 -0700
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/NetUtils.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b59b1b4c/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index 6099379..68f4965 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -26,14 +26,7 @@ import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URI;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Formatter;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -46,6 +39,7 @@ import com.googlecode.ipv6.IPv6Network;
import com.cloud.utils.IteratorUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.script.Script;
+import org.apache.commons.lang.SystemUtils;
public class NetUtils {
protected final static Logger s_logger = Logger.getLogger(NetUtils.class);
@@ -158,8 +152,10 @@ public class NetUtils {
return false;
}
+
+
public static String getDefaultHostIp() {
- if(isWindows()) {
+ if(SystemUtils.IS_OS_WINDOWS) {
Pattern pattern = Pattern.compile("\\s*0.0.0.0\\s*0.0.0.0\\s*(\\S*)\\s*(\\S*)\\s*");
try {
Process result = Runtime.getRuntime().exec("route print -4");
@@ -197,6 +193,10 @@ public class NetUtils {
}
public static String getDefaultEthDevice() {
+ if (SystemUtils.IS_OS_MAC) {
+ String defDev = Script.runSimpleBashScript("/sbin/route -n get default | grep interface | awk '{print $2}'");
+ return defDev;
+ }
String defaultRoute = Script.runSimpleBashScript("/sbin/route | grep default");
if (defaultRoute == null) {
@@ -212,6 +212,8 @@ public class NetUtils {
return defaultRouteList[7];
}
+
+
public static InetAddress getFirstNonLoopbackLocalInetAddress() {
InetAddress[] addrs = getAllLocalInetAddresses();
if (addrs != null) {