From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Hohnbaum Subject: [PATCH] xmtest network script check Date: Fri, 21 Jul 2006 16:26:23 -0700 Message-ID: <1153524384.8690.35.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-61a6xvsL7BlNNn6ELeZY" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=-61a6xvsL7BlNNn6ELeZY Content-Type: text/plain Content-Transfer-Encoding: 7bit The network script check in xmtest needs to look for "network" as a valid script name, and if found set netenv to bridge. This patch does that and allows xmtest to run on a normal install. # HG changeset patch # User root@localhost.localdomain # Node ID 6d7c5675bdd43c44a29d4b043a6bc215e88bda6c # Parent bbabdebc54ada9b72889eb6a66dfed1d73801825 "network" is a valid network script, add check for it Signed-off-by: Michael Hohnbaum diff -r bbabdebc54ad -r 6d7c5675bdd4 tools/xm-test/lib/XmTestLib/NetConfig.py --- a/tools/xm-test/lib/XmTestLib/NetConfig.py Wed Jul 19 21:13:36 2006 +0100 +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py Fri Jul 21 16:09:45 2006 -0700 @@ -54,6 +54,8 @@ def getXendNetConfig(): val = pin.get_val() if val[1] == "network-bridge": + netenv = "bridge" + elif val[1] == "network": netenv = "bridge" elif val[1] == "network-route": netenv = "route" -- Michael Hohnbaum 503-578-5486 hohnbaum@us.ibm.com T/L 775-5486 --=-61a6xvsL7BlNNn6ELeZY Content-Disposition: attachment; filename=patch Content-Type: text/plain; name=patch; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit # HG changeset patch # User root@localhost.localdomain # Node ID 6d7c5675bdd43c44a29d4b043a6bc215e88bda6c # Parent bbabdebc54ada9b72889eb6a66dfed1d73801825 "network" is a valid network script, add check for it diff -r bbabdebc54ad -r 6d7c5675bdd4 tools/xm-test/lib/XmTestLib/NetConfig.py --- a/tools/xm-test/lib/XmTestLib/NetConfig.py Wed Jul 19 21:13:36 2006 +0100 +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py Fri Jul 21 16:09:45 2006 -0700 @@ -54,6 +54,8 @@ def getXendNetConfig(): val = pin.get_val() if val[1] == "network-bridge": + netenv = "bridge" + elif val[1] == "network": netenv = "bridge" elif val[1] == "network-route": netenv = "route" --=-61a6xvsL7BlNNn6ELeZY Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-61a6xvsL7BlNNn6ELeZY--