Controller side unique node name allocation. Ref #541.

This commit is contained in:
grossmj committed 2016-06-11 17:31:30 -06:00
1 parent 6cd136b423
commit 2bde02d459
11 files changed
+128 -47

No files matched your search

+4 -4
View File
@@ -53,8 +53,8 @@ def test_create_link(http_controller, tmpdir, project, compute, async_run):
response.json = {"console": 2048}
compute.post = AsyncioMagicMock(return_value=response)
node1 = async_run(project.add_node(compute, None))
node2 = async_run(project.add_node(compute, None))
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), {
@@ -82,8 +82,8 @@ def test_list_link(http_controller, tmpdir, project, compute, async_run):
response.json = {"console": 2048}
compute.post = AsyncioMagicMock(return_value=response)
node1 = async_run(project.add_node(compute, None))
node2 = async_run(project.add_node(compute, None))
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), {
+1 -1
View File
@@ -50,7 +50,7 @@ def project(http_controller, async_run):
@pytest.fixture
def node(project, compute, async_run):
node = Node(project, compute, name="test", node_type="vpcs")
node = Node(project, compute, "test", node_type="vpcs")
project._nodes[node.id] = node
return node