openstack/zun
Code Issues Proposed changes

Merge "Delete container failed if container host is None"

Browse Source
This commit is contained in:
Zuul 2018-03-20 10:31:14 +00:00 committed by Gerrit Code Review
commit 6e94dc4865
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zun/api/controllers/v1/containers.py
View File

@ -665,7 +665,10 @@ class ContainersController(base.Controller):
req_version=req_version,
min_version=min_version)
container.status = consts.DELETING
compute_api.container_delete(context, container, force)
if container.host:
compute_api.container_delete(context, container, force)
else:
container.destroy(context)
pecan.response.status = 204
@pecan.expose('json')

14
zun/tests/unit/api/controllers/v1/test_containers.py
View File

@ -1267,6 +1267,20 @@ class TestContainerController(api_base.FunctionalTest):
self.assertRaises(AppError, self.delete,
'/v1/containers/%s' % uuid)
@patch('zun.objects.Container.destroy')
@patch('zun.common.utils.validate_container_state')
@patch('zun.objects.Container.get_by_uuid')
def test_delete_container_without_host(self, mock_get_by_uuid,
mock_validate, mock_destroy):
test_container = utils.get_test_container(host="")
test_container_obj = objects.Container(self.context, **test_container)
mock_get_by_uuid.return_value = test_container_obj
container_uuid = test_container.get('uuid')
response = self.delete('/v1/containers/%s/' % container_uuid)
self.assertEqual(204, response.status_int)
mock_validate.assert_called_once()
mock_destroy.assert_called_once()
@patch('zun.common.utils.validate_container_state')
@patch('zun.compute.api.API.container_kill')
@patch('zun.objects.Container.get_by_uuid')