Return controller version as server version (temporary)

This commit is contained in:
Julien Duponchelle committed 2016-03-04 16:58:53 +01:00
1 parent 0532b4de8a
commit 0921df520c
2 files changed
+6 -2

No files matched your search

+4 -1
View File
@@ -18,6 +18,8 @@
from ..controller.controller_error import ControllerError
from ..config import Config
from ..version import __version__
import logging
log = logging.getLogger(__name__)
@@ -42,7 +44,8 @@ class Server:
self._password = password
self._connected = False
# The remote server version
self._version = None
# TODO: For the moment it's fake we return the controller version
self._version = __version__
# If the server is local but the server id is local
# it's a configuration issue
+2 -1
View File
@@ -20,6 +20,7 @@ import pytest
from unittest.mock import patch
from gns3server.controller.server import Server, ServerError
from gns3server.version import __version__
@pytest.fixture
@@ -53,5 +54,5 @@ def test_json(server):
"port": 84,
"user": "test",
"connected": False,
"version": None
"version": __version__
}