From 632521636982c5c326c8df45edbe6bb8a51f391b Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 6 Sep 2007 18:10:04 +0100 Subject: Fix xm-test python import after XSM security changes. Signed-off-by: Keir Fraser --- tools/xm-test/lib/XmTestLib/acm.py | 2 +- tools/xm-test/tests/security-acm/01_security-acm_basic.py | 2 +- tools/xm-test/tests/security-acm/07_security-acm_pol_update.py | 3 ++- tools/xm-test/tests/security-acm/08_security-acm_xapi.py | 3 ++- tools/xm-test/tests/security-acm/09_security-acm_pol_update.py | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) (limited to 'tools/xm-test') diff --git a/tools/xm-test/lib/XmTestLib/acm.py b/tools/xm-test/lib/XmTestLib/acm.py index 021aec048f..5456da6453 100644 --- a/tools/xm-test/lib/XmTestLib/acm.py +++ b/tools/xm-test/lib/XmTestLib/acm.py @@ -18,7 +18,7 @@ """ from Test import * -from xen.util import security +import xen.util.xsm.xsm as security from xen.xm.main import server from xen.util import xsconstants import re diff --git a/tools/xm-test/tests/security-acm/01_security-acm_basic.py b/tools/xm-test/tests/security-acm/01_security-acm_basic.py index a6af767faf..26666f1faa 100644 --- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py +++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py @@ -14,7 +14,7 @@ # - resources from XmTestLib import * -from xen.util import security +import xen.util.xsm.xsm as security from xen.util import xsconstants import commands import os diff --git a/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py b/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py index d4d5eafdf7..a9e19a2153 100644 --- a/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py +++ b/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py @@ -9,7 +9,8 @@ from XmTestLib import xapi from XmTestLib.XenAPIDomain import XmTestAPIDomain from XmTestLib import * from xen.xend import XendAPIConstants -from xen.util import acmpolicy, security, xsconstants +import xen.util.xsm.xsm as security +from xen.util import acmpolicy, xsconstants from xen.util.acmpolicy import ACMPolicy from xen.xend.XendDomain import DOM0_UUID from XmTestLib.acm import * diff --git a/tools/xm-test/tests/security-acm/08_security-acm_xapi.py b/tools/xm-test/tests/security-acm/08_security-acm_xapi.py index 7eafc3607b..44e2fce008 100644 --- a/tools/xm-test/tests/security-acm/08_security-acm_xapi.py +++ b/tools/xm-test/tests/security-acm/08_security-acm_xapi.py @@ -9,7 +9,8 @@ from XmTestLib import xapi from XmTestLib.XenAPIDomain import XmTestAPIDomain from XmTestLib import * from xen.xend import XendAPIConstants -from xen.util import acmpolicy, security, xsconstants +import xen.util.xsm.xsm as security +from xen.util import acmpolicy, xsconstants import commands import os diff --git a/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py b/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py index fc3dab7664..cc53baf2b9 100644 --- a/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py +++ b/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py @@ -10,7 +10,8 @@ from XmTestLib.XenAPIDomain import XmTestAPIDomain from XmTestLib.acm import * from XmTestLib import * from xen.xend import XendAPIConstants -from xen.util import security, xsconstants +import xen.util.xsm.xsm as security +from xen.util import xsconstants from xen.util.acmpolicy import ACMPolicy from xen.xend.XendDomain import DOM0_UUID import base64 -- cgit v1.2.3