From: Ewan Mellor <ewan@xensource.com>
Date: Thu, 1 Feb 2007 11:42:50 +0000 (+0000)
Subject: Copy the definition of DOM0_UUID into XenDomain so that we don't need to import
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15358^2~27^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6880c9f6b778acf031f54fb8f2b44730db085434;p=xen.git

Copy the definition of DOM0_UUID into XenDomain so that we don't need to import
large swathes of the server to run the Xen-API tests.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---

diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py
index 3fcfcea4f1..09d6f4c764 100644
--- a/tools/xm-test/lib/XmTestLib/XenDomain.py
+++ b/tools/xm-test/lib/XmTestLib/XenDomain.py
@@ -33,6 +33,9 @@ from DomainTracking import *
 from acm import *
 
 
+DOM0_UUID = "00000000-0000-0000-0000-000000000000"
+
+
 def getDefaultKernel():
     return arch.getDefaultKernel()
 
diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
index 4798dc13c6..6a17c51045 100644
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
@@ -13,7 +13,6 @@
 from XmTestLib import xapi
 from XmTestLib.XenAPIDomain import XmTestAPIDomain
 from XmTestLib import *
-from xen.xend import XendDomain
 from vtpm_utils import *
 import commands
 import os
@@ -28,7 +27,7 @@ except Exception, e:
 vm_uuid = domain.get_uuid()
 
 vtpmcfg = {}
-vtpmcfg['backend'] = XendDomain.DOM0_UUID
+vtpmcfg['backend'] = DOM0_UUID
 vtpmcfg['VM'] = vm_uuid
 
 session = xapi.connect()