diff --git a/docs/api/examples/common_get_version.txt b/docs/api/examples/controller_get_version.txt similarity index 67% rename from docs/api/examples/common_get_version.txt rename to docs/api/examples/controller_get_version.txt index f6e7b75d..ea035fdd 100644 --- a/docs/api/examples/common_get_version.txt +++ b/docs/api/examples/controller_get_version.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/version' +curl -i -X GET 'http://localhost:8000/v2/version' -GET /v1/version HTTP/1.1 +GET /v2/version HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 49 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/version +X-ROUTE: /v2/controller/version { "local": true, diff --git a/docs/api/examples/controller_post_servers.txt b/docs/api/examples/controller_post_servers.txt index aba2d76a..521b9e0b 100644 --- a/docs/api/examples/controller_post_servers.txt +++ b/docs/api/examples/controller_post_servers.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/servers' -d '{"host": "example.com", "password": "secure", "port": 84, "protocol": "http", "server_id": "my_server_id", "user": "julien"}' +curl -i -X POST 'http://localhost:8000/v2/servers' -d '{"host": "example.com", "password": "secure", "port": 84, "protocol": "http", "server_id": "my_server_id", "user": "julien"}' -POST /v1/servers HTTP/1.1 +POST /v2/servers HTTP/1.1 { "host": "example.com", "password": "secure", @@ -17,7 +17,7 @@ CONTENT-LENGTH: 176 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/controller/servers +X-ROUTE: /v2/controller/servers { "connected": false, diff --git a/docs/api/examples/common_post_version.txt b/docs/api/examples/controller_post_version.txt similarity index 66% rename from docs/api/examples/common_post_version.txt rename to docs/api/examples/controller_post_version.txt index c9d7884b..cac8aa44 100644 --- a/docs/api/examples/common_post_version.txt +++ b/docs/api/examples/controller_post_version.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.5.0dev1"}' +curl -i -X POST 'http://localhost:8000/v2/version' -d '{"version": "1.5.0dev1"}' -POST /v1/version HTTP/1.1 +POST /v2/version HTTP/1.1 { "version": "1.5.0dev1" } @@ -12,7 +12,7 @@ CONTENT-LENGTH: 30 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/version +X-ROUTE: /v2/controller/version { "version": "1.5.0dev1" diff --git a/docs/api/examples/hypervisor_delete_projectsprojectid.txt b/docs/api/examples/hypervisor_delete_projectsprojectid.txt index 7080eb25..cc40be97 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectid.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80 HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80 HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id} +X-ROUTE: /v2/hypervisor/projects/{project_id} diff --git a/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt index e905d31f..9197962d 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/95443b90-227a-4c50-acc4-41cce637a7fa/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/ea050c4a-695b-4135-bbda-907a1bafbb2e/adapters/0/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/95443b90-227a-4c50-acc4-41cce637a7fa/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/ea050c4a-695b-4135-bbda-907a1bafbb2e/adapters/0/ports/0/nio HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt index 22e0016a..5ce5fbae 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/487f966e-f0b7-440e-9360-dd0b3ec85298' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/85bf8018-891e-4a8f-97b0-efc3046aab36' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/487f966e-f0b7-440e-9360-dd0b3ec85298 HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/85bf8018-891e-4a8f-97b0-efc3046aab36 HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id} diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 67ef222a..9c8839d3 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/397fcae2-0e84-4289-9bfc-9f647ffba05b/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/9a5ad4df-3231-4f25-9f6d-9a55e2680f42/adapters/1/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/397fcae2-0e84-4289-9bfc-9f647ffba05b/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/9a5ad4df-3231-4f25-9f6d-9a55e2680f42/adapters/1/ports/0/nio HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt index a047ee0d..73060984 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/089172d7-6de2-4936-961f-1cddec3ec4df' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/9ae4aaa3-ffc0-4695-8216-fbd82d67e428' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/089172d7-6de2-4936-961f-1cddec3ec4df HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/9ae4aaa3-ffc0-4695-8216-fbd82d67e428 HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id} diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt index c07b9c7c..3143d544 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d734018d-601c-4b62-b044-5abd8c99bbd1/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f2e60e4e-cc85-4821-96a5-a429b3143eb1/adapters/1/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d734018d-601c-4b62-b044-5abd8c99bbd1/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f2e60e4e-cc85-4821-96a5-a429b3143eb1/adapters/1/ports/0/nio HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 2e1f614c..1c3f39e5 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/149016fb-30de-44c9-b28b-ddb3c66b150d/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/272af52d-3b76-47f8-a8b9-49be2c779afa/adapters/0/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/149016fb-30de-44c9-b28b-ddb3c66b150d/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/272af52d-3b76-47f8-a8b9-49be2c779afa/adapters/0/ports/0/nio HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt index 6c1c462f..431412db 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/59b49b36-b525-48ef-8cdc-1d004fd3c93e' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a96b0be9-0632-4e08-aa5c-2da20e33aafd' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/59b49b36-b525-48ef-8cdc-1d004fd3c93e HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a96b0be9-0632-4e08-aa5c-2da20e33aafd HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 6152b562..20c68076 100644 --- a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c1431d7f-7a11-4765-bfcf-af3042313503/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/696826a1-e02f-41da-993a-24e119235ad0/adapters/0/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c1431d7f-7a11-4765-bfcf-af3042313503/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/696826a1-e02f-41da-993a-24e119235ad0/adapters/0/ports/0/nio HTTP/1.1 @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/hypervisor_get_interfaces.txt b/docs/api/examples/hypervisor_get_interfaces.txt index 17fb4b7a..3b25a2cc 100644 --- a/docs/api/examples/hypervisor_get_interfaces.txt +++ b/docs/api/examples/hypervisor_get_interfaces.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/interfaces' +curl -i -X GET 'http://localhost:8000/v2/interfaces' -GET /v1/interfaces HTTP/1.1 +GET /v2/interfaces HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 1253 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/interfaces +X-ROUTE: /v2/hypervisor/interfaces [ { diff --git a/docs/api/examples/hypervisor_get_iouvms.txt b/docs/api/examples/hypervisor_get_iouvms.txt index c0ec53e9..72bb538c 100644 --- a/docs/api/examples/hypervisor_get_iouvms.txt +++ b/docs/api/examples/hypervisor_get_iouvms.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/iou/vms' +curl -i -X GET 'http://localhost:8000/v2/iou/vms' -GET /v1/iou/vms HTTP/1.1 +GET /v2/iou/vms HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 72 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/iou/vms +X-ROUTE: /v2/hypervisor/iou/vms [ { diff --git a/docs/api/examples/hypervisor_get_projects.txt b/docs/api/examples/hypervisor_get_projects.txt index ad89c6bc..fcf51415 100644 --- a/docs/api/examples/hypervisor_get_projects.txt +++ b/docs/api/examples/hypervisor_get_projects.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects' +curl -i -X GET 'http://localhost:8000/v2/projects' -GET /v1/projects HTTP/1.1 +GET /v2/projects HTTP/1.1 @@ -10,21 +10,21 @@ CONTENT-LENGTH: 692 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects +X-ROUTE: /v2/hypervisor/projects [ { - "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvw_p95ay/projects", + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzdacjj9u/projects", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvw_p95ay/projects/00010203-0405-0607-0809-0a0b0c0d0e0f", - "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzdacjj9u/projects/00010203-0405-0607-0809-0a0b0c0d0e0b", + "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0b", "temporary": false }, { - "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvw_p95ay/projects", + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzdacjj9u/projects", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvw_p95ay/projects/00010203-0405-0607-0809-0a0b0c0d0e0b", - "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0b", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzdacjj9u/projects/00010203-0405-0607-0809-0a0b0c0d0e0f", + "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f", "temporary": false } ] diff --git a/docs/api/examples/hypervisor_get_projectsprojectid.txt b/docs/api/examples/hypervisor_get_projectsprojectid.txt index db0372e4..8956dfb4 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectid.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/00010203-0405-0607-0809-0a0b0c0d0e02' +curl -i -X GET 'http://localhost:8000/v2/projects/00010203-0405-0607-0809-0a0b0c0d0e02' -GET /v1/projects/00010203-0405-0607-0809-0a0b0c0d0e02 HTTP/1.1 +GET /v2/projects/00010203-0405-0607-0809-0a0b0c0d0e02 HTTP/1.1 @@ -10,12 +10,12 @@ CONTENT-LENGTH: 315 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id} +X-ROUTE: /v2/hypervisor/projects/{project_id} { - "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpifme43c6/projects", + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpblilnlks/projects", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpifme43c6/projects/00010203-0405-0607-0809-0a0b0c0d0e02", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpblilnlks/projects/00010203-0405-0607-0809-0a0b0c0d0e02", "project_id": "00010203-0405-0607-0809-0a0b0c0d0e02", "temporary": false } diff --git a/docs/api/examples/hypervisor_get_projectsprojectidfiles.txt b/docs/api/examples/hypervisor_get_projectsprojectidfiles.txt index 0f44d68f..08d0ece5 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectidfiles.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectidfiles.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/files' +curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/files' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/files HTTP/1.1 +GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/files HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 204 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/files +X-ROUTE: /v2/hypervisor/projects/{project_id}/files [ { diff --git a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt index 6822bc99..e5f9560f 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/88a020ea-366e-4cd1-8d4d-4963e11d61eb' +curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d3b40654-aac9-4482-ae7f-b17585452f47' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/88a020ea-366e-4cd1-8d4d-4963e11d61eb HTTP/1.1 +GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d3b40654-aac9-4482-ae7f-b17585452f47 HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 643 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id} { "command_line": "", @@ -28,6 +28,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id} "serial_adapters": 2, "startup_config": null, "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/88a020ea-366e-4cd1-8d4d-4963e11d61eb", - "vm_id": "88a020ea-366e-4cd1-8d4d-4963e11d61eb" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/d3b40654-aac9-4482-ae7f-b17585452f47", + "vm_id": "d3b40654-aac9-4482-ae7f-b17585452f47" } diff --git a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt index 9ed58791..ea4885b1 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a795d38e-6c70-423e-ba56-c847c9bea0e1/configs' +curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5d06cf86-3c43-43cd-880f-563365da9af9/configs' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a795d38e-6c70-423e-ba56-c847c9bea0e1/configs HTTP/1.1 +GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5d06cf86-3c43-43cd-880f-563365da9af9/configs HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 40 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/configs +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/configs { "startup_config_content": "TEST" diff --git a/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt index 598c74ba..cef14b59 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/87059fce-411b-4bde-9fe5-ff3a52b4665a' +curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2434ca92-6f86-4791-a37b-16829022c3c3' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/87059fce-411b-4bde-9fe5-ff3a52b4665a HTTP/1.1 +GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2434ca92-6f86-4791-a37b-16829022c3c3 HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 1386 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id} { "acpi_shutdown": false, @@ -42,15 +42,15 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id} "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:66:5a:00", + "mac_address": "00:00:ab:c3:c3:00", "name": "PC TEST 1", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp48y504z6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpniqxbosk/qemu-system-x86_64", "ram": 256, "usage": "", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/87059fce-411b-4bde-9fe5-ff3a52b4665a", - "vm_id": "87059fce-411b-4bde-9fe5-ff3a52b4665a" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/2434ca92-6f86-4791-a37b-16829022c3c3", + "vm_id": "2434ca92-6f86-4791-a37b-16829022c3c3" } diff --git a/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt index cbbd357a..65392b2d 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/90cbd7a9-dddf-43cf-90c7-766ae33a49f5' +curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/01702d40-34f3-4035-9c26-fe8cdb914ca6' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/90cbd7a9-dddf-43cf-90c7-766ae33a49f5 HTTP/1.1 +GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/01702d40-34f3-4035-9c26-fe8cdb914ca6 HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 415 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} { "acpi_shutdown": false, @@ -24,6 +24,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} "ram": 0, "use_any_adapter": false, "vm_directory": null, - "vm_id": "90cbd7a9-dddf-43cf-90c7-766ae33a49f5", + "vm_id": "01702d40-34f3-4035-9c26-fe8cdb914ca6", "vmname": "VMTEST" } diff --git a/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt index 17567224..7cc65fa2 100644 --- a/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt +++ b/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fdd9250a-63f3-4027-8754-eef610194c57' +curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/cbe8e7a6-dbc8-45ac-a0b5-85ed524d18a5' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fdd9250a-63f3-4027-8754-eef610194c57 HTTP/1.1 +GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/cbe8e7a6-dbc8-45ac-a0b5-85ed524d18a5 HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 455 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} { "command_line": "", @@ -20,6 +20,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} "startup_script": null, "startup_script_path": null, "status": "stopped", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/fdd9250a-63f3-4027-8754-eef610194c57", - "vm_id": "fdd9250a-63f3-4027-8754-eef610194c57" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/cbe8e7a6-dbc8-45ac-a0b5-85ed524d18a5", + "vm_id": "cbe8e7a6-dbc8-45ac-a0b5-85ed524d18a5" } diff --git a/docs/api/examples/hypervisor_get_qemubinaries.txt b/docs/api/examples/hypervisor_get_qemubinaries.txt index b6a15496..ec4b9a1a 100644 --- a/docs/api/examples/hypervisor_get_qemubinaries.txt +++ b/docs/api/examples/hypervisor_get_qemubinaries.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/qemu/binaries' -d '{"archs": ["i386"]}' +curl -i -X GET 'http://localhost:8000/v2/qemu/binaries' -d '{"archs": ["i386"]}' -GET /v1/qemu/binaries HTTP/1.1 +GET /v2/qemu/binaries HTTP/1.1 { "archs": [ "i386" @@ -14,7 +14,7 @@ CONTENT-LENGTH: 212 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/qemu/binaries +X-ROUTE: /v2/hypervisor/qemu/binaries [ { diff --git a/docs/api/examples/hypervisor_get_qemucapabilities.txt b/docs/api/examples/hypervisor_get_qemucapabilities.txt index 706ec47f..28dea903 100644 --- a/docs/api/examples/hypervisor_get_qemucapabilities.txt +++ b/docs/api/examples/hypervisor_get_qemucapabilities.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/qemu/capabilities' +curl -i -X GET 'http://localhost:8000/v2/qemu/capabilities' -GET /v1/qemu/capabilities HTTP/1.1 +GET /v2/qemu/capabilities HTTP/1.1 @@ -10,7 +10,7 @@ CONTENT-LENGTH: 39 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/qemu/capabilities +X-ROUTE: /v2/hypervisor/qemu/capabilities { "kvm": [ diff --git a/docs/api/examples/hypervisor_get_version.txt b/docs/api/examples/hypervisor_get_version.txt new file mode 100644 index 00000000..9634fc35 --- /dev/null +++ b/docs/api/examples/hypervisor_get_version.txt @@ -0,0 +1,18 @@ +curl -i -X GET 'http://localhost:8000/v2/version' + +GET /v2/version HTTP/1.1 + + + +HTTP/1.1 200 +ACCESS-CONTROL-ALLOW-ORIGIN: * +CONTENT-LENGTH: 49 +CONTENT-TYPE: application/json +DATE: Thu, 08 Jan 2015 16:09:15 GMT +SERVER: Python/3.5 GNS3/1.5.0dev1 +X-ROUTE: /v2/hypervisor/version + +{ + "local": true, + "version": "1.5.0dev1" +} diff --git a/docs/api/examples/hypervisor_post_configreload.txt b/docs/api/examples/hypervisor_post_configreload.txt index 77f65a85..f433a3cf 100644 --- a/docs/api/examples/hypervisor_post_configreload.txt +++ b/docs/api/examples/hypervisor_post_configreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/config/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/config/reload' -d '{}' -POST /v1/config/reload HTTP/1.1 +POST /v2/config/reload HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/config/reload +X-ROUTE: /v2/hypervisor/config/reload diff --git a/docs/api/examples/hypervisor_post_projects.txt b/docs/api/examples/hypervisor_post_projects.txt index 7f36b299..87db116b 100644 --- a/docs/api/examples/hypervisor_post_projects.txt +++ b/docs/api/examples/hypervisor_post_projects.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects' -d '{"name": "test"}' +curl -i -X POST 'http://localhost:8000/v2/projects' -d '{"name": "test"}' -POST /v1/projects HTTP/1.1 +POST /v2/projects HTTP/1.1 { "name": "test" } @@ -12,12 +12,12 @@ CONTENT-LENGTH: 315 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects +X-ROUTE: /v2/hypervisor/projects { - "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpw5zez4l6/projects", + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpr31cd789/projects", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpw5zez4l6/projects/28e98ad8-23a2-48ea-a316-c9e5d9bb40d5", - "project_id": "28e98ad8-23a2-48ea-a316-c9e5d9bb40d5", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpr31cd789/projects/8bae0914-715e-4e8f-8342-7606f012c5af", + "project_id": "8bae0914-715e-4e8f-8342-7606f012c5af", "temporary": false } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidclose.txt b/docs/api/examples/hypervisor_post_projectsprojectidclose.txt index 174228ce..22fcdc2b 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidclose.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidclose.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/close' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/close' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/close HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/close HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/close +X-ROUTE: /v2/hypervisor/projects/{project_id}/close diff --git a/docs/api/examples/hypervisor_post_projectsprojectidcommit.txt b/docs/api/examples/hypervisor_post_projectsprojectidcommit.txt index de650a63..f70e0d17 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidcommit.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidcommit.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/commit' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/commit' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/commit HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/commit HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/commit +X-ROUTE: /v2/hypervisor/projects/{project_id}/commit diff --git a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt index 87da743e..3b154bb1 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/d06db3b1-1bda-4758-b1e1-f28d84b30af8/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/04c0796b-af7d-44a5-9b58-42454dc078b1/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/d06db3b1-1bda-4758-b1e1-f28d84b30af8/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/04c0796b-af7d-44a5-9b58-42454dc078b1/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", @@ -15,7 +15,7 @@ CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { "lport": 4242, diff --git a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt index 43395cb6..b373dcee 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/0c55c22c-c92b-4352-8881-3777c22e39c1/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/40f56eb3-e579-4368-8db6-904959f9302c/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/0c55c22c-c92b-4352-8881-3777c22e39c1/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/40f56eb3-e579-4368-8db6-904959f9302c/adapters/0/ports/0/start_capture HTTP/1.1 { "capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB" @@ -13,8 +13,8 @@ CONTENT-LENGTH: 167 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture { - "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap" + "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt index 8a955fa0..14bcf809 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/1e957352-5bcb-4655-9bc8-03f7e3b543b7/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/c6618f98-06af-4be5-a0b0-172de6a1c95e/adapters/0/ports/0/stop_capture' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/1e957352-5bcb-4655-9bc8-03f7e3b543b7/adapters/0/ports/0/stop_capture HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/c6618f98-06af-4be5-a0b0-172de6a1c95e/adapters/0/ports/0/stop_capture HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt index 555327e7..d7be7157 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt @@ -1,11 +1,11 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "iou.bin", "startup_config_content": "hostname test", "vm_id": "939d59a8-17c9-40c5-8880-6d1bfc88a130"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "iou.bin", "startup_config_content": "hostname test", "vm_id": "a01038d7-fd9a-4efc-ae16-d7f60c583f68"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms HTTP/1.1 { "name": "PC TEST 1", "path": "iou.bin", "startup_config_content": "hostname test", - "vm_id": "939d59a8-17c9-40c5-8880-6d1bfc88a130" + "vm_id": "a01038d7-fd9a-4efc-ae16-d7f60c583f68" } @@ -15,7 +15,7 @@ CONTENT-LENGTH: 659 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms { "command_line": "", @@ -33,6 +33,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms "serial_adapters": 2, "startup_config": "startup-config.cfg", "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/939d59a8-17c9-40c5-8880-6d1bfc88a130", - "vm_id": "939d59a8-17c9-40c5-8880-6d1bfc88a130" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/a01038d7-fd9a-4efc-ae16-d7f60c583f68", + "vm_id": "a01038d7-fd9a-4efc-ae16-d7f60c583f68" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 06d1f43f..2605eac9 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/6ea8873d-ddda-47c1-afad-8303fcce4ac0/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_generic_ethernet"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/aeb0ed3a-49f2-47a6-9deb-c9dadad2128c/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_generic_ethernet"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/6ea8873d-ddda-47c1-afad-8303fcce4ac0/adapters/1/ports/0/nio HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/aeb0ed3a-49f2-47a6-9deb-c9dadad2128c/adapters/1/ports/0/nio HTTP/1.1 { "ethernet_device": "bridge0", "type": "nio_generic_ethernet" @@ -13,7 +13,7 @@ CONTENT-LENGTH: 72 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { "ethernet_device": "bridge0", diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt index d4af266c..93dfd214 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8eb7925a-cd50-4fc6-bc55-30ea769d3a9a/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b86a3780-f2dc-4b65-a32b-40fefcf23c9d/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8eb7925a-cd50-4fc6-bc55-30ea769d3a9a/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b86a3780-f2dc-4b65-a32b-40fefcf23c9d/adapters/0/ports/0/start_capture HTTP/1.1 { "capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB" @@ -13,8 +13,8 @@ CONTENT-LENGTH: 167 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture { - "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap" + "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt index 6480e491..ea7067de 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7bdba100-186c-4665-9f9e-beae8ccd47f6/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/36f9d2a3-fccb-4602-ae5a-ae2166b8a037/adapters/0/ports/0/stop_capture' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7bdba100-186c-4665-9f9e-beae8ccd47f6/adapters/0/ports/0/stop_capture HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/36f9d2a3-fccb-4602-ae5a-ae2166b8a037/adapters/0/ports/0/stop_capture HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt index 282b1ee7..b154c690 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/78f1524b-0656-4666-94e5-d975c22a0362/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b43e13b6-793c-4abe-9a61-558aa5468611/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/78f1524b-0656-4666-94e5-d975c22a0362/reload HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b43e13b6-793c-4abe-9a61-558aa5468611/reload HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/reload +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/reload diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt index 49ec495b..19a36aaf 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/2220af9e-1308-487c-9394-d07fc02b48d2/start' -d '{"iourc_content": "test"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/6cae9c24-fbc6-485f-b8cf-df8512bb512e/start' -d '{"iourc_content": "test"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/2220af9e-1308-487c-9394-d07fc02b48d2/start HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/6cae9c24-fbc6-485f-b8cf-df8512bb512e/start HTTP/1.1 { "iourc_content": "test" } @@ -12,13 +12,13 @@ CONTENT-LENGTH: 707 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start { "command_line": "", "console": 2001, "ethernet_adapters": 2, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpy0ailev_/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpq6flori0/iourc", "l1_keepalives": false, "md5sum": null, "name": "PC TEST 1", @@ -30,6 +30,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start "serial_adapters": 2, "startup_config": null, "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/2220af9e-1308-487c-9394-d07fc02b48d2", - "vm_id": "2220af9e-1308-487c-9394-d07fc02b48d2" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/6cae9c24-fbc6-485f-b8cf-df8512bb512e", + "vm_id": "6cae9c24-fbc6-485f-b8cf-df8512bb512e" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt index ee3691a3..098c77fd 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/afa54e26-adf2-48f7-b2ba-86f888de1898/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/ee4a551d-df59-40bf-9de0-571844d80bf7/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/afa54e26-adf2-48f7-b2ba-86f888de1898/stop HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/ee4a551d-df59-40bf-9de0-571844d80bf7/stop HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/stop +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/stop diff --git a/docs/api/examples/hypervisor_post_projectsprojectidportsudp.txt b/docs/api/examples/hypervisor_post_projectsprojectidportsudp.txt index d1133476..9e715344 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidportsudp.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidportsudp.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/ports/udp' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/ports/udp' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/ports/udp HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/ports/udp HTTP/1.1 {} @@ -10,7 +10,7 @@ CONTENT-LENGTH: 25 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/ports/udp +X-ROUTE: /v2/hypervisor/projects/{project_id}/ports/udp { "udp_port": 10000 diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt index 18bfdfd3..ebca1663 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt @@ -1,10 +1,10 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp48y504z6/qemu-system-x86_64", "ram": 1024}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpniqxbosk/qemu-system-x86_64", "ram": 1024}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1 { "hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp48y504z6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpniqxbosk/qemu-system-x86_64", "ram": 1024 } @@ -15,7 +15,7 @@ CONTENT-LENGTH: 1432 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms { "acpi_shutdown": false, @@ -47,15 +47,15 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:77:f2:00", + "mac_address": "00:00:ab:a6:43:00", "name": "PC TEST 1", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp48y504z6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpniqxbosk/qemu-system-x86_64", "ram": 1024, "usage": "", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/0a62f9a9-90e3-4248-84a9-01739dee77f2", - "vm_id": "0a62f9a9-90e3-4248-84a9-01739dee77f2" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/cd7d5a8d-6451-45c1-939c-1207e3baa643", + "vm_id": "cd7d5a8d-6451-45c1-939c-1207e3baa643" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 656d25c7..00759204 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2ff68c2e-369e-44ba-8dbc-9126134132c5/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/738edd89-4ee0-4291-a09e-a8bcf148d957/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2ff68c2e-369e-44ba-8dbc-9126134132c5/adapters/1/ports/0/nio HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/738edd89-4ee0-4291-a09e-a8bcf148d957/adapters/1/ports/0/nio HTTP/1.1 { "ethernet_device": "eth0", "type": "nio_generic_ethernet" @@ -13,7 +13,7 @@ CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { "message": "NIO of type nio_generic_ethernet is not supported", diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt index 797a778c..bf374fcd 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a7ff3dd0-f7ac-4a56-b521-6bd4d328daf5/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b51edf2b-0448-4ea3-9775-6f55153ec826/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a7ff3dd0-f7ac-4a56-b521-6bd4d328daf5/reload HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b51edf2b-0448-4ea3-9775-6f55153ec826/reload HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/reload +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/reload diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt index a21a59e5..5096df01 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e52aeb77-ae1e-4a30-9611-c9932ed11bb6/resume' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5b08ab35-71f7-4574-a81a-25e0ba69bb15/resume' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e52aeb77-ae1e-4a30-9611-c9932ed11bb6/resume HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5b08ab35-71f7-4574-a81a-25e0ba69bb15/resume HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/resume +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/resume diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt index 0658c4ba..e2fe9361 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/da6bf262-3558-4159-9592-71af45849f81/start' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/9b3ff5e8-49eb-4f87-b273-f5e62dca8077/start' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/da6bf262-3558-4159-9592-71af45849f81/start HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/9b3ff5e8-49eb-4f87-b273-f5e62dca8077/start HTTP/1.1 {} @@ -10,7 +10,7 @@ CONTENT-LENGTH: 1386 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/start +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/start { "acpi_shutdown": false, @@ -42,15 +42,15 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/start "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:9f:81:00", + "mac_address": "00:00:ab:80:77:00", "name": "PC TEST 1", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp48y504z6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpniqxbosk/qemu-system-x86_64", "ram": 256, "usage": "", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/da6bf262-3558-4159-9592-71af45849f81", - "vm_id": "da6bf262-3558-4159-9592-71af45849f81" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/9b3ff5e8-49eb-4f87-b273-f5e62dca8077", + "vm_id": "9b3ff5e8-49eb-4f87-b273-f5e62dca8077" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt index 1083fbad..139a4702 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/19544b05-42c5-4e1e-a2f2-7f036f8ede75/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2f307e0a-1354-4ac7-915b-7fc9a7d17d75/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/19544b05-42c5-4e1e-a2f2-7f036f8ede75/stop HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2f307e0a-1354-4ac7-915b-7fc9a7d17d75/stop HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/stop +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/stop diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt index fe159e3b..3891f85c 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6c7f9d40-72e3-4e90-bc69-51130cafebc9/suspend' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/92aca201-d518-425f-8744-46947bab2d02/suspend' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6c7f9d40-72e3-4e90-bc69-51130cafebc9/suspend HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/92aca201-d518-425f-8744-46947bab2d02/suspend HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/suspend +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/suspend diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt index 7d87650f..0fe6b13b 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms' -d '{"linked_clone": false, "name": "VM1", "vmname": "VM1"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms' -d '{"linked_clone": false, "name": "VM1", "vmname": "VM1"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms HTTP/1.1 { "linked_clone": false, "name": "VM1", @@ -14,7 +14,7 @@ CONTENT-LENGTH: 409 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms { "acpi_shutdown": false, @@ -28,6 +28,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms "ram": 0, "use_any_adapter": false, "vm_directory": null, - "vm_id": "4e0a9fb2-fae7-4ac8-8c95-3ffa5f39b187", + "vm_id": "68c3509a-64f8-43ab-8add-a991029de221", "vmname": "VM1" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 1704de79..4f34702f 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6a1112d0-9001-4c57-9b91-6a1636b2f887/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/20a29cc5-24a6-4f76-901d-e98ce26bc756/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6a1112d0-9001-4c57-9b91-6a1636b2f887/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/20a29cc5-24a6-4f76-901d-e98ce26bc756/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", @@ -15,7 +15,7 @@ CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { "lport": 4242, diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt index 98a5824a..01424395 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/5e20d5f0-1f8c-42e8-979f-2c57bbc9fc7f/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/804c121d-935d-499e-9c34-4d33b3045dd2/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/5e20d5f0-1f8c-42e8-979f-2c57bbc9fc7f/reload HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/804c121d-935d-499e-9c34-4d33b3045dd2/reload HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/reload +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/reload diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt index cacce35d..a5112758 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c5705196-021e-4b40-8361-be73c9d12c5d/resume' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/b180eae6-a768-4d18-8429-5db71fb14ac9/resume' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c5705196-021e-4b40-8361-be73c9d12c5d/resume HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/b180eae6-a768-4d18-8429-5db71fb14ac9/resume HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/resume +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/resume diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt index 27230a98..ea10165c 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/e7490dfc-a7aa-4d2b-8915-73cad6c93e70/start' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/06b7a2a5-9510-4ade-808c-0c606d224954/start' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/e7490dfc-a7aa-4d2b-8915-73cad6c93e70/start HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/06b7a2a5-9510-4ade-808c-0c606d224954/start HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/start +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/start diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt index 107abe1f..3bf762a9 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6081826a-ac27-42c7-95cd-30c5e8805aa9/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/de197f04-925d-4bfc-afcb-63506870949f/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6081826a-ac27-42c7-95cd-30c5e8805aa9/stop HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/de197f04-925d-4bfc-afcb-63506870949f/stop HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/stop +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/stop diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt index e31537d8..63fab8d6 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/98596a2c-a8e8-4870-a702-4f53747fdc7e/suspend' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4d67ae8d-5ba3-476a-bf5d-860e313fbcac/suspend' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/98596a2c-a8e8-4870-a702-4f53747fdc7e/suspend HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4d67ae8d-5ba3-476a-bf5d-860e313fbcac/suspend HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/suspend +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/suspend diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt index a40a0d33..78a98863 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms' -d '{"name": "PC TEST 1"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms' -d '{"name": "PC TEST 1"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms HTTP/1.1 { "name": "PC TEST 1" } @@ -12,7 +12,7 @@ CONTENT-LENGTH: 455 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms { "command_line": "", @@ -22,6 +22,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms "startup_script": null, "startup_script_path": null, "status": "stopped", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/d9573d45-01c0-4beb-ac3c-0d0d810c4a9f", - "vm_id": "d9573d45-01c0-4beb-ac3c-0d0d810c4a9f" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/014a59f3-9906-4060-8bb5-9dec035285da", + "vm_id": "014a59f3-9906-4060-8bb5-9dec035285da" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 1b8d7768..d55d0eaa 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/4c222853-b5b2-435e-865f-cf66f0bd32da/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/32d2b974-140e-423b-a1a7-0febadf201b3/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/4c222853-b5b2-435e-865f-cf66f0bd32da/adapters/0/ports/0/nio HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/32d2b974-140e-423b-a1a7-0febadf201b3/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", @@ -15,7 +15,7 @@ CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { "lport": 4242, diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt index 26127746..c03d5993 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/be1f8feb-e276-43a9-a383-1899002c8871/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c72d1bbe-97b0-4711-a372-f472929e3cb5/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/be1f8feb-e276-43a9-a383-1899002c8871/reload HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c72d1bbe-97b0-4711-a372-f472929e3cb5/reload HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/reload +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/reload diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt index 73ee2a0b..86be6ad7 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/b8c36dbd-2274-4148-923f-a35865b38a48/start' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a2598c6d-3952-47a1-bdc0-37da99c1e273/start' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/b8c36dbd-2274-4148-923f-a35865b38a48/start HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a2598c6d-3952-47a1-bdc0-37da99c1e273/start HTTP/1.1 {} @@ -10,7 +10,7 @@ CONTENT-LENGTH: 455 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/start +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/start { "command_line": "", @@ -20,6 +20,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/start "startup_script": null, "startup_script_path": null, "status": "stopped", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/b8c36dbd-2274-4148-923f-a35865b38a48", - "vm_id": "b8c36dbd-2274-4148-923f-a35865b38a48" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/a2598c6d-3952-47a1-bdc0-37da99c1e273", + "vm_id": "a2598c6d-3952-47a1-bdc0-37da99c1e273" } diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt index 489ce1a2..033445e6 100644 --- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt +++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/58b7b281-a9f4-43f2-a5ad-316d78043ad3/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a67684f4-59c6-452d-80f6-d22cece832fb/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/58b7b281-a9f4-43f2-a5ad-316d78043ad3/stop HTTP/1.1 +POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a67684f4-59c6-452d-80f6-d22cece832fb/stop HTTP/1.1 {} @@ -9,5 +9,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/stop +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/stop diff --git a/docs/api/examples/hypervisor_post_qemuimg.txt b/docs/api/examples/hypervisor_post_qemuimg.txt index 2e5879f9..818c005f 100644 --- a/docs/api/examples/hypervisor_post_qemuimg.txt +++ b/docs/api/examples/hypervisor_post_qemuimg.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/qemu/img' -d '{"cluster_size": 64, "format": "qcow2", "lazy_refcounts": "off", "path": "/tmp/hda.qcow2", "preallocation": "metadata", "qemu_img": "/tmp/qemu-img", "refcount_bits": 12, "size": 100}' +curl -i -X POST 'http://localhost:8000/v2/qemu/img' -d '{"cluster_size": 64, "format": "qcow2", "lazy_refcounts": "off", "path": "/tmp/hda.qcow2", "preallocation": "metadata", "qemu_img": "/tmp/qemu-img", "refcount_bits": 12, "size": 100}' -POST /v1/qemu/img HTTP/1.1 +POST /v2/qemu/img HTTP/1.1 { "cluster_size": 64, "format": "qcow2", @@ -18,5 +18,5 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/qemu/img +X-ROUTE: /v2/hypervisor/qemu/img diff --git a/docs/api/examples/hypervisor_post_version.txt b/docs/api/examples/hypervisor_post_version.txt new file mode 100644 index 00000000..45cab3ab --- /dev/null +++ b/docs/api/examples/hypervisor_post_version.txt @@ -0,0 +1,19 @@ +curl -i -X POST 'http://localhost:8000/v2/version' -d '{"version": "1.5.0dev1"}' + +POST /v2/version HTTP/1.1 +{ + "version": "1.5.0dev1" +} + + +HTTP/1.1 200 +ACCESS-CONTROL-ALLOW-ORIGIN: * +CONTENT-LENGTH: 30 +CONTENT-TYPE: application/json +DATE: Thu, 08 Jan 2015 16:09:15 GMT +SERVER: Python/3.5 GNS3/1.5.0dev1 +X-ROUTE: /v2/hypervisor/version + +{ + "version": "1.5.0dev1" +} diff --git a/docs/api/examples/hypervisor_put_projectsprojectid.txt b/docs/api/examples/hypervisor_put_projectsprojectid.txt index d67740f9..ebf63582 100644 --- a/docs/api/examples/hypervisor_put_projectsprojectid.txt +++ b/docs/api/examples/hypervisor_put_projectsprojectid.txt @@ -1,9 +1,9 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/c9b21e04-b7f1-4dfb-8ea0-d9b195fec5ff' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-436/test_update_path_project_non_l0"}' +curl -i -X PUT 'http://localhost:8000/v2/projects/a922355c-cb97-411b-879f-d9d09d330005' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-553/test_update_path_project_non_l0"}' -PUT /v1/projects/c9b21e04-b7f1-4dfb-8ea0-d9b195fec5ff HTTP/1.1 +PUT /v2/projects/a922355c-cb97-411b-879f-d9d09d330005 HTTP/1.1 { "name": "second_name", - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-436/test_update_path_project_non_l0" + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-553/test_update_path_project_non_l0" } @@ -13,7 +13,7 @@ CONTENT-LENGTH: 96 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id} +X-ROUTE: /v2/hypervisor/projects/{project_id} { "message": "You are not allowed to modify the project directory path", diff --git a/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt index ca1fda7f..639a970c 100644 --- a/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt +++ b/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/bee007f4-d97c-4273-9e17-b8f95ee25645' -d '{"console": 2003, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}' +curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/289c485c-fe29-4f35-a65c-146cd4854262' -d '{"console": 2003, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/bee007f4-d97c-4273-9e17-b8f95ee25645 HTTP/1.1 +PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/289c485c-fe29-4f35-a65c-146cd4854262 HTTP/1.1 { "console": 2003, "environment": "GNS3=1\nGNS4=0", @@ -15,7 +15,7 @@ CONTENT-LENGTH: 531 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/docker/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id} { "adapters": 2, @@ -28,6 +28,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/docker/vms/{vm_id} "name": "test", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "start_command": "yes", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/docker/bee007f4-d97c-4273-9e17-b8f95ee25645", - "vm_id": "bee007f4-d97c-4273-9e17-b8f95ee25645" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/docker/289c485c-fe29-4f35-a65c-146cd4854262", + "vm_id": "289c485c-fe29-4f35-a65c-146cd4854262" } diff --git a/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt index add0355a..d7d4ee37 100644 --- a/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt +++ b/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/330e4cd0-f20e-4ee9-b15e-1f57dcbe7b9e' -d '{"console": 2002, "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:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/088ce9f5-eda0-403c-9336-c56d2fd18e59' -d '{"console": 2002, "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 /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/330e4cd0-f20e-4ee9-b15e-1f57dcbe7b9e HTTP/1.1 +PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/088ce9f5-eda0-403c-9336-c56d2fd18e59 HTTP/1.1 { "console": 2002, "ethernet_adapters": 4, @@ -21,13 +21,13 @@ CONTENT-LENGTH: 718 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id} { "command_line": "", "console": 2002, "ethernet_adapters": 4, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxy5rc5sv/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppfz9vhu7/iourc", "l1_keepalives": true, "md5sum": null, "name": "test", @@ -39,6 +39,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/iou/vms/{vm_id} "serial_adapters": 0, "startup_config": "startup-config.cfg", "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcf202_bh/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/330e4cd0-f20e-4ee9-b15e-1f57dcbe7b9e", - "vm_id": "330e4cd0-f20e-4ee9-b15e-1f57dcbe7b9e" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_i_9npri/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/088ce9f5-eda0-403c-9336-c56d2fd18e59", + "vm_id": "088ce9f5-eda0-403c-9336-c56d2fd18e59" } diff --git a/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt index 99f0bb9c..30fbb292 100644 --- a/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt +++ b/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/138d36ec-6f7b-48b5-9e2b-7fa1eb9d2913' -d '{"console": 2002, "hdb_disk_image": "linux.img", "name": "test", "ram": 1024}' +curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d91efeb6-ebae-46b2-ad8c-b0cedaff3058' -d '{"console": 2002, "hdb_disk_image": "linux.img", "name": "test", "ram": 1024}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/138d36ec-6f7b-48b5-9e2b-7fa1eb9d2913 HTTP/1.1 +PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d91efeb6-ebae-46b2-ad8c-b0cedaff3058 HTTP/1.1 { "console": 2002, "hdb_disk_image": "linux.img", @@ -15,7 +15,7 @@ CONTENT-LENGTH: 1391 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id} { "acpi_shutdown": false, @@ -47,15 +47,15 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id} "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:29:13:00", + "mac_address": "00:00:ab:30:58:00", "name": "test", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp48y504z6/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpniqxbosk/qemu-system-x86_64", "ram": 1024, "usage": "", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/138d36ec-6f7b-48b5-9e2b-7fa1eb9d2913", - "vm_id": "138d36ec-6f7b-48b5-9e2b-7fa1eb9d2913" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/d91efeb6-ebae-46b2-ad8c-b0cedaff3058", + "vm_id": "d91efeb6-ebae-46b2-ad8c-b0cedaff3058" } diff --git a/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt index 6e80e088..c4d6ed45 100644 --- a/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt +++ b/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6ae23735-e754-4e32-b6b5-458bd2828328' -d '{"console": 2011, "name": "test"}' +curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/53b90f87-4268-4cb7-9526-7897a028ddae' -d '{"console": 2011, "name": "test"}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6ae23735-e754-4e32-b6b5-458bd2828328 HTTP/1.1 +PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/53b90f87-4268-4cb7-9526-7897a028ddae HTTP/1.1 { "console": 2011, "name": "test" @@ -13,7 +13,7 @@ CONTENT-LENGTH: 413 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} { "acpi_shutdown": false, @@ -27,6 +27,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} "ram": 0, "use_any_adapter": false, "vm_directory": null, - "vm_id": "6ae23735-e754-4e32-b6b5-458bd2828328", + "vm_id": "53b90f87-4268-4cb7-9526-7897a028ddae", "vmname": "VMTEST" } diff --git a/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt index f16b5e85..708dc6a7 100644 --- a/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt +++ b/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fed59d23-c0e8-4ce3-a4dd-9acc73d8b40c' -d '{"console": 2012, "name": "test", "startup_script": "ip 192.168.1.1"}' +curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/5f21b010-55dd-450c-a0ed-1fe0706afd2c' -d '{"console": 2012, "name": "test", "startup_script": "ip 192.168.1.1"}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fed59d23-c0e8-4ce3-a4dd-9acc73d8b40c HTTP/1.1 +PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/5f21b010-55dd-450c-a0ed-1fe0706afd2c HTTP/1.1 { "console": 2012, "name": "test", @@ -14,7 +14,7 @@ CONTENT-LENGTH: 471 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT SERVER: Python/3.5 GNS3/1.5.0dev1 -X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} +X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} { "command_line": "", @@ -24,6 +24,6 @@ X-ROUTE: /v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} "startup_script": "ip 192.168.1.1", "startup_script_path": "startup.vpc", "status": "stopped", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxwj0vubb/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/fed59d23-c0e8-4ce3-a4dd-9acc73d8b40c", - "vm_id": "fed59d23-c0e8-4ce3-a4dd-9acc73d8b40c" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwq5ca6jn/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/5f21b010-55dd-450c-a0ed-1fe0706afd2c", + "vm_id": "5f21b010-55dd-450c-a0ed-1fe0706afd2c" } diff --git a/docs/api/v1/controller/server.rst b/docs/api/v2/controller/server.rst similarity index 100% rename from docs/api/v1/controller/server.rst rename to docs/api/v2/controller/server.rst diff --git a/docs/api/v1/controller/server/servers.rst b/docs/api/v2/controller/server/servers.rst similarity index 98% rename from docs/api/v1/controller/server/servers.rst rename to docs/api/v2/controller/server/servers.rst index 59bce824..e5553698 100644 --- a/docs/api/v1/controller/server/servers.rst +++ b/docs/api/v2/controller/server/servers.rst @@ -1,9 +1,9 @@ -/v1/controller/servers +/v2/controller/servers ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/controller/servers +POST /v2/controller/servers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Register a server diff --git a/docs/api/v1/controller/server/servershutdown.rst b/docs/api/v2/controller/server/serversshutdown.rst similarity index 86% rename from docs/api/v1/controller/server/servershutdown.rst rename to docs/api/v2/controller/server/serversshutdown.rst index dcb4ffc2..f6caa152 100644 --- a/docs/api/v1/controller/server/servershutdown.rst +++ b/docs/api/v2/controller/server/serversshutdown.rst @@ -1,9 +1,9 @@ -/v1/controller/server/shutdown +/v2/controller/servers/shutdown ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/controller/server/shutdown +POST /v2/controller/servers/shutdown ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Shutdown the local server diff --git a/docs/api/v1/common/version.rst b/docs/api/v2/controller/version.rst similarity index 100% rename from docs/api/v1/common/version.rst rename to docs/api/v2/controller/version.rst diff --git a/docs/api/v1/common/version/version.rst b/docs/api/v2/controller/version/version.rst similarity index 92% rename from docs/api/v1/common/version/version.rst rename to docs/api/v2/controller/version/version.rst index 99130bbe..c1c845b1 100644 --- a/docs/api/v1/common/version/version.rst +++ b/docs/api/v2/controller/version/version.rst @@ -1,9 +1,9 @@ -/v1/version +/v2/controller/version ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/version +GET /v2/controller/version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the server version number @@ -25,10 +25,10 @@ Sample session *************** -.. literalinclude:: ../../../examples/common_get_version.txt +.. literalinclude:: ../../../examples/controller_get_version.txt -POST /v1/version +POST /v2/controller/version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Check if version is the same as the server @@ -61,5 +61,5 @@ Sample session *************** -.. literalinclude:: ../../../examples/common_post_version.txt +.. literalinclude:: ../../../examples/controller_post_version.txt diff --git a/docs/api/v1/hypervisor/config.rst b/docs/api/v2/hypervisor/config.rst similarity index 100% rename from docs/api/v1/hypervisor/config.rst rename to docs/api/v2/hypervisor/config.rst diff --git a/docs/api/v1/hypervisor/config/configreload.rst b/docs/api/v2/hypervisor/config/configreload.rst similarity index 90% rename from docs/api/v1/hypervisor/config/configreload.rst rename to docs/api/v2/hypervisor/config/configreload.rst index 2a933681..38ec104d 100644 --- a/docs/api/v1/hypervisor/config/configreload.rst +++ b/docs/api/v2/hypervisor/config/configreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/config/reload +/v2/hypervisor/config/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/config/reload +POST /v2/hypervisor/config/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Check if version is the same as the server diff --git a/docs/api/v1/hypervisor/docker.rst b/docs/api/v2/hypervisor/docker.rst similarity index 100% rename from docs/api/v1/hypervisor/docker.rst rename to docs/api/v2/hypervisor/docker.rst diff --git a/docs/api/v1/hypervisor/docker/dockerimages.rst b/docs/api/v2/hypervisor/docker/dockerimages.rst similarity index 86% rename from docs/api/v1/hypervisor/docker/dockerimages.rst rename to docs/api/v2/hypervisor/docker/dockerimages.rst index 91860f98..7d719339 100644 --- a/docs/api/v1/hypervisor/docker/dockerimages.rst +++ b/docs/api/v2/hypervisor/docker/dockerimages.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/docker/images +/v2/hypervisor/docker/images ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/docker/images +GET /v2/hypervisor/docker/images ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get all available Docker images diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervms.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervms.rst similarity index 97% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervms.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervms.rst index a97e307c..f1c754a5 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervms.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms +/v2/hypervisor/projects/{project_id}/docker/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms +POST /v2/hypervisor/projects/**{project_id}**/docker/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new Docker container diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsid.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst similarity index 83% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsid.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst index d9be1c62..25f3afbf 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsid.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{id} +/v2/hypervisor/projects/{project_id}/docker/vms/{id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -DELETE /v1/hypervisor/projects/**{project_id}**/docker/vms/**{id}** +DELETE /v2/hypervisor/projects/**{project_id}**/docker/vms/**{id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a Docker container diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidreload.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst similarity index 97% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidreload.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst index 61591083..e47f6bb4 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidreload.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{id}/reload +/v2/hypervisor/projects/{project_id}/docker/vms/{id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Restart a Docker container diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidstart.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst similarity index 97% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidstart.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst index 7e35f776..730692bc 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidstart.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{id}/start +/v2/hypervisor/projects/{project_id}/docker/vms/{id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/start +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a Docker container diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidstop.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst similarity index 97% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidstop.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst index 0708947b..58c1ca3c 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidstop.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{id}/stop +/v2/hypervisor/projects/{project_id}/docker/vms/{id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a Docker container diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst similarity index 97% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst index d4710e1d..120a7010 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{id}/suspend +/v2/hypervisor/projects/{project_id}/docker/vms/{id}/suspend ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/suspend +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{id}**/suspend ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Pause a Docker container diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmid.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmid.rst similarity index 97% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmid.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmid.rst index 7aced4a1..89681d96 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmid.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/docker/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -PUT /v1/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a Docker instance diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 89% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst index 4811f9b9..9b289cdd 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,17 +1,17 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a Docker container Parameters ********** - **id**: ID of the container -- **project_id**: UUID for the project - **port_number**: Port on the adapter +- **project_id**: UUID for the project - **adapter_number**: Adapter where the nio should be added Response status codes @@ -27,15 +27,15 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt -DELETE /v1/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a Docker container Parameters ********** - **id**: ID of the container -- **project_id**: UUID for the project - **port_number**: Port on the adapter +- **project_id**: UUID for the project - **adapter_number**: Adapter where the nio should be added Response status codes diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst similarity index 92% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index e84a5a8c..425850fc 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +/v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a packet capture on a IOU VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter - **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst similarity index 88% rename from docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst rename to docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 7383615b..130e46a9 100644 --- a/docs/api/v1/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +/v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture +POST /v2/hypervisor/projects/**{project_id}**/docker/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a packet capture on a IOU VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_device.rst b/docs/api/v2/hypervisor/dynamips_device.rst similarity index 100% rename from docs/api/v1/hypervisor/dynamips_device.rst rename to docs/api/v2/hypervisor/dynamips_device.rst diff --git a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevices.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevices.rst similarity index 95% rename from docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevices.rst rename to docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevices.rst index ec26e820..bb3a8f75 100644 --- a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevices.rst +++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevices.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/devices +/v2/hypervisor/projects/{project_id}/dynamips/devices ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/devices +POST /v2/hypervisor/projects/**{project_id}**/dynamips/devices ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new Dynamips device instance diff --git a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst similarity index 95% rename from docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst rename to docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst index f1508dee..2c6c5808 100644 --- a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst +++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst @@ -1,16 +1,16 @@ -/v1/hypervisor/projects/{project_id}/dynamips/devices/{device_id} +/v2/hypervisor/projects/{project_id}/dynamips/devices/{device_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}** +GET /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project - **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** @@ -32,14 +32,14 @@ Output -PUT /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}** +PUT /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project - **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** @@ -90,14 +90,14 @@ Output -DELETE /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project - **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst similarity index 97% rename from docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst rename to docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst index 3b3f539a..54a07e38 100644 --- a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst @@ -1,17 +1,17 @@ -/v1/hypervisor/projects/{project_id}/dynamips/devices/{device_id}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/dynamips/devices/{device_id}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **port_number**: Port on the device - **device_id**: UUID for the instance +- **port_number**: Port on the device +- **project_id**: UUID for the project Response status codes ********************** @@ -133,15 +133,15 @@ Body -DELETE /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **port_number**: Port on the device - **device_id**: UUID for the instance +- **port_number**: Port on the device +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst similarity index 91% rename from docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst rename to docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst index a72c3b05..708f70da 100644 --- a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst +++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst @@ -1,17 +1,17 @@ -/v1/hypervisor/projects/{project_id}/dynamips/devices/{device_id}/ports/{port_number:\d+}/start_capture +/v2/hypervisor/projects/{project_id}/dynamips/devices/{device_id}/ports/{port_number:\d+}/start_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/start_capture +POST /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/start_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a packet capture on a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **port_number**: Port on the device - **device_id**: UUID for the instance +- **port_number**: Port on the device +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst similarity index 85% rename from docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst rename to docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst index dc01d2f2..07685adc 100644 --- a/docs/api/v1/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst +++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst @@ -1,17 +1,17 @@ -/v1/hypervisor/projects/{project_id}/dynamips/devices/{device_id}/ports/{port_number:\d+}/stop_capture +/v2/hypervisor/projects/{project_id}/dynamips/devices/{device_id}/ports/{port_number:\d+}/stop_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/stop_capture +POST /v2/hypervisor/projects/**{project_id}**/dynamips/devices/**{device_id}**/ports/**{port_number:\d+}**/stop_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a packet capture on a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **port_number**: Port on the device - **device_id**: UUID for the instance +- **port_number**: Port on the device +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_vm.rst b/docs/api/v2/hypervisor/dynamips_vm.rst similarity index 100% rename from docs/api/v1/hypervisor/dynamips_vm.rst rename to docs/api/v2/hypervisor/dynamips_vm.rst diff --git a/docs/api/v1/hypervisor/dynamips_vm/dynamipsvms.rst b/docs/api/v2/hypervisor/dynamips_vm/dynamipsvms.rst similarity index 87% rename from docs/api/v1/hypervisor/dynamips_vm/dynamipsvms.rst rename to docs/api/v2/hypervisor/dynamips_vm/dynamipsvms.rst index 0ae1842a..58bfdd18 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/dynamipsvms.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/dynamipsvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/dynamips/vms +/v2/hypervisor/dynamips/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/dynamips/vms +GET /v2/hypervisor/dynamips/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the list of Dynamips VMS diff --git a/docs/api/v1/hypervisor/dynamips_vm/dynamipsvmspath.rst b/docs/api/v2/hypervisor/dynamips_vm/dynamipsvmspath.rst similarity index 83% rename from docs/api/v1/hypervisor/dynamips_vm/dynamipsvmspath.rst rename to docs/api/v2/hypervisor/dynamips_vm/dynamipsvmspath.rst index 43ecfa8e..5d760b86 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/dynamipsvmspath.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/dynamipsvmspath.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/dynamips/vms/{path} +/v2/hypervisor/dynamips/vms/{path} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/dynamips/vms/**{path}** +POST /v2/hypervisor/dynamips/vms/**{path}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upload Dynamips image. diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvms.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvms.rst similarity index 99% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvms.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvms.rst index 36ac5176..094036b4 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvms.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms +/v2/hypervisor/projects/{project_id}/dynamips/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new Dynamips VM instance diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst similarity index 98% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst index 4c0b85e0..53632f1a 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}** +GET /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a Dynamips VM instance @@ -71,7 +71,7 @@ Output -PUT /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a Dynamips VM instance @@ -188,7 +188,7 @@ Output -DELETE /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a Dynamips VM instance diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 88% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst index 0c53beba..af13a75d 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a Dynamips VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter - **adapter_number**: Adapter where the nio should be added +- **port_number**: Port on the adapter +- **project_id**: UUID for the project Response status codes ********************** @@ -21,16 +21,16 @@ Response status codes - **404**: Instance doesn't exist -DELETE /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a Dynamips VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter - **adapter_number**: Adapter from where the nio should be removed +- **port_number**: Port on the adapter +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst similarity index 91% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index 95c3215b..bd61a89e 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a packet capture on a Dynamips VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter - **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst similarity index 86% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 00359821..9a9b3658 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a packet capture on a Dynamips VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidautoidlepc.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidautoidlepc.rst similarity index 80% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidautoidlepc.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidautoidlepc.rst index f9124af3..6d49c337 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidautoidlepc.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidautoidlepc.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/auto_idlepc +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/auto_idlepc ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/auto_idlepc +GET /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/auto_idlepc ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the idlepc proposals diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigs.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigs.rst similarity index 90% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigs.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigs.rst index 97599c9a..e6b041f5 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigs.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigs.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/configs +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/configs ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/configs +GET /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/configs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the startup and private configs content diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigssave.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigssave.rst similarity index 80% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigssave.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigssave.rst index 335d73ed..66dd3ca2 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigssave.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidconfigssave.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/configs/save +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/configs/save ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/configs/save +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/configs/save ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Save the startup and private configs content diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmididlepcproposals.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmididlepcproposals.rst similarity index 80% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmididlepcproposals.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmididlepcproposals.rst index 2d3223d6..d22fdcd7 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmididlepcproposals.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmididlepcproposals.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/idlepc_proposals +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/idlepc_proposals ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/idlepc_proposals +GET /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/idlepc_proposals ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the idlepc proposals diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst similarity index 82% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst index 5bb6350d..a1aff578 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/reload +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reload a Dynamips VM instance diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst similarity index 82% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst index 16c96c45..91162ad7 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/resume +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/resume ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/resume +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/resume ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Resume a suspended Dynamips VM instance diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst similarity index 82% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst index 01214471..f6eb0d39 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/start +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/start +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a Dynamips VM instance diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst similarity index 82% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst index 34641c1c..b4aabb29 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/stop +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a Dynamips VM instance diff --git a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst similarity index 82% rename from docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst rename to docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst index adec5eb8..3dc7f270 100644 --- a/docs/api/v1/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst +++ b/docs/api/v2/hypervisor/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/suspend +/v2/hypervisor/projects/{project_id}/dynamips/vms/{vm_id}/suspend ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/suspend +POST /v2/hypervisor/projects/**{project_id}**/dynamips/vms/**{vm_id}**/suspend ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suspend a Dynamips VM instance diff --git a/docs/api/v1/hypervisor/file.rst b/docs/api/v2/hypervisor/file.rst similarity index 100% rename from docs/api/v1/hypervisor/file.rst rename to docs/api/v2/hypervisor/file.rst diff --git a/docs/api/v1/hypervisor/file/filesstream.rst b/docs/api/v2/hypervisor/file/filesstream.rst similarity index 93% rename from docs/api/v1/hypervisor/file/filesstream.rst rename to docs/api/v2/hypervisor/file/filesstream.rst index d1c0e1ac..83cedc06 100644 --- a/docs/api/v1/hypervisor/file/filesstream.rst +++ b/docs/api/v2/hypervisor/file/filesstream.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/files/stream +/v2/hypervisor/files/stream ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/files/stream +GET /v2/hypervisor/files/stream ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stream a file from the server diff --git a/docs/api/v1/hypervisor/iou.rst b/docs/api/v2/hypervisor/iou.rst similarity index 100% rename from docs/api/v1/hypervisor/iou.rst rename to docs/api/v2/hypervisor/iou.rst diff --git a/docs/api/v1/hypervisor/iou/iouvms.rst b/docs/api/v2/hypervisor/iou/iouvms.rst similarity index 91% rename from docs/api/v1/hypervisor/iou/iouvms.rst rename to docs/api/v2/hypervisor/iou/iouvms.rst index e54a9fac..f8968590 100644 --- a/docs/api/v1/hypervisor/iou/iouvms.rst +++ b/docs/api/v2/hypervisor/iou/iouvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/iou/vms +/v2/hypervisor/iou/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/iou/vms +GET /v2/hypervisor/iou/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the list of IOU VMS diff --git a/docs/api/v1/hypervisor/iou/iouvmspath.rst b/docs/api/v2/hypervisor/iou/iouvmspath.rst similarity index 85% rename from docs/api/v1/hypervisor/iou/iouvmspath.rst rename to docs/api/v2/hypervisor/iou/iouvmspath.rst index e43ebd9a..73336828 100644 --- a/docs/api/v1/hypervisor/iou/iouvmspath.rst +++ b/docs/api/v2/hypervisor/iou/iouvmspath.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/iou/vms/{path} +/v2/hypervisor/iou/vms/{path} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/iou/vms/**{path}** +POST /v2/hypervisor/iou/vms/**{path}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upload IOU image. diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvms.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvms.rst similarity index 98% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvms.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvms.rst index 7de42ac4..9e374b55 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvms.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms +/v2/hypervisor/projects/{project_id}/iou/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms +POST /v2/hypervisor/projects/**{project_id}**/iou/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new IOU instance diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmid.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmid.rst similarity index 97% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmid.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmid.rst index 15a89fff..2e70fb0c 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmid.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}** +GET /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a IOU instance @@ -50,7 +50,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_get_projectsprojectidiouvmsvmid.txt -PUT /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a IOU instance @@ -119,7 +119,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_put_projectsprojectidiouvmsvmid.txt -DELETE /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a IOU instance diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 90% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst index bd79c841..463484a7 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a IOU instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port where the nio should be added - **adapter_number**: Network adapter where the nio is located +- **port_number**: Port where the nio should be added +- **project_id**: UUID for the project Response status codes ********************** @@ -27,16 +27,16 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt -DELETE /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a IOU instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port from where the nio should be removed - **adapter_number**: Network adapter where the nio is located +- **port_number**: Port from where the nio should be removed +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst similarity index 92% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index 20028dfc..77a2785e 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a packet capture on a IOU VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter - **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst similarity index 88% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index e125c4bd..9ec2265f 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a packet capture on a IOU VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidconfigs.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidconfigs.rst similarity index 91% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidconfigs.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidconfigs.rst index ff7d59f5..b7d24c8a 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidconfigs.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidconfigs.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/configs +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/configs ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/configs +GET /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/configs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the startup and private configs content diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidconfigssave.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidconfigssave.rst similarity index 79% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidconfigssave.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidconfigssave.rst index 667a7c69..c15d2dd5 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidconfigssave.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidconfigssave.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/configs/save +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/configs/save ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/configs/save +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/configs/save ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Save the startup and private configs content diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidreload.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidreload.rst similarity index 85% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidreload.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidreload.rst index 4e3a1907..f6df15ec 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidreload.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/reload +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reload a IOU instance diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidstart.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidstart.rst similarity index 97% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidstart.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidstart.rst index 0942554a..aba4e078 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidstart.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/start +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a IOU instance diff --git a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidstop.rst b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidstop.rst similarity index 85% rename from docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidstop.rst rename to docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidstop.rst index 4e1ecb77..52310247 100644 --- a/docs/api/v1/hypervisor/iou/projectsprojectidiouvmsvmidstop.rst +++ b/docs/api/v2/hypervisor/iou/projectsprojectidiouvmsvmidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/iou/vms/{vm_id}/stop +/v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/iou/vms/**{vm_id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a IOU instance diff --git a/docs/api/v1/hypervisor/network.rst b/docs/api/v2/hypervisor/network.rst similarity index 100% rename from docs/api/v1/hypervisor/network.rst rename to docs/api/v2/hypervisor/network.rst diff --git a/docs/api/v1/hypervisor/network/interfaces.rst b/docs/api/v2/hypervisor/network/interfaces.rst similarity index 90% rename from docs/api/v1/hypervisor/network/interfaces.rst rename to docs/api/v2/hypervisor/network/interfaces.rst index f6d5b34c..8b68876c 100644 --- a/docs/api/v1/hypervisor/network/interfaces.rst +++ b/docs/api/v2/hypervisor/network/interfaces.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/interfaces +/v2/hypervisor/interfaces ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/interfaces +GET /v2/hypervisor/interfaces ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ List all the network interfaces available on the server diff --git a/docs/api/v1/hypervisor/network/projectsprojectidportsudp.rst b/docs/api/v2/hypervisor/network/projectsprojectidportsudp.rst similarity index 86% rename from docs/api/v1/hypervisor/network/projectsprojectidportsudp.rst rename to docs/api/v2/hypervisor/network/projectsprojectidportsudp.rst index a295a845..936cb80b 100644 --- a/docs/api/v1/hypervisor/network/projectsprojectidportsudp.rst +++ b/docs/api/v2/hypervisor/network/projectsprojectidportsudp.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/ports/udp +/v2/hypervisor/projects/{project_id}/ports/udp ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/ports/udp +POST /v2/hypervisor/projects/**{project_id}**/ports/udp ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Allocate an UDP port on the server diff --git a/docs/api/v1/hypervisor/project.rst b/docs/api/v2/hypervisor/project.rst similarity index 100% rename from docs/api/v1/hypervisor/project.rst rename to docs/api/v2/hypervisor/project.rst diff --git a/docs/api/v1/hypervisor/project/projects.rst b/docs/api/v2/hypervisor/project/projects.rst similarity index 97% rename from docs/api/v1/hypervisor/project/projects.rst rename to docs/api/v2/hypervisor/project/projects.rst index 70585f08..8f9aa1ea 100644 --- a/docs/api/v1/hypervisor/project/projects.rst +++ b/docs/api/v2/hypervisor/project/projects.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects +/v2/hypervisor/projects ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects +GET /v2/hypervisor/projects ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ List projects opened on the server @@ -18,7 +18,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_get_projects.txt -POST /v1/hypervisor/projects +POST /v2/hypervisor/projects ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new project on the server diff --git a/docs/api/v1/hypervisor/project/projectsprojectid.rst b/docs/api/v2/hypervisor/project/projectsprojectid.rst similarity index 96% rename from docs/api/v1/hypervisor/project/projectsprojectid.rst rename to docs/api/v2/hypervisor/project/projectsprojectid.rst index 8e57d7b5..5758c184 100644 --- a/docs/api/v1/hypervisor/project/projectsprojectid.rst +++ b/docs/api/v2/hypervisor/project/projectsprojectid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id} +/v2/hypervisor/projects/{project_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}** +GET /v2/hypervisor/projects/**{project_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get project information @@ -36,7 +36,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_get_projectsprojectid.txt -PUT /v1/hypervisor/projects/**{project_id}** +PUT /v2/hypervisor/projects/**{project_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a project @@ -81,7 +81,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_put_projectsprojectid.txt -DELETE /v1/hypervisor/projects/**{project_id}** +DELETE /v2/hypervisor/projects/**{project_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a project from disk diff --git a/docs/api/v1/hypervisor/project/projectsprojectidclose.rst b/docs/api/v2/hypervisor/project/projectsprojectidclose.rst similarity index 86% rename from docs/api/v1/hypervisor/project/projectsprojectidclose.rst rename to docs/api/v2/hypervisor/project/projectsprojectidclose.rst index d0308f04..7a3cbca3 100644 --- a/docs/api/v1/hypervisor/project/projectsprojectidclose.rst +++ b/docs/api/v2/hypervisor/project/projectsprojectidclose.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/close +/v2/hypervisor/projects/{project_id}/close ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/close +POST /v2/hypervisor/projects/**{project_id}**/close ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Close a project diff --git a/docs/api/v1/hypervisor/project/projectsprojectidcommit.rst b/docs/api/v2/hypervisor/project/projectsprojectidcommit.rst similarity index 86% rename from docs/api/v1/hypervisor/project/projectsprojectidcommit.rst rename to docs/api/v2/hypervisor/project/projectsprojectidcommit.rst index 98f0540e..79c9e997 100644 --- a/docs/api/v1/hypervisor/project/projectsprojectidcommit.rst +++ b/docs/api/v2/hypervisor/project/projectsprojectidcommit.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/commit +/v2/hypervisor/projects/{project_id}/commit ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/commit +POST /v2/hypervisor/projects/**{project_id}**/commit ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Write changes on disk diff --git a/docs/api/v1/hypervisor/project/projectsprojectidfiles.rst b/docs/api/v2/hypervisor/project/projectsprojectidfiles.rst similarity index 87% rename from docs/api/v1/hypervisor/project/projectsprojectidfiles.rst rename to docs/api/v2/hypervisor/project/projectsprojectidfiles.rst index 12fc682f..0c23c27b 100644 --- a/docs/api/v1/hypervisor/project/projectsprojectidfiles.rst +++ b/docs/api/v2/hypervisor/project/projectsprojectidfiles.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/files +/v2/hypervisor/projects/{project_id}/files ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/files +GET /v2/hypervisor/projects/**{project_id}**/files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ List files of a project diff --git a/docs/api/v1/hypervisor/project/projectsprojectidfilespath.rst b/docs/api/v2/hypervisor/project/projectsprojectidfilespath.rst similarity index 82% rename from docs/api/v1/hypervisor/project/projectsprojectidfilespath.rst rename to docs/api/v2/hypervisor/project/projectsprojectidfilespath.rst index 2b13e82c..d242f623 100644 --- a/docs/api/v1/hypervisor/project/projectsprojectidfilespath.rst +++ b/docs/api/v2/hypervisor/project/projectsprojectidfilespath.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/files/{path:.+} +/v2/hypervisor/projects/{project_id}/files/{path:.+} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/files/**{path:.+}** +GET /v2/hypervisor/projects/**{project_id}**/files/**{path:.+}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a file of a project diff --git a/docs/api/v1/hypervisor/project/projectsprojectidnotifications.rst b/docs/api/v2/hypervisor/project/projectsprojectidnotifications.rst similarity index 82% rename from docs/api/v1/hypervisor/project/projectsprojectidnotifications.rst rename to docs/api/v2/hypervisor/project/projectsprojectidnotifications.rst index a23fa700..944ad02d 100644 --- a/docs/api/v1/hypervisor/project/projectsprojectidnotifications.rst +++ b/docs/api/v2/hypervisor/project/projectsprojectidnotifications.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/notifications +/v2/hypervisor/projects/{project_id}/notifications ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/notifications +GET /v2/hypervisor/projects/**{project_id}**/notifications ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Receive notifications about the projects diff --git a/docs/api/v1/hypervisor/qemu.rst b/docs/api/v2/hypervisor/qemu.rst similarity index 100% rename from docs/api/v1/hypervisor/qemu.rst rename to docs/api/v2/hypervisor/qemu.rst diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvms.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvms.rst similarity index 99% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvms.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvms.rst index 20b570b5..d7f6e2d2 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvms.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms +/v2/hypervisor/projects/{project_id}/qemu/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmid.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmid.rst similarity index 99% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmid.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmid.rst index bba00e65..1ac59073 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmid.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}** +GET /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a Qemu VM instance @@ -73,7 +73,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt -PUT /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a Qemu VM instance @@ -188,7 +188,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt -DELETE /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 90% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst index d322abbd..1f325293 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a Qemu VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Network adapter where the nio is located +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** @@ -27,16 +27,16 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt -DELETE /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a Qemu VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Network adapter where the nio is located +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidreload.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidreload.rst similarity index 85% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidreload.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidreload.rst index 9e2dc98c..2f145f49 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidreload.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/reload +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reload a Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidresume.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidresume.rst similarity index 85% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidresume.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidresume.rst index 6bf24433..e9523f1e 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidresume.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidresume.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/resume +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/resume ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/resume +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/resume ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Resume a Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidstart.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidstart.rst similarity index 98% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidstart.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidstart.rst index c67d9e67..2ed11267 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidstart.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/start +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/start +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidstop.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidstop.rst similarity index 85% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidstop.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidstop.rst index aa7ca312..239619fa 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidstop.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/stop +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidsuspend.rst b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidsuspend.rst similarity index 85% rename from docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidsuspend.rst rename to docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidsuspend.rst index 39ecbf95..a9c640e7 100644 --- a/docs/api/v1/hypervisor/qemu/projectsprojectidqemuvmsvmidsuspend.rst +++ b/docs/api/v2/hypervisor/qemu/projectsprojectidqemuvmsvmidsuspend.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/suspend +/v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/suspend ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/suspend +POST /v2/hypervisor/projects/**{project_id}**/qemu/vms/**{vm_id}**/suspend ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suspend a Qemu VM instance diff --git a/docs/api/v1/hypervisor/qemu/qemubinaries.rst b/docs/api/v2/hypervisor/qemu/qemubinaries.rst similarity index 94% rename from docs/api/v1/hypervisor/qemu/qemubinaries.rst rename to docs/api/v2/hypervisor/qemu/qemubinaries.rst index ff720d9f..2a7b5fa6 100644 --- a/docs/api/v1/hypervisor/qemu/qemubinaries.rst +++ b/docs/api/v2/hypervisor/qemu/qemubinaries.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/qemu/binaries +/v2/hypervisor/qemu/binaries ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/qemu/binaries +GET /v2/hypervisor/qemu/binaries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a list of available Qemu binaries diff --git a/docs/api/v1/hypervisor/qemu/qemucapabilities.rst b/docs/api/v2/hypervisor/qemu/qemucapabilities.rst similarity index 93% rename from docs/api/v1/hypervisor/qemu/qemucapabilities.rst rename to docs/api/v2/hypervisor/qemu/qemucapabilities.rst index f2d0251a..f1d12bfd 100644 --- a/docs/api/v1/hypervisor/qemu/qemucapabilities.rst +++ b/docs/api/v2/hypervisor/qemu/qemucapabilities.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/qemu/capabilities +/v2/hypervisor/qemu/capabilities ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/qemu/capabilities +GET /v2/hypervisor/qemu/capabilities ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a list of Qemu capabilities on this server diff --git a/docs/api/v1/hypervisor/qemu/qemuimg.rst b/docs/api/v2/hypervisor/qemu/qemuimg.rst similarity index 98% rename from docs/api/v1/hypervisor/qemu/qemuimg.rst rename to docs/api/v2/hypervisor/qemu/qemuimg.rst index 113ef946..702c182f 100644 --- a/docs/api/v1/hypervisor/qemu/qemuimg.rst +++ b/docs/api/v2/hypervisor/qemu/qemuimg.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/qemu/img +/v2/hypervisor/qemu/img ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/qemu/img +POST /v2/hypervisor/qemu/img ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a Qemu image diff --git a/docs/api/v1/hypervisor/qemu/qemuimgbinaries.rst b/docs/api/v2/hypervisor/qemu/qemuimgbinaries.rst similarity index 87% rename from docs/api/v1/hypervisor/qemu/qemuimgbinaries.rst rename to docs/api/v2/hypervisor/qemu/qemuimgbinaries.rst index b302e555..dacde9e4 100644 --- a/docs/api/v1/hypervisor/qemu/qemuimgbinaries.rst +++ b/docs/api/v2/hypervisor/qemu/qemuimgbinaries.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/qemu/img-binaries +/v2/hypervisor/qemu/img-binaries ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/qemu/img-binaries +GET /v2/hypervisor/qemu/img-binaries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a list of available Qemu-img binaries diff --git a/docs/api/v1/hypervisor/qemu/qemuvms.rst b/docs/api/v2/hypervisor/qemu/qemuvms.rst similarity index 89% rename from docs/api/v1/hypervisor/qemu/qemuvms.rst rename to docs/api/v2/hypervisor/qemu/qemuvms.rst index 616ccc7d..9357026b 100644 --- a/docs/api/v1/hypervisor/qemu/qemuvms.rst +++ b/docs/api/v2/hypervisor/qemu/qemuvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/qemu/vms +/v2/hypervisor/qemu/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/qemu/vms +GET /v2/hypervisor/qemu/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the list of Qemu images diff --git a/docs/api/v1/hypervisor/qemu/qemuvmspath.rst b/docs/api/v2/hypervisor/qemu/qemuvmspath.rst similarity index 84% rename from docs/api/v1/hypervisor/qemu/qemuvmspath.rst rename to docs/api/v2/hypervisor/qemu/qemuvmspath.rst index 6ac41a86..3d202a64 100644 --- a/docs/api/v1/hypervisor/qemu/qemuvmspath.rst +++ b/docs/api/v2/hypervisor/qemu/qemuvmspath.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/qemu/vms/{path:.+} +/v2/hypervisor/qemu/vms/{path:.+} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/qemu/vms/**{path:.+}** +POST /v2/hypervisor/qemu/vms/**{path:.+}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upload Qemu image. diff --git a/docs/api/v2/hypervisor/version.rst b/docs/api/v2/hypervisor/version.rst new file mode 100644 index 00000000..70939776 --- /dev/null +++ b/docs/api/v2/hypervisor/version.rst @@ -0,0 +1,8 @@ +Version +----------------------------- + +.. toctree:: + :glob: + :maxdepth: 2 + + version/* diff --git a/docs/api/v2/hypervisor/version/version.rst b/docs/api/v2/hypervisor/version/version.rst new file mode 100644 index 00000000..a4fc822b --- /dev/null +++ b/docs/api/v2/hypervisor/version/version.rst @@ -0,0 +1,65 @@ +/v2/hypervisor/version +------------------------------------------------------------------------------------------------------------------------------------------ + +.. contents:: + +GET /v2/hypervisor/version +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Retrieve the server version number + +Response status codes +********************** +- **200**: OK + +Output +******* +.. raw:: html + + + + + +
Name Mandatory Type Description
local boolean Either this is a local server
version ✔ string Version number human readable
+ +Sample session +*************** + + +.. literalinclude:: ../../../examples/hypervisor_get_version.txt + + +POST /v2/hypervisor/version +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Check if version is the same as the server + +Response status codes +********************** +- **200**: Same version +- **409**: Invalid version + +Input +******* +.. raw:: html + + + + + +
Name Mandatory Type Description
local boolean Either this is a local server
version ✔ string Version number human readable
+ +Output +******* +.. raw:: html + + + + + +
Name Mandatory Type Description
local boolean Either this is a local server
version ✔ string Version number human readable
+ +Sample session +*************** + + +.. literalinclude:: ../../../examples/hypervisor_post_version.txt + diff --git a/docs/api/v1/hypervisor/virtualbox.rst b/docs/api/v2/hypervisor/virtualbox.rst similarity index 100% rename from docs/api/v1/hypervisor/virtualbox.rst rename to docs/api/v2/hypervisor/virtualbox.rst diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvms.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvms.rst similarity index 97% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvms.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvms.rst index 79c9fab7..7b12ca39 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvms.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms +/v2/hypervisor/projects/{project_id}/virtualbox/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmid.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmid.rst similarity index 97% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmid.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmid.rst index 2c6d05b8..9e6c0c25 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmid.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}** +GET /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a VirtualBox VM instance @@ -46,7 +46,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt -PUT /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a VirtualBox VM instance @@ -108,7 +108,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt -DELETE /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 90% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst index 97c431a8..1650e97f 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a VirtualBox VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter where the nio should be added +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** @@ -27,16 +27,16 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt -DELETE /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a VirtualBox VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter from where the nio should be removed +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst similarity index 91% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index ab8e21e3..ca945a87 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a packet capture on a VirtualBox VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst similarity index 86% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 22e45888..bcdcbdc8 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a packet capture on a VirtualBox VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst similarity index 85% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst index 32c1f305..d9876e4a 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/reload +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reload a VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst similarity index 85% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst index 93cc1a7f..944b6ddb 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/resume +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/resume ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/resume +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/resume ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Resume a suspended VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst similarity index 85% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst index 81a99555..8b686da8 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/start +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/start +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst similarity index 84% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst index 0ac8cf75..df75ec9d 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/stop +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst similarity index 85% rename from docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst rename to docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst index 57e3b04d..dfbdd759 100644 --- a/docs/api/v1/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst +++ b/docs/api/v2/hypervisor/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/suspend +/v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}/suspend ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/suspend +POST /v2/hypervisor/projects/**{project_id}**/virtualbox/vms/**{vm_id}**/suspend ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suspend a VirtualBox VM instance diff --git a/docs/api/v1/hypervisor/virtualbox/virtualboxvms.rst b/docs/api/v2/hypervisor/virtualbox/virtualboxvms.rst similarity index 86% rename from docs/api/v1/hypervisor/virtualbox/virtualboxvms.rst rename to docs/api/v2/hypervisor/virtualbox/virtualboxvms.rst index bf837242..94f8856b 100644 --- a/docs/api/v1/hypervisor/virtualbox/virtualboxvms.rst +++ b/docs/api/v2/hypervisor/virtualbox/virtualboxvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/virtualbox/vms +/v2/hypervisor/virtualbox/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/virtualbox/vms +GET /v2/hypervisor/virtualbox/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get all VirtualBox VMs available diff --git a/docs/api/v1/hypervisor/vmware.rst b/docs/api/v2/hypervisor/vmware.rst similarity index 100% rename from docs/api/v1/hypervisor/vmware.rst rename to docs/api/v2/hypervisor/vmware.rst diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevms.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevms.rst similarity index 98% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevms.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevms.rst index 8f79a549..e608a6a7 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevms.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms +/v2/hypervisor/projects/{project_id}/vmware/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmid.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmid.rst similarity index 97% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmid.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmid.rst index 294dc2ae..9cf32716 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmid.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}** +GET /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a VMware VM instance @@ -40,7 +40,7 @@ Output -PUT /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a VMware VM instance @@ -96,7 +96,7 @@ Output -DELETE /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 88% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst index 8fe523da..ff7a2d85 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a VMware VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter where the nio should be added +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** @@ -21,16 +21,16 @@ Response status codes - **404**: Instance doesn't exist -DELETE /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a VMware VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter from where the nio should be removed +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst similarity index 91% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index 6950bf88..f9b3a296 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a packet capture on a VMware VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst similarity index 86% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 6893dd18..665a4885 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a packet capture on a VMware VM instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port on the adapter (always 0) - **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst similarity index 81% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst index 589e5b2a..bd4c166d 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/interfaces/vmnet +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/interfaces/vmnet ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/interfaces/vmnet +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/interfaces/vmnet ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Allocate a VMware VMnet interface on the server diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidreload.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidreload.rst similarity index 82% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidreload.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidreload.rst index bdc33592..20dfa30a 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidreload.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/reload +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reload a VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidresume.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidresume.rst similarity index 82% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidresume.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidresume.rst index cfed6b83..c55e24f4 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidresume.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidresume.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/resume +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/resume ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/resume +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/resume ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Resume a suspended VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidstart.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidstart.rst similarity index 82% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidstart.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidstart.rst index d1a3e291..2c47e6a4 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidstart.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/start +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/start +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidstop.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidstop.rst similarity index 82% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidstop.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidstop.rst index 0c82c953..c06fc038 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidstop.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/stop +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidsuspend.rst b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidsuspend.rst similarity index 82% rename from docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidsuspend.rst rename to docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidsuspend.rst index 70e8f837..2326e477 100644 --- a/docs/api/v1/hypervisor/vmware/projectsprojectidvmwarevmsvmidsuspend.rst +++ b/docs/api/v2/hypervisor/vmware/projectsprojectidvmwarevmsvmidsuspend.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/suspend +/v2/hypervisor/projects/{project_id}/vmware/vms/{vm_id}/suspend ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/suspend +POST /v2/hypervisor/projects/**{project_id}**/vmware/vms/**{vm_id}**/suspend ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suspend a VMware VM instance diff --git a/docs/api/v1/hypervisor/vmware/vmwarevms.rst b/docs/api/v2/hypervisor/vmware/vmwarevms.rst similarity index 87% rename from docs/api/v1/hypervisor/vmware/vmwarevms.rst rename to docs/api/v2/hypervisor/vmware/vmwarevms.rst index b2c0eea8..dbddcfd9 100644 --- a/docs/api/v1/hypervisor/vmware/vmwarevms.rst +++ b/docs/api/v2/hypervisor/vmware/vmwarevms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/vmware/vms +/v2/hypervisor/vmware/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/vmware/vms +GET /v2/hypervisor/vmware/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get all VMware VMs available diff --git a/docs/api/v1/hypervisor/vpcs.rst b/docs/api/v2/hypervisor/vpcs.rst similarity index 100% rename from docs/api/v1/hypervisor/vpcs.rst rename to docs/api/v2/hypervisor/vpcs.rst diff --git a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvms.rst b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvms.rst similarity index 97% rename from docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvms.rst rename to docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvms.rst index 03e055bd..3a6723d2 100644 --- a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvms.rst +++ b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvms.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vpcs/vms +/v2/hypervisor/projects/{project_id}/vpcs/vms ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vpcs/vms +POST /v2/hypervisor/projects/**{project_id}**/vpcs/vms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new VPCS instance diff --git a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmid.rst b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmid.rst similarity index 96% rename from docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmid.rst rename to docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmid.rst index 0fb5c33f..d2c77022 100644 --- a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmid.rst +++ b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmid.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} +/v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id} ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -GET /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}** +GET /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Get a VPCS instance @@ -42,7 +42,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt -PUT /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}** +PUT /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update a VPCS instance @@ -93,7 +93,7 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt -DELETE /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}** +DELETE /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Delete a VPCS instance diff --git a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst similarity index 90% rename from docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst rename to docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst index 3f1a742a..b7599790 100644 --- a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -1,18 +1,18 @@ -/v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio +/v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +POST /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Add a NIO to a VPCS instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port where the nio should be added - **adapter_number**: Network adapter where the nio is located +- **port_number**: Port where the nio should be added +- **project_id**: UUID for the project Response status codes ********************** @@ -27,16 +27,16 @@ Sample session .. literalinclude:: ../../../examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt -DELETE /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio +DELETE /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Remove a NIO from a VPCS instance Parameters ********** - **vm_id**: UUID for the instance -- **project_id**: UUID for the project -- **port_number**: Port from where the nio should be removed - **adapter_number**: Network adapter where the nio is located +- **port_number**: Port from where the nio should be removed +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidreload.rst b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidreload.rst similarity index 84% rename from docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidreload.rst rename to docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidreload.rst index 3a0505b0..88670b68 100644 --- a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidreload.rst +++ b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidreload.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/reload +/v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/reload ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/reload +POST /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/reload ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reload a VPCS instance diff --git a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstart.rst b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstart.rst similarity index 95% rename from docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstart.rst rename to docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstart.rst index b20b10b2..c122fae3 100644 --- a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstart.rst +++ b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstart.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/start +/v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/start ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/start +POST /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Start a VPCS instance diff --git a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstop.rst b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstop.rst similarity index 85% rename from docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstop.rst rename to docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstop.rst index 642ba1b2..13f37701 100644 --- a/docs/api/v1/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstop.rst +++ b/docs/api/v2/hypervisor/vpcs/projectsprojectidvpcsvmsvmidstop.rst @@ -1,9 +1,9 @@ -/v1/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/stop +/v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/stop ------------------------------------------------------------------------------------------------------------------------------------------ .. contents:: -POST /v1/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/stop +POST /v2/hypervisor/projects/**{project_id}**/vpcs/vms/**{vm_id}**/stop ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Stop a VPCS instance diff --git a/docs/general.rst b/docs/general.rst index 97fef935..eef976fd 100644 --- a/docs/general.rst +++ b/docs/general.rst @@ -211,3 +211,10 @@ The available notification are: * vm.stopped * log.error +Previous versions +================= + +API version 1 +------------- +Shipped with GNS3 1.3 and 1.4. This API doesn't support the controller system. + diff --git a/docs/index.rst b/docs/index.rst index 9b2710c6..0655deaf 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -19,18 +19,6 @@ GNS3 expose two type of endpoints: * Controller * Hypervisor - -Common API Endpoints -~~~~~~~~~~~~~~~~~~~~ - -This calls are available on both server. - -.. toctree:: - :glob: - :maxdepth: 2 - - api/v1/common/* - Controller API Endpoints ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -46,7 +34,7 @@ hypervisors. :glob: :maxdepth: 2 - api/v1/controller/* + api/v2/controller/* Hypervisor API Endpoints @@ -62,5 +50,5 @@ the VM process. :glob: :maxdepth: 2 - api/v1/hypervisor/* + api/v2/hypervisor/* diff --git a/gns3server/handlers/__init__.py b/gns3server/handlers/__init__.py index f266befa..a5e774db 100644 --- a/gns3server/handlers/__init__.py +++ b/gns3server/handlers/__init__.py @@ -14,30 +14,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys -import os from gns3server.handlers.upload_handler import UploadHandler from gns3server.handlers.index_handler import IndexHandler -from gns3server.handlers.api.version_handler import VersionHandler +from gns3server.handlers.api.controller import * +from gns3server.handlers.api.hypervisor import * -# TODO: Do not load if controller is off -from gns3server.handlers.api.controller.server_handler import ServerHandler -from gns3server.handlers.api.hypervisor.network_handler import NetworkHandler -from gns3server.handlers.api.hypervisor.project_handler import ProjectHandler -from gns3server.handlers.api.hypervisor.dynamips_device_handler import DynamipsDeviceHandler -from gns3server.handlers.api.hypervisor.dynamips_vm_handler import DynamipsVMHandler -from gns3server.handlers.api.hypervisor.qemu_handler import QEMUHandler -from gns3server.handlers.api.hypervisor.virtualbox_handler import VirtualBoxHandler -from gns3server.handlers.api.hypervisor.docker_handler import DockerHandler -from gns3server.handlers.api.hypervisor.vpcs_handler import VPCSHandler -from gns3server.handlers.api.hypervisor.vmware_handler import VMwareHandler -from gns3server.handlers.api.hypervisor.config_handler import ConfigHandler -from gns3server.handlers.api.hypervisor.file_handler import FileHandler - -if sys.platform.startswith("linux") or hasattr(sys, "_called_from_test") or os.environ.get("PYTEST_BUILD_DOCUMENTATION") == "1": - # IOU runs only on Linux but testsuite work on UNIX platform - if not sys.platform.startswith("win"): - from gns3server.handlers.api.hypervisor.iou_handler import IOUHandler diff --git a/gns3server/handlers/api/controller/__init__.py b/gns3server/handlers/api/controller/__init__.py index e69de29b..5c060547 100644 --- a/gns3server/handlers/api/controller/__init__.py +++ b/gns3server/handlers/api/controller/__init__.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +# +# Copyright (C) 2016 GNS3 Technologies Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from .server_handler import ServerHandler +from .version_handler import VersionHandler + + diff --git a/gns3server/handlers/api/controller/server_handler.py b/gns3server/handlers/api/controller/server_handler.py index 69070ce5..2234306b 100644 --- a/gns3server/handlers/api/controller/server_handler.py +++ b/gns3server/handlers/api/controller/server_handler.py @@ -52,7 +52,7 @@ class ServerHandler: @classmethod @Route.post( - r"/server/shutdown", + r"/servers/shutdown", description="Shutdown the local server", status_codes={ 201: "Server is shutting down", diff --git a/gns3server/handlers/api/version_handler.py b/gns3server/handlers/api/controller/version_handler.py similarity index 92% rename from gns3server/handlers/api/version_handler.py rename to gns3server/handlers/api/controller/version_handler.py index 22a2131c..dad6d31b 100644 --- a/gns3server/handlers/api/version_handler.py +++ b/gns3server/handlers/api/controller/version_handler.py @@ -15,10 +15,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from ...web.route import Route -from ...config import Config -from ...schemas.version import VERSION_SCHEMA -from ...version import __version__ +from ....web.route import Route +from ....config import Config +from ....schemas.version import VERSION_SCHEMA +from ....version import __version__ from aiohttp.web import HTTPConflict diff --git a/gns3server/handlers/api/hypervisor/__init__.py b/gns3server/handlers/api/hypervisor/__init__.py index e69de29b..b6b0b381 100644 --- a/gns3server/handlers/api/hypervisor/__init__.py +++ b/gns3server/handlers/api/hypervisor/__init__.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# +# Copyright (C) 2016 GNS3 Technologies Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import sys +import os + +from .network_handler import NetworkHandler +from .project_handler import ProjectHandler +from .dynamips_device_handler import DynamipsDeviceHandler +from .dynamips_vm_handler import DynamipsVMHandler +from .qemu_handler import QEMUHandler +from .virtualbox_handler import VirtualBoxHandler +from .vpcs_handler import VPCSHandler +from .vmware_handler import VMwareHandler +from .config_handler import ConfigHandler +from .file_handler import FileHandler +from .version_handler import VersionHandler + + +if sys.platform.startswith("linux") or hasattr(sys, "_called_from_test") or os.environ.get("PYTEST_BUILD_DOCUMENTATION") == "1": + # IOU runs only on Linux but testsuite work on UNIX platform + if not sys.platform.startswith("win"): + from .iou_handler import IOUHandler + from .docker_handler import DockerHandler + + diff --git a/gns3server/handlers/api/hypervisor/version_handler.py b/gns3server/handlers/api/hypervisor/version_handler.py new file mode 100644 index 00000000..dad6d31b --- /dev/null +++ b/gns3server/handlers/api/hypervisor/version_handler.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2015 GNS3 Technologies Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ....web.route import Route +from ....config import Config +from ....schemas.version import VERSION_SCHEMA +from ....version import __version__ +from aiohttp.web import HTTPConflict + + +class VersionHandler: + + @classmethod + @Route.get( + r"/version", + description="Retrieve the server version number", + output=VERSION_SCHEMA) + def version(request, response): + + config = Config.instance() + local_server = config.get_section_config("Server").getboolean("local", False) + response.json({"version": __version__, "local": local_server}) + + @classmethod + @Route.post( + r"/version", + description="Check if version is the same as the server", + output=VERSION_SCHEMA, + input=VERSION_SCHEMA, + status_codes={ + 200: "Same version", + 409: "Invalid version" + }) + def check_version(request, response): + if request.json["version"] != __version__: + raise HTTPConflict(text="Client version {} differs with server version {}".format(request.json["version"], __version__)) + response.json({"version": __version__}) diff --git a/gns3server/web/documentation.py b/gns3server/web/documentation.py index c55d6037..ecc67270 100644 --- a/gns3server/web/documentation.py +++ b/gns3server/web/documentation.py @@ -39,16 +39,22 @@ class Documentation(object): self.write_documentation("hypervisor") # Controller documentation self.write_documentation("controller") - # Write doc common to both - self.write_documentation("common") def write_documentation(self, doc_type): """ Build all the doc page for handlers - :param doc_type: Type of doc to generate (controller, hypervisor or common) + :param doc_type: Type of doc to generate (controller, hypervisor) """ for handler_name in sorted(self._documentation): + if "controller." in handler_name: + server_type = "controller" + elif "hypervisor." in handler_name: + server_type = "hypervisor" + + if doc_type != server_type: + continue + print("Build {}".format(handler_name)) for path in sorted(self._documentation[handler_name]): @@ -57,16 +63,6 @@ class Documentation(object): if api_version is None: continue - if "controller." in handler_name: - server_type = "controller" - elif "hypervisor." in handler_name: - server_type = "hypervisor" - else: - server_type = "common" - - if doc_type != server_type: - continue - filename = self._file_path(path) handler_doc = self._documentation[handler_name][path] handler = handler_name.replace(server_type + ".", "") @@ -126,7 +122,7 @@ class Documentation(object): def _file_path(self, path): path = path.replace("hypervisor", "") path = path.replace("controller", "") - return re.sub("^v1", "", re.sub("[^a-z0-9]", "", path)) + return re.sub("^v2", "", re.sub("[^a-z0-9]", "", path)) def _write_definitions(self, f, schema): if "definitions" in schema: diff --git a/gns3server/web/route.py b/gns3server/web/route.py index e8eebe3e..da2f31c1 100644 --- a/gns3server/web/route.py +++ b/gns3server/web/route.py @@ -120,7 +120,7 @@ class Route(object): # This block is executed only the first time output_schema = kw.get("output", {}) input_schema = kw.get("input", {}) - api_version = kw.get("api_version", 1) + api_version = kw.get("api_version", 2) raw = kw.get("raw", False) def register(func): @@ -129,8 +129,6 @@ class Route(object): route = "/v{version}/controller{path}".format(path=path, version=api_version) elif "hypervisor" in func.__module__: route = "/v{version}/hypervisor{path}".format(path=path, version=api_version) - elif "handlers.api" in func.__module__: - route = "/v{version}{path}".format(path=path, version=api_version) else: route = path diff --git a/tests/conftest.py b/tests/conftest.py index be2a8629..0c26fa6a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -119,7 +119,7 @@ def http_controller(loop, http_server): Return an helper allowing you to call the server API without any prefix """ host, port = http_server - return Query(loop, host=host, port=port, prefix="/controller", api_version=1) + return Query(loop, host=host, port=port, prefix="/controller", api_version=2) @pytest.fixture @@ -128,16 +128,7 @@ def http_hypervisor(loop, http_server): Return an helper allowing you to call the hypervisor API via HTTP """ host, port = http_server - return Query(loop, host=host, port=port, prefix="/hypervisor", api_version=1) - - -@pytest.fixture -def http_api(loop, http_server): - """ - Return an helper allowing you to call the root API via HTTP - """ - host, port = http_server - return Query(loop, host=host, port=port, api_version=1) + return Query(loop, host=host, port=port, prefix="/hypervisor", api_version=2) @pytest.fixture(scope="function") diff --git a/tests/handlers/api/base.py b/tests/handlers/api/base.py index 30235a96..29b5307f 100644 --- a/tests/handlers/api/base.py +++ b/tests/handlers/api/base.py @@ -135,8 +135,5 @@ class Query: def _example_file_path(self, method, path): path = re.sub('[^a-z0-9]', '', path) - if len(self._prefix): - prefix = self._prefix.replace('/', '') - else: - prefix = 'common' + prefix = self._prefix.replace('/', '') return "docs/api/examples/{}_{}_{}.txt".format(prefix, method.lower(), path) diff --git a/tests/handlers/api/test_version.py b/tests/handlers/api/controller/test_version.py similarity index 74% rename from tests/handlers/api/test_version.py rename to tests/handlers/api/controller/test_version.py index 745d1e65..a763ce00 100644 --- a/tests/handlers/api/test_version.py +++ b/tests/handlers/api/controller/test_version.py @@ -25,37 +25,37 @@ from gns3server.config import Config from gns3server.version import __version__ -def test_version_output(http_api): +def test_version_output(http_controller): config = Config.instance() config.set("Server", "local", "true") - response = http_api.get('/version', example=True) + response = http_controller.get('/version', example=True) assert response.status == 200 assert response.json == {'local': True, 'version': __version__} -def test_version_input(http_api): +def test_version_input(http_controller): query = {'version': __version__} - response = http_api.post('/version', query, example=True) + response = http_controller.post('/version', query, example=True) assert response.status == 200 assert response.json == {'version': __version__} -def test_version_invalid_input(http_api): +def test_version_invalid_input(http_controller): query = {'version': "0.4.2"} - response = http_api.post('/version', query) + response = http_controller.post('/version', query) assert response.status == 409 assert response.json == {'message': 'Client version 0.4.2 differs with server version {}'.format(__version__), 'status': 409} -def test_version_invalid_input_schema(http_api): +def test_version_invalid_input_schema(http_controller): query = {'version': "0.4.2", "bla": "blu"} - response = http_api.post('/version', query) + response = http_controller.post('/version', query) assert response.status == 400 -def test_version_invalid_json(http_api): +def test_version_invalid_json(http_controller): query = "BOUM" - response = http_api.post('/version', query, raw=True) + response = http_controller.post('/version', query, raw=True) assert response.status == 400 diff --git a/tests/handlers/api/hypervisor/__init__.py b/tests/handlers/api/hypervisor/__init__.py index e69de29b..8b137891 100644 --- a/tests/handlers/api/hypervisor/__init__.py +++ b/tests/handlers/api/hypervisor/__init__.py @@ -0,0 +1 @@ + diff --git a/tests/handlers/api/hypervisor/test_version.py b/tests/handlers/api/hypervisor/test_version.py new file mode 100644 index 00000000..59fa5424 --- /dev/null +++ b/tests/handlers/api/hypervisor/test_version.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2015 GNS3 Technologies Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +""" +This test suite check /version endpoint +It's also used for unittest the HTTP implementation. +""" + +from gns3server.config import Config + +from gns3server.version import __version__ + + +def test_version_output(http_hypervisor): + config = Config.instance() + config.set("Server", "local", "true") + + response = http_hypervisor.get('/version', example=True) + assert response.status == 200 + assert response.json == {'local': True, 'version': __version__} + + +def test_version_input(http_hypervisor): + query = {'version': __version__} + response = http_hypervisor.post('/version', query, example=True) + assert response.status == 200 + assert response.json == {'version': __version__} + + +def test_version_invalid_input(http_hypervisor): + query = {'version': "0.4.2"} + response = http_hypervisor.post('/version', query) + assert response.status == 409 + assert response.json == {'message': 'Client version 0.4.2 differs with server version {}'.format(__version__), + 'status': 409} + + +def test_version_invalid_input_schema(http_hypervisor): + query = {'version': "0.4.2", "bla": "blu"} + response = http_hypervisor.post('/version', query) + assert response.status == 400 + + +def test_version_invalid_json(http_hypervisor): + query = "BOUM" + response = http_hypervisor.post('/version', query, raw=True) + assert response.status == 400 diff --git a/tests/web/test_documentation.py b/tests/web/test_documentation.py index ac2a6d43..3eafd6a7 100644 --- a/tests/web/test_documentation.py +++ b/tests/web/test_documentation.py @@ -30,13 +30,13 @@ def test_documentation_write(tmpdir): Documentation(Route, str(tmpdir)).write() assert os.path.exists(str(tmpdir / "api")) - assert os.path.exists(str(tmpdir / "api" / "v1" / "hypervisor")) - assert os.path.exists(str(tmpdir / "api" / "v1" / "hypervisor" / "virtualbox.rst")) - assert os.path.exists(str(tmpdir / "api" / "v1" / "hypervisor" / "virtualbox")) - assert os.path.exists(str(tmpdir / "api" / "v1" / "hypervisor" / "virtualbox" / "virtualboxvms.rst")) - with open(str(tmpdir / "api" / "v1" / "hypervisor" / "virtualbox" / "projectsprojectidvirtualboxvms.rst")) as f: + assert os.path.exists(str(tmpdir / "api" / "v2" / "hypervisor")) + assert os.path.exists(str(tmpdir / "api" / "v2" / "hypervisor" / "virtualbox.rst")) + assert os.path.exists(str(tmpdir / "api" / "v2" / "hypervisor" / "virtualbox")) + assert os.path.exists(str(tmpdir / "api" / "v2" / "hypervisor" / "virtualbox" / "virtualboxvms.rst")) + with open(str(tmpdir / "api" / "v2" / "hypervisor" / "virtualbox" / "projectsprojectidvirtualboxvms.rst")) as f: content = f.read() assert "Sample session" in content assert "literalinclude:: ../../../examples/hypervisor_post_projectsprojectidvirtualboxvms.txt" in content - assert os.path.exists(str(tmpdir / "api" / "v1" / "controller" / "server.rst")) + assert os.path.exists(str(tmpdir / "api" / "v2" / "controller" / "server.rst"))