[Xen-changelog] [xen-unstable] xm-test: Identifying the network env specified in xend config fails,

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236365788 0
# Node ID 6c7ae9c859f5705b50580d0d359d263599dff66d
# Parent  728d8dee880bc6f253b54a0785ae348b68313fa5
xm-test: Identifying the network env specified in xend config fails,
if an additional parameter is given for the network-bridge
(e.g. netdev=eth1) The patch splits the network command into the
command name and its parameters to determine the netenv (bridge,
route, nat)

Signed-off-by: juergen.gross@xxxxxxxxxxxxxxxxxxx
---
 tools/xm-test/lib/XmTestLib/NetConfig.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff -r 728d8dee880b -r 6c7ae9c859f5 tools/xm-test/lib/XmTestLib/NetConfig.py
--- a/tools/xm-test/lib/XmTestLib/NetConfig.py  Fri Mar 06 18:55:05 2009 +0000
+++ b/tools/xm-test/lib/XmTestLib/NetConfig.py  Fri Mar 06 18:56:28 2009 +0000
@@ -57,11 +57,13 @@ def getXendNetConfig():
     while val[0] != 'network-script':
         val = pin.get_val()
 
-    if val[1] == "network-bridge":
+    # split network command into script name and its parameters
+    sub_val = val[1].split()
+    if sub_val[0] == "network-bridge":
         netenv = "bridge"
-    elif val[1] == "network-route":
+    elif sub_val[0] == "network-route":
         netenv = "route"
-    elif val[1] == "network-nat":
+    elif sub_val[0] == "network-nat":
         netenv = "nat"
     else:
         raise NetworkError("Failed to get network env from xend config")

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog