diff --git a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 7e23b064..5ed0c891 100644 --- a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/80666914-950d-4290-97f1-437fbc028bc5/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/305224bd-aab4-4bdb-a4b1-dc652a941a77/adapters/0/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/80666914-950d-4290-97f1-437fbc028bc5/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/305224bd-aab4-4bdb-a4b1-dc652a941a77/adapters/0/ports/0/nio HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt index 0ee303b8..47435c34 100644 --- a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt +++ b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9ce22dc6-5de5-4446-970a-874ba515cd3a' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/0bd39f79-0b73-442b-bc55-77bd2d2fff16' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9ce22dc6-5de5-4446-970a-874ba515cd3a HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/0bd39f79-0b73-442b-bc55-77bd2d2fff16 HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt index c4776589..7a311334 100644 --- a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/5e2b3753-807c-4dc2-a412-265c516b31fd/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/24d1f352-8017-4959-b860-4abc0baf8470/adapters/1/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/5e2b3753-807c-4dc2-a412-265c516b31fd/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/24d1f352-8017-4959-b860-4abc0baf8470/adapters/1/ports/0/nio HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt index b58b5a96..85a29d18 100644 --- a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt +++ b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ff156ea7-94ca-4876-b920-d449c8f2c411' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b146a1d0-8961-4614-85d5-a351db2f06cd' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ff156ea7-94ca-4876-b920-d449c8f2c411 HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b146a1d0-8961-4614-85d5-a351db2f06cd HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt index e0378cc8..cba99551 100644 --- a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/026f8bee-df53-47a3-850f-b64ebfd8dbaf/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a8d07b94-8f39-4fc1-ba10-cd8d7eef3acf/adapters/1/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/026f8bee-df53-47a3-850f-b64ebfd8dbaf/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a8d07b94-8f39-4fc1-ba10-cd8d7eef3acf/adapters/1/ports/0/nio HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 748db023..cac5dfce 100644 --- a/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/f1f877b6-a7a1-4bf2-9e73-a6f9068bae30/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/1b1f5eff-6bdf-437f-b568-654454bec4e5/adapters/0/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/f1f877b6-a7a1-4bf2-9e73-a6f9068bae30/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/1b1f5eff-6bdf-437f-b568-654454bec4e5/adapters/0/ports/0/nio HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt index 56879249..67224f9a 100644 --- a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt +++ b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a2275f0e-db6c-4ea1-85f0-07b6200d011e' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/342a5f3b-63a1-4d18-85e6-bf4681dfb72d' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a2275f0e-db6c-4ea1-85f0-07b6200d011e HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/342a5f3b-63a1-4d18-85e6-bf4681dfb72d HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt index f1607628..e3d3e7ab 100644 --- a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/661923f6-e1eb-4462-b634-03832e2893af/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4c0fce7a-142e-440a-870b-e00bac7785ae/adapters/0/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/661923f6-e1eb-4462-b634-03832e2893af/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4c0fce7a-142e-440a-870b-e00bac7785ae/adapters/0/ports/0/nio HTTP/1.1 diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt index 446e98c7..72fc403b 100644 --- a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt +++ b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt @@ -1,11 +1,11 @@ -curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/bf96bdd7-49de-45f8-8b48-0d7bb2ce1392' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f03a53b5-8b6d-437f-8e13-272ddf22692d' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/bf96bdd7-49de-45f8-8b48-0d7bb2ce1392 HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f03a53b5-8b6d-437f-8e13-272ddf22692d HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 732 +CONTENT-LENGTH: 720 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -13,15 +13,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id} { "command_line": "", - "console": 5000, + "console": 5711, "console_type": "telnet", "ethernet_adapters": 2, "iourc_path": null, "l1_keepalives": false, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/bf96bdd7-49de-45f8-8b48-0d7bb2ce1392", - "node_id": "bf96bdd7-49de-45f8-8b48-0d7bb2ce1392", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/project-files/iou/f03a53b5-8b6d-437f-8e13-272ddf22692d", + "node_id": "f03a53b5-8b6d-437f-8e13-272ddf22692d", "nvram": 128, "path": "iou.bin", "private_config": null, diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt index c8ee21e3..ad310e95 100644 --- a/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt +++ b/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fdaa617e-a4fd-45cb-b830-1ce62e34d24d/configs' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fbecd194-0b77-4f32-a3a5-3f6f5ce4d451/configs' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fdaa617e-a4fd-45cb-b830-1ce62e34d24d/configs HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fbecd194-0b77-4f32-a3a5-3f6f5ce4d451/configs HTTP/1.1 diff --git a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt index c05f359c..cc177ff5 100644 --- a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt +++ b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/eaae5159-6ad1-407a-a7db-990a30be5987' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e701b34-dd30-4cac-851c-135bbecfcf24' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/eaae5159-6ad1-407a-a7db-990a30be5987 HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e701b34-dd30-4cac-851c-135bbecfcf24 HTTP/1.1 @@ -19,7 +19,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id} "cdrom_image": "", "cdrom_image_md5sum": null, "command_line": "", - "console": 5000, + "console": 5711, "console_type": "telnet", "cpu_throttling": 0, "cpus": 1, @@ -41,15 +41,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id} "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:dd:80:59:87:00", + "mac_address": "00:dd:80:cf:24:00", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/eaae5159-6ad1-407a-a7db-990a30be5987", - "node_id": "eaae5159-6ad1-407a-a7db-990a30be5987", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/8e701b34-dd30-4cac-851c-135bbecfcf24", + "node_id": "8e701b34-dd30-4cac-851c-135bbecfcf24", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppxlqz2q6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", "ram": 256, "status": "stopped", "usage": "" diff --git a/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt index 312a23c8..fb1410f2 100644 --- a/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt +++ b/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/cbdad143-02ed-4ada-916e-47c175fdbb3a' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c15b6665-d370-4770-9048-986b88e61c9e' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/cbdad143-02ed-4ada-916e-47c175fdbb3a HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c15b6665-d370-4770-9048-986b88e61c9e HTTP/1.1 @@ -15,12 +15,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id} "acpi_shutdown": false, "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)", "adapters": 0, - "console": 5001, + "console": 5712, "enable_remote_console": false, "headless": false, "name": "VMTEST", "node_directory": null, - "node_id": "cbdad143-02ed-4ada-916e-47c175fdbb3a", + "node_id": "c15b6665-d370-4770-9048-986b88e61c9e", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "ram": 0, "status": "stopped", diff --git a/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt index d8c671df..574b3069 100644 --- a/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt +++ b/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/1f46cb1e-417c-449d-ab20-06452dcebf3f' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2678aeb4-0618-41d2-81c7-5adb0e44a499' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/1f46cb1e-417c-449d-ab20-06452dcebf3f HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2678aeb4-0618-41d2-81c7-5adb0e44a499 HTTP/1.1 @@ -13,11 +13,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id} { "command_line": "", - "console": 5009, + "console": 5720, "console_type": "telnet", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/1f46cb1e-417c-449d-ab20-06452dcebf3f", - "node_id": "1f46cb1e-417c-449d-ab20-06452dcebf3f", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/2678aeb4-0618-41d2-81c7-5adb0e44a499", + "node_id": "2678aeb4-0618-41d2-81c7-5adb0e44a499", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "startup_script": null, "startup_script_path": null, diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt index c9d8ac20..32c55d9b 100644 --- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b3c0e521-af7c-4cce-bf6b-e1556ff46be0/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/57a199e9-5512-4595-8624-315e680d276e/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b3c0e521-af7c-4cce-bf6b-e1556ff46be0/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/57a199e9-5512-4595-8624-315e680d276e/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt index bbe23135..0c9494b4 100644 --- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt +++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ed10c861-7d3d-4d1b-8bbf-880f63318ac9/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/e820e416-5af5-4944-9527-6c52267ae187/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ed10c861-7d3d-4d1b-8bbf-880f63318ac9/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/e820e416-5af5-4944-9527-6c52267ae187/adapters/0/ports/0/start_capture HTTP/1.1 { "capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB" @@ -8,12 +8,12 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ed10 HTTP/1.1 200 -CONTENT-LENGTH: 157 +CONTENT-LENGTH: 145 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture { - "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/tmp/captures/test.pcap" + "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/tmp/captures/test.pcap" } diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt index 9791bd86..24c2fe30 100644 --- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt +++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/5358d4b5-3915-4c0e-9c1e-8cf8f0e3a21a/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c369b5d5-e4bb-428d-95d7-e8c1f8f22f0b/adapters/0/ports/0/stop_capture' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/5358d4b5-3915-4c0e-9c1e-8cf8f0e3a21a/adapters/0/ports/0/stop_capture HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c369b5d5-e4bb-428d-95d7-e8c1f8f22f0b/adapters/0/ports/0/stop_capture HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidiounodes.txt b/docs/api/examples/compute_post_projectsprojectidiounodes.txt index c5caf6e4..01e2fcf7 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodes.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodes.txt @@ -1,16 +1,16 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "42497072-bf05-4460-ab72-d1b66a398db0", "path": "iou.bin", "startup_config_content": "hostname test"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "b3134bc0-c871-4824-9d50-c92bf3cbe55f", "path": "iou.bin", "startup_config_content": "hostname test"}' POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes HTTP/1.1 { "name": "PC TEST 1", - "node_id": "42497072-bf05-4460-ab72-d1b66a398db0", + "node_id": "b3134bc0-c871-4824-9d50-c92bf3cbe55f", "path": "iou.bin", "startup_config_content": "hostname test" } HTTP/1.1 201 -CONTENT-LENGTH: 748 +CONTENT-LENGTH: 736 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -18,15 +18,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes { "command_line": "", - "console": 5000, + "console": 5711, "console_type": "telnet", "ethernet_adapters": 2, "iourc_path": null, "l1_keepalives": false, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/42497072-bf05-4460-ab72-d1b66a398db0", - "node_id": "42497072-bf05-4460-ab72-d1b66a398db0", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/project-files/iou/b3134bc0-c871-4824-9d50-c92bf3cbe55f", + "node_id": "b3134bc0-c871-4824-9d50-c92bf3cbe55f", "nvram": 128, "path": "iou.bin", "private_config": null, diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 4dc01c8e..20abbea3 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b308f696-712d-4ab6-8f93-bbf0d38bc89b/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7edfe66e-cb09-4c5e-beca-5d567c5ca850/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b308f696-712d-4ab6-8f93-bbf0d38bc89b/adapters/1/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7edfe66e-cb09-4c5e-beca-5d567c5ca850/adapters/1/ports/0/nio HTTP/1.1 { "ethernet_device": "bridge0", "type": "nio_ethernet" diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt index 7ad453ac..e4482cdd 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/16d14d26-f840-4b6d-9448-bfebda27bfa0/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/dad20c57-972f-4c48-b377-46640b6d5e6a/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/16d14d26-f840-4b6d-9448-bfebda27bfa0/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/dad20c57-972f-4c48-b377-46640b6d5e6a/adapters/0/ports/0/start_capture HTTP/1.1 { "capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB" @@ -8,12 +8,12 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/16d14d2 HTTP/1.1 200 -CONTENT-LENGTH: 157 +CONTENT-LENGTH: 145 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture { - "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/tmp/captures/test.pcap" + "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/tmp/captures/test.pcap" } diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt index 71abac56..b45deb02 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7e17d58c-c826-4cbf-9dc4-4d402df68392/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/6b305d2c-970d-4d4c-bba9-fc45186d62bd/adapters/0/ports/0/stop_capture' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7e17d58c-c826-4cbf-9dc4-4d402df68392/adapters/0/ports/0/stop_capture HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/6b305d2c-970d-4d4c-bba9-fc45186d62bd/adapters/0/ports/0/stop_capture HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt index 1d34b58e..081f9580 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b171b97a-2b3a-43ed-a926-d83e8bcf1d7a/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/40e17dc8-c8f7-4bd8-9862-fab4a26283af/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b171b97a-2b3a-43ed-a926-d83e8bcf1d7a/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/40e17dc8-c8f7-4bd8-9862-fab4a26283af/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt index 9c74bd66..e82d4659 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt @@ -1,13 +1,13 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b48c7121-655b-4fa5-b0e9-f513c063067a/start' -d '{"iourc_content": "test"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/32fe2601-8b78-4cde-b73c-65060b257553/start' -d '{"iourc_content": "test"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b48c7121-655b-4fa5-b0e9-f513c063067a/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/32fe2601-8b78-4cde-b73c-65060b257553/start HTTP/1.1 { "iourc_content": "test" } HTTP/1.1 200 -CONTENT-LENGTH: 796 +CONTENT-LENGTH: 784 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -15,15 +15,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start { "command_line": "", - "console": 5000, + "console": 5711, "console_type": "telnet", "ethernet_adapters": 2, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpggab7jn1/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpdcip9igy/iourc", "l1_keepalives": false, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/b48c7121-655b-4fa5-b0e9-f513c063067a", - "node_id": "b48c7121-655b-4fa5-b0e9-f513c063067a", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/project-files/iou/32fe2601-8b78-4cde-b73c-65060b257553", + "node_id": "32fe2601-8b78-4cde-b73c-65060b257553", "nvram": 128, "path": "iou.bin", "private_config": null, diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt index 23ebeb94..05a6ed66 100644 --- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt +++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/938b7bfb-66d7-42b7-8456-cc3bf11bf6e1/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/641b1855-3fec-4168-80b4-d6b351ad160c/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/938b7bfb-66d7-42b7-8456-cc3bf11bf6e1/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/641b1855-3fec-4168-80b4-d6b351ad160c/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt index 307c9b4a..9f900dfb 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt @@ -1,10 +1,10 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppxlqz2q6/qemu-system-x86_64", "ram": 1024}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", "ram": 1024}' POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes HTTP/1.1 { "hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppxlqz2q6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", "ram": 1024 } @@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes "cdrom_image": "", "cdrom_image_md5sum": null, "command_line": "", - "console": 5000, + "console": 5711, "console_type": "telnet", "cpu_throttling": 0, "cpus": 1, @@ -46,15 +46,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:dd:80:3b:b2:00", + "mac_address": "00:dd:80:9a:75:00", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/6c215183-8fd9-4a96-b9f2-58ecf7b73bb2", - "node_id": "6c215183-8fd9-4a96-b9f2-58ecf7b73bb2", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/e05ded0f-5a86-4007-825c-0762bedc9a75", + "node_id": "e05ded0f-5a86-4007-825c-0762bedc9a75", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppxlqz2q6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", "ram": 1024, "status": "stopped", "usage": "" diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 83ebd21c..311b2eff 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5311f612-c0d4-42b6-a592-8d700c7170b5/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2b51a589-8708-4644-9b30-8c906c0259e2/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5311f612-c0d4-42b6-a592-8d700c7170b5/adapters/1/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2b51a589-8708-4644-9b30-8c906c0259e2/adapters/1/ports/0/nio HTTP/1.1 { "ethernet_device": "eth0", "type": "nio_ethernet" diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt index 52ba22d4..e2ba6fe9 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/cc65d1ae-7624-4308-a024-6ce262c5771a/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/690bb17e-b4b5-461c-be5f-5a5ee2a2accf/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/cc65d1ae-7624-4308-a024-6ce262c5771a/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/690bb17e-b4b5-461c-be5f-5a5ee2a2accf/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt index 8b86b7bd..54a11b87 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/f433ae3a-42a3-4f91-a94c-9fa9b0b54c4c/resume' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b5ca2c74-1437-429c-a393-ae1678bbbacb/resume' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/f433ae3a-42a3-4f91-a94c-9fa9b0b54c4c/resume HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b5ca2c74-1437-429c-a393-ae1678bbbacb/resume HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt index 71f07fa0..dc384652 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/26feaf3b-7983-4c48-938f-8dc4ba10afa5/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdfb623a-7a47-4d23-a8cf-854eccee293a/start' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/26feaf3b-7983-4c48-938f-8dc4ba10afa5/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdfb623a-7a47-4d23-a8cf-854eccee293a/start HTTP/1.1 {} @@ -19,7 +19,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start "cdrom_image": "", "cdrom_image_md5sum": null, "command_line": "", - "console": 5000, + "console": 5711, "console_type": "telnet", "cpu_throttling": 0, "cpus": 1, @@ -41,15 +41,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:dd:80:af:a5:00", + "mac_address": "00:dd:80:29:3a:00", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/26feaf3b-7983-4c48-938f-8dc4ba10afa5", - "node_id": "26feaf3b-7983-4c48-938f-8dc4ba10afa5", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/bdfb623a-7a47-4d23-a8cf-854eccee293a", + "node_id": "bdfb623a-7a47-4d23-a8cf-854eccee293a", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppxlqz2q6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", "ram": 256, "status": "stopped", "usage": "" diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt index d7a34253..9909993e 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2f6c1506-2d07-43ba-a639-4cc2350e3357/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c988ff0f-1b8c-49ee-9c33-4bda6043bf6b/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2f6c1506-2d07-43ba-a639-4cc2350e3357/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c988ff0f-1b8c-49ee-9c33-4bda6043bf6b/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt index 1f1168fa..5ad27143 100644 --- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt +++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/9a8dc111-0c14-42b5-9ea0-f9b1bc3f5064/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a4bbf623-f85b-446c-beef-6fb33139295e/suspend' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/9a8dc111-0c14-42b5-9ea0-f9b1bc3f5064/suspend HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a4bbf623-f85b-446c-beef-6fb33139295e/suspend HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt index 34e732c6..64f72b34 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt @@ -19,12 +19,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes "acpi_shutdown": false, "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)", "adapters": 0, - "console": 5000, + "console": 5711, "enable_remote_console": false, "headless": false, "name": "VM1", "node_directory": null, - "node_id": "d3a3793c-e923-4038-bfa3-d5b24709e193", + "node_id": "b6c304fa-95fe-4d16-af59-cee90a19b5b3", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "ram": 0, "status": "stopped", diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 405794b1..34f7173b 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/3f772bbb-9670-4613-89ca-a7864a155923/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/dfe091c4-c1da-4fe2-8d49-d1695523c430/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/3f772bbb-9670-4613-89ca-a7864a155923/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/dfe091c4-c1da-4fe2-8d49-d1695523c430/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt index 570f5a46..f70598d4 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/0f898c28-c9ee-44d9-8d3c-a7f16d73dba4/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5cc1f014-5e4f-4be5-9254-c196b5a91ae4/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/0f898c28-c9ee-44d9-8d3c-a7f16d73dba4/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5cc1f014-5e4f-4be5-9254-c196b5a91ae4/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt index 8b3d8218..22f3dbb1 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/41c90061-32bc-4c52-8339-4f5faedca8b1/resume' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/296a6160-4b15-4ce9-823d-eb4a93fac281/resume' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/41c90061-32bc-4c52-8339-4f5faedca8b1/resume HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/296a6160-4b15-4ce9-823d-eb4a93fac281/resume HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt index 7adbff4e..c43a5d15 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a5f81f44-41e4-4d2c-84b7-deb170428ded/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6332d884-74ee-4a4c-9ce1-80c24dc2457c/start' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a5f81f44-41e4-4d2c-84b7-deb170428ded/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6332d884-74ee-4a4c-9ce1-80c24dc2457c/start HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt index 078708ff..e67710fd 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5fe45c51-95ee-434c-bc4e-68af3ef601f8/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/499b156b-4083-4ce9-88ec-03daad1bac64/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5fe45c51-95ee-434c-bc4e-68af3ef601f8/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/499b156b-4083-4ce9-88ec-03daad1bac64/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt index 342312d7..e9754e1e 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6816e57b-7aa0-4025-b13d-6d00c53113aa/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/687fc228-d2f0-4c56-9a20-9f62b193d66e/suspend' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6816e57b-7aa0-4025-b13d-6d00c53113aa/suspend HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/687fc228-d2f0-4c56-9a20-9f62b193d66e/suspend HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt index e6863257..fa98bad9 100644 --- a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt +++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt @@ -15,11 +15,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes { "command_line": "", - "console": 5009, + "console": 5720, "console_type": "telnet", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/77ba062b-1654-4c92-9d71-3c31ce6b6164", - "node_id": "77ba062b-1654-4c92-9d71-3c31ce6b6164", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/b590cf5c-5245-4c0b-a4c8-1ffd1e440560", + "node_id": "b590cf5c-5245-4c0b-a4c8-1ffd1e440560", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "startup_script": null, "startup_script_path": null, diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt index be8313ab..b96c15f3 100644 --- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/605d9435-2e8e-41b2-92ac-c13577e5e2cd/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/bef47961-5db0-4e5a-bf90-969c44e14bdc/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/605d9435-2e8e-41b2-92ac-c13577e5e2cd/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/bef47961-5db0-4e5a-bf90-969c44e14bdc/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt index dbae3775..daf35633 100644 --- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt +++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/13f1e028-00a5-4e6a-ba69-5305ae119206/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/56ba2ca5-841b-4756-b9b0-a6f43a89a7a2/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/13f1e028-00a5-4e6a-ba69-5305ae119206/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/56ba2ca5-841b-4756-b9b0-a6f43a89a7a2/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt index 750b24df..e8f1d99d 100644 --- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt +++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/94c8d5fa-7e95-44c5-be2d-caa04cf6460d/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/29e9d99d-a114-49bd-b9af-9220bbbf17ad/start' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/94c8d5fa-7e95-44c5-be2d-caa04cf6460d/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/29e9d99d-a114-49bd-b9af-9220bbbf17ad/start HTTP/1.1 {} @@ -13,11 +13,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/start { "command_line": "", - "console": 5009, + "console": 5720, "console_type": "telnet", "name": "PC TEST 1", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/94c8d5fa-7e95-44c5-be2d-caa04cf6460d", - "node_id": "94c8d5fa-7e95-44c5-be2d-caa04cf6460d", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/29e9d99d-a114-49bd-b9af-9220bbbf17ad", + "node_id": "29e9d99d-a114-49bd-b9af-9220bbbf17ad", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "startup_script": null, "startup_script_path": null, diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt index 842b6a2b..0a11c3b1 100644 --- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt +++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/71a56900-2afe-48ee-808f-59c376bf90a6/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/9afc5595-041b-48cb-b027-8300bc94df14/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/71a56900-2afe-48ee-808f-59c376bf90a6/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/9afc5595-041b-48cb-b027-8300bc94df14/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_put_projectsprojectid.txt b/docs/api/examples/compute_put_projectsprojectid.txt index e32c7099..ff5b1e79 100644 --- a/docs/api/examples/compute_put_projectsprojectid.txt +++ b/docs/api/examples/compute_put_projectsprojectid.txt @@ -1,9 +1,9 @@ -curl -i -X PUT 'http://localhost:3080/v2/compute/projects/90010203-0405-0607-0809-0a0b0c0d0e0b' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-400/test_update_path_project_non_l0"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/90010203-0405-0607-0809-0a0b0c0d0e0b' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_update_path_project_non_l0"}' PUT /v2/compute/projects/90010203-0405-0607-0809-0a0b0c0d0e0b HTTP/1.1 { "name": "second_name", - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-400/test_update_path_project_non_l0" + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_update_path_project_non_l0" } diff --git a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt index 7bcf6ae6..90135ac2 100644 --- a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt @@ -1,8 +1,8 @@ -curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/5dd5ecf8-66a4-4f18-a040-469bdb8168e7' -d '{"console": 5002, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ac67f13e-7aca-43cd-bc62-a3b210032f97' -d '{"console": 5713, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/5dd5ecf8-66a4-4f18-a040-469bdb8168e7 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ac67f13e-7aca-43cd-bc62-a3b210032f97 HTTP/1.1 { - "console": 5002, + "console": 5713, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes" @@ -10,7 +10,7 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/5dd5e HTTP/1.1 200 -CONTENT-LENGTH: 665 +CONTENT-LENGTH: 653 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -18,8 +18,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id} { "adapters": 2, - "aux": 5001, - "console": 5002, + "aux": 5712, + "console": 5713, "console_http_path": "/", "console_http_port": 80, "console_resolution": "1280x1024", @@ -28,8 +28,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id} "environment": "GNS3=1\nGNS4=0", "image": "nginx:latest", "name": "test", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/docker/5dd5ecf8-66a4-4f18-a040-469bdb8168e7", - "node_id": "5dd5ecf8-66a4-4f18-a040-469bdb8168e7", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/project-files/docker/ac67f13e-7aca-43cd-bc62-a3b210032f97", + "node_id": "ac67f13e-7aca-43cd-bc62-a3b210032f97", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "start_command": "yes", "status": "stopped" diff --git a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt index 0a8d8a34..233410c3 100644 --- a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt @@ -1,8 +1,8 @@ -curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2ac41811-76ef-4e8e-8911-21571433f8c5' -d '{"console": 5001, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/addcf831-79be-49c8-818c-b984a721f2ab' -d '{"console": 5712, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2ac41811-76ef-4e8e-8911-21571433f8c5 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/addcf831-79be-49c8-818c-b984a721f2ab HTTP/1.1 { - "console": 5001, + "console": 5712, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, @@ -16,7 +16,7 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2ac41811 HTTP/1.1 200 -CONTENT-LENGTH: 807 +CONTENT-LENGTH: 795 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -24,15 +24,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id} { "command_line": "", - "console": 5001, + "console": 5712, "console_type": "telnet", "ethernet_adapters": 4, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps0mdxqc5/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpia0c1pau/iourc", "l1_keepalives": true, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "test", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3wi0bosu/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/2ac41811-76ef-4e8e-8911-21571433f8c5", - "node_id": "2ac41811-76ef-4e8e-8911-21571433f8c5", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/project-files/iou/addcf831-79be-49c8-818c-b984a721f2ab", + "node_id": "addcf831-79be-49c8-818c-b984a721f2ab", "nvram": 2048, "path": "iou.bin", "private_config": null, diff --git a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt index eb3fdead..26abf0f9 100644 --- a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt @@ -1,8 +1,8 @@ -curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/e72ee144-d082-45a1-9e40-612f8e87e169' -d '{"console": 5001, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/decc7ae7-9caf-42bd-bbc5-dba2922eac5f' -d '{"console": 5712, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/e72ee144-d082-45a1-9e40-612f8e87e169 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/decc7ae7-9caf-42bd-bbc5-dba2922eac5f HTTP/1.1 { - "console": 5001, + "console": 5712, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024 @@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id} "cdrom_image": "", "cdrom_image_md5sum": null, "command_line": "", - "console": 5001, + "console": 5712, "console_type": "telnet", "cpu_throttling": 0, "cpus": 1, @@ -46,15 +46,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id} "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:dd:80:e1:69:00", + "mac_address": "00:dd:80:ac:5f:00", "name": "test", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/e72ee144-d082-45a1-9e40-612f8e87e169", - "node_id": "e72ee144-d082-45a1-9e40-612f8e87e169", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/decc7ae7-9caf-42bd-bbc5-dba2922eac5f", + "node_id": "decc7ae7-9caf-42bd-bbc5-dba2922eac5f", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppxlqz2q6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", "ram": 1024, "status": "stopped", "usage": "" diff --git a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt index cfc0ac52..b69ad8dd 100644 --- a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt @@ -1,8 +1,8 @@ -curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b7923dd9-b67b-4feb-95f4-dd98665cb0c0' -d '{"console": 5010, "name": "test"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c0869edb-3133-4d7d-8c00-c20800eb22d9' -d '{"console": 5721, "name": "test"}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b7923dd9-b67b-4feb-95f4-dd98665cb0c0 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c0869edb-3133-4d7d-8c00-c20800eb22d9 HTTP/1.1 { - "console": 5010, + "console": 5721, "name": "test" } @@ -18,12 +18,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id} "acpi_shutdown": false, "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)", "adapters": 0, - "console": 5010, + "console": 5721, "enable_remote_console": false, "headless": false, "name": "test", "node_directory": null, - "node_id": "b7923dd9-b67b-4feb-95f4-dd98665cb0c0", + "node_id": "c0869edb-3133-4d7d-8c00-c20800eb22d9", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "ram": 0, "status": "stopped", diff --git a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt index 9e36b44d..077add3d 100644 --- a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt @@ -1,8 +1,8 @@ -curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0e07afde-7278-475a-be20-999474849eb0' -d '{"console": 5011, "name": "test", "startup_script": "ip 192.168.1.1"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/c71e56fd-6129-4fc7-9890-5229d9d5f463' -d '{"console": 5722, "name": "test", "startup_script": "ip 192.168.1.1"}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0e07afde-7278-475a-be20-999474849eb0 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/c71e56fd-6129-4fc7-9890-5229d9d5f463 HTTP/1.1 { - "console": 5011, + "console": 5722, "name": "test", "startup_script": "ip 192.168.1.1" } @@ -17,11 +17,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id} { "command_line": "", - "console": 5011, + "console": 5722, "console_type": "telnet", "name": "test", - "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp7hg5dyd9/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/0e07afde-7278-475a-be20-999474849eb0", - "node_id": "0e07afde-7278-475a-be20-999474849eb0", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9qob6cob/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/c71e56fd-6129-4fc7-9890-5229d9d5f463", + "node_id": "c71e56fd-6129-4fc7-9890-5229d9d5f463", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "startup_script": "ip 192.168.1.1", "startup_script_path": "startup.vpc", diff --git a/docs/api/examples/controller_delete_projectsprojectid.txt b/docs/api/examples/controller_delete_projectsprojectid.txt index 1a83d6dd..8fb6f955 100644 --- a/docs/api/examples/controller_delete_projectsprojectid.txt +++ b/docs/api/examples/controller_delete_projectsprojectid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/projects/47be58b6-fc50-4675-9cf9-13f02338257a' +curl -i -X DELETE 'http://localhost:3080/v2/projects/acab1c35-d42b-4219-b741-12ee4fdc814b' -DELETE /v2/projects/47be58b6-fc50-4675-9cf9-13f02338257a HTTP/1.1 +DELETE /v2/projects/acab1c35-d42b-4219-b741-12ee4fdc814b HTTP/1.1 diff --git a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt index c04cc178..19ba6555 100644 --- a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt +++ b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/projects/7a89a8b6-0524-4753-88d9-0a58fd051155/drawings/754c76da-3312-4e92-b54f-3811255b0396' +curl -i -X DELETE 'http://localhost:3080/v2/projects/d02d47d4-282e-4643-8308-87dba6d31c7c/drawings/246a4d6f-f046-4376-b3f5-b56d4a27803c' -DELETE /v2/projects/7a89a8b6-0524-4753-88d9-0a58fd051155/drawings/754c76da-3312-4e92-b54f-3811255b0396 HTTP/1.1 +DELETE /v2/projects/d02d47d4-282e-4643-8308-87dba6d31c7c/drawings/246a4d6f-f046-4376-b3f5-b56d4a27803c HTTP/1.1 diff --git a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt index 09b4880c..0e8a9fd8 100644 --- a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt +++ b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/projects/c977add5-89c0-4f6f-8adb-c144cdf48d7a/links/12d88104-280e-4e23-b333-0565e3aa7c9f' +curl -i -X DELETE 'http://localhost:3080/v2/projects/35b02ebb-6e70-4077-b752-e759c38f4b81/links/e74e45eb-364c-4a91-a902-c591ecd96d33' -DELETE /v2/projects/c977add5-89c0-4f6f-8adb-c144cdf48d7a/links/12d88104-280e-4e23-b333-0565e3aa7c9f HTTP/1.1 +DELETE /v2/projects/35b02ebb-6e70-4077-b752-e759c38f4b81/links/e74e45eb-364c-4a91-a902-c591ecd96d33 HTTP/1.1 diff --git a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt index 4b8b6d03..9d53b8d3 100644 --- a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt +++ b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:3080/v2/projects/44860002-3328-4d80-a40a-f373e3d5d2b3/nodes/568689fa-6648-4458-80f3-fbd84a35852c' +curl -i -X DELETE 'http://localhost:3080/v2/projects/4ea837c7-286a-4ca0-b1ce-9d7ea40a1f1f/nodes/5e1be81a-f447-4f4d-b7a0-505006981111' -DELETE /v2/projects/44860002-3328-4d80-a40a-f373e3d5d2b3/nodes/568689fa-6648-4458-80f3-fbd84a35852c HTTP/1.1 +DELETE /v2/projects/4ea837c7-286a-4ca0-b1ce-9d7ea40a1f1f/nodes/5e1be81a-f447-4f4d-b7a0-505006981111 HTTP/1.1 diff --git a/docs/api/examples/controller_get_computes.txt b/docs/api/examples/controller_get_computes.txt index 4bdbe9bf..6bc04ac4 100644 --- a/docs/api/examples/controller_get_computes.txt +++ b/docs/api/examples/controller_get_computes.txt @@ -5,7 +5,7 @@ GET /v2/computes HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 221 +CONTENT-LENGTH: 294 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -15,7 +15,9 @@ X-ROUTE: /v2/computes { "compute_id": "my_compute_id", "connected": false, + "cpu_usage_percent": null, "host": "example.com", + "memory_usage_percent": null, "name": "My super server", "port": 84, "protocol": "http", diff --git a/docs/api/examples/controller_get_computescomputeid.txt b/docs/api/examples/controller_get_computescomputeid.txt index 06f5a715..b103d5f3 100644 --- a/docs/api/examples/controller_get_computescomputeid.txt +++ b/docs/api/examples/controller_get_computescomputeid.txt @@ -5,7 +5,7 @@ GET /v2/computes/my_compute_id HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 194 +CONTENT-LENGTH: 259 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -14,7 +14,9 @@ X-ROUTE: /v2/computes/{compute_id} { "compute_id": "my_compute_id", "connected": false, + "cpu_usage_percent": null, "host": "example.com", + "memory_usage_percent": null, "name": "http://julien@example.com:84", "port": 84, "protocol": "http", diff --git a/docs/api/examples/controller_get_projects.txt b/docs/api/examples/controller_get_projects.txt index 52159422..40cd3cdc 100644 --- a/docs/api/examples/controller_get_projects.txt +++ b/docs/api/examples/controller_get_projects.txt @@ -5,7 +5,7 @@ GET /v2/projects HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 285 +CONTENT-LENGTH: 284 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -15,7 +15,7 @@ X-ROUTE: /v2/projects { "filename": "test.gns3", "name": "test", - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-400/test_list_projects1", + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_list_projects1", "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f", "status": "opened" } diff --git a/docs/api/examples/controller_get_projectsprojectid.txt b/docs/api/examples/controller_get_projectsprojectid.txt index 07d2f4df..041653d5 100644 --- a/docs/api/examples/controller_get_projectsprojectid.txt +++ b/docs/api/examples/controller_get_projectsprojectid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/1a84cee7-0277-4cfd-a264-6fd4d5027825' +curl -i -X GET 'http://localhost:3080/v2/projects/b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5' -GET /v2/projects/1a84cee7-0277-4cfd-a264-6fd4d5027825 HTTP/1.1 +GET /v2/projects/b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5 HTTP/1.1 @@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id} { "filename": "test.gns3", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_pux4vt_/projects/1a84cee7-0277-4cfd-a264-6fd4d5027825", - "project_id": "1a84cee7-0277-4cfd-a264-6fd4d5027825", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppejbpo2a/projects/b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5", + "project_id": "b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5", "status": "opened" } diff --git a/docs/api/examples/controller_get_projectsprojectiddrawings.txt b/docs/api/examples/controller_get_projectsprojectiddrawings.txt index 8eae94fe..876e0787 100644 --- a/docs/api/examples/controller_get_projectsprojectiddrawings.txt +++ b/docs/api/examples/controller_get_projectsprojectiddrawings.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/af06990c-093d-4b9f-9d31-4fae0435c8ce/drawings' +curl -i -X GET 'http://localhost:3080/v2/projects/3f671aae-cbd9-41e0-a785-5b2e241b702f/drawings' -GET /v2/projects/af06990c-093d-4b9f-9d31-4fae0435c8ce/drawings HTTP/1.1 +GET /v2/projects/3f671aae-cbd9-41e0-a785-5b2e241b702f/drawings HTTP/1.1 @@ -13,8 +13,8 @@ X-ROUTE: /v2/projects/{project_id}/drawings [ { - "drawing_id": "82d12592-c4b4-457e-adfe-60d42ddd01c9", - "project_id": "af06990c-093d-4b9f-9d31-4fae0435c8ce", + "drawing_id": "65e95f65-35a6-4c21-bc37-a5158870ad99", + "project_id": "3f671aae-cbd9-41e0-a785-5b2e241b702f", "rotation": 0, "svg": "", "x": 10, diff --git a/docs/api/examples/controller_get_projectsprojectidlinks.txt b/docs/api/examples/controller_get_projectsprojectidlinks.txt index bcc7640d..533ba987 100644 --- a/docs/api/examples/controller_get_projectsprojectidlinks.txt +++ b/docs/api/examples/controller_get_projectsprojectidlinks.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/ea00a74f-7c47-428f-9a3c-83dd681d31da/links' +curl -i -X GET 'http://localhost:3080/v2/projects/12024b7e-cb63-4f67-898f-2a9858a6589e/links' -GET /v2/projects/ea00a74f-7c47-428f-9a3c-83dd681d31da/links HTTP/1.1 +GET /v2/projects/12024b7e-cb63-4f67-898f-2a9858a6589e/links HTTP/1.1 @@ -16,19 +16,19 @@ X-ROUTE: /v2/projects/{project_id}/links "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "0edc474a-2ac1-4558-b366-b24676e52864", + "link_id": "0b37f142-dae6-4c6c-9f83-fa2169dbdc06", "nodes": [ { "adapter_number": 0, - "node_id": "2ba2088d-a4cb-4243-9421-2d9e9d119a4b", + "node_id": "7ad6abb3-3daa-4617-8d49-cbb7fe1797db", "port_number": 3 }, { "adapter_number": 2, - "node_id": "cba32dde-b445-43b5-83dc-e577409e49e4", + "node_id": "ee0b77d8-5042-4010-ab55-91b52c35f392", "port_number": 4 } ], - "project_id": "ea00a74f-7c47-428f-9a3c-83dd681d31da" + "project_id": "12024b7e-cb63-4f67-898f-2a9858a6589e" } ] diff --git a/docs/api/examples/controller_get_projectsprojectidnodes.txt b/docs/api/examples/controller_get_projectsprojectidnodes.txt index 8d67576b..709fedc4 100644 --- a/docs/api/examples/controller_get_projectsprojectidnodes.txt +++ b/docs/api/examples/controller_get_projectsprojectidnodes.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/4e98845f-e7fa-4b1e-8ba2-84fcc717763b/nodes' +curl -i -X GET 'http://localhost:3080/v2/projects/4e75e733-6925-4ab7-b569-c8e783d69006/nodes' -GET /v2/projects/4e98845f-e7fa-4b1e-8ba2-84fcc717763b/nodes HTTP/1.1 +GET /v2/projects/4e75e733-6925-4ab7-b569-c8e783d69006/nodes HTTP/1.1 @@ -27,9 +27,9 @@ X-ROUTE: /v2/projects/{project_id}/nodes }, "name": "test", "node_directory": null, - "node_id": "f65c0c2d-9b14-4ab1-a5b5-45b089d1b4fc", + "node_id": "8d436bbf-9dbb-482f-9ab6-ecd1d60eedce", "node_type": "vpcs", - "project_id": "4e98845f-e7fa-4b1e-8ba2-84fcc717763b", + "project_id": "4e75e733-6925-4ab7-b569-c8e783d69006", "properties": { "startup_script": "echo test" }, diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt index a9826028..bd7bd029 100644 --- a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt +++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/036cac10-21fa-45a3-b574-b20f1fdf3734/nodes/fb28508b-a684-483b-bf45-9dedc368b667/dynamips/auto_idlepc' +curl -i -X GET 'http://localhost:3080/v2/projects/030080fd-dd52-4a30-9bcc-e35978251ea1/nodes/aadb5f86-ed34-4349-8d38-b6672d22c48e/dynamips/auto_idlepc' -GET /v2/projects/036cac10-21fa-45a3-b574-b20f1fdf3734/nodes/fb28508b-a684-483b-bf45-9dedc368b667/dynamips/auto_idlepc HTTP/1.1 +GET /v2/projects/030080fd-dd52-4a30-9bcc-e35978251ea1/nodes/aadb5f86-ed34-4349-8d38-b6672d22c48e/dynamips/auto_idlepc HTTP/1.1 diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt index b0a5a213..b76dce2d 100644 --- a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt +++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/53035bf4-759c-44cd-8cfc-8135d639323c/nodes/31c9ebc5-f710-48e5-ab11-038b53d1666a/dynamips/idlepc_proposals' +curl -i -X GET 'http://localhost:3080/v2/projects/e5249991-dc00-4d35-9aec-68048d5f1f25/nodes/61fa2499-5fd1-439f-a63e-aaade4f93042/dynamips/idlepc_proposals' -GET /v2/projects/53035bf4-759c-44cd-8cfc-8135d639323c/nodes/31c9ebc5-f710-48e5-ab11-038b53d1666a/dynamips/idlepc_proposals HTTP/1.1 +GET /v2/projects/e5249991-dc00-4d35-9aec-68048d5f1f25/nodes/61fa2499-5fd1-439f-a63e-aaade4f93042/dynamips/idlepc_proposals HTTP/1.1 diff --git a/docs/api/examples/controller_post_computes.txt b/docs/api/examples/controller_post_computes.txt index f6db711e..5fec4984 100644 --- a/docs/api/examples/controller_post_computes.txt +++ b/docs/api/examples/controller_post_computes.txt @@ -12,7 +12,7 @@ POST /v2/computes HTTP/1.1 HTTP/1.1 201 -CONTENT-LENGTH: 194 +CONTENT-LENGTH: 259 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -21,7 +21,9 @@ X-ROUTE: /v2/computes { "compute_id": "my_compute_id", "connected": false, + "cpu_usage_percent": null, "host": "example.com", + "memory_usage_percent": null, "name": "http://julien@example.com:84", "port": 84, "protocol": "http", diff --git a/docs/api/examples/controller_post_projects.txt b/docs/api/examples/controller_post_projects.txt index c04ff6f7..ee4163b0 100644 --- a/docs/api/examples/controller_post_projects.txt +++ b/docs/api/examples/controller_post_projects.txt @@ -17,7 +17,7 @@ X-ROUTE: /v2/projects { "filename": "test.gns3", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpe6aaxp90/projects/10010203-0405-0607-0809-0a0b0c0d0e0f", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph3mo7f5h/projects/10010203-0405-0607-0809-0a0b0c0d0e0f", "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f", "status": "opened" } diff --git a/docs/api/examples/controller_post_projectsload.txt b/docs/api/examples/controller_post_projectsload.txt index 5d04371d..09a36cfc 100644 --- a/docs/api/examples/controller_post_projectsload.txt +++ b/docs/api/examples/controller_post_projectsload.txt @@ -16,7 +16,7 @@ X-ROUTE: /v2/projects/load { "filename": "test.gns3", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmm1jq_o5/projects/0924183d-5fef-4d6d-b580-b3c6b817dfe0", - "project_id": "0924183d-5fef-4d6d-b580-b3c6b817dfe0", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpw3zdvkqa/projects/c62e1f15-ea3c-4dc0-aed9-fee3d66a6480", + "project_id": "c62e1f15-ea3c-4dc0-aed9-fee3d66a6480", "status": "opened" } diff --git a/docs/api/examples/controller_post_projectsprojectidclose.txt b/docs/api/examples/controller_post_projectsprojectidclose.txt index cebda160..3e30dcac 100644 --- a/docs/api/examples/controller_post_projectsprojectidclose.txt +++ b/docs/api/examples/controller_post_projectsprojectidclose.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/f7a09edb-ea05-468f-aa24-db67409a4e35/close' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/234ec184-e165-4f4d-af7c-f283485869b1/close' -d '{}' -POST /v2/projects/f7a09edb-ea05-468f-aa24-db67409a4e35/close HTTP/1.1 +POST /v2/projects/234ec184-e165-4f4d-af7c-f283485869b1/close HTTP/1.1 {} @@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id}/close { "filename": "test.gns3", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpkkubc5dj/projects/f7a09edb-ea05-468f-aa24-db67409a4e35", - "project_id": "f7a09edb-ea05-468f-aa24-db67409a4e35", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmptannbxbk/projects/234ec184-e165-4f4d-af7c-f283485869b1", + "project_id": "234ec184-e165-4f4d-af7c-f283485869b1", "status": "opened" } diff --git a/docs/api/examples/controller_post_projectsprojectiddrawings.txt b/docs/api/examples/controller_post_projectsprojectiddrawings.txt index 8a660a80..b650a861 100644 --- a/docs/api/examples/controller_post_projectsprojectiddrawings.txt +++ b/docs/api/examples/controller_post_projectsprojectiddrawings.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/2643d960-e139-4c49-94e8-5aa36da47e4c/drawings' -d '{"svg": "", "x": 10, "y": 20, "z": 0}' +curl -i -X POST 'http://localhost:3080/v2/projects/84a7dff6-a2ef-46dd-aece-0f68b7a761f3/drawings' -d '{"svg": "", "x": 10, "y": 20, "z": 0}' -POST /v2/projects/2643d960-e139-4c49-94e8-5aa36da47e4c/drawings HTTP/1.1 +POST /v2/projects/84a7dff6-a2ef-46dd-aece-0f68b7a761f3/drawings HTTP/1.1 { "svg": "", "x": 10, @@ -17,8 +17,8 @@ SERVER: Python/3.5 GNS3/2.0.0dev1 X-ROUTE: /v2/projects/{project_id}/drawings { - "drawing_id": "ea2442e1-888f-4cbf-b534-cc22654ab90f", - "project_id": "2643d960-e139-4c49-94e8-5aa36da47e4c", + "drawing_id": "6dd8c8c3-3e23-4aa3-9105-1616c3478a56", + "project_id": "84a7dff6-a2ef-46dd-aece-0f68b7a761f3", "rotation": 0, "svg": "", "x": 10, diff --git a/docs/api/examples/controller_post_projectsprojectidlinks.txt b/docs/api/examples/controller_post_projectsprojectidlinks.txt index 6d7d8956..f44ec8bf 100644 --- a/docs/api/examples/controller_post_projectsprojectidlinks.txt +++ b/docs/api/examples/controller_post_projectsprojectidlinks.txt @@ -1,16 +1,16 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/1e84101d-53ff-4e74-a2cd-7b3defcf20d9/links' -d '{"nodes": [{"adapter_number": 0, "node_id": "7b202c02-156d-44f4-be5f-d896b86bd25f", "port_number": 3}, {"adapter_number": 2, "node_id": "dd41d495-8afd-4f8b-8dae-1b1fffeadba6", "port_number": 4}]}' +curl -i -X POST 'http://localhost:3080/v2/projects/c42b72eb-76d4-4827-82be-83afe23c357a/links' -d '{"nodes": [{"adapter_number": 0, "node_id": "bc277490-eec3-4347-90bc-9ddfb320be28", "port_number": 3}, {"adapter_number": 2, "node_id": "9be1db1b-816f-482f-b1c4-26687f32b0de", "port_number": 4}]}' -POST /v2/projects/1e84101d-53ff-4e74-a2cd-7b3defcf20d9/links HTTP/1.1 +POST /v2/projects/c42b72eb-76d4-4827-82be-83afe23c357a/links HTTP/1.1 { "nodes": [ { "adapter_number": 0, - "node_id": "7b202c02-156d-44f4-be5f-d896b86bd25f", + "node_id": "bc277490-eec3-4347-90bc-9ddfb320be28", "port_number": 3 }, { "adapter_number": 2, - "node_id": "dd41d495-8afd-4f8b-8dae-1b1fffeadba6", + "node_id": "9be1db1b-816f-482f-b1c4-26687f32b0de", "port_number": 4 } ] @@ -28,18 +28,18 @@ X-ROUTE: /v2/projects/{project_id}/links "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "db4b684a-2540-4024-afd4-3213b56cd12a", + "link_id": "f517c22e-88b0-4bd5-abf4-443e1c67b7da", "nodes": [ { "adapter_number": 0, - "node_id": "7b202c02-156d-44f4-be5f-d896b86bd25f", + "node_id": "bc277490-eec3-4347-90bc-9ddfb320be28", "port_number": 3 }, { "adapter_number": 2, - "node_id": "dd41d495-8afd-4f8b-8dae-1b1fffeadba6", + "node_id": "9be1db1b-816f-482f-b1c4-26687f32b0de", "port_number": 4 } ], - "project_id": "1e84101d-53ff-4e74-a2cd-7b3defcf20d9" + "project_id": "c42b72eb-76d4-4827-82be-83afe23c357a" } diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt index 019e8e27..b0a6f049 100644 --- a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt +++ b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/2c6943d4-b951-40e9-9622-82972566258e/links/0a9b95b9-7c56-4f6d-af89-34f540073f2f/start_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/eabbad3e-53b1-4777-9101-24f361dfa19f/links/df5438b4-1301-4c64-ba87-4367722a03a7/start_capture' -d '{}' -POST /v2/projects/2c6943d4-b951-40e9-9622-82972566258e/links/0a9b95b9-7c56-4f6d-af89-34f540073f2f/start_capture HTTP/1.1 +POST /v2/projects/eabbad3e-53b1-4777-9101-24f361dfa19f/links/df5438b4-1301-4c64-ba87-4367722a03a7/start_capture HTTP/1.1 {} @@ -15,7 +15,7 @@ X-ROUTE: /v2/projects/{project_id}/links/{link_id}/start_capture "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "0a9b95b9-7c56-4f6d-af89-34f540073f2f", + "link_id": "df5438b4-1301-4c64-ba87-4367722a03a7", "nodes": [], - "project_id": "2c6943d4-b951-40e9-9622-82972566258e" + "project_id": "eabbad3e-53b1-4777-9101-24f361dfa19f" } diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt index 16bc7927..bae65d9a 100644 --- a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt +++ b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/0fb13845-d69a-43c8-b062-0733cf9f33f6/links/2282e661-12fe-47de-b7b6-20064a772cbc/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/6decafaa-f9d9-4a39-8009-f44f3d608eef/links/e8eb0e6d-ba57-4be2-b434-dbcd38410722/stop_capture' -d '{}' -POST /v2/projects/0fb13845-d69a-43c8-b062-0733cf9f33f6/links/2282e661-12fe-47de-b7b6-20064a772cbc/stop_capture HTTP/1.1 +POST /v2/projects/6decafaa-f9d9-4a39-8009-f44f3d608eef/links/e8eb0e6d-ba57-4be2-b434-dbcd38410722/stop_capture HTTP/1.1 {} @@ -15,7 +15,7 @@ X-ROUTE: /v2/projects/{project_id}/links/{link_id}/stop_capture "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "2282e661-12fe-47de-b7b6-20064a772cbc", + "link_id": "e8eb0e6d-ba57-4be2-b434-dbcd38410722", "nodes": [], - "project_id": "0fb13845-d69a-43c8-b062-0733cf9f33f6" + "project_id": "6decafaa-f9d9-4a39-8009-f44f3d608eef" } diff --git a/docs/api/examples/controller_post_projectsprojectidnodes.txt b/docs/api/examples/controller_post_projectsprojectidnodes.txt index d8e6b1d2..53e258dc 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodes.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodes.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/87e475be-751f-449e-8065-c83a98f47a78/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}' +curl -i -X POST 'http://localhost:3080/v2/projects/bbfbe6c6-a76f-46df-9926-5779a0d085df/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}' -POST /v2/projects/87e475be-751f-449e-8065-c83a98f47a78/nodes HTTP/1.1 +POST /v2/projects/bbfbe6c6-a76f-46df-9926-5779a0d085df/nodes HTTP/1.1 { "compute_id": "example.com", "name": "test", @@ -33,9 +33,9 @@ X-ROUTE: /v2/projects/{project_id}/nodes }, "name": "test", "node_directory": null, - "node_id": "a1b1c1d9-2c81-48b3-8760-b761a9a5bce3", + "node_id": "4a3c6dbb-dea0-4495-8cb9-5fed340bc7ea", "node_type": "vpcs", - "project_id": "87e475be-751f-449e-8065-c83a98f47a78", + "project_id": "bbfbe6c6-a76f-46df-9926-5779a0d085df", "properties": { "startup_script": "echo test" }, diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt index 547babe4..4a831506 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/fe1e2fad-e6e4-4470-8c2e-44de93628422/nodes/78ea2484-c9a9-4083-92d8-c79ac218569d/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/4ff7f05e-b11b-4d06-8757-3dccef62f8df/nodes/bab7352a-69e5-4395-a908-f6f1cd1df213/reload' -d '{}' -POST /v2/projects/fe1e2fad-e6e4-4470-8c2e-44de93628422/nodes/78ea2484-c9a9-4083-92d8-c79ac218569d/reload HTTP/1.1 +POST /v2/projects/4ff7f05e-b11b-4d06-8757-3dccef62f8df/nodes/bab7352a-69e5-4395-a908-f6f1cd1df213/reload HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt index e4d42d18..48a784ff 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/11dddbcf-f323-4073-9f76-c3bccf93321e/nodes/e1a20e97-16e7-460e-97b1-5ac0df45891f/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/51c45968-cf8d-452a-b070-417504221f8f/nodes/579139f5-e617-4afe-a544-3e250f1c08ee/start' -d '{}' -POST /v2/projects/11dddbcf-f323-4073-9f76-c3bccf93321e/nodes/e1a20e97-16e7-460e-97b1-5ac0df45891f/start HTTP/1.1 +POST /v2/projects/51c45968-cf8d-452a-b070-417504221f8f/nodes/579139f5-e617-4afe-a544-3e250f1c08ee/start HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt index 60240cd8..548e143d 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/b0e1da88-6576-4b74-a3dd-5ec6d45ce51c/nodes/1eb6f22a-e88c-4e65-963a-49adbc3f4167/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/316b9215-3ebe-4078-9420-53e6ecec47f3/nodes/0e56a3a6-c5c9-45c1-92be-d9de3278d8db/stop' -d '{}' -POST /v2/projects/b0e1da88-6576-4b74-a3dd-5ec6d45ce51c/nodes/1eb6f22a-e88c-4e65-963a-49adbc3f4167/stop HTTP/1.1 +POST /v2/projects/316b9215-3ebe-4078-9420-53e6ecec47f3/nodes/0e56a3a6-c5c9-45c1-92be-d9de3278d8db/stop HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt index ed351945..c7396aa9 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/fce29e84-7993-4693-a394-64a570330066/nodes/8cb4add0-3a54-45f1-b9a0-b97fcb3a8c8b/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/163eb9ae-4f77-45ba-a515-a42ca07eab10/nodes/5f153630-560a-45f7-99da-48b3137d4aa7/suspend' -d '{}' -POST /v2/projects/fce29e84-7993-4693-a394-64a570330066/nodes/8cb4add0-3a54-45f1-b9a0-b97fcb3a8c8b/suspend HTTP/1.1 +POST /v2/projects/163eb9ae-4f77-45ba-a515-a42ca07eab10/nodes/5f153630-560a-45f7-99da-48b3137d4aa7/suspend HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt index fe3b1786..d3506e37 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/943065be-24ea-43ad-ad57-21b060bf324c/nodes/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/ae6be0a7-6b6a-4f01-9a4b-de833b12a50e/nodes/reload' -d '{}' -POST /v2/projects/943065be-24ea-43ad-ad57-21b060bf324c/nodes/reload HTTP/1.1 +POST /v2/projects/ae6be0a7-6b6a-4f01-9a4b-de833b12a50e/nodes/reload HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt index 3408fa6d..17d99374 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/6bdbd12f-6053-47e6-9aaa-c07317aa91d7/nodes/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/b4072f94-3ed8-4496-b774-152082a08956/nodes/start' -d '{}' -POST /v2/projects/6bdbd12f-6053-47e6-9aaa-c07317aa91d7/nodes/start HTTP/1.1 +POST /v2/projects/b4072f94-3ed8-4496-b774-152082a08956/nodes/start HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt index 70611b53..f75eb64f 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/4951829b-c2df-4be7-943e-ee5732f8fafb/nodes/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/a4e5e7d2-dec6-4d38-89c3-8a48d2c67793/nodes/stop' -d '{}' -POST /v2/projects/4951829b-c2df-4be7-943e-ee5732f8fafb/nodes/stop HTTP/1.1 +POST /v2/projects/a4e5e7d2-dec6-4d38-89c3-8a48d2c67793/nodes/stop HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt index 31a64625..2cd14c57 100644 --- a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt +++ b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/5e4c9fe2-34c3-4901-b485-c4115ca99e9f/nodes/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/1f14792a-4d5f-4861-9346-aa9df42a7332/nodes/suspend' -d '{}' -POST /v2/projects/5e4c9fe2-34c3-4901-b485-c4115ca99e9f/nodes/suspend HTTP/1.1 +POST /v2/projects/1f14792a-4d5f-4861-9346-aa9df42a7332/nodes/suspend HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidopen.txt b/docs/api/examples/controller_post_projectsprojectidopen.txt index 1b03ef11..d6d7d5f8 100644 --- a/docs/api/examples/controller_post_projectsprojectidopen.txt +++ b/docs/api/examples/controller_post_projectsprojectidopen.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:3080/v2/projects/f4d8b0cb-eccb-4b98-875a-eee63c081a5d/open' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e/open' -d '{}' -POST /v2/projects/f4d8b0cb-eccb-4b98-875a-eee63c081a5d/open HTTP/1.1 +POST /v2/projects/3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e/open HTTP/1.1 {} @@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id}/open { "filename": "test.gns3", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpndez2wp3/projects/f4d8b0cb-eccb-4b98-875a-eee63c081a5d", - "project_id": "f4d8b0cb-eccb-4b98-875a-eee63c081a5d", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpby9j9ch1/projects/3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e", + "project_id": "3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e", "status": "opened" } diff --git a/docs/api/examples/controller_put_computescomputeid.txt b/docs/api/examples/controller_put_computescomputeid.txt index 4f46f2f2..e9c5afb4 100644 --- a/docs/api/examples/controller_put_computescomputeid.txt +++ b/docs/api/examples/controller_put_computescomputeid.txt @@ -12,7 +12,7 @@ PUT /v2/computes/my_compute_id HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 195 +CONTENT-LENGTH: 260 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -21,7 +21,9 @@ X-ROUTE: /v2/computes/{compute_id} { "compute_id": "my_compute_id", "connected": false, + "cpu_usage_percent": null, "host": "example.com", + "memory_usage_percent": null, "name": "http://julien@example.com:84", "port": 84, "protocol": "https", diff --git a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt index 40f929d0..c7293f56 100644 --- a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt +++ b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:3080/v2/projects/5bead709-1759-478c-9c0f-77d0edb9f760/drawings/3edb7b33-91da-4f7b-9699-97a80d921501' -d '{"x": 42}' +curl -i -X PUT 'http://localhost:3080/v2/projects/ccbcb061-2217-4d51-8a58-4dc449febf51/drawings/da5b82f0-9064-4a3e-9d59-560bbb93d884' -d '{"x": 42}' -PUT /v2/projects/5bead709-1759-478c-9c0f-77d0edb9f760/drawings/3edb7b33-91da-4f7b-9699-97a80d921501 HTTP/1.1 +PUT /v2/projects/ccbcb061-2217-4d51-8a58-4dc449febf51/drawings/da5b82f0-9064-4a3e-9d59-560bbb93d884 HTTP/1.1 { "x": 42 } @@ -14,8 +14,8 @@ SERVER: Python/3.5 GNS3/2.0.0dev1 X-ROUTE: /v2/projects/{project_id}/drawings/{drawing_id} { - "drawing_id": "3edb7b33-91da-4f7b-9699-97a80d921501", - "project_id": "5bead709-1759-478c-9c0f-77d0edb9f760", + "drawing_id": "da5b82f0-9064-4a3e-9d59-560bbb93d884", + "project_id": "ccbcb061-2217-4d51-8a58-4dc449febf51", "rotation": 0, "svg": "", "x": 42, diff --git a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt index e5efccff..d9ea25c7 100644 --- a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt +++ b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:3080/v2/projects/afb97df7-c471-4e51-98a8-8bb991b00aa9/nodes/55b06206-e9af-4290-a064-f4303a0aa304' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}' +curl -i -X PUT 'http://localhost:3080/v2/projects/f56c0169-3bae-45c3-80d2-a222679db430/nodes/373d4ce5-13aa-46df-9556-1d177106ab80' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}' -PUT /v2/projects/afb97df7-c471-4e51-98a8-8bb991b00aa9/nodes/55b06206-e9af-4290-a064-f4303a0aa304 HTTP/1.1 +PUT /v2/projects/f56c0169-3bae-45c3-80d2-a222679db430/nodes/373d4ce5-13aa-46df-9556-1d177106ab80 HTTP/1.1 { "compute_id": "example.com", "name": "test", @@ -33,9 +33,9 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id} }, "name": "test", "node_directory": null, - "node_id": "55b06206-e9af-4290-a064-f4303a0aa304", + "node_id": "373d4ce5-13aa-46df-9556-1d177106ab80", "node_type": "vpcs", - "project_id": "afb97df7-c471-4e51-98a8-8bb991b00aa9", + "project_id": "f56c0169-3bae-45c3-80d2-a222679db430", "properties": {}, "status": "stopped", "symbol": ":/symbols/computer.svg", diff --git a/docs/api/notifications/compute.created.json b/docs/api/notifications/compute.created.json new file mode 100644 index 00000000..4008519d --- /dev/null +++ b/docs/api/notifications/compute.created.json @@ -0,0 +1,11 @@ +{ + "compute_id": "my_compute", + "connected": false, + "cpu_usage_percent": null, + "host": "example.com", + "memory_usage_percent": null, + "name": "http://julien@example.com:84", + "port": 84, + "protocol": "http", + "user": "julien" +} \ No newline at end of file diff --git a/docs/api/notifications/compute.deleted.json b/docs/api/notifications/compute.deleted.json new file mode 100644 index 00000000..60e56f7c --- /dev/null +++ b/docs/api/notifications/compute.deleted.json @@ -0,0 +1,11 @@ +{ + "compute_id": "my_compute_id", + "connected": false, + "cpu_usage_percent": null, + "host": "example.com", + "memory_usage_percent": null, + "name": "http://julien@example.com:84", + "port": 84, + "protocol": "http", + "user": "julien" +} \ No newline at end of file diff --git a/docs/api/notifications/compute.updated.json b/docs/api/notifications/compute.updated.json new file mode 100644 index 00000000..00271f64 --- /dev/null +++ b/docs/api/notifications/compute.updated.json @@ -0,0 +1,11 @@ +{ + "compute_id": "my_compute_id", + "connected": false, + "cpu_usage_percent": null, + "host": "example.com", + "memory_usage_percent": null, + "name": "http://julien@example.com:84", + "port": 84, + "protocol": "https", + "user": "julien" +} \ No newline at end of file diff --git a/docs/api/notifications/drawing.created.json b/docs/api/notifications/drawing.created.json new file mode 100644 index 00000000..b9c9b77e --- /dev/null +++ b/docs/api/notifications/drawing.created.json @@ -0,0 +1,9 @@ +{ + "drawing_id": "65e95f65-35a6-4c21-bc37-a5158870ad99", + "project_id": "3f671aae-cbd9-41e0-a785-5b2e241b702f", + "rotation": 0, + "svg": "", + "x": 10, + "y": 20, + "z": 0 +} \ No newline at end of file diff --git a/docs/api/notifications/drawing.deleted.json b/docs/api/notifications/drawing.deleted.json new file mode 100644 index 00000000..b90d50ef --- /dev/null +++ b/docs/api/notifications/drawing.deleted.json @@ -0,0 +1,9 @@ +{ + "drawing_id": "246a4d6f-f046-4376-b3f5-b56d4a27803c", + "project_id": "d02d47d4-282e-4643-8308-87dba6d31c7c", + "rotation": 0, + "svg": "", + "x": 0, + "y": 0, + "z": 0 +} \ No newline at end of file diff --git a/docs/api/notifications/drawing.updated.json b/docs/api/notifications/drawing.updated.json new file mode 100644 index 00000000..1b7720c8 --- /dev/null +++ b/docs/api/notifications/drawing.updated.json @@ -0,0 +1,8 @@ +{ + "drawing_id": "da5b82f0-9064-4a3e-9d59-560bbb93d884", + "project_id": "ccbcb061-2217-4d51-8a58-4dc449febf51", + "rotation": 0, + "x": 42, + "y": 20, + "z": 0 +} \ No newline at end of file diff --git a/docs/api/notifications/ignore.json b/docs/api/notifications/ignore.json new file mode 100644 index 00000000..9bf8f5c3 --- /dev/null +++ b/docs/api/notifications/ignore.json @@ -0,0 +1,3 @@ +{ + "project_id": 42 +} \ No newline at end of file diff --git a/docs/api/notifications/link.created.json b/docs/api/notifications/link.created.json new file mode 100644 index 00000000..6ec24d3a --- /dev/null +++ b/docs/api/notifications/link.created.json @@ -0,0 +1,19 @@ +{ + "capture_file_name": null, + "capture_file_path": null, + "capturing": false, + "link_id": "0b37f142-dae6-4c6c-9f83-fa2169dbdc06", + "nodes": [ + { + "adapter_number": 0, + "node_id": "7ad6abb3-3daa-4617-8d49-cbb7fe1797db", + "port_number": 3 + }, + { + "adapter_number": 2, + "node_id": "ee0b77d8-5042-4010-ab55-91b52c35f392", + "port_number": 4 + } + ], + "project_id": "12024b7e-cb63-4f67-898f-2a9858a6589e" +} \ No newline at end of file diff --git a/docs/api/notifications/link.deleted.json b/docs/api/notifications/link.deleted.json new file mode 100644 index 00000000..21af85e1 --- /dev/null +++ b/docs/api/notifications/link.deleted.json @@ -0,0 +1,8 @@ +{ + "capture_file_name": null, + "capture_file_path": null, + "capturing": false, + "link_id": "e74e45eb-364c-4a91-a902-c591ecd96d33", + "nodes": [], + "project_id": "35b02ebb-6e70-4077-b752-e759c38f4b81" +} \ No newline at end of file diff --git a/docs/api/notifications/link.updated.json b/docs/api/notifications/link.updated.json new file mode 100644 index 00000000..76b0e126 --- /dev/null +++ b/docs/api/notifications/link.updated.json @@ -0,0 +1,19 @@ +{ + "capture_file_name": "V1_0-4_to_I1_3-1.pcap", + "capture_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9sl1mhpc/projects/555df717-1a35-4203-84e2-8523b8d75cb4/project-files/captures/V1_0-4_to_I1_3-1.pcap", + "capturing": false, + "link_id": "2e6bfd5e-174b-4833-ad60-2174b33e9b21", + "nodes": [ + { + "adapter_number": 0, + "node_id": "d490f5cb-d3a9-42bd-b074-88f472948b0e", + "port_number": 4 + }, + { + "adapter_number": 3, + "node_id": "b2848d9f-6542-4298-9d28-09d8d0062aef", + "port_number": 1 + } + ], + "project_id": "555df717-1a35-4203-84e2-8523b8d75cb4" +} \ No newline at end of file diff --git a/docs/api/notifications/log.error.json b/docs/api/notifications/log.error.json new file mode 100644 index 00000000..aaf314d7 --- /dev/null +++ b/docs/api/notifications/log.error.json @@ -0,0 +1,3 @@ +{ + "message": "Permission denied on /tmp" +} \ No newline at end of file diff --git a/docs/api/notifications/log.info.json b/docs/api/notifications/log.info.json new file mode 100644 index 00000000..f77299a5 --- /dev/null +++ b/docs/api/notifications/log.info.json @@ -0,0 +1,3 @@ +{ + "message": "Image uploaded" +} \ No newline at end of file diff --git a/docs/api/notifications/log.warning.json b/docs/api/notifications/log.warning.json new file mode 100644 index 00000000..5d630354 --- /dev/null +++ b/docs/api/notifications/log.warning.json @@ -0,0 +1,3 @@ +{ + "message": "Warning ASA 8 is not officialy supported by GNS3" +} \ No newline at end of file diff --git a/docs/api/notifications/node.created.json b/docs/api/notifications/node.created.json new file mode 100644 index 00000000..e24038fa --- /dev/null +++ b/docs/api/notifications/node.created.json @@ -0,0 +1,3 @@ +{ + "a": "b" +} \ No newline at end of file diff --git a/docs/api/notifications/node.deleted.json b/docs/api/notifications/node.deleted.json new file mode 100644 index 00000000..0f5357c5 --- /dev/null +++ b/docs/api/notifications/node.deleted.json @@ -0,0 +1,25 @@ +{ + "command_line": null, + "compute_id": "example.com", + "console": null, + "console_host": "example.org", + "console_type": null, + "label": { + "color": "#ff000000", + "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "text": "", + "x": -17.0234375, + "y": -25.0 + }, + "name": "test", + "node_directory": null, + "node_id": "5e1be81a-f447-4f4d-b7a0-505006981111", + "node_type": "vpcs", + "project_id": "4ea837c7-286a-4ca0-b1ce-9d7ea40a1f1f", + "properties": {}, + "status": "stopped", + "symbol": ":/symbols/computer.svg", + "x": 0, + "y": 0, + "z": 0 +} \ No newline at end of file diff --git a/docs/api/notifications/node.updated.json b/docs/api/notifications/node.updated.json new file mode 100644 index 00000000..8de60010 --- /dev/null +++ b/docs/api/notifications/node.updated.json @@ -0,0 +1,25 @@ +{ + "command_line": null, + "compute_id": "example.com", + "console": null, + "console_host": "example.org", + "console_type": null, + "label": { + "color": "#ff000000", + "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "text": "", + "x": -17.0234375, + "y": -25.0 + }, + "name": "test", + "node_directory": null, + "node_id": "373d4ce5-13aa-46df-9556-1d177106ab80", + "node_type": "vpcs", + "project_id": "f56c0169-3bae-45c3-80d2-a222679db430", + "properties": {}, + "status": "stopped", + "symbol": ":/symbols/computer.svg", + "x": 0, + "y": 0, + "z": 0 +} \ No newline at end of file diff --git a/docs/api/notifications/ping.json b/docs/api/notifications/ping.json new file mode 100644 index 00000000..4df2d436 --- /dev/null +++ b/docs/api/notifications/ping.json @@ -0,0 +1,3 @@ +{ + "compute_id": 12 +} \ No newline at end of file diff --git a/docs/api/notifications/settings.updated.json b/docs/api/notifications/settings.updated.json new file mode 100644 index 00000000..69fbf10a --- /dev/null +++ b/docs/api/notifications/settings.updated.json @@ -0,0 +1,3 @@ +{ + "test": true +} \ No newline at end of file diff --git a/docs/api/notifications/test.json b/docs/api/notifications/test.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/docs/api/notifications/test.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index b8be2016..ba6ddf55 100644 --- a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on an ATM switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 523f3841..690dead3 100644 --- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to an ATM switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from an ATM switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 5c2274c3..37472348 100644 --- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on an ATM switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index ede2ac8c..56080a32 100644 --- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a cloud instance Parameters ********** -- **port_number**: Port on the cloud -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the cloud (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the cloud +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from a cloud instance Parameters ********** -- **port_number**: Port on the cloud -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the cloud (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the cloud +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 4ac538d8..c6c4abc4 100644 --- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a cloud instance Parameters ********** -- **port_number**: Port on the cloud -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the cloud (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the cloud +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 2941b6a7..0ef066b3 100644 --- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a cloud instance Parameters ********** -- **port_number**: Port on the cloud -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the cloud (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the cloud +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst index af6a7a01..42a52c04 100644 --- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a Docker container Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter where the nio should be added +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a Docker container Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter where the nio should be added +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index aaa34f47..10062644 100644 --- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a Docker container instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 0e531461..149b6674 100644 --- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a Docker container instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 904e192a..f7871c12 100644 --- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a Dynamips VM instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter where the nio should be added +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from a Dynamips VM instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter from where the nio should be removed +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index ce05a6f3..e92fa5a7 100644 --- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a Dynamips VM instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index f6acc1b6..3fb34a24 100644 --- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a Dynamips VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 31d3d125..ef0cd267 100644 --- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to an Ethernet hub instance Parameters ********** -- **port_number**: Port on the hub -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the hub (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the hub +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from an Ethernet hub instance Parameters ********** -- **port_number**: Port on the hub -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the hub (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the hub +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index c860eb48..39d6cb29 100644 --- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on an Ethernet hub instance Parameters ********** -- **port_number**: Port on the hub -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the hub (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the hub +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index e09214b7..0450df8a 100644 --- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on an Ethernet hub instance Parameters ********** -- **port_number**: Port on the hub -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the hub (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the hub +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 84c94e64..a1c1fcd9 100644 --- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to an Ethernet switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from an Ethernet switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index e65ec2f5..5b0441af 100644 --- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on an Ethernet switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index a07bf3c7..6d8ba8de 100644 --- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on an Ethernet switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index dba2b096..9657e2bd 100644 --- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a Frame Relay switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from a Frame Relay switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index fed437bf..5bc70cd5 100644 --- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a Frame Relay switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 5ed8e932..8de75f26 100644 --- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a Frame Relay switch instance Parameters ********** -- **port_number**: Port on the switch -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter on the switch (always 0) +- **project_id**: Project UUID +- **port_number**: Port on the switch +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst index be3466bd..8d92b949 100644 --- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a IOU instance Parameters ********** -- **port_number**: Port where the nio should be added -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Network adapter where the nio is located +- **project_id**: Project UUID +- **port_number**: Port where the nio should be added +- **node_id**: Node UUID Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a IOU instance Parameters ********** -- **port_number**: Port from where the nio should be removed -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Network adapter where the nio is located +- **project_id**: Project UUID +- **port_number**: Port from where the nio should be removed +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 1ae60494..e83d8898 100644 --- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on an IOU VM instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index f45f1fa4..fa74f200 100644 --- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on an IOU VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 8aa66c8e..ac6a8c46 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a Qemu VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Network adapter where the nio is located +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a Qemu VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Network adapter where the nio is located +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 8757068b..6121bf1a 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a Qemu VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 14ec7c01..046d7839 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a Qemu VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 396c82fb..11dfa599 100644 --- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a VirtualBox VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter where the nio should be added +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a VirtualBox VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter from where the nio should be removed +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 4cded3b3..3c79c652 100644 --- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a VirtualBox VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 7417f421..a2e42d04 100644 --- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a VirtualBox VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 1fdbbfa9..a7104f5c 100644 --- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a VMware VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter where the nio should be added +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from a VMware VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter from where the nio should be removed +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index ed0207c9..d418d432 100644 --- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a VMware VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 245d5512..6dcb6076 100644 --- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a VMware VM instance Parameters ********** -- **port_number**: Port on the adapter (always 0) -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter (always 0) +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index ecd726ba..569f5c96 100644 --- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a VPCS instance Parameters ********** -- **port_number**: Port where the nio should be added -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Network adapter where the nio is located +- **project_id**: Project UUID +- **port_number**: Port where the nio should be added +- **node_id**: Node UUID Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a VPCS instance Parameters ********** -- **port_number**: Port from where the nio should be removed -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Network adapter where the nio is located +- **project_id**: Project UUID +- **port_number**: Port from where the nio should be removed +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 1f64e2c8..ad08e9bf 100644 --- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a VPCS instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to start a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 6893ef8a..18f566e7 100644 --- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a VPCS instance Parameters ********** -- **port_number**: Port on the adapter -- **project_id**: Project UUID -- **node_id**: Node UUID - **adapter_number**: Adapter to stop a packet capture +- **project_id**: Project UUID +- **port_number**: Port on the adapter +- **node_id**: Node UUID Response status codes ********************** diff --git a/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst b/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst index 956f0a76..749b099f 100644 --- a/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst +++ b/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst @@ -9,8 +9,8 @@ Create a new drawing instance Parameters ********** -- **drawing_id**: Drawing UUID - **project_id**: Project UUID +- **drawing_id**: Drawing UUID Response status codes ********************** @@ -60,8 +60,8 @@ Delete a drawing instance Parameters ********** -- **drawing_id**: Drawing UUID - **project_id**: Project UUID +- **drawing_id**: Drawing UUID Response status codes ********************** diff --git a/docs/curl.rst b/docs/curl.rst index 41a22284..f425d3be 100644 --- a/docs/curl.rst +++ b/docs/curl.rst @@ -167,7 +167,7 @@ The port is the field console in the create Node request. Checking for duplicate address... PC1 : 192.168.1.1 255.255.255.0 - VPCS> disconnect + VPCS> disconnect Good-bye Connection closed by foreign host. @@ -243,6 +243,8 @@ You can see notification about the changes via the notification feed: A websocket version is also available on http://localhost:3080/v2/projects/b8c070f7-f34c-4b7b-ba6f-be3d26ed073f/notifications/ws +Read :doc:`notifications` for more informations + How to found the endpoints? ########################### diff --git a/docs/general.rst b/docs/general.rst index f8c5c43c..4bb1dd52 100644 --- a/docs/general.rst +++ b/docs/general.rst @@ -95,26 +95,10 @@ the API over HTTPS. Notifications ============= + You can receive notification from the server if you listen the HTTP stream /notifications or the websocket. -The available notification are: - * ping - * compute.created - * compute.updated - * compute.deleted - * node.created - * node.updated - * node.deleted - * link.created - * link.updated - * link.deleted - * drawing.created - * drawing.updated - * drawing.deleted - * log.error - * log.warning - * log.info - * settings.updated +Read :doc:`notifications` for more informations Previous versions ================= diff --git a/docs/index.rst b/docs/index.rst index d92b8ace..de821515 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -22,6 +22,7 @@ API general glossary curl + notifications endpoints GNS3 developements diff --git a/docs/notifications.rst b/docs/notifications.rst new file mode 100644 index 00000000..81dd1472 --- /dev/null +++ b/docs/notifications.rst @@ -0,0 +1,160 @@ +Notifications +============= + +You can receive notification from the controller allowing you to update your local data. + +Notifications endpoints +*********************** + +You can listen the HTTP stream /notifications or the websocket. + + * :doc:`api/v2/controller/project/projectsprojectidnotifications` + * :doc:`api/v2/controller/project/projectsprojectidnotificationsws` + +We recommend using the websocket. + +Available notifications +*********************** + +.. contents:: + :local: + +ping +---- +Keep the connection between client and controller. + +.. literalinclude:: api/notifications/ping.json + + +compute.created +---------------- + +Compute has been created. + +.. literalinclude:: api/notifications/compute.created.json + + +compute.updated +---------------- + +Compute has been updated. You will receive a lot of this +event because it's include change of CPU and memory usage +on the compute node. + +.. literalinclude:: api/notifications/compute.updated.json + + +compute.deleted +--------------- + +Compute has been deleted. + +.. literalinclude:: api/notifications/compute.deleted.json + + +node.created +------------ + +Node has been created. + +.. literalinclude:: api/notifications/node.created.json + + +node.updated +------------ + +Node has been updated. + +.. literalinclude:: api/notifications/node.updated.json + + +node.deleted +------------ + +Node has been deleted. + +.. literalinclude:: api/notifications/node.deleted.json + + +link.created +------------ + +Link has been created. Note that a link when created +is not yet connected to both part. + +.. literalinclude:: api/notifications/link.created.json + + +link.updated +------------ + +Link has been updated. + +.. literalinclude:: api/notifications/link.updated.json + + +link.deleted +------------ + +Link has been deleted. + +.. literalinclude:: api/notifications/link.deleted.json + + +drawing.created +--------------- + +Drawing has been created. + +.. literalinclude:: api/notifications/drawing.created.json + + +drawing.updated +--------------- + +Drawing has been updated. To reduce data transfert if the +svg field has not change the field is not included. + +.. literalinclude:: api/notifications/drawing.updated.json + + +drawing.deleted +--------------- + +Drawing has been deleted. + +.. literalinclude:: api/notifications/drawing.deleted.json + + +log.error +--------- + +Send an error to the user + +.. literalinclude:: api/notifications/log.error.json + + +log.warning +------------ + +Send a warning to the user + +.. literalinclude:: api/notifications/log.warning.json + + +log.info +--------- + +Send an information to the user + +.. literalinclude:: api/notifications/log.info.json + + +settings.updated +----------------- + +GUI settings updated. Will be removed in a later release. + +.. literalinclude:: api/notifications/settings.updated.json + + diff --git a/gns3server/controller/notification.py b/gns3server/controller/notification.py index c52bc551..f499073b 100644 --- a/gns3server/controller/notification.py +++ b/gns3server/controller/notification.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +import os import aiohttp from contextlib import contextmanager @@ -75,6 +76,19 @@ class Notification: :param action: Action name :param event: Event to send """ + + # If use in tests for documentation we save a sample + if os.environ.get("PYTEST_BUILD_DOCUMENTATION") == "1": + os.makedirs("docs/api/notifications", exist_ok=True) + try: + import json + data = json.dumps(event, indent=4, sort_keys=True) + if "MagicMock" not in data: + with open(os.path.join("docs/api/notifications", action + ".json"), 'w+') as f: + f.write(data) + except TypeError: # If we receive a mock as an event it will raise TypeError when using json dump + pass + if "project_id" in event: self._send_event_to_project(event["project_id"], action, event) else: diff --git a/scripts/documentation.sh b/scripts/documentation.sh index 3dd1db86..38464e30 100755 --- a/scripts/documentation.sh +++ b/scripts/documentation.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # # Copyright (C) 2015 GNS3 Technologies Inc. # @@ -28,7 +28,7 @@ export PYTEST_BUILD_DOCUMENTATION=1 rm -Rf docs/api/ mkdir -p docs/api/examples -py.test -v tests/handlers +py.test -v tests export PYTHONPATH=. python3 gns3server/web/documentation.py diff --git a/tests/controller/test_notification.py b/tests/controller/test_notification.py index 2e201075..3bfe7bf7 100644 --- a/tests/controller/test_notification.py +++ b/tests/controller/test_notification.py @@ -112,3 +112,10 @@ def test_dispatch_node_updated(async_run, controller, node, project): assert action == "node.updated" assert event["name"] == "hello" assert event["properties"]["startup_config"] == "ip 192" + + +def test_various_notification(controller): + notif = controller.notification + notif.emit("log.info", {"message": "Image uploaded"}) + notif.emit("log.warning", {"message": "Warning ASA 8 is not officialy supported by GNS3"}) + notif.emit("log.error", {"message": "Permission denied on /tmp"})