Return the current controller hostname/IP from any compute

This commit is contained in:
grossmj committed 2021-10-21 21:38:36 +10:30
1 parent dddfe7c531
commit bb15b13a9d
18 files changed
+215 -198

No files matched your search

+13 -13
View File
@@ -37,7 +37,7 @@ async def vm(app: FastAPI, client: AsyncClient, compute_project: Project, vmx_pa
}
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.create", return_value=True) as mock:
response = await client.post(app.url_path_for("create_vmware_node", project_id=compute_project.id),
response = await client.post(app.url_path_for("compute:create_vmware_node", project_id=compute_project.id),
json=params)
assert mock.called
assert response.status_code == status.HTTP_201_CREATED
@@ -65,7 +65,7 @@ async def test_vmware_create(app: FastAPI, client: AsyncClient, compute_project:
}
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.create", return_value=True):
response = await client.post(app.url_path_for("create_vmware_node", project_id=compute_project.id),
response = await client.post(app.url_path_for("compute:create_vmware_node", project_id=compute_project.id),
json=params)
assert response.status_code == status.HTTP_201_CREATED
assert response.json()["name"] == "VM1"
@@ -74,7 +74,7 @@ async def test_vmware_create(app: FastAPI, client: AsyncClient, compute_project:
async def test_vmware_get(app: FastAPI, client: AsyncClient, compute_project: Project, vm: dict) -> None:
response = await client.get(app.url_path_for("get_vmware_node", project_id=vm["project_id"], node_id=vm["node_id"]))
response = await client.get(app.url_path_for("compute:get_vmware_node", project_id=vm["project_id"], node_id=vm["node_id"]))
assert response.status_code == status.HTTP_200_OK
assert response.json()["name"] == "VMTEST"
assert response.json()["project_id"] == compute_project.id
@@ -83,7 +83,7 @@ async def test_vmware_get(app: FastAPI, client: AsyncClient, compute_project: Pr
async def test_vmware_start(app: FastAPI, client: AsyncClient, vm: dict) -> None:
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.start", return_value=True) as mock:
response = await client.post(app.url_path_for("start_vmware_node",
response = await client.post(app.url_path_for("compute:start_vmware_node",
project_id=vm["project_id"],
node_id=vm["node_id"]))
assert mock.called
@@ -93,7 +93,7 @@ async def test_vmware_start(app: FastAPI, client: AsyncClient, vm: dict) -> None
async def test_vmware_stop(app: FastAPI, client: AsyncClient, vm: dict) -> None:
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.stop", return_value=True) as mock:
response = await client.post(app.url_path_for("stop_vmware_node",
response = await client.post(app.url_path_for("compute:stop_vmware_node",
project_id=vm["project_id"],
node_id=vm["node_id"]))
assert mock.called
@@ -103,7 +103,7 @@ async def test_vmware_stop(app: FastAPI, client: AsyncClient, vm: dict) -> None:
async def test_vmware_suspend(app: FastAPI, client: AsyncClient, vm: dict) -> None:
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.suspend", return_value=True) as mock:
response = await client.post(app.url_path_for("suspend_vmware_node",
response = await client.post(app.url_path_for("compute:suspend_vmware_node",
project_id=vm["project_id"],
node_id=vm["node_id"]))
assert mock.called
@@ -113,7 +113,7 @@ async def test_vmware_suspend(app: FastAPI, client: AsyncClient, vm: dict) -> No
async def test_vmware_resume(app: FastAPI, client: AsyncClient, vm: dict) -> None:
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.resume", return_value=True) as mock:
response = await client.post(app.url_path_for("resume_vmware_node",
response = await client.post(app.url_path_for("compute:resume_vmware_node",
project_id=vm["project_id"],
node_id=vm["node_id"]))
assert mock.called
@@ -123,7 +123,7 @@ async def test_vmware_resume(app: FastAPI, client: AsyncClient, vm: dict) -> Non
async def test_vmware_reload(app: FastAPI, client: AsyncClient, vm: dict) -> None:
with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.reload", return_value=True) as mock:
response = await client.post(app.url_path_for("reload_vmware_node",
response = await client.post(app.url_path_for("compute:reload_vmware_node",
project_id=vm["project_id"],
node_id=vm["node_id"]))
assert mock.called
@@ -139,7 +139,7 @@ async def test_vmware_nio_create_udp(app: FastAPI, client: AsyncClient, vm: dict
"rhost": "127.0.0.1"
}
url = app.url_path_for("create_vmware_node_nio",
url = app.url_path_for("compute:create_vmware_node_nio",
project_id=vm["project_id"],
node_id=vm["node_id"],
adapter_number="0",
@@ -176,7 +176,7 @@ async def test_vmware_nio_create_udp(app: FastAPI, client: AsyncClient, vm: dict
async def test_vmware_delete_nio(app: FastAPI, client: AsyncClient, vm: dict) -> None:
url = app.url_path_for("delete_vmware_node_nio",
url = app.url_path_for("compute:delete_vmware_node_nio",
project_id=vm["project_id"],
node_id=vm["node_id"],
adapter_number="0",
@@ -198,7 +198,7 @@ async def test_vmware_update(app: FastAPI, client: AsyncClient, vm: dict, free_c
"console": free_console_port
}
response = await client.put(app.url_path_for("update_vmware_node",
response = await client.put(app.url_path_for("compute:update_vmware_node",
project_id=vm["project_id"],
node_id=vm["node_id"]), json=params)
assert response.status_code == status.HTTP_200_OK
@@ -213,7 +213,7 @@ async def test_vmware_start_capture(app: FastAPI, client: AsyncClient, vm: dict)
"data_link_type": "DLT_EN10MB"
}
url = app.url_path_for("start_vmware_node_capture",
url = app.url_path_for("compute:start_vmware_node_capture",
project_id=vm["project_id"],
node_id=vm["node_id"],
adapter_number="0",
@@ -230,7 +230,7 @@ async def test_vmware_start_capture(app: FastAPI, client: AsyncClient, vm: dict)
async def test_vmware_stop_capture(app: FastAPI, client: AsyncClient, vm: dict) -> None:
url = app.url_path_for("stop_vmware_node_capture",
url = app.url_path_for("compute:stop_vmware_node_capture",
project_id=vm["project_id"],
node_id=vm["node_id"],
adapter_number="0",