xm-test: Fix bugzilla #1051.

This is a patch to fix xm-test's network errors
http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1051

From: Lukasz Szymanski <Lukasz.Szymanski@unisys.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac
index 14aee142b7b7e8f4d5166657703f0ea034d987f3..bbc639bdb07b89ed5ed4851abade5217a44a8586 100644 (file)
--- a/tools/xm-test/configure.ac
+++ b/tools/xm-test/configure.ac
@@ -85,9 +85,9 @@ AC_SUBST(NET_IP_RANGE)
 AC_SUBST(NETWORK_ADDRESS)
 AC_SUBST(NETMASK)
 
-DOM0_INTF="vif0.0"
+DOM0_INTF="eth0"
 AC_ARG_WITH(dom0-intf,
-        [ --with-dom0-intf=intf Set dom0 interface name [[default="vif0.0"]]],
+        [ --with-dom0-intf=intf Set dom0 interface name [[default="eth0"]]],
         [ DOM0_INTF="$withval" ])
 
 AC_SUBST(DOM0_INTF)

diff --git a/tools/xm-test/lib/XmTestLib/NetConfig.py b/tools/xm-test/lib/XmTestLib/NetConfig.py
index fe0cfb429f2c118181a825b5eeca47f3e5e7a415..919af65fdb6df8ca951b4931c505065992a45e81 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/NetConfig.py
+++ b/tools/xm-test/lib/XmTestLib/NetConfig.py
@@ -71,7 +71,7 @@ def getXendNetConfig():
 
 def checkZeroconfAddresses():
     # Make sure there aren't existing zeroconf addresses.
-    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep -v vif")
+    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep eth0")
     if rc == 0:
         raise NetworkError("Zeroconf addresses already used: %s" % out)