Merge "Cleanup container client api rewrite function"

This commit is contained in:
Jenkins 2016-03-24 02:51:25 +00:00 committed by Gerrit Code Review
commit 82e5037145
4 changed files with 4 additions and 83 deletions

View File

@ -148,20 +148,3 @@ class DockerHTTPClient(client.Client):
else:
res.append(info['Config'].get('Hostname'))
return res
def pause(self, container):
if isinstance(container, dict):
container = container.get('Id')
url = self._url('/containers/{0}/pause'.format(container))
res = self._post(url)
self._raise_for_status(res)
def unpause(self, container):
if isinstance(container, dict):
container = container.get('Id')
url = self._url('/containers/{0}/unpause'.format(container))
res = self._post(url)
self._raise_for_status(res)
def get_container_logs(self, docker_id):
return self.logs(docker_id)

View File

@ -190,7 +190,7 @@ class Handler(object):
container_uuid) as docker:
docker_id = self._find_container_by_name(docker,
container_uuid)
return {'output': docker.get_container_logs(docker_id)}
return {'output': docker.logs(docker_id)}
@wrap_container_exception
def container_exec(self, context, container_uuid, command):

View File

@ -228,65 +228,3 @@ class DockerClientTestCase(base.BaseTestCase):
self.assertEqual(inspect_results, instances)
mock_containers.assert_called_once_with(all=True)
mock_inspect.assert_has_calls([mock.call(x) for x in range(0, 3)])
@mock.patch.object(docker_py_client.Client, '_raise_for_status')
@mock.patch.object(docker_py_client.Client, '_post')
@mock.patch.object(docker_py_client.Client, '_url')
def test_pause(self, mock_url, mock_post, mock_raise_for_status):
client = docker_utils.DockerHTTPClient()
client.pause('someid')
mock_url.assert_called_once_with('/containers/someid/pause')
mock_post.assert_called_once_with(mock_url.return_value)
mock_raise_for_status.assert_called_once_with(
mock_post.return_value)
@mock.patch.object(docker_py_client.Client, '_raise_for_status')
@mock.patch.object(docker_py_client.Client, '_post')
@mock.patch.object(docker_py_client.Client, '_url')
def test_pause_container_dict(self, mock_url, mock_post,
mock_raise_for_status):
client = docker_utils.DockerHTTPClient()
client.pause(dict(Id='someid'))
mock_url.assert_called_once_with('/containers/someid/pause')
mock_post.assert_called_once_with(mock_url.return_value)
mock_raise_for_status.assert_called_once_with(
mock_post.return_value)
@mock.patch.object(docker_py_client.Client, '_raise_for_status')
@mock.patch.object(docker_py_client.Client, '_post')
@mock.patch.object(docker_py_client.Client, '_url')
def test_unpause(self, mock_url, mock_post, mock_raise_for_status):
client = docker_utils.DockerHTTPClient()
client.unpause('someid')
mock_url.assert_called_once_with('/containers/someid/unpause')
mock_post.assert_called_once_with(mock_url.return_value)
mock_raise_for_status.assert_called_once_with(
mock_post.return_value)
@mock.patch.object(docker_py_client.Client, '_raise_for_status')
@mock.patch.object(docker_py_client.Client, '_post')
@mock.patch.object(docker_py_client.Client, '_url')
def test_unpause_container_dict(self, mock_url, mock_post,
mock_raise_for_status):
client = docker_utils.DockerHTTPClient()
client.unpause(dict(Id='someid'))
mock_url.assert_called_once_with('/containers/someid/unpause')
mock_post.assert_called_once_with(mock_url.return_value)
mock_raise_for_status.assert_called_once_with(
mock_post.return_value)
@mock.patch.object(docker_py_client.Client, 'logs')
def test_get_container_logs(self, mock_logs):
client = docker_utils.DockerHTTPClient()
client.get_container_logs('someid')
mock_logs.assert_called_once_with('someid')

View File

@ -525,7 +525,7 @@ class TestDockerHandler(base.BaseTestCase):
mock_docker_id = '2703ef2b705d'
mock_find_container.return_value = mock_docker_id
self.conductor.container_logs(None, mock_container_uuid)
self.mock_docker.get_container_logs.assert_called_once_with(
self.mock_docker.logs.assert_called_once_with(
mock_docker_id)
mock_find_container.assert_called_once_with(self.mock_docker,
mock_container_uuid)
@ -537,12 +537,12 @@ class TestDockerHandler(base.BaseTestCase):
mock_docker_id = '2703ef2b705d'
mock_find_container.return_value = mock_docker_id
mock_init.return_value = 'hit error'
self.mock_docker.get_container_logs = mock.Mock(
self.mock_docker.logs = mock.Mock(
side_effect=errors.APIError('Error', '', ''))
self.assertRaises(exception.ContainerException,
self.conductor.container_logs,
None, mock_container_uuid)
self.mock_docker.get_container_logs.assert_called_once_with(
self.mock_docker.logs.assert_called_once_with(
mock_docker_id)
mock_find_container.assert_called_once_with(self.mock_docker,
mock_container_uuid)