mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Create a /server API for register servers
This allow to push to the controller information about the connection to a server.
This commit is contained in:
10 files changed
+311
-25
No files matched your search
+9
-2
@@ -40,6 +40,7 @@ from gns3server.handlers import *
|
||||
from gns3server.modules import MODULES
|
||||
from gns3server.modules.port_manager import PortManager
|
||||
from gns3server.modules.project_manager import ProjectManager
|
||||
from gns3server.controller import Controller
|
||||
from tests.handlers.api.base import Query
|
||||
|
||||
|
||||
@@ -136,8 +137,14 @@ def ethernet_device():
|
||||
return sorted(psutil.net_if_addrs().keys())[0]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def controller():
|
||||
Controller._instance = None
|
||||
return Controller.instance()
|
||||
|
||||
|
||||
@pytest.yield_fixture(autouse=True)
|
||||
def run_around_tests(monkeypatch, port_manager):
|
||||
def run_around_tests(monkeypatch, port_manager, controller):
|
||||
"""
|
||||
This setup a temporay project file environnement around tests
|
||||
"""
|
||||
@@ -151,7 +158,7 @@ def run_around_tests(monkeypatch, port_manager):
|
||||
config.set("Server", "project_directory", os.path.join(tmppath, 'projects'))
|
||||
config.set("Server", "images_path", os.path.join(tmppath, 'images'))
|
||||
config.set("Server", "auth", False)
|
||||
config.set("Server", "controller", False)
|
||||
config.set("Server", "controller", True)
|
||||
|
||||
# Prevent executions of the VM if we forgot to mock something
|
||||
config.set("VirtualBox", "vboxmanage_path", tmppath)
|
||||
|
||||
@@ -18,19 +18,23 @@
|
||||
import pytest
|
||||
|
||||
from gns3server.controller import Controller
|
||||
from gns3server.controller.server import Server
|
||||
from gns3server.config import Config
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def controller():
|
||||
Controller._instance = None
|
||||
return Controller.instance()
|
||||
|
||||
|
||||
|
||||
def test_isEnabled(controller):
|
||||
Config.instance().set("Server", "controller", False)
|
||||
assert not controller.isEnabled()
|
||||
Config.instance().set("Server", "controller", True)
|
||||
assert controller.isEnabled()
|
||||
|
||||
|
||||
def test_addServer(controller):
|
||||
server1 = Server("test1")
|
||||
|
||||
controller.addServer(server1)
|
||||
assert len(controller.servers) == 1
|
||||
controller.addServer(Server("test1"))
|
||||
assert len(controller.servers) == 1
|
||||
controller.addServer(Server("test2"))
|
||||
assert len(controller.servers) == 2
|
||||
@@ -0,0 +1,48 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (C) 2016 GNS3 Technologies Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import pytest
|
||||
|
||||
from gns3server.controller.server import Server
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def server():
|
||||
return Server("my_server_id", protocol="https", host="example.com", port=84, user="test", password="secure")
|
||||
|
||||
|
||||
def test_init(server):
|
||||
assert server.id == "my_server_id"
|
||||
|
||||
|
||||
def test_json(server):
|
||||
assert server.__json__() == {
|
||||
"server_id": "my_server_id",
|
||||
"protocol": "https",
|
||||
"host": "example.com",
|
||||
"port": 84,
|
||||
"user": "test",
|
||||
"connected": False,
|
||||
"version": None
|
||||
}
|
||||
|
||||
|
||||
def test__eq__(server):
|
||||
assert server != 1
|
||||
assert server == server
|
||||
assert server == Server("my_server_id")
|
||||
assert server != Server("test")
|
||||
@@ -0,0 +1,36 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (C) 2016 GNS3 Technologies Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
def test_server_create(server, controller):
|
||||
|
||||
params = {
|
||||
"server_id": "my_server_id",
|
||||
"protocol": "http",
|
||||
"host": "example.com",
|
||||
"port": 84,
|
||||
"user": "julien",
|
||||
"password": "secure"
|
||||
}
|
||||
response = server.post("/servers", params)
|
||||
assert response.status == 201
|
||||
assert response.route == "/servers"
|
||||
assert response.json["user"] == "julien"
|
||||
assert "password" not in response.json
|
||||
|
||||
assert len(controller.servers) == 1
|
||||
assert controller.servers["my_server_id"].host == "example.com"
|
||||
Reference in new issue
Block a user