# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1189098604 -3600
# Node ID 9813c9c79055cf1d779bd2723b492a1e2f2bcc71
# Parent 49b67fdefcd6e1ffb70be155579dfbd7b8a38767
Fix xm-test python import after XSM security changes.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
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(-)
diff -r 49b67fdefcd6 -r 9813c9c79055 tools/xm-test/lib/XmTestLib/acm.py
--- a/tools/xm-test/lib/XmTestLib/acm.py Thu Sep 06 18:05:18 2007 +0100
+++ b/tools/xm-test/lib/XmTestLib/acm.py Thu Sep 06 18:10:04 2007 +0100
@@ -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 -r 49b67fdefcd6 -r 9813c9c79055
tools/xm-test/tests/security-acm/01_security-acm_basic.py
--- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py Thu Sep 06
18:05:18 2007 +0100
+++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py Thu Sep 06
18:10:04 2007 +0100
@@ -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 -r 49b67fdefcd6 -r 9813c9c79055
tools/xm-test/tests/security-acm/07_security-acm_pol_update.py
--- a/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py Thu Sep
06 18:05:18 2007 +0100
+++ b/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py Thu Sep
06 18:10:04 2007 +0100
@@ -9,7 +9,8 @@ from XmTestLib.XenAPIDomain import XmTes
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 -r 49b67fdefcd6 -r 9813c9c79055
tools/xm-test/tests/security-acm/08_security-acm_xapi.py
--- a/tools/xm-test/tests/security-acm/08_security-acm_xapi.py Thu Sep 06
18:05:18 2007 +0100
+++ b/tools/xm-test/tests/security-acm/08_security-acm_xapi.py Thu Sep 06
18:10:04 2007 +0100
@@ -9,7 +9,8 @@ from XmTestLib.XenAPIDomain import XmTes
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 -r 49b67fdefcd6 -r 9813c9c79055
tools/xm-test/tests/security-acm/09_security-acm_pol_update.py
--- a/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py Thu Sep
06 18:05:18 2007 +0100
+++ b/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py Thu Sep
06 18:10:04 2007 +0100
@@ -10,7 +10,8 @@ from XmTestLib.acm import *
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
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home