aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xm-test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/xm-test')
-rw-r--r--tools/xm-test/tests/security-acm/10_security-acm_pol_update.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py b/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py
index 914b84f38d..b85079de35 100644
--- a/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py
+++ b/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py
@@ -21,11 +21,20 @@ def checkLabel(labeldata, expected, domname):
FAIL("%s does not have '%s' label but '%s'." %
(domname, expected[2], labeldata[2]))
+if not isACMEnabled():
+ SKIP("Not running this test since ACM not enabled.")
+
testpolicy = "xm-test"
testlabel1 = "blue"
testlabel2 = "red"
testlabel3 = "green"
+# reset the policy - must work
+s, o = traceCommand('xm resetpolicy')
+if s:
+ FAIL("Could not reset the policy.")
+
+
s, o = traceCommand('xm resources | grep -E "^[phy|file|vlan]" ')
resnames = []
if o:
@@ -183,7 +192,7 @@ if label != 'ACM:xm-test:blue':
% label)
# Terminate blue domain
-domain_blue.stop()
+domain_blue.destroy()
# Update the system's policy. Should work and rename the green domain to GREEN
s, o = traceCommand('xm setpolicy ACM xm-test-update')