openstack
/
charm-ceph
Code Issues Proposed changes

rename actions

This commit is contained in:
Chris MacNaughton 2016-02-12 08:26:13 -05:00
parent faa7b3ad95
commit 7709b7d538
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions.yaml
View File

@ -1,4 +1,4 @@
pause:
pause-health:
description: Pause ceph health operations
resume:
resume-health:
description: Resume ceph health operations

0
actions/pause → actions/pause-health
View File

0
actions/resume → actions/resume-health
View File

10
tests/basic_deployment.py
View File

@ -443,18 +443,16 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
cmd = "ceph -s"
sentry_unit = self.ceph0_sentry
# action_id = self.action_do(sentry_unit, 'pause')
action_id = u.run_action(sentry_unit, 'pause')
# self.action_fetch(action_id)
assert u.wait_on_action(action_id), "Pause action failed."
action_id = u.run_action(sentry_unit, 'pause-health')
assert u.wait_on_action(action_id), "Pause health action failed."
output, code = sentry_unit.run(cmd)
if 'nodown' not in output or 'noout' not in output:
amulet.raise_status(amulet.FAIL, msg="Missing noout,nodown")
u.log.debug("Testing resume")
action_id = u.run_action(sentry_unit, 'resume')
assert u.wait_on_action(action_id), "Resume action failed."
action_id = u.run_action(sentry_unit, 'resume-health')
assert u.wait_on_action(action_id), "Resume health action failed."
output, code = sentry_unit.run(cmd)
if 'nodown' in output or 'noout' in output: