[PATCH] xmtest network script check

[PATCH] xmtest network script check

[Michael Hohnbaum]

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

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 <hohnbaum@us.ibm.com>

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

[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 704 bytes --]

# 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"

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] xmtest network script check

[Keir Fraser]

On 22 Jul 2006, at 00:26, Michael Hohnbaum wrote:

> 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.

I don't believe we have an out-of-the box script called 'network'. So 
where does it come from?

  -- Keir

Re: [PATCH] xmtest network script check

[Michael Hohnbaum]

On Tue, 2006-07-25 at 11:35 +0100, Keir Fraser wrote:
> On 22 Jul 2006, at 00:26, Michael Hohnbaum wrote:
> 
> > 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.
> 
> I don't believe we have an out-of-the box script called 'network'. So 
> where does it come from?

Excellent question.  Looking at this system, it appears the 
'network' script is called from /etc/xen/xend-config.sxp.  Turns
out both the 'network' script and the xend-config.sxp file both
were created on this machine in April 2005.  The machine has not
been used for quite a while (at least since sometime last year),
so these files are stale from a long past install.

Last week I downloaded xen, make world, make install,
then ran xm-test and stumbled across this problem.  Apparently,
the install world did not replace/update xend-config.sxp.  So,
ignore the patch.  While it solved my problem, it is not relevant
to the larger Xen community. If anything needs to be done, it is 
fixing the install process to update xend-config.sxp. 

                Michael
> 
>   -- Keir
> 
-- 
Michael Hohnbaum            503-578-5486
hohnbaum@us.ibm.com         T/L 775-5486