diff --git a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 5ed0c891..c2af051b 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/305224bd-aab4-4bdb-a4b1-dc652a941a77/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/a50af7fb-1337-472d-b345-e9127ebf32fc/adapters/0/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/305224bd-aab4-4bdb-a4b1-dc652a941a77/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/a50af7fb-1337-472d-b345-e9127ebf32fc/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 47435c34..2d7702b0 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/0bd39f79-0b73-442b-bc55-77bd2d2fff16' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/239df2a0-a6dd-41fc-8864-c2f56ba4336f' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/0bd39f79-0b73-442b-bc55-77bd2d2fff16 HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/239df2a0-a6dd-41fc-8864-c2f56ba4336f HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt index 7a311334..e013f7bc 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/24d1f352-8017-4959-b860-4abc0baf8470/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/70b80558-6125-4906-96ce-6c1b7e8fd3d1/adapters/1/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/24d1f352-8017-4959-b860-4abc0baf8470/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/70b80558-6125-4906-96ce-6c1b7e8fd3d1/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 85a29d18..f70a8914 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/b146a1d0-8961-4614-85d5-a351db2f06cd' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ea36b1d0-f063-49b5-bdd9-9a77e7a00e15' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b146a1d0-8961-4614-85d5-a351db2f06cd HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ea36b1d0-f063-49b5-bdd9-9a77e7a00e15 HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt index cba99551..f0940844 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/a8d07b94-8f39-4fc1-ba10-cd8d7eef3acf/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7b2602b2-0866-48bf-b794-a3dc8c3c504f/adapters/1/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a8d07b94-8f39-4fc1-ba10-cd8d7eef3acf/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7b2602b2-0866-48bf-b794-a3dc8c3c504f/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 cac5dfce..ff4d91eb 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/1b1f5eff-6bdf-437f-b568-654454bec4e5/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c99b6aa0-b5e6-4f72-a383-0be455abadfc/adapters/0/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/1b1f5eff-6bdf-437f-b568-654454bec4e5/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c99b6aa0-b5e6-4f72-a383-0be455abadfc/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 67224f9a..4aac81e2 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/342a5f3b-63a1-4d18-85e6-bf4681dfb72d' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e59e9694-d15b-47b5-9553-c608df755350' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/342a5f3b-63a1-4d18-85e6-bf4681dfb72d HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e59e9694-d15b-47b5-9553-c608df755350 HTTP/1.1 diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt index e3d3e7ab..d0858158 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/4c0fce7a-142e-440a-870b-e00bac7785ae/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/37c887a4-e766-484a-8179-b3d397b48e70/adapters/0/ports/0/nio' -DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4c0fce7a-142e-440a-870b-e00bac7785ae/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/37c887a4-e766-484a-8179-b3d397b48e70/adapters/0/ports/0/nio HTTP/1.1 diff --git a/docs/api/examples/compute_get_interfaces.txt b/docs/api/examples/compute_get_interfaces.txt deleted file mode 100644 index e0e99d9e..00000000 --- a/docs/api/examples/compute_get_interfaces.txt +++ /dev/null @@ -1,405 +0,0 @@ -curl -i -X GET 'http://localhost:3080/v2/compute/interfaces' - -GET /v2/compute/interfaces HTTP/1.1 - - - -HTTP/1.1 200 -CONTENT-LENGTH: 9218 -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/interfaces - -[ - { - "id": "bridge0", - "ip_address": "", - "mac_address": "3e:07:54:87:bc:00", - "name": "bridge0" - }, - { - "id": "en0", - "ip_address": "", - "mac_address": "3c:07:54:78:07:cc", - "name": "en0" - }, - { - "id": "en1", - "ip_address": "192.168.84.106", - "mac_address": "68:a8:6d:4a:c3:16", - "name": "en1" - }, - { - "id": "en2", - "ip_address": "", - "mac_address": "d2:00:1b:c0:17:80", - "name": "en2" - }, - { - "id": "fw0", - "ip_address": "", - "mac_address": "3c:07:54:ff:fe:bc:01:78", - "name": "fw0" - }, - { - "id": "lo0", - "ip_address": "127.0.0.1", - "mac_address": "", - "name": "lo0" - }, - { - "id": "p2p0", - "ip_address": "", - "mac_address": "0a:a8:6d:4a:c3:16", - "name": "p2p0" - }, - { - "id": "vboxnet0", - "ip_address": "", - "mac_address": "0a:00:27:00:00:00", - "name": "vboxnet0" - }, - { - "id": "vboxnet1", - "ip_address": "", - "mac_address": "0a:00:27:00:00:01", - "name": "vboxnet1" - }, - { - "id": "vboxnet2", - "ip_address": "", - "mac_address": "0a:00:27:00:00:02", - "name": "vboxnet2" - }, - { - "id": "vboxnet3", - "ip_address": "", - "mac_address": "0a:00:27:00:00:03", - "name": "vboxnet3" - }, - { - "id": "vboxnet4", - "ip_address": "", - "mac_address": "0a:00:27:00:00:04", - "name": "vboxnet4" - }, - { - "id": "vboxnet5", - "ip_address": "", - "mac_address": "0a:00:27:00:00:05", - "name": "vboxnet5" - }, - { - "id": "vboxnet6", - "ip_address": "", - "mac_address": "0a:00:27:00:00:06", - "name": "vboxnet6" - }, - { - "id": "vboxnet7", - "ip_address": "", - "mac_address": "0a:00:27:00:00:07", - "name": "vboxnet7" - }, - { - "id": "vmnet1", - "ip_address": "172.16.16.1", - "mac_address": "00:50:56:c0:00:01", - "name": "vmnet1" - }, - { - "id": "vmnet10", - "ip_address": "172.16.7.1", - "mac_address": "00:50:56:c0:00:0a", - "name": "vmnet10" - }, - { - "id": "vmnet11", - "ip_address": "172.16.8.1", - "mac_address": "00:50:56:c0:00:0b", - "name": "vmnet11" - }, - { - "id": "vmnet12", - "ip_address": "172.16.9.1", - "mac_address": "00:50:56:c0:00:0c", - "name": "vmnet12" - }, - { - "id": "vmnet13", - "ip_address": "172.16.10.1", - "mac_address": "00:50:56:c0:00:0d", - "name": "vmnet13" - }, - { - "id": "vmnet14", - "ip_address": "172.16.11.1", - "mac_address": "00:50:56:c0:00:0e", - "name": "vmnet14" - }, - { - "id": "vmnet15", - "ip_address": "172.16.12.1", - "mac_address": "00:50:56:c0:00:0f", - "name": "vmnet15" - }, - { - "id": "vmnet16", - "ip_address": "172.16.13.1", - "mac_address": "00:50:56:c0:00:10", - "name": "vmnet16" - }, - { - "id": "vmnet17", - "ip_address": "172.16.14.1", - "mac_address": "00:50:56:c0:00:11", - "name": "vmnet17" - }, - { - "id": "vmnet18", - "ip_address": "172.16.15.1", - "mac_address": "00:50:56:c0:00:12", - "name": "vmnet18" - }, - { - "id": "vmnet19", - "ip_address": "172.16.17.1", - "mac_address": "00:50:56:c0:00:13", - "name": "vmnet19" - }, - { - "id": "vmnet2", - "ip_address": "172.16.0.1", - "mac_address": "00:50:56:c0:00:02", - "name": "vmnet2" - }, - { - "id": "vmnet20", - "ip_address": "172.16.18.1", - "mac_address": "00:50:56:c0:00:14", - "name": "vmnet20" - }, - { - "id": "vmnet21", - "ip_address": "172.16.19.1", - "mac_address": "00:50:56:c0:00:15", - "name": "vmnet21" - }, - { - "id": "vmnet22", - "ip_address": "172.16.20.1", - "mac_address": "00:50:56:c0:00:16", - "name": "vmnet22" - }, - { - "id": "vmnet23", - "ip_address": "172.16.21.1", - "mac_address": "00:50:56:c0:00:17", - "name": "vmnet23" - }, - { - "id": "vmnet24", - "ip_address": "172.16.22.1", - "mac_address": "00:50:56:c0:00:18", - "name": "vmnet24" - }, - { - "id": "vmnet25", - "ip_address": "172.16.23.1", - "mac_address": "00:50:56:c0:00:19", - "name": "vmnet25" - }, - { - "id": "vmnet26", - "ip_address": "172.16.24.1", - "mac_address": "00:50:56:c0:00:1a", - "name": "vmnet26" - }, - { - "id": "vmnet27", - "ip_address": "172.16.25.1", - "mac_address": "00:50:56:c0:00:1b", - "name": "vmnet27" - }, - { - "id": "vmnet28", - "ip_address": "172.16.26.1", - "mac_address": "00:50:56:c0:00:1c", - "name": "vmnet28" - }, - { - "id": "vmnet29", - "ip_address": "172.16.27.1", - "mac_address": "00:50:56:c0:00:1d", - "name": "vmnet29" - }, - { - "id": "vmnet3", - "ip_address": "172.16.1.1", - "mac_address": "00:50:56:c0:00:03", - "name": "vmnet3" - }, - { - "id": "vmnet30", - "ip_address": "172.16.28.1", - "mac_address": "00:50:56:c0:00:1e", - "name": "vmnet30" - }, - { - "id": "vmnet31", - "ip_address": "172.16.29.1", - "mac_address": "00:50:56:c0:00:1f", - "name": "vmnet31" - }, - { - "id": "vmnet32", - "ip_address": "172.16.30.1", - "mac_address": "00:50:56:c0:00:20", - "name": "vmnet32" - }, - { - "id": "vmnet33", - "ip_address": "172.16.31.1", - "mac_address": "00:50:56:c0:00:21", - "name": "vmnet33" - }, - { - "id": "vmnet34", - "ip_address": "172.16.32.1", - "mac_address": "00:50:56:c0:00:22", - "name": "vmnet34" - }, - { - "id": "vmnet35", - "ip_address": "172.16.33.1", - "mac_address": "00:50:56:c0:00:23", - "name": "vmnet35" - }, - { - "id": "vmnet36", - "ip_address": "172.16.34.1", - "mac_address": "00:50:56:c0:00:24", - "name": "vmnet36" - }, - { - "id": "vmnet37", - "ip_address": "172.16.35.1", - "mac_address": "00:50:56:c0:00:25", - "name": "vmnet37" - }, - { - "id": "vmnet38", - "ip_address": "172.16.36.1", - "mac_address": "00:50:56:c0:00:26", - "name": "vmnet38" - }, - { - "id": "vmnet39", - "ip_address": "172.16.37.1", - "mac_address": "00:50:56:c0:00:27", - "name": "vmnet39" - }, - { - "id": "vmnet4", - "ip_address": "172.16.2.1", - "mac_address": "00:50:56:c0:00:04", - "name": "vmnet4" - }, - { - "id": "vmnet40", - "ip_address": "172.16.38.1", - "mac_address": "00:50:56:c0:00:28", - "name": "vmnet40" - }, - { - "id": "vmnet41", - "ip_address": "172.16.39.1", - "mac_address": "00:50:56:c0:00:29", - "name": "vmnet41" - }, - { - "id": "vmnet42", - "ip_address": "172.16.40.1", - "mac_address": "00:50:56:c0:00:2a", - "name": "vmnet42" - }, - { - "id": "vmnet43", - "ip_address": "172.16.41.1", - "mac_address": "00:50:56:c0:00:2b", - "name": "vmnet43" - }, - { - "id": "vmnet44", - "ip_address": "172.16.42.1", - "mac_address": "00:50:56:c0:00:2c", - "name": "vmnet44" - }, - { - "id": "vmnet45", - "ip_address": "172.16.43.1", - "mac_address": "00:50:56:c0:00:2d", - "name": "vmnet45" - }, - { - "id": "vmnet46", - "ip_address": "172.16.44.1", - "mac_address": "00:50:56:c0:00:2e", - "name": "vmnet46" - }, - { - "id": "vmnet47", - "ip_address": "172.16.45.1", - "mac_address": "00:50:56:c0:00:2f", - "name": "vmnet47" - }, - { - "id": "vmnet48", - "ip_address": "172.16.46.1", - "mac_address": "00:50:56:c0:00:30", - "name": "vmnet48" - }, - { - "id": "vmnet49", - "ip_address": "172.16.47.1", - "mac_address": "00:50:56:c0:00:31", - "name": "vmnet49" - }, - { - "id": "vmnet5", - "ip_address": "172.16.3.1", - "mac_address": "00:50:56:c0:00:05", - "name": "vmnet5" - }, - { - "id": "vmnet50", - "ip_address": "172.16.48.1", - "mac_address": "00:50:56:c0:00:32", - "name": "vmnet50" - }, - { - "id": "vmnet6", - "ip_address": "172.16.4.1", - "mac_address": "00:50:56:c0:00:06", - "name": "vmnet6" - }, - { - "id": "vmnet7", - "ip_address": "172.16.5.1", - "mac_address": "00:50:56:c0:00:07", - "name": "vmnet7" - }, - { - "id": "vmnet8", - "ip_address": "192.168.229.1", - "mac_address": "00:50:56:c0:00:08", - "name": "vmnet8" - }, - { - "id": "vmnet9", - "ip_address": "172.16.6.1", - "mac_address": "00:50:56:c0:00:09", - "name": "vmnet9" - } -] diff --git a/docs/api/examples/compute_get_networkinterfaces.txt b/docs/api/examples/compute_get_networkinterfaces.txt new file mode 100644 index 00000000..844f682a --- /dev/null +++ b/docs/api/examples/compute_get_networkinterfaces.txt @@ -0,0 +1,120 @@ +curl -i -X GET 'http://localhost:3080/v2/compute/network/interfaces' + +GET /v2/compute/network/interfaces HTTP/1.1 + + + +HTTP/1.1 200 +CONTENT-LENGTH: 2414 +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/network/interfaces + +[ + { + "id": "bridge0", + "ip_address": "", + "mac_address": "3e:07:54:87:bc:00", + "name": "bridge0", + "type": "ethernet" + }, + { + "id": "en0", + "ip_address": "", + "mac_address": "3c:07:54:78:07:cc", + "name": "en0", + "type": "ethernet" + }, + { + "id": "en1", + "ip_address": "192.168.84.106", + "mac_address": "68:a8:6d:4a:c3:16", + "name": "en1", + "type": "ethernet" + }, + { + "id": "en2", + "ip_address": "", + "mac_address": "d2:00:1b:c0:17:80", + "name": "en2", + "type": "ethernet" + }, + { + "id": "fw0", + "ip_address": "", + "mac_address": "3c:07:54:ff:fe:bc:01:78", + "name": "fw0", + "type": "ethernet" + }, + { + "id": "lo0", + "ip_address": "127.0.0.1", + "mac_address": "", + "name": "lo0", + "type": "ethernet" + }, + { + "id": "p2p0", + "ip_address": "", + "mac_address": "0a:a8:6d:4a:c3:16", + "name": "p2p0", + "type": "ethernet" + }, + { + "id": "vboxnet0", + "ip_address": "", + "mac_address": "0a:00:27:00:00:00", + "name": "vboxnet0", + "type": "ethernet" + }, + { + "id": "vboxnet1", + "ip_address": "", + "mac_address": "0a:00:27:00:00:01", + "name": "vboxnet1", + "type": "ethernet" + }, + { + "id": "vboxnet2", + "ip_address": "", + "mac_address": "0a:00:27:00:00:02", + "name": "vboxnet2", + "type": "ethernet" + }, + { + "id": "vboxnet3", + "ip_address": "", + "mac_address": "0a:00:27:00:00:03", + "name": "vboxnet3", + "type": "ethernet" + }, + { + "id": "vboxnet4", + "ip_address": "", + "mac_address": "0a:00:27:00:00:04", + "name": "vboxnet4", + "type": "ethernet" + }, + { + "id": "vboxnet5", + "ip_address": "", + "mac_address": "0a:00:27:00:00:05", + "name": "vboxnet5", + "type": "ethernet" + }, + { + "id": "vboxnet6", + "ip_address": "", + "mac_address": "0a:00:27:00:00:06", + "name": "vboxnet6", + "type": "ethernet" + }, + { + "id": "vboxnet7", + "ip_address": "", + "mac_address": "0a:00:27:00:00:07", + "name": "vboxnet7", + "type": "ethernet" + } +] diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt index 72fc403b..8bdfe7ed 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/f03a53b5-8b6d-437f-8e13-272ddf22692d' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/25fc3db3-83a5-4bd1-9ffb-995bfee680da' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f03a53b5-8b6d-437f-8e13-272ddf22692d HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/25fc3db3-83a5-4bd1-9ffb-995bfee680da HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 720 +CONTENT-LENGTH: 721 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -20,8 +20,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id} "l1_keepalives": false, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", - "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", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/test_json4/project-files/iou/25fc3db3-83a5-4bd1-9ffb-995bfee680da", + "node_id": "25fc3db3-83a5-4bd1-9ffb-995bfee680da", "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 ad310e95..c3a9f72d 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/fbecd194-0b77-4f32-a3a5-3f6f5ce4d451/configs' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/57a90df6-f75a-40cd-83d6-53baaa911507/configs' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/fbecd194-0b77-4f32-a3a5-3f6f5ce4d451/configs HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/57a90df6-f75a-40cd-83d6-53baaa911507/configs HTTP/1.1 diff --git a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt index cc177ff5..0f657776 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/8e701b34-dd30-4cac-851c-135bbecfcf24' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/dd253990-3312-4d1f-9f17-b1e983cc60c3' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e701b34-dd30-4cac-851c-135bbecfcf24 HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/dd253990-3312-4d1f-9f17-b1e983cc60c3 HTTP/1.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:cf:24:00", + "mac_address": "00:dd:80:60:c3:00", "name": "PC TEST 1", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/dd253990-3312-4d1f-9f17-b1e983cc60c3", + "node_id": "dd253990-3312-4d1f-9f17-b1e983cc60c3", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp6mpl67gj/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 fb1410f2..c20174f0 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/c15b6665-d370-4770-9048-986b88e61c9e' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c8c769ae-8d64-4597-af8a-c3f1452362b5' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c15b6665-d370-4770-9048-986b88e61c9e HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c8c769ae-8d64-4597-af8a-c3f1452362b5 HTTP/1.1 @@ -20,7 +20,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id} "headless": false, "name": "VMTEST", "node_directory": null, - "node_id": "c15b6665-d370-4770-9048-986b88e61c9e", + "node_id": "c8c769ae-8d64-4597-af8a-c3f1452362b5", "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 574b3069..bbbedfde 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/2678aeb4-0618-41d2-81c7-5adb0e44a499' +curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/56a1b0b7-45be-44ba-aa79-141421ee39e4' -GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2678aeb4-0618-41d2-81c7-5adb0e44a499 HTTP/1.1 +GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/56a1b0b7-45be-44ba-aa79-141421ee39e4 HTTP/1.1 @@ -16,8 +16,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id} "console": 5720, "console_type": "telnet", "name": "PC TEST 1", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/56a1b0b7-45be-44ba-aa79-141421ee39e4", + "node_id": "56a1b0b7-45be-44ba-aa79-141421ee39e4", "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 32c55d9b..a6bd6c1d 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/57a199e9-5512-4595-8624-315e680d276e/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/20b00faa-faf8-4aec-ad24-75d7b5cb90cb/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/57a199e9-5512-4595-8624-315e680d276e/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/20b00faa-faf8-4aec-ad24-75d7b5cb90cb/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 0c9494b4..2bcec0a1 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/e820e416-5af5-4944-9527-6c52267ae187/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/c02554d2-5ad8-4801-8e01-b1889acf395f/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/e820e416-5af5-4944-9527-6c52267ae187/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/c02554d2-5ad8-4801-8e01-b1889acf395f/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/e820 HTTP/1.1 200 -CONTENT-LENGTH: 145 +CONTENT-LENGTH: 146 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": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/tmp/captures/test.pcap" + "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/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 24c2fe30..8b789de5 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/c369b5d5-e4bb-428d-95d7-e8c1f8f22f0b/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/6e1b0d11-6bf2-4a66-85a9-c607fdf1b19f/adapters/0/ports/0/stop_capture' -d '{}' -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 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/6e1b0d11-6bf2-4a66-85a9-c607fdf1b19f/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 01e2fcf7..5c14088f 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": "b3134bc0-c871-4824-9d50-c92bf3cbe55f", "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": "d9ee0d78-5698-48b0-b563-f573f10b0c2f", "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": "b3134bc0-c871-4824-9d50-c92bf3cbe55f", + "node_id": "d9ee0d78-5698-48b0-b563-f573f10b0c2f", "path": "iou.bin", "startup_config_content": "hostname test" } HTTP/1.1 201 -CONTENT-LENGTH: 736 +CONTENT-LENGTH: 737 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -25,8 +25,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes "l1_keepalives": false, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", - "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", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/test_json4/project-files/iou/d9ee0d78-5698-48b0-b563-f573f10b0c2f", + "node_id": "d9ee0d78-5698-48b0-b563-f573f10b0c2f", "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 20abbea3..99c9d834 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/7edfe66e-cb09-4c5e-beca-5d567c5ca850/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/04767c6c-f689-4c0d-964e-a28818fef452/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7edfe66e-cb09-4c5e-beca-5d567c5ca850/adapters/1/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/04767c6c-f689-4c0d-964e-a28818fef452/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 e4482cdd..b6e85d85 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/dad20c57-972f-4c48-b377-46640b6d5e6a/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/1b62ef5c-5025-43db-b3b1-161ef796c878/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/dad20c57-972f-4c48-b377-46640b6d5e6a/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1b62ef5c-5025-43db-b3b1-161ef796c878/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/dad20c5 HTTP/1.1 200 -CONTENT-LENGTH: 145 +CONTENT-LENGTH: 146 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": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-49/test_json4/tmp/captures/test.pcap" + "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/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 b45deb02..c7a968cc 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/6b305d2c-970d-4d4c-bba9-fc45186d62bd/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7c483a80-db2c-4dd9-a091-7d6950ae9bd5/adapters/0/ports/0/stop_capture' -d '{}' -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 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7c483a80-db2c-4dd9-a091-7d6950ae9bd5/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 081f9580..eec5245b 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/40e17dc8-c8f7-4bd8-9862-fab4a26283af/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4dba317a-5d38-4648-9e61-668491fc53a7/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/40e17dc8-c8f7-4bd8-9862-fab4a26283af/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4dba317a-5d38-4648-9e61-668491fc53a7/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt index e82d4659..9f7c0b39 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/32fe2601-8b78-4cde-b73c-65060b257553/start' -d '{"iourc_content": "test"}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/44197fd5-11f2-439f-818d-8768b9a6d847/start' -d '{"iourc_content": "test"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/32fe2601-8b78-4cde-b73c-65060b257553/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/44197fd5-11f2-439f-818d-8768b9a6d847/start HTTP/1.1 { "iourc_content": "test" } HTTP/1.1 200 -CONTENT-LENGTH: 784 +CONTENT-LENGTH: 785 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -18,12 +18,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start "console": 5711, "console_type": "telnet", "ethernet_adapters": 2, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpdcip9igy/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpv4a5e10u/iourc", "l1_keepalives": false, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", - "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", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/test_json4/project-files/iou/44197fd5-11f2-439f-818d-8768b9a6d847", + "node_id": "44197fd5-11f2-439f-818d-8768b9a6d847", "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 05a6ed66..f20eee6b 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/641b1855-3fec-4168-80b4-d6b351ad160c/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9a9691d5-c94e-4b38-af4c-de56f7393ce0/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/641b1855-3fec-4168-80b4-d6b351ad160c/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9a9691d5-c94e-4b38-af4c-de56f7393ce0/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt index 9f900dfb..2f58d47f 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/tmpwy832b4a/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/tmp6mpl67gj/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/tmpwy832b4a/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp6mpl67gj/qemu-system-x86_64", "ram": 1024 } @@ -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:9a:75:00", + "mac_address": "00:dd:80:91:93:00", "name": "PC TEST 1", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/41436491-3239-4983-8138-5df5b92a9193", + "node_id": "41436491-3239-4983-8138-5df5b92a9193", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp6mpl67gj/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 311b2eff..4499ade8 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/2b51a589-8708-4644-9b30-8c906c0259e2/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/5ff1bc09-fd04-4e45-be01-3d17f4bafede/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2b51a589-8708-4644-9b30-8c906c0259e2/adapters/1/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5ff1bc09-fd04-4e45-be01-3d17f4bafede/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 e2ba6fe9..48fc58c8 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/690bb17e-b4b5-461c-be5f-5a5ee2a2accf/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b0b5d07e-e9dd-45cf-a62f-1f5e18f53af4/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/690bb17e-b4b5-461c-be5f-5a5ee2a2accf/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b0b5d07e-e9dd-45cf-a62f-1f5e18f53af4/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt index 54a11b87..7d21974d 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/b5ca2c74-1437-429c-a393-ae1678bbbacb/resume' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/57fcfc13-f61a-4137-be26-48ea3acf5296/resume' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b5ca2c74-1437-429c-a393-ae1678bbbacb/resume HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/57fcfc13-f61a-4137-be26-48ea3acf5296/resume HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt index dc384652..d14cf406 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/bdfb623a-7a47-4d23-a8cf-854eccee293a/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b4fc132c-e98e-418a-af51-2a35fb341ed1/start' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdfb623a-7a47-4d23-a8cf-854eccee293a/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b4fc132c-e98e-418a-af51-2a35fb341ed1/start HTTP/1.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:29:3a:00", + "mac_address": "00:dd:80:1e:d1:00", "name": "PC TEST 1", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/b4fc132c-e98e-418a-af51-2a35fb341ed1", + "node_id": "b4fc132c-e98e-418a-af51-2a35fb341ed1", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp6mpl67gj/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 9909993e..6576558f 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/c988ff0f-1b8c-49ee-9c33-4bda6043bf6b/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/294691a7-a86d-4151-96fc-1d062f16eae9/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c988ff0f-1b8c-49ee-9c33-4bda6043bf6b/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/294691a7-a86d-4151-96fc-1d062f16eae9/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt index 5ad27143..fdabecad 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/a4bbf623-f85b-446c-beef-6fb33139295e/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b9e1a44e-f770-45af-83e7-137aadd0e2ac/suspend' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a4bbf623-f85b-446c-beef-6fb33139295e/suspend HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b9e1a44e-f770-45af-83e7-137aadd0e2ac/suspend HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt index 64f72b34..f78c6837 100644 --- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt +++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt @@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes "headless": false, "name": "VM1", "node_directory": null, - "node_id": "b6c304fa-95fe-4d16-af59-cee90a19b5b3", + "node_id": "9efb0e5a-665f-4233-bf0e-09e82f796525", "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 34f7173b..aa37c087 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/dfe091c4-c1da-4fe2-8d49-d1695523c430/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/941144ca-6583-414d-8de8-4305062ee296/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/dfe091c4-c1da-4fe2-8d49-d1695523c430/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/941144ca-6583-414d-8de8-4305062ee296/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 f70598d4..75bafb1f 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/5cc1f014-5e4f-4be5-9254-c196b5a91ae4/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/43a070da-5331-4d79-8459-61a318df0559/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5cc1f014-5e4f-4be5-9254-c196b5a91ae4/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/43a070da-5331-4d79-8459-61a318df0559/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt index 22f3dbb1..64ec101a 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/296a6160-4b15-4ce9-823d-eb4a93fac281/resume' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/f4dc55ae-b07a-4b46-abd4-c1d1de418ede/resume' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/296a6160-4b15-4ce9-823d-eb4a93fac281/resume HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/f4dc55ae-b07a-4b46-abd4-c1d1de418ede/resume HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt index c43a5d15..944d4e4a 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/6332d884-74ee-4a4c-9ce1-80c24dc2457c/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/21c736c9-52d0-4d30-b14a-c3f5ae59947a/start' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6332d884-74ee-4a4c-9ce1-80c24dc2457c/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/21c736c9-52d0-4d30-b14a-c3f5ae59947a/start HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt index e67710fd..b1c9a2b1 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/499b156b-4083-4ce9-88ec-03daad1bac64/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/7abdbc54-10f9-4619-a842-e6440ba2b69f/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/499b156b-4083-4ce9-88ec-03daad1bac64/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/7abdbc54-10f9-4619-a842-e6440ba2b69f/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt index e9754e1e..c87d0d74 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/687fc228-d2f0-4c56-9a20-9f62b193d66e/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a0ef04ab-fbb3-4911-a9f1-02d7e47da47c/suspend' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/687fc228-d2f0-4c56-9a20-9f62b193d66e/suspend HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a0ef04ab-fbb3-4911-a9f1-02d7e47da47c/suspend HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt index fa98bad9..6be333ba 100644 --- a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt +++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt @@ -18,8 +18,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes "console": 5720, "console_type": "telnet", "name": "PC TEST 1", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/23fa124a-cbd9-4efb-aa4e-2d16078adbaa", + "node_id": "23fa124a-cbd9-4efb-aa4e-2d16078adbaa", "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 b96c15f3..6a425bc1 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/bef47961-5db0-4e5a-bf90-969c44e14bdc/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/abe83043-07a7-41a1-8216-a887b554b30f/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/bef47961-5db0-4e5a-bf90-969c44e14bdc/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/abe83043-07a7-41a1-8216-a887b554b30f/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 daf35633..7a6192dd 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/56ba2ca5-841b-4756-b9b0-a6f43a89a7a2/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4ad02999-418a-40a2-83dd-218e377d7e6c/reload' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/56ba2ca5-841b-4756-b9b0-a6f43a89a7a2/reload HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4ad02999-418a-40a2-83dd-218e377d7e6c/reload HTTP/1.1 {} diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt index e8f1d99d..0bb8edbc 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/29e9d99d-a114-49bd-b9af-9220bbbf17ad/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/cc9d4efb-813a-4ed7-aad3-b26513c51888/start' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/29e9d99d-a114-49bd-b9af-9220bbbf17ad/start HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/cc9d4efb-813a-4ed7-aad3-b26513c51888/start HTTP/1.1 {} @@ -16,8 +16,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/start "console": 5720, "console_type": "telnet", "name": "PC TEST 1", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/cc9d4efb-813a-4ed7-aad3-b26513c51888", + "node_id": "cc9d4efb-813a-4ed7-aad3-b26513c51888", "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 0a11c3b1..c4e63a0f 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/9afc5595-041b-48cb-b027-8300bc94df14/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/09030c15-3a0c-4008-9c58-e3b0730cc8b6/stop' -d '{}' -POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/9afc5595-041b-48cb-b027-8300bc94df14/stop HTTP/1.1 +POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/09030c15-3a0c-4008-9c58-e3b0730cc8b6/stop HTTP/1.1 {} diff --git a/docs/api/examples/compute_put_projectsprojectid.txt b/docs/api/examples/compute_put_projectsprojectid.txt index ff5b1e79..94e78259 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-49/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-524/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-49/test_update_path_project_non_l0" + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/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 90135ac2..3c380cfa 100644 --- a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt @@ -1,6 +1,6 @@ -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"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/7f34cdf1-c85a-458e-8162-b189a24e222d' -d '{"console": 5713, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ac67f13e-7aca-43cd-bc62-a3b210032f97 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/7f34cdf1-c85a-458e-8162-b189a24e222d HTTP/1.1 { "console": 5713, "environment": "GNS3=1\nGNS4=0", @@ -10,7 +10,7 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ac67f HTTP/1.1 200 -CONTENT-LENGTH: 653 +CONTENT-LENGTH: 654 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -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": "/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", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/test_json4/project-files/docker/7f34cdf1-c85a-458e-8162-b189a24e222d", + "node_id": "7f34cdf1-c85a-458e-8162-b189a24e222d", "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 233410c3..70728149 100644 --- a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt @@ -1,6 +1,6 @@ -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}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/26d3b8b2-71be-427d-bce7-48c0e48d7647' -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/addcf831-79be-49c8-818c-b984a721f2ab HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/26d3b8b2-71be-427d-bce7-48c0e48d7647 HTTP/1.1 { "console": 5712, "ethernet_adapters": 4, @@ -16,7 +16,7 @@ PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/addcf831 HTTP/1.1 200 -CONTENT-LENGTH: 795 +CONTENT-LENGTH: 796 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -27,12 +27,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id} "console": 5712, "console_type": "telnet", "ethernet_adapters": 4, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpia0c1pau/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpndfoeh4v/iourc", "l1_keepalives": true, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "test", - "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", + "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/test_json4/project-files/iou/26d3b8b2-71be-427d-bce7-48c0e48d7647", + "node_id": "26d3b8b2-71be-427d-bce7-48c0e48d7647", "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 26abf0f9..fa8cbc00 100644 --- a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt @@ -1,6 +1,6 @@ -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}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/06d5ac45-b978-42c9-beb0-8febc58831d5' -d '{"console": 5712, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/decc7ae7-9caf-42bd-bbc5-dba2922eac5f HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/06d5ac45-b978-42c9-beb0-8febc58831d5 HTTP/1.1 { "console": 5712, "hdb_disk_image": "linux\u8f7d.img", @@ -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:ac:5f:00", + "mac_address": "00:dd:80:31:d5:00", "name": "test", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/06d5ac45-b978-42c9-beb0-8febc58831d5", + "node_id": "06d5ac45-b978-42c9-beb0-8febc58831d5", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwy832b4a/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp6mpl67gj/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 b69ad8dd..d3a8f35a 100644 --- a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt @@ -1,6 +1,6 @@ -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"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/1d269e1c-fc5a-4185-b577-998c4872aeba' -d '{"console": 5721, "name": "test"}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c0869edb-3133-4d7d-8c00-c20800eb22d9 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/1d269e1c-fc5a-4185-b577-998c4872aeba HTTP/1.1 { "console": 5721, "name": "test" @@ -23,7 +23,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id} "headless": false, "name": "test", "node_directory": null, - "node_id": "c0869edb-3133-4d7d-8c00-c20800eb22d9", + "node_id": "1d269e1c-fc5a-4185-b577-998c4872aeba", "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 077add3d..7feda631 100644 --- a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt +++ b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt @@ -1,6 +1,6 @@ -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"}' +curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/85c226b1-7e7f-47da-b5d3-d51d8e051d19' -d '{"console": 5722, "name": "test", "startup_script": "ip 192.168.1.1"}' -PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/c71e56fd-6129-4fc7-9890-5229d9d5f463 HTTP/1.1 +PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/85c226b1-7e7f-47da-b5d3-d51d8e051d19 HTTP/1.1 { "console": 5722, "name": "test", @@ -20,8 +20,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id} "console": 5722, "console_type": "telnet", "name": "test", - "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", + "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq7gacfaj/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/85c226b1-7e7f-47da-b5d3-d51d8e051d19", + "node_id": "85c226b1-7e7f-47da-b5d3-d51d8e051d19", "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 8fb6f955..4201ce12 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/acab1c35-d42b-4219-b741-12ee4fdc814b' +curl -i -X DELETE 'http://localhost:3080/v2/projects/66d70bee-da7c-4b65-85fb-ba60bbbbf4f1' -DELETE /v2/projects/acab1c35-d42b-4219-b741-12ee4fdc814b HTTP/1.1 +DELETE /v2/projects/66d70bee-da7c-4b65-85fb-ba60bbbbf4f1 HTTP/1.1 diff --git a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt index 19ba6555..e0ff40e3 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/d02d47d4-282e-4643-8308-87dba6d31c7c/drawings/246a4d6f-f046-4376-b3f5-b56d4a27803c' +curl -i -X DELETE 'http://localhost:3080/v2/projects/334050e2-d33d-4aab-a3f6-8ca4b15edf7f/drawings/eda0ee4d-aada-4a4a-9e20-b769d446d027' -DELETE /v2/projects/d02d47d4-282e-4643-8308-87dba6d31c7c/drawings/246a4d6f-f046-4376-b3f5-b56d4a27803c HTTP/1.1 +DELETE /v2/projects/334050e2-d33d-4aab-a3f6-8ca4b15edf7f/drawings/eda0ee4d-aada-4a4a-9e20-b769d446d027 HTTP/1.1 diff --git a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt index 0e8a9fd8..528ab160 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/35b02ebb-6e70-4077-b752-e759c38f4b81/links/e74e45eb-364c-4a91-a902-c591ecd96d33' +curl -i -X DELETE 'http://localhost:3080/v2/projects/ab738561-f1ff-4d75-a093-f9f05dd07a1a/links/cb7f05be-c81f-4c6f-9019-2e7ad10a112e' -DELETE /v2/projects/35b02ebb-6e70-4077-b752-e759c38f4b81/links/e74e45eb-364c-4a91-a902-c591ecd96d33 HTTP/1.1 +DELETE /v2/projects/ab738561-f1ff-4d75-a093-f9f05dd07a1a/links/cb7f05be-c81f-4c6f-9019-2e7ad10a112e HTTP/1.1 diff --git a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt index 9d53b8d3..d6638ec9 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/4ea837c7-286a-4ca0-b1ce-9d7ea40a1f1f/nodes/5e1be81a-f447-4f4d-b7a0-505006981111' +curl -i -X DELETE 'http://localhost:3080/v2/projects/f34a9fd6-cc9f-4203-a1a4-6f3b0b59f6e9/nodes/4a3bf3e4-d588-4be0-b0d7-87d0ac5f8bbd' -DELETE /v2/projects/4ea837c7-286a-4ca0-b1ce-9d7ea40a1f1f/nodes/5e1be81a-f447-4f4d-b7a0-505006981111 HTTP/1.1 +DELETE /v2/projects/f34a9fd6-cc9f-4203-a1a4-6f3b0b59f6e9/nodes/4a3bf3e4-d588-4be0-b0d7-87d0ac5f8bbd HTTP/1.1 diff --git a/docs/api/examples/controller_get_projects.txt b/docs/api/examples/controller_get_projects.txt index 40cd3cdc..38ddc048 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: 284 +CONTENT-LENGTH: 285 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-49/test_list_projects1", + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-524/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 041653d5..b09fea3d 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/b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5' +curl -i -X GET 'http://localhost:3080/v2/projects/ea7af613-69fc-4eb6-b2e5-6bc378093737' -GET /v2/projects/b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5 HTTP/1.1 +GET /v2/projects/ea7af613-69fc-4eb6-b2e5-6bc378093737 HTTP/1.1 @@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id} { "filename": "test.gns3", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppejbpo2a/projects/b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5", - "project_id": "b4f6fb3a-cd11-49d3-b7b3-cee6766be7e5", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpqdz9215j/projects/ea7af613-69fc-4eb6-b2e5-6bc378093737", + "project_id": "ea7af613-69fc-4eb6-b2e5-6bc378093737", "status": "opened" } diff --git a/docs/api/examples/controller_get_projectsprojectiddrawings.txt b/docs/api/examples/controller_get_projectsprojectiddrawings.txt index 876e0787..474c8937 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/3f671aae-cbd9-41e0-a785-5b2e241b702f/drawings' +curl -i -X GET 'http://localhost:3080/v2/projects/63a45f0d-f886-436f-b07e-f52cdcbeaff4/drawings' -GET /v2/projects/3f671aae-cbd9-41e0-a785-5b2e241b702f/drawings HTTP/1.1 +GET /v2/projects/63a45f0d-f886-436f-b07e-f52cdcbeaff4/drawings HTTP/1.1 @@ -13,8 +13,8 @@ X-ROUTE: /v2/projects/{project_id}/drawings [ { - "drawing_id": "65e95f65-35a6-4c21-bc37-a5158870ad99", - "project_id": "3f671aae-cbd9-41e0-a785-5b2e241b702f", + "drawing_id": "b52e45b0-d1a7-46b4-8ecc-5db59eba7e0f", + "project_id": "63a45f0d-f886-436f-b07e-f52cdcbeaff4", "rotation": 0, "svg": "", "x": 10, diff --git a/docs/api/examples/controller_get_projectsprojectidlinks.txt b/docs/api/examples/controller_get_projectsprojectidlinks.txt index 533ba987..f18f9f96 100644 --- a/docs/api/examples/controller_get_projectsprojectidlinks.txt +++ b/docs/api/examples/controller_get_projectsprojectidlinks.txt @@ -1,11 +1,11 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/12024b7e-cb63-4f67-898f-2a9858a6589e/links' +curl -i -X GET 'http://localhost:3080/v2/projects/87658726-db5c-47e0-9f4b-1688f4f9b04e/links' -GET /v2/projects/12024b7e-cb63-4f67-898f-2a9858a6589e/links HTTP/1.1 +GET /v2/projects/87658726-db5c-47e0-9f4b-1688f4f9b04e/links HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 594 +CONTENT-LENGTH: 1078 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -16,19 +16,33 @@ X-ROUTE: /v2/projects/{project_id}/links "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "0b37f142-dae6-4c6c-9f83-fa2169dbdc06", + "link_id": "ca9142e8-9684-4b31-b9c4-68eaec0f0b0d", "nodes": [ { "adapter_number": 0, - "node_id": "7ad6abb3-3daa-4617-8d49-cbb7fe1797db", + "label": { + "rotation": 0, + "style": "font-size: 10; font-style: Verdana", + "text": "0/3", + "x": -10, + "y": -10 + }, + "node_id": "c4812669-53d7-4098-bc90-76be0ff7bf1a", "port_number": 3 }, { "adapter_number": 2, - "node_id": "ee0b77d8-5042-4010-ab55-91b52c35f392", + "label": { + "rotation": 0, + "style": "font-size: 10; font-style: Verdana", + "text": "2/4", + "x": -10, + "y": -10 + }, + "node_id": "0d0bfaee-1d67-4909-be6a-c0d2ae16521d", "port_number": 4 } ], - "project_id": "12024b7e-cb63-4f67-898f-2a9858a6589e" + "project_id": "87658726-db5c-47e0-9f4b-1688f4f9b04e" } ] diff --git a/docs/api/examples/controller_get_projectsprojectidnodes.txt b/docs/api/examples/controller_get_projectsprojectidnodes.txt index 709fedc4..6a4e286a 100644 --- a/docs/api/examples/controller_get_projectsprojectidnodes.txt +++ b/docs/api/examples/controller_get_projectsprojectidnodes.txt @@ -1,11 +1,11 @@ -curl -i -X GET 'http://localhost:3080/v2/projects/4e75e733-6925-4ab7-b569-c8e783d69006/nodes' +curl -i -X GET 'http://localhost:3080/v2/projects/6031c4ea-8e3e-44f9-a236-28611e86b823/nodes' -GET /v2/projects/4e75e733-6925-4ab7-b569-c8e783d69006/nodes HTTP/1.1 +GET /v2/projects/6031c4ea-8e3e-44f9-a236-28611e86b823/nodes HTTP/1.1 HTTP/1.1 200 -CONTENT-LENGTH: 775 +CONTENT-LENGTH: 806 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -18,23 +18,25 @@ X-ROUTE: /v2/projects/{project_id}/nodes "console": 2048, "console_host": "example.org", "console_type": null, + "height": 70, "label": { - "color": "#ff000000", - "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "rotation": 0, + "style": "font-size: 10;font-familly: Verdana", "text": "", - "x": -17.0234375, - "y": -25.0 + "x": -17, + "y": -25 }, "name": "test", "node_directory": null, - "node_id": "8d436bbf-9dbb-482f-9ab6-ecd1d60eedce", + "node_id": "0d215b97-cdbb-4fab-b54d-7c76f83a1e5b", "node_type": "vpcs", - "project_id": "4e75e733-6925-4ab7-b569-c8e783d69006", + "project_id": "6031c4ea-8e3e-44f9-a236-28611e86b823", "properties": { "startup_script": "echo test" }, "status": "stopped", "symbol": ":/symbols/computer.svg", + "width": 70, "x": 0, "y": 0, "z": 0 diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt index bd7bd029..675433aa 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/030080fd-dd52-4a30-9bcc-e35978251ea1/nodes/aadb5f86-ed34-4349-8d38-b6672d22c48e/dynamips/auto_idlepc' +curl -i -X GET 'http://localhost:3080/v2/projects/174edd5e-f4f5-4c6f-9e44-d1e89a6d365e/nodes/5fb1d484-d0eb-44e9-bfbd-c01b2b3f97f8/dynamips/auto_idlepc' -GET /v2/projects/030080fd-dd52-4a30-9bcc-e35978251ea1/nodes/aadb5f86-ed34-4349-8d38-b6672d22c48e/dynamips/auto_idlepc HTTP/1.1 +GET /v2/projects/174edd5e-f4f5-4c6f-9e44-d1e89a6d365e/nodes/5fb1d484-d0eb-44e9-bfbd-c01b2b3f97f8/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 b76dce2d..775eed98 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/e5249991-dc00-4d35-9aec-68048d5f1f25/nodes/61fa2499-5fd1-439f-a63e-aaade4f93042/dynamips/idlepc_proposals' +curl -i -X GET 'http://localhost:3080/v2/projects/9acd92be-3ffc-4bea-b937-b676a90e76d9/nodes/2c2ffb39-7ca3-40a4-8864-6e4054320405/dynamips/idlepc_proposals' -GET /v2/projects/e5249991-dc00-4d35-9aec-68048d5f1f25/nodes/61fa2499-5fd1-439f-a63e-aaade4f93042/dynamips/idlepc_proposals HTTP/1.1 +GET /v2/projects/9acd92be-3ffc-4bea-b937-b676a90e76d9/nodes/2c2ffb39-7ca3-40a4-8864-6e4054320405/dynamips/idlepc_proposals HTTP/1.1 diff --git a/docs/api/examples/controller_post_projects.txt b/docs/api/examples/controller_post_projects.txt index ee4163b0..982c3f48 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/tmph3mo7f5h/projects/10010203-0405-0607-0809-0a0b0c0d0e0f", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbjibh90f/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 09a36cfc..430e05fc 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/tmpw3zdvkqa/projects/c62e1f15-ea3c-4dc0-aed9-fee3d66a6480", - "project_id": "c62e1f15-ea3c-4dc0-aed9-fee3d66a6480", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmsg1_a45/projects/ecc81a86-29b7-4477-b725-98af3d2e3bb1", + "project_id": "ecc81a86-29b7-4477-b725-98af3d2e3bb1", "status": "opened" } diff --git a/docs/api/examples/controller_post_projectsprojectidclose.txt b/docs/api/examples/controller_post_projectsprojectidclose.txt index 3e30dcac..58df67b1 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/234ec184-e165-4f4d-af7c-f283485869b1/close' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/69b6718d-30f9-47b0-867c-717bc074e5ff/close' -d '{}' -POST /v2/projects/234ec184-e165-4f4d-af7c-f283485869b1/close HTTP/1.1 +POST /v2/projects/69b6718d-30f9-47b0-867c-717bc074e5ff/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/tmptannbxbk/projects/234ec184-e165-4f4d-af7c-f283485869b1", - "project_id": "234ec184-e165-4f4d-af7c-f283485869b1", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph3xuizor/projects/69b6718d-30f9-47b0-867c-717bc074e5ff", + "project_id": "69b6718d-30f9-47b0-867c-717bc074e5ff", "status": "opened" } diff --git a/docs/api/examples/controller_post_projectsprojectiddrawings.txt b/docs/api/examples/controller_post_projectsprojectiddrawings.txt index b650a861..c319195f 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/84a7dff6-a2ef-46dd-aece-0f68b7a761f3/drawings' -d '{"svg": "", "x": 10, "y": 20, "z": 0}' +curl -i -X POST 'http://localhost:3080/v2/projects/310203c0-fb79-420d-8352-555419c784a3/drawings' -d '{"svg": "", "x": 10, "y": 20, "z": 0}' -POST /v2/projects/84a7dff6-a2ef-46dd-aece-0f68b7a761f3/drawings HTTP/1.1 +POST /v2/projects/310203c0-fb79-420d-8352-555419c784a3/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": "6dd8c8c3-3e23-4aa3-9105-1616c3478a56", - "project_id": "84a7dff6-a2ef-46dd-aece-0f68b7a761f3", + "drawing_id": "3e245095-4bda-4ca1-82f5-7ae53c54ac59", + "project_id": "310203c0-fb79-420d-8352-555419c784a3", "rotation": 0, "svg": "", "x": 10, diff --git a/docs/api/examples/controller_post_projectsprojectidlinks.txt b/docs/api/examples/controller_post_projectsprojectidlinks.txt index f44ec8bf..fe23c34a 100644 --- a/docs/api/examples/controller_post_projectsprojectidlinks.txt +++ b/docs/api/examples/controller_post_projectsprojectidlinks.txt @@ -1,16 +1,21 @@ -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}]}' +curl -i -X POST 'http://localhost:3080/v2/projects/8b10f40a-8be8-4706-be27-f596f6102d51/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "ff1e3b4a-b3c6-4940-a5da-dbb732633249", "port_number": 3}, {"adapter_number": 2, "node_id": "fa2ca2d9-7d50-4f83-8f5f-9b76f0000b49", "port_number": 4}]}' -POST /v2/projects/c42b72eb-76d4-4827-82be-83afe23c357a/links HTTP/1.1 +POST /v2/projects/8b10f40a-8be8-4706-be27-f596f6102d51/links HTTP/1.1 { "nodes": [ { "adapter_number": 0, - "node_id": "bc277490-eec3-4347-90bc-9ddfb320be28", + "label": { + "text": "Text", + "x": 42, + "y": 0 + }, + "node_id": "ff1e3b4a-b3c6-4940-a5da-dbb732633249", "port_number": 3 }, { "adapter_number": 2, - "node_id": "9be1db1b-816f-482f-b1c4-26687f32b0de", + "node_id": "fa2ca2d9-7d50-4f83-8f5f-9b76f0000b49", "port_number": 4 } ] @@ -18,7 +23,7 @@ POST /v2/projects/c42b72eb-76d4-4827-82be-83afe23c357a/links HTTP/1.1 HTTP/1.1 201 -CONTENT-LENGTH: 514 +CONTENT-LENGTH: 846 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -28,18 +33,30 @@ X-ROUTE: /v2/projects/{project_id}/links "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "f517c22e-88b0-4bd5-abf4-443e1c67b7da", + "link_id": "3dbdcec5-4c9a-4ddb-8a38-2ea2fc31a970", "nodes": [ { "adapter_number": 0, - "node_id": "bc277490-eec3-4347-90bc-9ddfb320be28", + "label": { + "text": "Text", + "x": 42, + "y": 0 + }, + "node_id": "ff1e3b4a-b3c6-4940-a5da-dbb732633249", "port_number": 3 }, { "adapter_number": 2, - "node_id": "9be1db1b-816f-482f-b1c4-26687f32b0de", + "label": { + "rotation": 0, + "style": "font-size: 10; font-style: Verdana", + "text": "2/4", + "x": -10, + "y": -10 + }, + "node_id": "fa2ca2d9-7d50-4f83-8f5f-9b76f0000b49", "port_number": 4 } ], - "project_id": "c42b72eb-76d4-4827-82be-83afe23c357a" + "project_id": "8b10f40a-8be8-4706-be27-f596f6102d51" } diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt index b0a6f049..a6cab2eb 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/eabbad3e-53b1-4777-9101-24f361dfa19f/links/df5438b4-1301-4c64-ba87-4367722a03a7/start_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/e08705cc-8a87-4055-89e9-7e2e545987a6/links/86ac047f-0e01-438d-b95c-4654f29a1c7d/start_capture' -d '{}' -POST /v2/projects/eabbad3e-53b1-4777-9101-24f361dfa19f/links/df5438b4-1301-4c64-ba87-4367722a03a7/start_capture HTTP/1.1 +POST /v2/projects/e08705cc-8a87-4055-89e9-7e2e545987a6/links/86ac047f-0e01-438d-b95c-4654f29a1c7d/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": "df5438b4-1301-4c64-ba87-4367722a03a7", + "link_id": "86ac047f-0e01-438d-b95c-4654f29a1c7d", "nodes": [], - "project_id": "eabbad3e-53b1-4777-9101-24f361dfa19f" + "project_id": "e08705cc-8a87-4055-89e9-7e2e545987a6" } diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt index bae65d9a..7c90df16 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/6decafaa-f9d9-4a39-8009-f44f3d608eef/links/e8eb0e6d-ba57-4be2-b434-dbcd38410722/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/1db885b5-c3e7-4e86-8bd1-bb0a891f009f/links/1e1ee684-cf5d-4eda-a3bf-a12b057648b6/stop_capture' -d '{}' -POST /v2/projects/6decafaa-f9d9-4a39-8009-f44f3d608eef/links/e8eb0e6d-ba57-4be2-b434-dbcd38410722/stop_capture HTTP/1.1 +POST /v2/projects/1db885b5-c3e7-4e86-8bd1-bb0a891f009f/links/1e1ee684-cf5d-4eda-a3bf-a12b057648b6/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": "e8eb0e6d-ba57-4be2-b434-dbcd38410722", + "link_id": "1e1ee684-cf5d-4eda-a3bf-a12b057648b6", "nodes": [], - "project_id": "6decafaa-f9d9-4a39-8009-f44f3d608eef" + "project_id": "1db885b5-c3e7-4e86-8bd1-bb0a891f009f" } diff --git a/docs/api/examples/controller_post_projectsprojectidnodes.txt b/docs/api/examples/controller_post_projectsprojectidnodes.txt index 53e258dc..7a8f4e8d 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/bbfbe6c6-a76f-46df-9926-5779a0d085df/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/07c2e2f4-28fb-44c5-9a9e-f6e6cd62f3c1/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}' -POST /v2/projects/bbfbe6c6-a76f-46df-9926-5779a0d085df/nodes HTTP/1.1 +POST /v2/projects/07c2e2f4-28fb-44c5-9a9e-f6e6cd62f3c1/nodes HTTP/1.1 { "compute_id": "example.com", "name": "test", @@ -12,7 +12,7 @@ POST /v2/projects/bbfbe6c6-a76f-46df-9926-5779a0d085df/nodes HTTP/1.1 HTTP/1.1 201 -CONTENT-LENGTH: 663 +CONTENT-LENGTH: 686 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -24,23 +24,25 @@ X-ROUTE: /v2/projects/{project_id}/nodes "console": 2048, "console_host": "example.org", "console_type": null, + "height": 70, "label": { - "color": "#ff000000", - "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "rotation": 0, + "style": "font-size: 10;font-familly: Verdana", "text": "", - "x": -17.0234375, - "y": -25.0 + "x": -17, + "y": -25 }, "name": "test", "node_directory": null, - "node_id": "4a3c6dbb-dea0-4495-8cb9-5fed340bc7ea", + "node_id": "10715eee-fce6-44bb-b5db-ab76bfac9dec", "node_type": "vpcs", - "project_id": "bbfbe6c6-a76f-46df-9926-5779a0d085df", + "project_id": "07c2e2f4-28fb-44c5-9a9e-f6e6cd62f3c1", "properties": { "startup_script": "echo test" }, "status": "stopped", "symbol": ":/symbols/computer.svg", + "width": 70, "x": 0, "y": 0, "z": 0 diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt index 4a831506..9bec7b89 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/4ff7f05e-b11b-4d06-8757-3dccef62f8df/nodes/bab7352a-69e5-4395-a908-f6f1cd1df213/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/743b5bc1-841f-4ef7-9d61-92659dbb7665/nodes/79d24d23-5689-4049-b2ab-3ab7446158e0/reload' -d '{}' -POST /v2/projects/4ff7f05e-b11b-4d06-8757-3dccef62f8df/nodes/bab7352a-69e5-4395-a908-f6f1cd1df213/reload HTTP/1.1 +POST /v2/projects/743b5bc1-841f-4ef7-9d61-92659dbb7665/nodes/79d24d23-5689-4049-b2ab-3ab7446158e0/reload HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt index 48a784ff..9c9ba9d4 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/51c45968-cf8d-452a-b070-417504221f8f/nodes/579139f5-e617-4afe-a544-3e250f1c08ee/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/95cc977a-493f-42d6-ad99-e2de35c1b933/nodes/633d00a4-2870-48cd-9f65-21ee0ed614d8/start' -d '{}' -POST /v2/projects/51c45968-cf8d-452a-b070-417504221f8f/nodes/579139f5-e617-4afe-a544-3e250f1c08ee/start HTTP/1.1 +POST /v2/projects/95cc977a-493f-42d6-ad99-e2de35c1b933/nodes/633d00a4-2870-48cd-9f65-21ee0ed614d8/start HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt index 548e143d..158eedfa 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/316b9215-3ebe-4078-9420-53e6ecec47f3/nodes/0e56a3a6-c5c9-45c1-92be-d9de3278d8db/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/52abd079-b78b-4c32-8d71-e319f3876423/nodes/2539caf7-59c0-465e-99d5-821fb17aad78/stop' -d '{}' -POST /v2/projects/316b9215-3ebe-4078-9420-53e6ecec47f3/nodes/0e56a3a6-c5c9-45c1-92be-d9de3278d8db/stop HTTP/1.1 +POST /v2/projects/52abd079-b78b-4c32-8d71-e319f3876423/nodes/2539caf7-59c0-465e-99d5-821fb17aad78/stop HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt index c7396aa9..39cfbe3d 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/163eb9ae-4f77-45ba-a515-a42ca07eab10/nodes/5f153630-560a-45f7-99da-48b3137d4aa7/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/e5cd4251-7c15-4e3f-849b-22dd7c0d2700/nodes/ed64e800-bd65-4651-9d85-ca4c1fbdfdc3/suspend' -d '{}' -POST /v2/projects/163eb9ae-4f77-45ba-a515-a42ca07eab10/nodes/5f153630-560a-45f7-99da-48b3137d4aa7/suspend HTTP/1.1 +POST /v2/projects/e5cd4251-7c15-4e3f-849b-22dd7c0d2700/nodes/ed64e800-bd65-4651-9d85-ca4c1fbdfdc3/suspend HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt index d3506e37..b61395ff 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/ae6be0a7-6b6a-4f01-9a4b-de833b12a50e/nodes/reload' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/6e38f9c0-d890-4dba-8573-65774aaa6539/nodes/reload' -d '{}' -POST /v2/projects/ae6be0a7-6b6a-4f01-9a4b-de833b12a50e/nodes/reload HTTP/1.1 +POST /v2/projects/6e38f9c0-d890-4dba-8573-65774aaa6539/nodes/reload HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt index 17d99374..0d1c16ab 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/b4072f94-3ed8-4496-b774-152082a08956/nodes/start' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/93db4de6-676c-4a1f-9cb1-fa0056e00f22/nodes/start' -d '{}' -POST /v2/projects/b4072f94-3ed8-4496-b774-152082a08956/nodes/start HTTP/1.1 +POST /v2/projects/93db4de6-676c-4a1f-9cb1-fa0056e00f22/nodes/start HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt index f75eb64f..ebd4f2ff 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/a4e5e7d2-dec6-4d38-89c3-8a48d2c67793/nodes/stop' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/22c95799-3303-4799-af41-252c66cbf892/nodes/stop' -d '{}' -POST /v2/projects/a4e5e7d2-dec6-4d38-89c3-8a48d2c67793/nodes/stop HTTP/1.1 +POST /v2/projects/22c95799-3303-4799-af41-252c66cbf892/nodes/stop HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt index 2cd14c57..36c82aa2 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/1f14792a-4d5f-4861-9346-aa9df42a7332/nodes/suspend' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/d0fb8c9a-e3a4-46da-bf30-a6db62931dc7/nodes/suspend' -d '{}' -POST /v2/projects/1f14792a-4d5f-4861-9346-aa9df42a7332/nodes/suspend HTTP/1.1 +POST /v2/projects/d0fb8c9a-e3a4-46da-bf30-a6db62931dc7/nodes/suspend HTTP/1.1 {} diff --git a/docs/api/examples/controller_post_projectsprojectidopen.txt b/docs/api/examples/controller_post_projectsprojectidopen.txt index d6d7d5f8..4cb4872d 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/3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e/open' -d '{}' +curl -i -X POST 'http://localhost:3080/v2/projects/e20aa66a-4d7f-4407-9763-3701f716ae0a/open' -d '{}' -POST /v2/projects/3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e/open HTTP/1.1 +POST /v2/projects/e20aa66a-4d7f-4407-9763-3701f716ae0a/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/tmpby9j9ch1/projects/3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e", - "project_id": "3a076eb5-9b0c-46f4-a318-5cfbe35d0e1e", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpkpm1kyek/projects/e20aa66a-4d7f-4407-9763-3701f716ae0a", + "project_id": "e20aa66a-4d7f-4407-9763-3701f716ae0a", "status": "opened" } diff --git a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt index c7293f56..e06d8364 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/ccbcb061-2217-4d51-8a58-4dc449febf51/drawings/da5b82f0-9064-4a3e-9d59-560bbb93d884' -d '{"x": 42}' +curl -i -X PUT 'http://localhost:3080/v2/projects/8159b62e-eeac-46e5-b878-8bb6bd193e8a/drawings/72c2ef6b-0c7b-4cd7-a950-15b82a1b8c0d' -d '{"x": 42}' -PUT /v2/projects/ccbcb061-2217-4d51-8a58-4dc449febf51/drawings/da5b82f0-9064-4a3e-9d59-560bbb93d884 HTTP/1.1 +PUT /v2/projects/8159b62e-eeac-46e5-b878-8bb6bd193e8a/drawings/72c2ef6b-0c7b-4cd7-a950-15b82a1b8c0d 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": "da5b82f0-9064-4a3e-9d59-560bbb93d884", - "project_id": "ccbcb061-2217-4d51-8a58-4dc449febf51", + "drawing_id": "72c2ef6b-0c7b-4cd7-a950-15b82a1b8c0d", + "project_id": "8159b62e-eeac-46e5-b878-8bb6bd193e8a", "rotation": 0, "svg": "", "x": 42, diff --git a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt index d9ea25c7..bbc4bb35 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/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"}}' +curl -i -X PUT 'http://localhost:3080/v2/projects/62d319e5-3bbc-4adf-b981-cf70111f88f2/nodes/1ee47c03-c07a-4675-9c81-29bd154fcda5' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}' -PUT /v2/projects/f56c0169-3bae-45c3-80d2-a222679db430/nodes/373d4ce5-13aa-46df-9556-1d177106ab80 HTTP/1.1 +PUT /v2/projects/62d319e5-3bbc-4adf-b981-cf70111f88f2/nodes/1ee47c03-c07a-4675-9c81-29bd154fcda5 HTTP/1.1 { "compute_id": "example.com", "name": "test", @@ -12,7 +12,7 @@ PUT /v2/projects/f56c0169-3bae-45c3-80d2-a222679db430/nodes/373d4ce5-13aa-46df-9 HTTP/1.1 200 -CONTENT-LENGTH: 620 +CONTENT-LENGTH: 643 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/2.0.0dev1 @@ -24,21 +24,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id} "console": 2048, "console_host": "example.org", "console_type": null, + "height": 70, "label": { - "color": "#ff000000", - "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "rotation": 0, + "style": "font-size: 10;font-familly: Verdana", "text": "", - "x": -17.0234375, - "y": -25.0 + "x": -17, + "y": -25 }, "name": "test", "node_directory": null, - "node_id": "373d4ce5-13aa-46df-9556-1d177106ab80", + "node_id": "1ee47c03-c07a-4675-9c81-29bd154fcda5", "node_type": "vpcs", - "project_id": "f56c0169-3bae-45c3-80d2-a222679db430", + "project_id": "62d319e5-3bbc-4adf-b981-cf70111f88f2", "properties": {}, "status": "stopped", "symbol": ":/symbols/computer.svg", + "width": 70, "x": 0, "y": 0, "z": 0 diff --git a/docs/api/notifications/drawing.created.json b/docs/api/notifications/drawing.created.json index b9c9b77e..ae7bb02b 100644 --- a/docs/api/notifications/drawing.created.json +++ b/docs/api/notifications/drawing.created.json @@ -1,6 +1,6 @@ { - "drawing_id": "65e95f65-35a6-4c21-bc37-a5158870ad99", - "project_id": "3f671aae-cbd9-41e0-a785-5b2e241b702f", + "drawing_id": "b52e45b0-d1a7-46b4-8ecc-5db59eba7e0f", + "project_id": "63a45f0d-f886-436f-b07e-f52cdcbeaff4", "rotation": 0, "svg": "", "x": 10, diff --git a/docs/api/notifications/drawing.deleted.json b/docs/api/notifications/drawing.deleted.json index b90d50ef..7b6955e8 100644 --- a/docs/api/notifications/drawing.deleted.json +++ b/docs/api/notifications/drawing.deleted.json @@ -1,6 +1,6 @@ { - "drawing_id": "246a4d6f-f046-4376-b3f5-b56d4a27803c", - "project_id": "d02d47d4-282e-4643-8308-87dba6d31c7c", + "drawing_id": "eda0ee4d-aada-4a4a-9e20-b769d446d027", + "project_id": "334050e2-d33d-4aab-a3f6-8ca4b15edf7f", "rotation": 0, "svg": "", "x": 0, diff --git a/docs/api/notifications/drawing.updated.json b/docs/api/notifications/drawing.updated.json index 1b7720c8..045552d9 100644 --- a/docs/api/notifications/drawing.updated.json +++ b/docs/api/notifications/drawing.updated.json @@ -1,6 +1,6 @@ { - "drawing_id": "da5b82f0-9064-4a3e-9d59-560bbb93d884", - "project_id": "ccbcb061-2217-4d51-8a58-4dc449febf51", + "drawing_id": "72c2ef6b-0c7b-4cd7-a950-15b82a1b8c0d", + "project_id": "8159b62e-eeac-46e5-b878-8bb6bd193e8a", "rotation": 0, "x": 42, "y": 20, diff --git a/docs/api/notifications/link.created.json b/docs/api/notifications/link.created.json index 6ec24d3a..f6e50041 100644 --- a/docs/api/notifications/link.created.json +++ b/docs/api/notifications/link.created.json @@ -2,18 +2,32 @@ "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "0b37f142-dae6-4c6c-9f83-fa2169dbdc06", + "link_id": "ca9142e8-9684-4b31-b9c4-68eaec0f0b0d", "nodes": [ { "adapter_number": 0, - "node_id": "7ad6abb3-3daa-4617-8d49-cbb7fe1797db", + "label": { + "rotation": 0, + "style": "font-size: 10; font-style: Verdana", + "text": "0/3", + "x": -10, + "y": -10 + }, + "node_id": "c4812669-53d7-4098-bc90-76be0ff7bf1a", "port_number": 3 }, { "adapter_number": 2, - "node_id": "ee0b77d8-5042-4010-ab55-91b52c35f392", + "label": { + "rotation": 0, + "style": "font-size: 10; font-style: Verdana", + "text": "2/4", + "x": -10, + "y": -10 + }, + "node_id": "0d0bfaee-1d67-4909-be6a-c0d2ae16521d", "port_number": 4 } ], - "project_id": "12024b7e-cb63-4f67-898f-2a9858a6589e" + "project_id": "87658726-db5c-47e0-9f4b-1688f4f9b04e" } \ No newline at end of file diff --git a/docs/api/notifications/link.deleted.json b/docs/api/notifications/link.deleted.json index 21af85e1..527792c0 100644 --- a/docs/api/notifications/link.deleted.json +++ b/docs/api/notifications/link.deleted.json @@ -2,7 +2,7 @@ "capture_file_name": null, "capture_file_path": null, "capturing": false, - "link_id": "e74e45eb-364c-4a91-a902-c591ecd96d33", + "link_id": "cb7f05be-c81f-4c6f-9019-2e7ad10a112e", "nodes": [], - "project_id": "35b02ebb-6e70-4077-b752-e759c38f4b81" + "project_id": "ab738561-f1ff-4d75-a093-f9f05dd07a1a" } \ No newline at end of file diff --git a/docs/api/notifications/link.updated.json b/docs/api/notifications/link.updated.json index 76b0e126..6191e693 100644 --- a/docs/api/notifications/link.updated.json +++ b/docs/api/notifications/link.updated.json @@ -1,19 +1,31 @@ { - "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", + "capture_file_name": null, + "capture_file_path": null, "capturing": false, - "link_id": "2e6bfd5e-174b-4833-ad60-2174b33e9b21", + "link_id": "994ee8ac-e59d-45bd-947a-33e38826e021", "nodes": [ { "adapter_number": 0, - "node_id": "d490f5cb-d3a9-42bd-b074-88f472948b0e", - "port_number": 4 + "label": { + "text": "Hello", + "x": 64, + "y": 0 + }, + "node_id": "c293dc3c-d7e2-402c-89c5-a04aa51965f6", + "port_number": 3 }, { - "adapter_number": 3, - "node_id": "b2848d9f-6542-4298-9d28-09d8d0062aef", - "port_number": 1 + "adapter_number": 2, + "label": { + "rotation": 0, + "style": "font-size: 10; font-style: Verdana", + "text": "2/4", + "x": -10, + "y": -10 + }, + "node_id": "fbb9bec7-3f67-4d2e-85af-79ccfa06156f", + "port_number": 4 } ], - "project_id": "555df717-1a35-4203-84e2-8523b8d75cb4" + "project_id": "303f4f73-d0ab-4ff5-9b89-a1f6b8b0bbc9" } \ No newline at end of file diff --git a/docs/api/notifications/node.deleted.json b/docs/api/notifications/node.deleted.json index 0f5357c5..5917a086 100644 --- a/docs/api/notifications/node.deleted.json +++ b/docs/api/notifications/node.deleted.json @@ -4,21 +4,23 @@ "console": null, "console_host": "example.org", "console_type": null, + "height": 70, "label": { - "color": "#ff000000", - "font": "TypeWriter,10,-1,5,75,0,0,0,0,0", + "rotation": 0, + "style": "font-size: 10;font-familly: Verdana", "text": "", - "x": -17.0234375, - "y": -25.0 + "x": -17, + "y": -25 }, "name": "test", "node_directory": null, - "node_id": "5e1be81a-f447-4f4d-b7a0-505006981111", + "node_id": "4a3bf3e4-d588-4be0-b0d7-87d0ac5f8bbd", "node_type": "vpcs", - "project_id": "4ea837c7-286a-4ca0-b1ce-9d7ea40a1f1f", + "project_id": "f34a9fd6-cc9f-4203-a1a4-6f3b0b59f6e9", "properties": {}, "status": "stopped", "symbol": ":/symbols/computer.svg", + "width": 70, "x": 0, "y": 0, "z": 0 diff --git a/docs/api/notifications/node.updated.json b/docs/api/notifications/node.updated.json deleted file mode 100644 index 8de60010..00000000 --- a/docs/api/notifications/node.updated.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "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/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index ba6ddf55..e80939cb 100644 --- a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on an ATM switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 690dead3..5f432e9d 100644 --- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to an ATM switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from an ATM switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 37472348..63c2746f 100644 --- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on an ATM switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 56080a32..a85838f4 100644 --- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a cloud instance Parameters ********** -- **adapter_number**: Adapter on the cloud (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the cloud (always 0) - **port_number**: Port on the cloud - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from a cloud instance Parameters ********** -- **adapter_number**: Adapter on the cloud (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the cloud (always 0) - **port_number**: Port on the cloud - **node_id**: Node UUID diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index c6c4abc4..e3408e2f 100644 --- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a cloud instance Parameters ********** -- **adapter_number**: Adapter on the cloud (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the cloud (always 0) - **port_number**: Port on the cloud - **node_id**: Node UUID diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 0ef066b3..d5c8831e 100644 --- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a cloud instance Parameters ********** -- **adapter_number**: Adapter on the cloud (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the cloud (always 0) - **port_number**: Port on the cloud - **node_id**: Node UUID diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 42a52c04..dd09d777 100644 --- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a Docker container Parameters ********** -- **adapter_number**: Adapter where the nio should be added - **project_id**: Project UUID +- **adapter_number**: Adapter where the nio should be added - **port_number**: Port on the adapter - **node_id**: Node UUID @@ -33,8 +33,8 @@ Remove a NIO from a Docker container Parameters ********** -- **adapter_number**: Adapter where the nio should be added - **project_id**: Project UUID +- **adapter_number**: Adapter where the nio should be added - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 10062644..d36d981e 100644 --- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a Docker container instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 149b6674..caa8bb57 100644 --- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a Docker container instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index f7871c12..e184e6af 100644 --- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter where the nio should be added - **project_id**: Project UUID +- **adapter_number**: Adapter where the nio should be added - **port_number**: Port on the adapter - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter from where the nio should be removed - **project_id**: Project UUID +- **adapter_number**: Adapter from where the nio should be removed - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index e92fa5a7..bc488f1e 100644 --- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 3fb34a24..30a88d5d 100644 --- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index ef0cd267..5bfada08 100644 --- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to an Ethernet hub instance Parameters ********** -- **adapter_number**: Adapter on the hub (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the hub (always 0) - **port_number**: Port on the hub - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from an Ethernet hub instance Parameters ********** -- **adapter_number**: Adapter on the hub (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the hub (always 0) - **port_number**: Port on the hub - **node_id**: Node UUID diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 39d6cb29..e60ea8f7 100644 --- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on an Ethernet hub instance Parameters ********** -- **adapter_number**: Adapter on the hub (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the hub (always 0) - **port_number**: Port on the hub - **node_id**: Node UUID diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 0450df8a..66024308 100644 --- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on an Ethernet hub instance Parameters ********** -- **adapter_number**: Adapter on the hub (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the hub (always 0) - **port_number**: Port on the hub - **node_id**: Node UUID diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index a1c1fcd9..53ae531e 100644 --- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to an Ethernet switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from an Ethernet switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 5b0441af..74e00e52 100644 --- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on an Ethernet switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 6d8ba8de..d8cd38c4 100644 --- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on an Ethernet switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 9657e2bd..5bbaafb6 100644 --- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a Frame Relay switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from a Frame Relay switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 5bc70cd5..adee0094 100644 --- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a Frame Relay switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 8de75f26..4e41e959 100644 --- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a Frame Relay switch instance Parameters ********** -- **adapter_number**: Adapter on the switch (always 0) - **project_id**: Project UUID +- **adapter_number**: Adapter on the switch (always 0) - **port_number**: Port on the switch - **node_id**: Node UUID diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 8d92b949..2db1c0b3 100644 --- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a IOU instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located - **project_id**: Project UUID +- **adapter_number**: Network adapter where the nio is located - **port_number**: Port where the nio should be added - **node_id**: Node UUID @@ -33,8 +33,8 @@ Remove a NIO from a IOU instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located - **project_id**: Project UUID +- **adapter_number**: Network adapter where the nio is located - **port_number**: Port from where the nio should be removed - **node_id**: Node UUID diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index e83d8898..237d27da 100644 --- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on an IOU VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index fa74f200..e846741f 100644 --- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on an IOU VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/network/interfaces.rst b/docs/api/v2/compute/network/networkinterfaces.rst similarity index 77% rename from docs/api/v2/compute/network/interfaces.rst rename to docs/api/v2/compute/network/networkinterfaces.rst index 4146c264..66f40f0d 100644 --- a/docs/api/v2/compute/network/interfaces.rst +++ b/docs/api/v2/compute/network/networkinterfaces.rst @@ -1,9 +1,9 @@ -/v2/compute/interfaces +/v2/compute/network/interfaces ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v2/compute/interfaces +GET /v2/compute/network/interfaces ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ List all the network interfaces available on the server @@ -15,5 +15,5 @@ Sample session *************** -.. literalinclude:: ../../../examples/compute_get_interfaces.txt +.. literalinclude:: ../../../examples/compute_get_networkinterfaces.txt diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst index b9a290d3..4f357856 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst @@ -124,6 +124,7 @@ Input kernel_image string QEMU kernel image path kernel_image_md5sum ['string', 'null'] QEMU kernel image checksum legacy_networking ['boolean', 'null'] Use QEMU legagy networking commands (-net syntax) + linked_clone boolean Whether the VM is a linked clone or not mac_address ['string', 'null'] QEMU MAC address name ['string', 'null'] QEMU VM instance name options ['string', 'null'] Additional QEMU options diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst index ac6a8c46..33788090 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a Qemu VM instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located - **project_id**: Project UUID +- **adapter_number**: Network adapter where the nio is located - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID @@ -33,8 +33,8 @@ Remove a NIO from a Qemu VM instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located - **project_id**: Project UUID +- **adapter_number**: Network adapter where the nio is located - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 6121bf1a..ff1844f4 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a Qemu VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 046d7839..e3a27472 100644 --- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a Qemu VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 11dfa599..ef8d9279 100644 --- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter where the nio should be added - **project_id**: Project UUID +- **adapter_number**: Adapter where the nio should be added - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID @@ -33,8 +33,8 @@ Remove a NIO from a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter from where the nio should be removed - **project_id**: Project UUID +- **adapter_number**: Adapter from where the nio should be removed - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index 3c79c652..408fbb00 100644 --- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index a2e42d04..7d5716e7 100644 --- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst index a7104f5c..4d117f5a 100644 --- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a VMware VM instance Parameters ********** -- **adapter_number**: Adapter where the nio should be added - **project_id**: Project UUID +- **adapter_number**: Adapter where the nio should be added - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID @@ -27,8 +27,8 @@ Remove a NIO from a VMware VM instance Parameters ********** -- **adapter_number**: Adapter from where the nio should be removed - **project_id**: Project UUID +- **adapter_number**: Adapter from where the nio should be removed - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index d418d432..1dfa0bee 100644 --- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a VMware VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 6dcb6076..e7004621 100644 --- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a VMware VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter (always 0) - **node_id**: Node UUID diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst index 569f5c96..0bac9b07 100644 --- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst @@ -9,8 +9,8 @@ Add a NIO to a VPCS instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located - **project_id**: Project UUID +- **adapter_number**: Network adapter where the nio is located - **port_number**: Port where the nio should be added - **node_id**: Node UUID @@ -33,8 +33,8 @@ Remove a NIO from a VPCS instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located - **project_id**: Project UUID +- **adapter_number**: Network adapter where the nio is located - **port_number**: Port from where the nio should be removed - **node_id**: Node UUID diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst index ad08e9bf..f7633e0a 100644 --- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,8 +9,8 @@ Start a packet capture on a VPCS instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to start a packet capture - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst index 18f566e7..d755e954 100644 --- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,8 +9,8 @@ Stop a packet capture on a VPCS instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture - **project_id**: Project UUID +- **adapter_number**: Adapter to stop a packet capture - **port_number**: Port on the adapter - **node_id**: Node UUID diff --git a/docs/api/v2/controller/compute/s.rst b/docs/api/v2/controller/compute/s.rst index 0b43adbb..b79785ee 100644 --- a/docs/api/v2/controller/compute/s.rst +++ b/docs/api/v2/controller/compute/s.rst @@ -33,8 +33,10 @@ Output - + + + diff --git a/docs/api/v2/controller/compute/sid.rst b/docs/api/v2/controller/compute/sid.rst index 9495bf30..37bede47 100644 --- a/docs/api/v2/controller/compute/sid.rst +++ b/docs/api/v2/controller/compute/sid.rst @@ -35,8 +35,10 @@ Output
Name Mandatory Type Description
compute_id ✔ string Server identifier
connected ✔ boolean Whether the controller is connected to the compute server or not
connected boolean Whether the controller is connected to the compute server or not
cpu_usage_percent ['number', 'null'] CPU usage of the compute. Read only
host ✔ string Server host
memory_usage_percent ['number', 'null'] RAM usage of the compute. Read only
name ✔ string Server name
port ✔ integer Server port
protocol ✔ enum Possible values: http, https
- + + + @@ -60,8 +62,10 @@ Output
Name Mandatory Type Description
compute_id ✔ string Server identifier
connected ✔ boolean Whether the controller is connected to the compute server or not
connected boolean Whether the controller is connected to the compute server or not
cpu_usage_percent ['number', 'null'] CPU usage of the compute. Read only
host ✔ string Server host
memory_usage_percent ['number', 'null'] RAM usage of the compute. Read only
name ✔ string Server name
port ✔ integer Server port
protocol ✔ enum Possible values: http, https
- + + + diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst index d93464d5..0d62948b 100644 --- a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst +++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst @@ -3,6 +3,49 @@ .. contents:: +PUT /v2/projects/**{project_id}**/links/**{link_id}** +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Update a link instance + +Parameters +********** +- **project_id**: Project UUID +- **link_id**: Link UUID + +Response status codes +********************** +- **400**: Invalid request +- **201**: Link updated + +Input +******* +.. raw:: html + +
Name Mandatory Type Description
compute_id ✔ string Server identifier
connected ✔ boolean Whether the controller is connected to the compute server or not
connected boolean Whether the controller is connected to the compute server or not
cpu_usage_percent ['number', 'null'] CPU usage of the compute. Read only
host ✔ string Server host
memory_usage_percent ['number', 'null'] RAM usage of the compute. Read only
name ✔ string Server name
port ✔ integer Server port
protocol ✔ enum Possible values: http, https
+ + + + + + + +
Name Mandatory Type Description
capture_file_name ['string', 'null'] Read only property. The name of the capture file if capture is running
capture_file_path ['string', 'null'] Read only property. The full path of the capture file if capture is running
capturing boolean Read only property. True if a capture running on the link
link_id string Link UUID
nodes ✔ array List of the VMS
project_id string Project UUID
+ +Output +******* +.. raw:: html + + + + + + + + + +
Name Mandatory Type Description
capture_file_name ['string', 'null'] Read only property. The name of the capture file if capture is running
capture_file_path ['string', 'null'] Read only property. The full path of the capture file if capture is running
capturing boolean Read only property. True if a capture running on the link
link_id string Link UUID
nodes ✔ array List of the VMS
project_id string Project UUID
+ + DELETE /v2/projects/**{project_id}**/links/**{link_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a link instance diff --git a/docs/api/v2/controller/node/projectsprojectidnodes.rst b/docs/api/v2/controller/node/projectsprojectidnodes.rst index 2ce8b53b..a05f8dc9 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodes.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodes.rst @@ -27,6 +27,7 @@ Input console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -36,9 +37,10 @@ Input properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Output @@ -52,6 +54,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -61,9 +64,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst index 89cbfba9..6bbb3d13 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst @@ -24,6 +24,7 @@ Input console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -33,9 +34,10 @@ Input properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Output @@ -49,6 +51,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -58,9 +61,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst index 1a2008e3..f6042bb2 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst @@ -29,6 +29,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -38,9 +39,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst index 231194f5..a43ed2cd 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst @@ -29,6 +29,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -38,9 +39,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst index 3edcbf32..11b00841 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst @@ -29,6 +29,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -38,9 +39,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst index 915df86a..7d9e0b6e 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst @@ -29,6 +29,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -38,9 +39,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesreload.rst index 9f4ceac6..4c8d01b9 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesreload.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesreload.rst @@ -28,6 +28,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -37,9 +38,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesstart.rst index fafb25b4..06f6910b 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesstart.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesstart.rst @@ -28,6 +28,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -37,9 +38,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodesstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesstop.rst index 66757826..017f6075 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodesstop.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodesstop.rst @@ -28,6 +28,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -37,9 +38,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst index 878c0b0b..25828eb4 100644 --- a/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst +++ b/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst @@ -28,6 +28,7 @@ Output console ['integer', 'null'] Console TCP port console_host string Console host console_type enum Possible values: serial, vnc, telnet, null + height integer Height of the node label object name string Node name node_directory ['null', 'string'] Working directory of the node. Read only @@ -37,9 +38,10 @@ Output properties object Properties specific to an emulator status enum Possible values: stopped, started, suspended symbol string Symbol of the node - x number X position of the node - y number Y position of the node - z number Z position of the node + width integer Width of the node + x integer X position of the node + y integer Y position of the node + z integer Z position of the node Sample session diff --git a/docs/file_format.rst b/docs/file_format.rst index 14da78f1..eb63e890 100644 --- a/docs/file_format.rst +++ b/docs/file_format.rst @@ -29,6 +29,10 @@ The revision is the version of file format: * 2: GNS3 1.3 * 1: GNS3 1.0, 1.1, 1.2 (Not mentionned in the topology file) +And the full JSON schema: + +.. literalinclude:: gns3_file.json + The .net ######### diff --git a/docs/gns3_file.json b/docs/gns3_file.json new file mode 100644 index 00000000..efd28973 --- /dev/null +++ b/docs/gns3_file.json @@ -0,0 +1,444 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "The topology", + "type": "object", + "required": [ + "project_id", + "type", + "revision", + "version", + "name", + "topology" + ], + "additionalProperties": false, + "properties": { + "project_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Project UUID", + "maxLength": 36, + "type": "string" + }, + "topology": { + "additionalProperties": false, + "required": [ + "nodes", + "links", + "drawings", + "computes" + ], + "description": "The topology content", + "type": "object", + "properties": { + "computes": { + "items": { + "required": [ + "compute_id", + "protocol", + "host", + "port", + "name" + ], + "description": "Request validation to a GNS3 compute object instance", + "type": "object", + "properties": { + "connected": { + "description": "Whether the controller is connected to the compute server or not", + "type": "boolean" + }, + "host": { + "description": "Server host", + "type": "string" + }, + "protocol": { + "enum": [ + "http", + "https" + ], + "description": "Server protocol" + }, + "memory_usage_percent": { + "description": "RAM usage of the compute. Read only", + "maximum": 100, + "type": [ + "number", + "null" + ], + "minimum": 0 + }, + "user": { + "description": "User for authentication", + "type": [ + "string", + "null" + ] + }, + "version": { + "description": "Version of the GNS3 remote compute server", + "type": [ + "string", + "null" + ] + }, + "cpu_usage_percent": { + "description": "CPU usage of the compute. Read only", + "maximum": 100, + "type": [ + "number", + "null" + ], + "minimum": 0 + }, + "port": { + "description": "Server port", + "type": "integer" + }, + "compute_id": { + "description": "Server identifier", + "type": "string" + }, + "name": { + "description": "Server name", + "type": "string" + } + }, + "additionalProperties": false, + "$schema": "http://json-schema.org/draft-04/schema#" + }, + "description": "Computes servers", + "type": "array" + }, + "drawings": { + "items": { + "additionalProperties": false, + "properties": { + "project_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Project UUID", + "maxLength": 36, + "type": "string" + }, + "x": { + "description": "X property", + "type": "integer" + }, + "drawing_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Drawing UUID", + "maxLength": 36, + "type": "string" + }, + "y": { + "description": "Y property", + "type": "integer" + }, + "svg": { + "description": "SVG content of the drawing", + "pattern": "^<(.|[\r\n])+>$", + "type": "string" + }, + "rotation": { + "description": "Rotation of the element", + "maximum": 360, + "type": "integer", + "minimum": 0 + }, + "z": { + "description": "Z property", + "type": "integer" + } + }, + "description": "An drawing object", + "type": "object", + "$schema": "http://json-schema.org/draft-04/schema#" + }, + "description": "Drawings elements", + "type": "array" + }, + "links": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "A link object", + "type": "object", + "required": [ + "nodes" + ], + "additionalProperties": false, + "properties": { + "project_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Project UUID", + "maxLength": 36, + "type": "string" + }, + "capturing": { + "description": "Read only property. True if a capture running on the link", + "type": "boolean" + }, + "link_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Link UUID", + "maxLength": 36, + "type": "string" + }, + "capture_file_name": { + "description": "Read only property. The name of the capture file if capture is running", + "type": [ + "string", + "null" + ] + }, + "nodes": { + "items": { + "additionalProperties": false, + "required": [ + "node_id", + "adapter_number", + "port_number" + ], + "type": "object", + "properties": { + "adapter_number": { + "description": "Adapter number", + "type": "integer" + }, + "label": { + "additionalProperties": false, + "required": [ + "text", + "x", + "y" + ], + "type": "object", + "properties": { + "style": { + "description": "SVG style attribute", + "type": "string" + }, + "y": { + "description": "Relative Y position of the label", + "type": "integer" + }, + "x": { + "description": "Relative X position of the label", + "type": "integer" + }, + "text": { + "type": "string" + }, + "rotation": { + "description": "Rotation of the label", + "type": "integer" + } + } + }, + "port_number": { + "description": "Port number", + "type": "integer" + }, + "node_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Node UUID", + "maxLength": 36, + "type": "string" + } + } + }, + "description": "List of the VMS", + "type": "array" + }, + "capture_file_path": { + "description": "Read only property. The full path of the capture file if capture is running", + "type": [ + "string", + "null" + ] + } + } + }, + "description": "Link elements", + "type": "array" + }, + "nodes": { + "items": { + "description": "A node object", + "type": "object", + "properties": { + "x": { + "description": "X position of the node", + "type": "integer" + }, + "y": { + "description": "Y position of the node", + "type": "integer" + }, + "node_directory": { + "description": "Working directory of the node. Read only", + "type": [ + "null", + "string" + ] + }, + "properties": { + "description": "Properties specific to an emulator", + "type": "object" + }, + "command_line": { + "description": "Command line use to start the node", + "type": [ + "null", + "string" + ] + }, + "symbol": { + "minLength": 1, + "description": "Symbol of the node", + "type": "string" + }, + "name": { + "minLength": 1, + "description": "Node name", + "type": "string" + }, + "project_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Project UUID", + "maxLength": 36, + "type": "string" + }, + "console": { + "description": "Console TCP port", + "maximum": 65535, + "type": [ + "integer", + "null" + ], + "minimum": 1 + }, + "console_host": { + "minLength": 1, + "description": "Console host", + "type": "string" + }, + "status": { + "enum": [ + "stopped", + "started", + "suspended" + ], + "description": "Status of the node" + }, + "console_type": { + "enum": [ + "serial", + "vnc", + "telnet", + null + ], + "description": "Console type" + }, + "node_type": { + "enum": [ + "cloud", + "ethernet_hub", + "ethernet_switch", + "frame_relay_switch", + "atm_switch", + "docker", + "dynamips", + "vpcs", + "virtualbox", + "vmware", + "iou", + "qemu" + ], + "description": "Type of node" + }, + "label": { + "additionalProperties": false, + "required": [ + "text", + "x", + "y" + ], + "type": "object", + "properties": { + "style": { + "description": "SVG style attribute", + "type": "string" + }, + "y": { + "description": "Relative Y position of the label", + "type": "integer" + }, + "x": { + "description": "Relative X position of the label", + "type": "integer" + }, + "text": { + "type": "string" + }, + "rotation": { + "description": "Rotation of the label", + "type": "integer" + } + } + }, + "width": { + "description": "Width of the node", + "type": "integer" + }, + "compute_id": { + "description": "Compute identifier", + "type": "string" + }, + "height": { + "description": "Height of the node", + "type": "integer" + }, + "z": { + "description": "Z position of the node", + "type": "integer" + }, + "node_id": { + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "description": "Node UUID", + "maxLength": 36, + "type": "string" + } + }, + "additionalProperties": false, + "$schema": "http://json-schema.org/draft-04/schema#" + }, + "description": "Nodes elements", + "type": "array" + } + } + }, + "type": { + "enum": [ + "topology" + ], + "description": "Type of file. It's always topology" + }, + "version": { + "description": "Version of the GNS3 software which have update the file for the last time", + "type": "string" + }, + "revision": { + "description": "Version of the .gns3 specification.", + "type": "integer" + }, + "name": { + "description": "Name of the project", + "type": "string" + } + } +} \ No newline at end of file diff --git a/scripts/documentation.sh b/scripts/documentation.sh index 38464e30..012794fe 100755 --- a/scripts/documentation.sh +++ b/scripts/documentation.sh @@ -30,7 +30,6 @@ mkdir -p docs/api/examples py.test -v tests -export PYTHONPATH=. python3 gns3server/web/documentation.py cd docs make html