diff options
4 files changed, 26 insertions, 3 deletions
diff --git a/tools/python/xen/util/acmpolicy.py b/tools/python/xen/util/acmpolicy.py index bc2569e657..277e6b49fa 100644 --- a/tools/python/xen/util/acmpolicy.py +++ b/tools/python/xen/util/acmpolicy.py @@ -818,12 +818,13 @@ class ACMPolicy(XSPolicy): if successful,the policy's flags will indicate that the policy is the one loaded into the hypervisor """ - (ret, output) = commands.getstatusoutput( + if not self.isloaded(): + (ret, output) = commands.getstatusoutput( security.xensec_tool + " loadpolicy " + self.get_filename(".bin")) - if ret != 0: - return -xsconstants.XSERR_POLICY_LOAD_FAILED + if ret != 0: + return -xsconstants.XSERR_POLICY_LOAD_FAILED return xsconstants.XSERR_SUCCESS def isloaded(self): diff --git a/tools/xm-test/lib/XmTestLib/acm.py b/tools/xm-test/lib/XmTestLib/acm.py index dc9ab1611a..021aec048f 100644 --- a/tools/xm-test/lib/XmTestLib/acm.py +++ b/tools/xm-test/lib/XmTestLib/acm.py @@ -67,6 +67,10 @@ def ACMLoadPolicy(policy='xm-test'): if main.serverType == main.SERVER_XEN_API: ACMLoadPolicy_XenAPI() else: + cmd='xm dumppolicy | grep -E "^POLICY REFERENCE = ' + policy + '.$"' + s, o = traceCommand(cmd) + if o != "": + return s, o = traceCommand("xm makepolicy %s" % (policy)) if s != 0: FAIL("Need to be able to do 'xm makepolicy %s' but could not" % 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 8365842930..d4d5eafdf7 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 @@ -12,11 +12,20 @@ from xen.xend import XendAPIConstants from xen.util import acmpolicy, security, xsconstants from xen.util.acmpolicy import ACMPolicy from xen.xend.XendDomain import DOM0_UUID +from XmTestLib.acm import * import commands import os import base64 +if not isACMEnabled(): + SKIP("Not running this test since ACM not enabled.") + +try: + session = xapi.connect() +except: + SKIP("Skipping this test since xm is not using the Xen-API.") + xm_test = {} xm_test['policyname'] = "xm-test" xm_test['date'] = "Fri Sep 29 14:44:38 2006" 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 f1a6757faf..fc3dab7664 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 @@ -7,6 +7,7 @@ from XmTestLib import xapi from XmTestLib.XenAPIDomain import XmTestAPIDomain +from XmTestLib.acm import * from XmTestLib import * from xen.xend import XendAPIConstants from xen.util import security, xsconstants @@ -16,6 +17,14 @@ import base64 import struct import time +if not isACMEnabled(): + SKIP("Not running this test since ACM not enabled.") + +try: + session = xapi.connect() +except: + SKIP("Skipping this test since xm is not using the Xen-API.") + def typestoxml(types): res = "" for t in types: |