NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 22:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lock docker API to 1.27

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1994
This commit is contained in:
Julien Duponchelle committed 2017-04-24 17:51:55 +02:00
1 parent 8b9f22c30c
commit effbe59414
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/docker/__init__.py
+2 -2
View File
@@ -33,7 +33,7 @@ from gns3server.compute.docker.docker_error import DockerError, DockerHttp304Err
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
DOCKER_MINIMUM_API_VERSION = "1.21" DOCKER_MINIMUM_API_VERSION = "1.27"
class Docker(BaseManager): class Docker(BaseManager):
@@ -113,7 +113,7 @@ class Docker(BaseManager):
:returns: HTTP response :returns: HTTP response
""" """
data = json.dumps(data) data = json.dumps(data)
url = "http://docker/" + path url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
if timeout is None: if timeout is None:
timeout = 60 * 60 * 24 * 31 # One month timeout timeout = 60 * 60 * 24 * 31 # One month timeout
tests/compute/docker/test_docker.py
+3 -3
View File
@@ -47,7 +47,7 @@ def test_query_success(loop, vm):
vm._session.request = AsyncioMagicMock(return_value=response) vm._session.request = AsyncioMagicMock(return_value=response)
data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1}))) data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1})))
vm._session.request.assert_called_with('POST', vm._session.request.assert_called_with('POST',
'http://docker/test', 'http://docker/v1.27/test',
data='{"a": true}', data='{"a": true}',
headers={'content-type': 'application/json'}, headers={'content-type': 'application/json'},
params={'b': 1}, params={'b': 1},
@@ -70,7 +70,7 @@ def test_query_error(loop, vm):
with pytest.raises(DockerError): with pytest.raises(DockerError):
data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1}))) data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1})))
vm._session.request.assert_called_with('POST', vm._session.request.assert_called_with('POST',
'http://docker/test', 'http://docker/v1.27/test',
data='{"a": true}', data='{"a": true}',
headers={'content-type': 'application/json'}, headers={'content-type': 'application/json'},
params={'b': 1}, params={'b': 1},
@@ -91,7 +91,7 @@ def test_query_error_json(loop, vm):
with pytest.raises(DockerError): with pytest.raises(DockerError):
data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1}))) data = loop.run_until_complete(asyncio.async(vm.query("POST", "test", data={"a": True}, params={"b": 1})))
vm._session.request.assert_called_with('POST', vm._session.request.assert_called_with('POST',
'http://docker/test', 'http://docker/v1.27/test',
data='{"a": true}', data='{"a": true}',
headers={'content-type': 'application/json'}, headers={'content-type': 'application/json'},
params={'b': 1}, params={'b': 1},