Skip to contentSkip to conversation

xm-test NetConfig.py error

PATCH New Juergen Gross 1 participant 1 message Mar 6, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xm-test NetConfig.py error

Hi,

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)

Juergen

Signature · 5 lines
Juergen Gross                             Principal Developer
IP SW OS6                      Telephone: +49 (0) 89 636 47950
Fujitsu Siemens Computers         e-mail: [email protected]
Otto-Hahn-Ring 6                Internet: www.fujitsu-siemens.com
D-81739 Muenchen         Company details: www.fujitsu-siemens.com/imprint.html

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 [email protected]

# HG changeset patch
# User [email protected]
# Date 1236325568 -3600
# Node ID 6315b66fbd5b25597ad2aa766aeda68d6852205d # Parent 7f573cb76db41a9fc46052867b02e9e0c107aa86

tools/xm-test/lib/XmTestLib/NetConfig.py +5 -3
diff -r 7f573cb76db4 -r 6315b66fbd5b tools/xm-test/lib/XmTestLib/NetConfig.py
@@ -57,11 +57,13 @@
     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-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel