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

Avoid duplicate node name when reloading a project

Browse Source
This commit is contained in:
Julien Duponchelle committed 2016-07-18 19:09:08 +02:00
1 parent c9bdd76922
commit bda1812811
3 files changed
+17 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/controller/test_node.py
+3 -3
View File
@@ -51,10 +51,10 @@ def node(compute, project):
def test_eq(compute, project, node, controller):
assert node == Node(project, compute, "demo", node_id=node.id, node_type="qemu")
assert node == Node(project, compute, "demo1", node_id=node.id, node_type="qemu")
assert node != "a"
assert node != Node(project, compute, "demo", node_id=str(uuid.uuid4()), node_type="qemu")
assert node != Node(Project(str(uuid.uuid4()), controller=controller), compute, "demo", node_id=node.id, node_type="qemu")
assert node != Node(project, compute, "demo2", node_id=str(uuid.uuid4()), node_type="qemu")
assert node != Node(Project(str(uuid.uuid4()), controller=controller), compute, "demo3", node_id=node.id, node_type="qemu")
def test_json(node, compute):
tests/controller/test_udp_link.py
+4 -4
View File
@@ -116,16 +116,16 @@ def test_choose_capture_side(async_run, project):
assert link._choose_capture_side()["node"] == node_iou
node_vpcs = Node(project, compute1, "node1", node_type="vpcs")
node_vpcs2 = Node(project, compute1, "node2", node_type="vpcs")
node_vpcs = Node(project, compute1, "node3", node_type="vpcs")
node_vpcs2 = Node(project, compute1, "node4", node_type="vpcs")
link = UDPLink(project)
async_run(link.add_node(node_vpcs, 0, 4))
async_run(link.add_node(node_vpcs2, 3, 1))
# Capture should run on the local node
node_iou = Node(project, compute1, "node1", node_type="iou")
node_iou2 = Node(project, compute2, "node2", node_type="iou")
node_iou = Node(project, compute1, "node5", node_type="iou")
node_iou2 = Node(project, compute2, "node6", node_type="iou")
link = UDPLink(project)
async_run(link.add_node(node_iou, 0, 4))