ia64/xen-unstable

changeset 15836:9813c9c79055

Fix xm-test python import after XSM security changes.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Sep 06 18:10:04 2007 +0100 (2007-09-06)
parents 49b67fdefcd6
children 32f331858d75
files tools/xm-test/lib/XmTestLib/acm.py tools/xm-test/tests/security-acm/01_security-acm_basic.py tools/xm-test/tests/security-acm/07_security-acm_pol_update.py tools/xm-test/tests/security-acm/08_security-acm_xapi.py tools/xm-test/tests/security-acm/09_security-acm_pol_update.py
line diff
     1.1 --- a/tools/xm-test/lib/XmTestLib/acm.py	Thu Sep 06 18:05:18 2007 +0100
     1.2 +++ b/tools/xm-test/lib/XmTestLib/acm.py	Thu Sep 06 18:10:04 2007 +0100
     1.3 @@ -18,7 +18,7 @@
     1.4  
     1.5  """
     1.6  from Test import *
     1.7 -from xen.util import security
     1.8 +import xen.util.xsm.xsm as security
     1.9  from xen.xm.main import server
    1.10  from xen.util import xsconstants
    1.11  import re
     2.1 --- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py	Thu Sep 06 18:05:18 2007 +0100
     2.2 +++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py	Thu Sep 06 18:10:04 2007 +0100
     2.3 @@ -14,7 +14,7 @@
     2.4  # - resources
     2.5  
     2.6  from XmTestLib import *
     2.7 -from xen.util import security
     2.8 +import xen.util.xsm.xsm as security
     2.9  from xen.util import xsconstants
    2.10  import commands
    2.11  import os
     3.1 --- a/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py	Thu Sep 06 18:05:18 2007 +0100
     3.2 +++ b/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py	Thu Sep 06 18:10:04 2007 +0100
     3.3 @@ -9,7 +9,8 @@ from XmTestLib import xapi
     3.4  from XmTestLib.XenAPIDomain import XmTestAPIDomain
     3.5  from XmTestLib import *
     3.6  from xen.xend import XendAPIConstants
     3.7 -from xen.util import acmpolicy, security, xsconstants
     3.8 +import xen.util.xsm.xsm as security
     3.9 +from xen.util import acmpolicy, xsconstants
    3.10  from xen.util.acmpolicy import ACMPolicy
    3.11  from xen.xend.XendDomain import DOM0_UUID
    3.12  from XmTestLib.acm import *
     4.1 --- a/tools/xm-test/tests/security-acm/08_security-acm_xapi.py	Thu Sep 06 18:05:18 2007 +0100
     4.2 +++ b/tools/xm-test/tests/security-acm/08_security-acm_xapi.py	Thu Sep 06 18:10:04 2007 +0100
     4.3 @@ -9,7 +9,8 @@ from XmTestLib import xapi
     4.4  from XmTestLib.XenAPIDomain import XmTestAPIDomain
     4.5  from XmTestLib import *
     4.6  from xen.xend import XendAPIConstants
     4.7 -from xen.util import acmpolicy, security, xsconstants
     4.8 +import xen.util.xsm.xsm as security
     4.9 +from xen.util import acmpolicy, xsconstants
    4.10  import commands
    4.11  import os
    4.12  
     5.1 --- a/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py	Thu Sep 06 18:05:18 2007 +0100
     5.2 +++ b/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py	Thu Sep 06 18:10:04 2007 +0100
     5.3 @@ -10,7 +10,8 @@ from XmTestLib.XenAPIDomain import XmTes
     5.4  from XmTestLib.acm import *
     5.5  from XmTestLib import *
     5.6  from xen.xend import XendAPIConstants
     5.7 -from xen.util import security, xsconstants
     5.8 +import xen.util.xsm.xsm as security
     5.9 +from xen.util import xsconstants
    5.10  from xen.util.acmpolicy import ACMPolicy
    5.11  from xen.xend.XendDomain import DOM0_UUID
    5.12  import base64