openstack/zun
Code Issues Proposed changes

Merge "Use uuid instead of container_id in _validate_container_state"

Browse Source
This commit is contained in:
Jenkins 2016-12-28 04:57:54 +00:00 committed by Gerrit Code Review
commit b60c861094
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zun/compute/manager.py
View File

@ -56,7 +56,7 @@ class Manager(object):
def _validate_container_state(self, container, action):
if container.status not in VALID_STATES[action]:
raise exception.InvalidStateException(
id=container.container_id,
id=container.uuid,
action=action,
actual_state=container.status)

25
zun/tests/unit/compute/test_compute_manager.py
View File

@ -45,19 +45,20 @@ class TestManager(base.TestCase):
def test_validate_container_state(self):
container = Container(self.context, **utils.get_test_container())
container.status = 'Stopped'
self.assertRaises(exception.InvalidStateException,
self.compute_manager._validate_container_state,
container, 'stop')
self.assertRaises(exception.InvalidStateException,
self.compute_manager._validate_container_state,
container, 'pause')
with self.assertRaisesRegexp(exception.InvalidStateException,
"%s" % container.uuid):
self.compute_manager._validate_container_state(container, 'stop')
with self.assertRaisesRegexp(exception.InvalidStateException,
"%s" % container.uuid):
self.compute_manager._validate_container_state(container, 'pause')
container.status = 'Running'
self.assertRaises(exception.InvalidStateException,
self.compute_manager._validate_container_state,
container, 'start')
self.assertRaises(exception.InvalidStateException,
self.compute_manager._validate_container_state,
container, 'unpause')
with self.assertRaisesRegexp(exception.InvalidStateException,
"%s" % container.uuid):
self.compute_manager._validate_container_state(container, 'start')
with self.assertRaisesRegexp(exception.InvalidStateException,
"%s" % container.uuid):
self.compute_manager._validate_container_state(container,
'unpause')
@mock.patch.object(Container, 'save')
@mock.patch('zun.image.driver.pull_image')