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

Support update link on controller

Browse Source 
Ref https://github.com/GNS3/gns3-gui/issues/1300
This commit is contained in:
Julien Duponchelle committed 2016-07-01 17:38:32 +02:00
1 parent 71d4c0a13a
commit fea1e3ba61
5 files changed
+179 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/controller/test_link.py
+63 -6
View File
@@ -50,20 +50,53 @@ def link(async_run, project, compute):
return link
def test_addNode(async_run, project, compute):
def test_add_node(async_run, project, compute):
node1 = Node(project, compute, "node1")
link = Link(project)
link._project.controller.notification.emit = MagicMock()
project.dump = AsyncioMagicMock()
async_run(link.add_node(node1, 0, 4))
assert link._nodes == [
{
"node": node1,
"adapter_number": 0,
"port_number": 4
"port_number": 4,
'label': {
'y': -10,
'text': '0/4',
'x': -10,
'style': 'font-size: 10; font-style: Verdana'
}
}
]
assert project.dump.called
assert not link._project.controller.notification.emit.called
# We call link.created only when both side are created
node2 = Node(project, compute, "node2")
async_run(link.add_node(node2, 0, 4))
link._project.controller.notification.emit.assert_called_with("link.created", link.__json__())
def test_update_node(async_run, project, compute):
node1 = Node(project, compute, "node1")
link = Link(project)
async_run(link.add_node(node1, 0, 4))
label = {
'y': -42,
'text': '0/4',
'x': -10,
'style': 'font-size: 10; font-style: Verdana'
}
project.dump = AsyncioMagicMock()
link._project.controller.notification.emit = MagicMock()
async_run(link.update_node(node1, 0, 4, label=label))
assert link._nodes[0]["label"]["y"] == -42
assert project.dump.called
link._project.controller.notification.emit.assert_called_with("link.updated", link.__json__())
def test_json(async_run, project, compute):
@@ -80,12 +113,24 @@ def test_json(async_run, project, compute):
{
"node_id": node1.id,
"adapter_number": 0,
"port_number": 4
"port_number": 4,
'label': {
'y': -10,
'text': '0/4',
'x': -10,
'style': 'font-size: 10; font-style: Verdana'
}
},
{
"node_id": node2.id,
"adapter_number": 1,
"port_number": 3
"port_number": 3,
'label': {
'y': -10,
'text': '1/3',
'x': -10,
'style': 'font-size: 10; font-style: Verdana'
}
}
],
"capturing": False,
@@ -98,12 +143,24 @@ def test_json(async_run, project, compute):
{
"node_id": node1.id,
"adapter_number": 0,
"port_number": 4
"port_number": 4,
'label': {
'y': -10,
'text': '0/4',
'x': -10,
'style': 'font-size: 10; font-style: Verdana'
}
},
{
"node_id": node2.id,
"adapter_number": 1,
"port_number": 3
"port_number": 3,
'label': {
'y': -10,
'text': '1/3',
'x': -10,
'style': 'font-size: 10; font-style: Verdana'
}
}
]
}
tests/handlers/api/controller/test_link.py
+60 -1
View File
@@ -62,7 +62,12 @@ def test_create_link(http_controller, tmpdir, project, compute, async_run):
{
"node_id": node1.id,
"adapter_number": 0,
"port_number": 3
"port_number": 3,
"label": {
"text": "Text",
"x": 42,
"y": 0
}
},
{
"node_id": node2.id,
@@ -75,6 +80,60 @@ def test_create_link(http_controller, tmpdir, project, compute, async_run):
assert response.status == 201
assert response.json["link_id"] is not None
assert len(response.json["nodes"]) == 2
assert response.json["nodes"][0]["label"]["x"] == 42
def test_update_link(http_controller, tmpdir, project, compute, async_run):
response = MagicMock()
response.json = {"console": 2048}
compute.post = AsyncioMagicMock(return_value=response)
node1 = async_run(project.add_node(compute, "node1", None))
node2 = async_run(project.add_node(compute, "node2", None))
with asyncio_patch("gns3server.controller.udp_link.UDPLink.create") as mock:
response = http_controller.post("/projects/{}/links".format(project.id), {
"nodes": [
{
"node_id": node1.id,
"adapter_number": 0,
"port_number": 3,
"label": {
"text": "Text",
"x": 42,
"y": 0
}
},
{
"node_id": node2.id,
"adapter_number": 2,
"port_number": 4
}
]
})
link_id = response.json["link_id"]
assert response.json["nodes"][0]["label"]["x"] == 42
response = http_controller.put("/projects/{}/links/{}".format(project.id, link_id), {
"nodes": [
{
"node_id": node1.id,
"adapter_number": 0,
"port_number": 3,
"label": {
"text": "Hello",
"x": 64,
"y": 0
}
},
{
"node_id": node2.id,
"adapter_number": 2,
"port_number": 4
}
]
})
assert response.status == 201
assert response.json["nodes"][0]["label"]["x"] == 64
def test_list_link(http_controller, tmpdir, project, compute, async_run):