diff options
| author | Ewan Mellor <ewan@xensource.com> | 2007-02-01 11:42:50 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan@xensource.com> | 2007-02-01 11:42:50 +0000 |
| commit | 6880c9f6b778acf031f54fb8f2b44730db085434 (patch) | |
| tree | 39f08a7777357f88b2c482eb1c13695177a01142 /tools/xm-test | |
| parent | 9c4ed974a4505b140782688093bc54d750716e38 (diff) | |
| download | xen-6880c9f6b778acf031f54fb8f2b44730db085434.tar.gz xen-6880c9f6b778acf031f54fb8f2b44730db085434.tar.bz2 xen-6880c9f6b778acf031f54fb8f2b44730db085434.zip | |
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>
Diffstat (limited to 'tools/xm-test')
| -rw-r--r-- | tools/xm-test/lib/XmTestLib/XenDomain.py | 3 | ||||
| -rw-r--r-- | tools/xm-test/tests/vtpm/09_vtpm-xapi.py | 3 |
2 files changed, 4 insertions, 2 deletions
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() |