openstack
/
charm-manila
Code Issues Proposed changes

Add pause/resume actions to manilla 

Implement the pause and resume actions in the charm.

Depends-On: https://review.openstack.org/#/c/603315/
Depends-On: https://review.openstack.org/#/c/603312/
Change-Id: I63d8ac5fd094ea6eadfb5d4583835e0e047f5370
This commit is contained in:
Liam Young 2018-09-18 09:01:15 +00:00
parent 7ee33628c3
commit 113eb62de3
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/tests/basic_deployment.py
View File

@ -111,20 +111,20 @@ class ManilaBasicDeployment(OpenStackAmuletDeployment):
self.keystone_sentry,
openstack_release=self._get_openstack_release())
def test_100_services(self):
"""Verify the expected services are running on the corresponding
service units."""
u.log.debug('Checking system services on units...')
manila_svcs = [
self.manila_svcs = [
'manila-api',
'manila-scheduler',
'manila-share',
'manila-data',
]
def test_100_services(self):
"""Verify the expected services are running on the corresponding
service units."""
u.log.debug('Checking system services on units...')
service_names = {
self.manila_sentry: manila_svcs,
self.manila_sentry: self.manila_svcs,
}
ret = u.validate_services_by_name(service_names)
@ -493,30 +493,20 @@ class ManilaBasicDeployment(OpenStackAmuletDeployment):
self.d.configure(juju_service, set_default)
u.log.debug('OK')
def _test_910_pause_and_resume(self):
def _assert_services(self, should_run):
services = self.manila_svcs
u.get_unit_process_ids(
{self.manila_sentry: services},
expect_success=should_run)
def test_910_pause_and_resume(self):
"""The services can be paused and resumed. """
# test disabled as feature is not implemented yet - kept for future
# usage.
return
u.log.debug('Checking pause and resume actions...')
unit_name = "manila/0"
juju_service = 'manila'
unit = self.d.sentry[juju_service][0]
assert u.status_get(unit)[0] == "active"
action_id = u.run_action(unit_name, "pause")
self._assert_services(should_run=True)
action_id = u.run_action(self.manila_sentry, "pause")
assert u.wait_on_action(action_id), "Pause action failed."
assert u.status_get(unit)[0] == "maintenance"
# trigger config-changed to ensure that services are still stopped
u.log.debug("Making config change on manila ...")
self.d.configure(juju_service, {'debug': 'True'})
assert u.status_get(unit)[0] == "maintenance"
self.d.configure(juju_service, {'debug': 'False'})
assert u.status_get(unit)[0] == "maintenance"
self._assert_services(should_run=False)
action_id = u.run_action(unit_name, "resume")
assert u.wait_on_action(action_id), "Resume action failed."
assert u.status_get(unit)[0] == "active"
u.log.debug('OK')
action_id = u.run_action(self.manila_sentry, "resume")
assert u.wait_on_action(action_id), "Resume action failed"
self._assert_services(should_run=True)