arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Add api versionning

Browse Source
This commit is contained in:
Julien Duponchelle 2015-02-04 10:24:59 +01:00
parent 119bebee25
commit 08158884a4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/web/route.py
View File

@ -84,7 +84,8 @@ class Route(object):
# This block is executed only the first time # This block is executed only the first time
output_schema = kw.get("output", {}) output_schema = kw.get("output", {})
input_schema = kw.get("input", {}) input_schema = kw.get("input", {})
cls._path = path api_version = kw.get("version", 1)
cls._path = "/v{version}{path}".format(path=path, version=api_version)
cls._documentation.setdefault(cls._path, {"methods": []}) cls._documentation.setdefault(cls._path, {"methods": []})
def register(func): def register(func):

4
tests/api/base.py
View File

@ -45,7 +45,7 @@ class Query:
return self._fetch("DELETE", path, **kwargs) return self._fetch("DELETE", path, **kwargs)
def _get_url(self, path): def _get_url(self, path):
return "http://{}:{}{}".format(self._host, self._port, path) return "http://{}:{}/v1{}".format(self._host, self._port, path)
def _fetch(self, method, path, body=None, **kwargs): def _fetch(self, method, path, body=None, **kwargs):
"""Fetch an url, parse the JSON and return response """Fetch an url, parse the JSON and return response
@ -74,7 +74,7 @@ class Query:
asyncio.async(go(future, response)) asyncio.async(go(future, response))
self._loop.run_until_complete(future) self._loop.run_until_complete(future)
response.body = future.result() response.body = future.result()
response.route = response.headers.get('X-Route', None) response.route = response.headers.get('X-Route', None).replace("/v1", "")
if response.body is not None: if response.body is not None:
try: try:

2
tox.ini
View File

@ -10,4 +10,4 @@ ignore = E501
[pytest] [pytest]
norecursedirs = old_tests .tox norecursedirs = old_tests .tox
timeout = 10 timeout = 1