From effbe594142a0b1cfd735c5c391f2e7d272dbff2 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 24 Apr 2017 17:51:55 +0200 Subject: [PATCH] Lock docker API to 1.27 Fix https://github.com/GNS3/gns3-gui/issues/1994 --- gns3server/compute/docker/__init__.py | 4 ++-- tests/compute/docker/test_docker.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gns3server/compute/docker/__init__.py b/gns3server/compute/docker/__init__.py index 3a70b282..ba092a56 100644 --- a/gns3server/compute/docker/__init__.py +++ b/gns3server/compute/docker/__init__.py @@ -33,7 +33,7 @@ from gns3server.compute.docker.docker_error import DockerError, DockerHttp304Err log = logging.getLogger(__name__) -DOCKER_MINIMUM_API_VERSION = "1.21" +DOCKER_MINIMUM_API_VERSION = "1.27" class Docker(BaseManager): @@ -113,7 +113,7 @@ class Docker(BaseManager): :returns: HTTP response """ data = json.dumps(data) - url = "http://docker/" + path + url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path if timeout is None: timeout = 60 * 60 * 24 * 31 # One month timeout diff --git a/tests/compute/docker/test_docker.py b/tests/compute/docker/test_docker.py index 25779ca6..72c4cb79 100644 --- a/tests/compute/docker/test_docker.py +++ b/tests/compute/docker/test_docker.py @@ -47,7 +47,7 @@ def test_query_success(loop, vm): vm._session.request = AsyncioMagicMock(return_value=response) data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1}))) vm._session.request.assert_called_with('POST', - 'http://docker/test', + 'http://docker/v1.27/test', data='{"a": true}', headers={'content-type': 'application/json'}, params={'b': 1}, @@ -70,7 +70,7 @@ def test_query_error(loop, vm): with pytest.raises(DockerError): data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1}))) vm._session.request.assert_called_with('POST', - 'http://docker/test', + 'http://docker/v1.27/test', data='{"a": true}', headers={'content-type': 'application/json'}, params={'b': 1}, @@ -91,7 +91,7 @@ def test_query_error_json(loop, vm): with pytest.raises(DockerError): data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1}))) vm._session.request.assert_called_with('POST', - 'http://docker/test', + 'http://docker/v1.27/test', data='{"a": true}', headers={'content-type': 'application/json'}, params={'b': 1},