From c3c971921d5ce8d9316c62d41f4c23e2488312b9 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Fri, 24 Jul 2015 10:15:15 +0200 Subject: [PATCH] Update documentation --- .../api/examples/delete_projectsprojectid.txt | 2 +- .../delete_projectsprojectidiouvmsvmid.txt | 6 ++-- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- .../delete_projectsprojectidqemuvmsvmid.txt | 6 ++-- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- .../delete_projectsprojectidvpcsvmsvmid.txt | 6 ++-- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- docs/api/examples/get_interfaces.txt | 6 ++-- docs/api/examples/get_iouvms.txt | 2 +- docs/api/examples/get_projects.txt | 31 +++++++++++++++++++ docs/api/examples/get_projectsprojectid.txt | 6 ++-- .../examples/get_projectsprojectidfiles.txt | 2 +- .../get_projectsprojectidiouvmsvmid.txt | 14 ++++----- ...get_projectsprojectidiouvmsvmidconfigs.txt | 6 ++-- .../get_projectsprojectidqemuvmsvmid.txt | 14 ++++----- ...get_projectsprojectidvirtualboxvmsvmid.txt | 8 ++--- .../get_projectsprojectidvpcsvmsvmid.txt | 10 +++--- docs/api/examples/get_qemubinaries.txt | 2 +- docs/api/examples/get_version.txt | 6 ++-- docs/api/examples/post_configreload.txt | 2 +- docs/api/examples/post_projects.txt | 8 ++--- .../examples/post_projectsprojectidclose.txt | 2 +- .../examples/post_projectsprojectidcommit.txt | 2 +- .../examples/post_projectsprojectidiouvms.txt | 16 +++++----- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- ...ternumberdportsportnumberdstartcapture.txt | 8 ++--- ...pternumberdportsportnumberdstopcapture.txt | 6 ++-- ...post_projectsprojectidiouvmsvmidreload.txt | 6 ++-- .../post_projectsprojectidiouvmsvmidstart.txt | 6 ++-- .../post_projectsprojectidiouvmsvmidstop.txt | 6 ++-- .../post_projectsprojectidportsudp.txt | 2 +- .../post_projectsprojectidqemuvms.txt | 20 ++++++------ ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- ...ost_projectsprojectidqemuvmsvmidreload.txt | 6 ++-- ...ost_projectsprojectidqemuvmsvmidresume.txt | 6 ++-- ...post_projectsprojectidqemuvmsvmidstart.txt | 6 ++-- .../post_projectsprojectidqemuvmsvmidstop.txt | 6 ++-- ...st_projectsprojectidqemuvmsvmidsuspend.txt | 6 ++-- .../post_projectsprojectidvirtualboxvms.txt | 4 +-- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- ...ojectsprojectidvirtualboxvmsvmidreload.txt | 6 ++-- ...ojectsprojectidvirtualboxvmsvmidresume.txt | 6 ++-- ...rojectsprojectidvirtualboxvmsvmidstart.txt | 6 ++-- ...projectsprojectidvirtualboxvmsvmidstop.txt | 6 ++-- ...jectsprojectidvirtualboxvmsvmidsuspend.txt | 6 ++-- .../post_projectsprojectidvpcsvms.txt | 6 ++-- ...ptersadapternumberdportsportnumberdnio.txt | 6 ++-- ...ost_projectsprojectidvpcsvmsvmidreload.txt | 6 ++-- ...post_projectsprojectidvpcsvmsvmidstart.txt | 6 ++-- .../post_projectsprojectidvpcsvmsvmidstop.txt | 6 ++-- docs/api/examples/post_version.txt | 10 +++--- docs/api/examples/put_projectsprojectid.txt | 8 ++--- .../put_projectsprojectidiouvmsvmid.txt | 16 +++++----- .../put_projectsprojectidqemuvmsvmid.txt | 20 ++++++------ ...put_projectsprojectidvirtualboxvmsvmid.txt | 8 ++--- .../put_projectsprojectidvpcsvmsvmid.txt | 10 +++--- ...ojectsprojectiddynamipsdevicesdeviceid.rst | 6 ++-- ...mipsdevicesdeviceidportsportnumberdnio.rst | 8 ++--- ...esdeviceidportsportnumberdstartcapture.rst | 4 +-- ...cesdeviceidportsportnumberdstopcapture.rst | 4 +-- ...ptersadapternumberdportsportnumberdnio.rst | 8 ++--- ...ternumberdportsportnumberdstartcapture.rst | 4 +-- ...pternumberdportsportnumberdstopcapture.rst | 4 +-- ...ptersadapternumberdportsportnumberdnio.rst | 8 ++--- ...ternumberdportsportnumberdstartcapture.rst | 4 +-- ...pternumberdportsportnumberdstopcapture.rst | 4 +-- docs/api/v1/project/projects.rst | 15 +++++++++ ...ptersadapternumberdportsportnumberdnio.rst | 8 ++--- ...ptersadapternumberdportsportnumberdnio.rst | 8 ++--- ...ternumberdportsportnumberdstartcapture.rst | 4 +-- ...pternumberdportsportnumberdstopcapture.rst | 4 +-- ...ptersadapternumberdportsportnumberdnio.rst | 8 ++--- ...ptersadapternumberdportsportnumberdnio.rst | 8 ++--- tests/handlers/test_upload.py | 8 +++++ 75 files changed, 295 insertions(+), 241 deletions(-) create mode 100644 docs/api/examples/get_projects.txt diff --git a/docs/api/examples/delete_projectsprojectid.txt b/docs/api/examples/delete_projectsprojectid.txt index 3619ca7a..f3240174 100644 --- a/docs/api/examples/delete_projectsprojectid.txt +++ b/docs/api/examples/delete_projectsprojectid.txt @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id} diff --git a/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt b/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt index aab9c18c..e78459a5 100644 --- a/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt +++ b/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/518cad4b-76e8-41fb-8cb9-6e9af9af62e8' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d7c56046-7535-45f4-aeca-1b5821c6717c' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/518cad4b-76e8-41fb-8cb9-6e9af9af62e8 HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d7c56046-7535-45f4-aeca-1b5821c6717c HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id} diff --git a/docs/api/examples/delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 58a96766..b773322e 100644 --- a/docs/api/examples/delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8105baad-5569-4955-867f-2b1ee01f6f9c/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/983db82c-d39d-435d-b586-66ef2cb032b9/adapters/1/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8105baad-5569-4955-867f-2b1ee01f6f9c/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/983db82c-d39d-435d-b586-66ef2cb032b9/adapters/1/ports/0/nio HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/delete_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/delete_projectsprojectidqemuvmsvmid.txt index 68a49e78..ab63b7f6 100644 --- a/docs/api/examples/delete_projectsprojectidqemuvmsvmid.txt +++ b/docs/api/examples/delete_projectsprojectidqemuvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a9ea89c4-b33b-492d-bcf8-c2d4dedaf218' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/0d65d66c-3220-4ef1-a5e2-7064d3b1e576' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a9ea89c4-b33b-492d-bcf8-c2d4dedaf218 HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/0d65d66c-3220-4ef1-a5e2-7064d3b1e576 HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id} diff --git a/docs/api/examples/delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 4c0550af..9c22f2fe 100644 --- a/docs/api/examples/delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d9b2c5b8-255f-4734-9a3a-0faec8b12316/adapters/1/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/c65c1cf0-27d4-4fe1-91bb-6f3f70b379bf/adapters/1/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d9b2c5b8-255f-4734-9a3a-0faec8b12316/adapters/1/ports/0/nio HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/c65c1cf0-27d4-4fe1-91bb-6f3f70b379bf/adapters/1/ports/0/nio HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 6dabbe55..b6abbae0 100644 --- a/docs/api/examples/delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/d95f4966-150e-48c5-a133-1924525853d9/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/739ee208-b0bd-466f-98bf-a48da2bb17b3/adapters/0/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/d95f4966-150e-48c5-a133-1924525853d9/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/739ee208-b0bd-466f-98bf-a48da2bb17b3/adapters/0/ports/0/nio HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/delete_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/delete_projectsprojectidvpcsvmsvmid.txt index ff5743ec..f3a0e7e1 100644 --- a/docs/api/examples/delete_projectsprojectidvpcsvmsvmid.txt +++ b/docs/api/examples/delete_projectsprojectidvpcsvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6a839a96-90c4-4736-8841-eda3f518f3f0' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/12ac0a2f-d5d3-4d92-a996-87870c8b1ad0' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6a839a96-90c4-4736-8841-eda3f518f3f0 HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/12ac0a2f-d5d3-4d92-a996-87870c8b1ad0 HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id} diff --git a/docs/api/examples/delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt index cd2a97a9..37936857 100644 --- a/docs/api/examples/delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/9f197704-d8f6-45b3-affd-0f9579878077/adapters/0/ports/0/nio' +curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6f19c6a0-c705-493c-8ed8-bbce923ef60b/adapters/0/ports/0/nio' -DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/9f197704-d8f6-45b3-affd-0f9579878077/adapters/0/ports/0/nio HTTP/1.1 +DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6f19c6a0-c705-493c-8ed8-bbce923ef60b/adapters/0/ports/0/nio HTTP/1.1 @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio diff --git a/docs/api/examples/get_interfaces.txt b/docs/api/examples/get_interfaces.txt index cd4dc17d..594b62e1 100644 --- a/docs/api/examples/get_interfaces.txt +++ b/docs/api/examples/get_interfaces.txt @@ -7,10 +7,10 @@ GET /v1/interfaces HTTP/1.1 HTTP/1.1 200 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 1253 +CONTENT-LENGTH: 1264 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/interfaces [ @@ -61,7 +61,7 @@ X-ROUTE: /v1/interfaces }, { "id": "vboxnet0", - "ip_address": "", + "ip_address": "172.16.43.1", "name": "vboxnet0" }, { diff --git a/docs/api/examples/get_iouvms.txt b/docs/api/examples/get_iouvms.txt index 25102d5e..9a66abc9 100644 --- a/docs/api/examples/get_iouvms.txt +++ b/docs/api/examples/get_iouvms.txt @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 45 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/iou/vms [ diff --git a/docs/api/examples/get_projects.txt b/docs/api/examples/get_projects.txt new file mode 100644 index 00000000..8b13df8d --- /dev/null +++ b/docs/api/examples/get_projects.txt @@ -0,0 +1,31 @@ +curl -i -X GET 'http://localhost:8000/v1/projects' + +GET /v1/projects HTTP/1.1 + + + +HTTP/1.1 200 +ACCESS-CONTROL-ALLOW-ORIGIN: * +CONNECTION: keep-alive +CONTENT-LENGTH: 656 +CONTENT-TYPE: application/json +DATE: Thu, 08 Jan 2015 16:09:15 GMT +SERVER: Python/3.4 GNS3/1.4.0dev3 +X-ROUTE: /v1/projects + +[ + { + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw", + "name": "test", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw/00010203-0405-0607-0809-0a0b0c0d0e0f", + "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f", + "temporary": false + }, + { + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw", + "name": "test", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw/00010203-0405-0607-0809-0a0b0c0d0e0b", + "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0b", + "temporary": false + } +] diff --git a/docs/api/examples/get_projectsprojectid.txt b/docs/api/examples/get_projectsprojectid.txt index f73f98e8..9b1e9ff3 100644 --- a/docs/api/examples/get_projectsprojectid.txt +++ b/docs/api/examples/get_projectsprojectid.txt @@ -10,13 +10,13 @@ CONNECTION: keep-alive CONTENT-LENGTH: 297 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id} { - "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp20bxyq9r", + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph5jkq_a4", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp20bxyq9r/00010203-0405-0607-0809-0a0b0c0d0e02", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph5jkq_a4/00010203-0405-0607-0809-0a0b0c0d0e02", "project_id": "00010203-0405-0607-0809-0a0b0c0d0e02", "temporary": false } diff --git a/docs/api/examples/get_projectsprojectidfiles.txt b/docs/api/examples/get_projectsprojectidfiles.txt index dab6f091..a75f639c 100644 --- a/docs/api/examples/get_projectsprojectidfiles.txt +++ b/docs/api/examples/get_projectsprojectidfiles.txt @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 204 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/files [ diff --git a/docs/api/examples/get_projectsprojectidiouvmsvmid.txt b/docs/api/examples/get_projectsprojectidiouvmsvmid.txt index 62d56f63..6b9159dd 100644 --- a/docs/api/examples/get_projectsprojectidiouvmsvmid.txt +++ b/docs/api/examples/get_projectsprojectidiouvmsvmid.txt @@ -1,16 +1,16 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/600a3562-f8b7-4748-a4fc-ef58f7721241' +curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/637d55e9-5f91-4de0-bb81-58905a4245b9' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/600a3562-f8b7-4748-a4fc-ef58f7721241 HTTP/1.1 +GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/637d55e9-5f91-4de0-bb81-58905a4245b9 HTTP/1.1 HTTP/1.1 200 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 721 +CONTENT-LENGTH: 722 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id} { @@ -21,13 +21,13 @@ X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id} "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", "nvram": 128, - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_iou_get0/iou.bin", + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_get0/iou.bin", "private_config": null, "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "ram": 256, "serial_adapters": 2, "startup_config": null, "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjb4sz6y3/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/600a3562-f8b7-4748-a4fc-ef58f7721241", - "vm_id": "600a3562-f8b7-4748-a4fc-ef58f7721241" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/637d55e9-5f91-4de0-bb81-58905a4245b9", + "vm_id": "637d55e9-5f91-4de0-bb81-58905a4245b9" } diff --git a/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt b/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt index c45f00dd..633ca7a6 100644 --- a/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt +++ b/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8ec89813-950e-4b4d-b43d-7448104a0893/configs' +curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/88536f60-dc74-4319-ba22-1a8e1919fe69/configs' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8ec89813-950e-4b4d-b43d-7448104a0893/configs HTTP/1.1 +GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/88536f60-dc74-4319-ba22-1a8e1919fe69/configs HTTP/1.1 @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 40 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/configs { diff --git a/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt index dfde9585..51cbfa4f 100644 --- a/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt +++ b/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/05e0937d-dc0c-4b31-bd01-b7befae466ff' +curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7b21f651-636f-40e3-9556-631b64ce6a0f' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/05e0937d-dc0c-4b31-bd01-b7befae466ff HTTP/1.1 +GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7b21f651-636f-40e3-9556-631b64ce6a0f HTTP/1.1 @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 1108 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id} { @@ -34,14 +34,14 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id} "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:66:ff:00", + "mac_address": "00:00:ab:6a:0f: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/tmpg645q6gq/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64", "ram": 256, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1454taw7/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/05e0937d-dc0c-4b31-bd01-b7befae466ff", - "vm_id": "05e0937d-dc0c-4b31-bd01-b7befae466ff" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/7b21f651-636f-40e3-9556-631b64ce6a0f", + "vm_id": "7b21f651-636f-40e3-9556-631b64ce6a0f" } diff --git a/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt index b106d7a7..883bdc76 100644 --- a/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt +++ b/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/7bb5a150-67a0-433b-80c9-95f6fce979f4' +curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/55f30d6b-9308-4960-9edf-b50a1015393b' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/7bb5a150-67a0-433b-80c9-95f6fce979f4 HTTP/1.1 +GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/55f30d6b-9308-4960-9edf-b50a1015393b HTTP/1.1 @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 415 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id} { @@ -25,6 +25,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id} "ram": 0, "use_any_adapter": false, "vm_directory": null, - "vm_id": "7bb5a150-67a0-433b-80c9-95f6fce979f4", + "vm_id": "55f30d6b-9308-4960-9edf-b50a1015393b", "vmname": "VMTEST" } diff --git a/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt index d347ee78..9af61db6 100644 --- a/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt +++ b/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/941d35fb-eb6b-48a2-b2fd-8315c9ae72fe' +curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f567fd70-ecbc-4fde-9b58-3639810def3f' -GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/941d35fb-eb6b-48a2-b2fd-8315c9ae72fe HTTP/1.1 +GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f567fd70-ecbc-4fde-9b58-3639810def3f HTTP/1.1 @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 422 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id} { @@ -20,6 +20,6 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id} "startup_script": null, "startup_script_path": null, "status": "stopped", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1454taw7/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/941d35fb-eb6b-48a2-b2fd-8315c9ae72fe", - "vm_id": "941d35fb-eb6b-48a2-b2fd-8315c9ae72fe" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f567fd70-ecbc-4fde-9b58-3639810def3f", + "vm_id": "f567fd70-ecbc-4fde-9b58-3639810def3f" } diff --git a/docs/api/examples/get_qemubinaries.txt b/docs/api/examples/get_qemubinaries.txt index e2ff9d38..19220df1 100644 --- a/docs/api/examples/get_qemubinaries.txt +++ b/docs/api/examples/get_qemubinaries.txt @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 134 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/qemu/binaries [ diff --git a/docs/api/examples/get_version.txt b/docs/api/examples/get_version.txt index ace70922..83468219 100644 --- a/docs/api/examples/get_version.txt +++ b/docs/api/examples/get_version.txt @@ -7,13 +7,13 @@ GET /v1/version HTTP/1.1 HTTP/1.1 200 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 50 +CONTENT-LENGTH: 49 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/version { "local": true, - "version": "1.4.0.dev1" + "version": "1.4.0dev3" } diff --git a/docs/api/examples/post_configreload.txt b/docs/api/examples/post_configreload.txt index 57a8955a..3ba05d55 100644 --- a/docs/api/examples/post_configreload.txt +++ b/docs/api/examples/post_configreload.txt @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/config/reload diff --git a/docs/api/examples/post_projects.txt b/docs/api/examples/post_projects.txt index bc565ab5..7d2614e3 100644 --- a/docs/api/examples/post_projects.txt +++ b/docs/api/examples/post_projects.txt @@ -12,13 +12,13 @@ CONNECTION: keep-alive CONTENT-LENGTH: 297 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects { - "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpckmaacu1", + "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpa178xv0w", "name": "test", - "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpckmaacu1/627163b8-dc72-4308-bccc-0a01fdf9e4b8", - "project_id": "627163b8-dc72-4308-bccc-0a01fdf9e4b8", + "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpa178xv0w/d6a59a61-52e7-471a-8930-ef27a313e606", + "project_id": "d6a59a61-52e7-471a-8930-ef27a313e606", "temporary": false } diff --git a/docs/api/examples/post_projectsprojectidclose.txt b/docs/api/examples/post_projectsprojectidclose.txt index 425dcf74..92b1be85 100644 --- a/docs/api/examples/post_projectsprojectidclose.txt +++ b/docs/api/examples/post_projectsprojectidclose.txt @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/close diff --git a/docs/api/examples/post_projectsprojectidcommit.txt b/docs/api/examples/post_projectsprojectidcommit.txt index 885f0ac7..bb017c54 100644 --- a/docs/api/examples/post_projectsprojectidcommit.txt +++ b/docs/api/examples/post_projectsprojectidcommit.txt @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/commit diff --git a/docs/api/examples/post_projectsprojectidiouvms.txt b/docs/api/examples/post_projectsprojectidiouvms.txt index 2dff1cd1..c0464565 100644 --- a/docs/api/examples/post_projectsprojectidiouvms.txt +++ b/docs/api/examples/post_projectsprojectidiouvms.txt @@ -1,21 +1,21 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_iou_create_startup_config0/iou.bin", "startup_config_content": "hostname test", "vm_id": "53179502-0fc1-4c59-a503-36b7d675ffb8"}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_create_startup_config0/iou.bin", "startup_config_content": "hostname test", "vm_id": "8f682934-a104-40f3-b70f-c4078ef89bc0"}' POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms HTTP/1.1 { "name": "PC TEST 1", - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_iou_create_startup_config0/iou.bin", + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_create_startup_config0/iou.bin", "startup_config_content": "hostname test", - "vm_id": "53179502-0fc1-4c59-a503-36b7d675ffb8" + "vm_id": "8f682934-a104-40f3-b70f-c4078ef89bc0" } HTTP/1.1 201 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 755 +CONTENT-LENGTH: 756 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms { @@ -26,13 +26,13 @@ X-ROUTE: /v1/projects/{project_id}/iou/vms "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "PC TEST 1", "nvram": 128, - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_iou_create_startup_config0/iou.bin", + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_create_startup_config0/iou.bin", "private_config": null, "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "ram": 256, "serial_adapters": 2, "startup_config": "startup-config.cfg", "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjb4sz6y3/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/53179502-0fc1-4c59-a503-36b7d675ffb8", - "vm_id": "53179502-0fc1-4c59-a503-36b7d675ffb8" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/8f682934-a104-40f3-b70f-c4078ef89bc0", + "vm_id": "8f682934-a104-40f3-b70f-c4078ef89bc0" } diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 3baa0d18..c3291054 100644 --- a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/cd4760c6-fbfc-44ba-a21e-5d3eeab66452/adapters/1/ports/0/nio' -d '{"ethernet_device": "lo0", "type": "nio_generic_ethernet"}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/fda1e4a4-a7c8-4011-96ec-dc266b81f8fb/adapters/1/ports/0/nio' -d '{"ethernet_device": "lo0", "type": "nio_generic_ethernet"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/cd4760c6-fbfc-44ba-a21e-5d3eeab66452/adapters/1/ports/0/nio HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/fda1e4a4-a7c8-4011-96ec-dc266b81f8fb/adapters/1/ports/0/nio HTTP/1.1 { "ethernet_device": "lo0", "type": "nio_generic_ethernet" @@ -13,7 +13,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 68 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt index 4e7720f1..e1750dca 100644 --- a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt +++ b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b89ab04d-ecb3-48ac-968c-9ea29a635513/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/6f21b20f-9d37-4dd1-a169-6eb17ec7da59/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/b89ab04d-ecb3-48ac-968c-9ea29a635513/adapters/0/ports/0/start_capture HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/6f21b20f-9d37-4dd1-a169-6eb17ec7da59/adapters/0/ports/0/start_capture HTTP/1.1 { "capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB" @@ -13,9 +13,9 @@ CONNECTION: keep-alive CONTENT-LENGTH: 158 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/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/tmpjb4sz6y3/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap" + "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap" } diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt index 0350ab7f..781962ba 100644 --- a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt +++ b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d3b24c51-1c3d-4e5f-9048-f778e8cd57f0/adapters/0/ports/0/stop_capture' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f7c0218d-7822-4eb0-be89-d74cc1eb138f/adapters/0/ports/0/stop_capture' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d3b24c51-1c3d-4e5f-9048-f778e8cd57f0/adapters/0/ports/0/stop_capture HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f7c0218d-7822-4eb0-be89-d74cc1eb138f/adapters/0/ports/0/stop_capture HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidreload.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidreload.txt index 8374ebeb..3177a79c 100644 --- a/docs/api/examples/post_projectsprojectidiouvmsvmidreload.txt +++ b/docs/api/examples/post_projectsprojectidiouvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/86c16543-b464-4963-9f76-635da1321b42/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/463da942-6b35-4edf-a046-8ec4c65ba755/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/86c16543-b464-4963-9f76-635da1321b42/reload HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/463da942-6b35-4edf-a046-8ec4c65ba755/reload HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/reload diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidstart.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidstart.txt index af645eb9..63c5d4e6 100644 --- a/docs/api/examples/post_projectsprojectidiouvmsvmidstart.txt +++ b/docs/api/examples/post_projectsprojectidiouvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f6f53adc-16a9-4fac-8f70-b8c7aedefa8d/start' -d '{"iourc_content": "test"}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/0e16aefc-8fa8-4123-8497-1190b8366c7c/start' -d '{"iourc_content": "test"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f6f53adc-16a9-4fac-8f70-b8c7aedefa8d/start HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/0e16aefc-8fa8-4123-8497-1190b8366c7c/start HTTP/1.1 { "iourc_content": "test" } @@ -11,6 +11,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/start diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidstop.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidstop.txt index 71b8ab2f..9aeede89 100644 --- a/docs/api/examples/post_projectsprojectidiouvmsvmidstop.txt +++ b/docs/api/examples/post_projectsprojectidiouvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/76fe121f-98f4-46e6-9507-74eac6c9975c/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5d163f0c-de53-41db-911b-9fb1b8752685/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/76fe121f-98f4-46e6-9507-74eac6c9975c/stop HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5d163f0c-de53-41db-911b-9fb1b8752685/stop HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/stop diff --git a/docs/api/examples/post_projectsprojectidportsudp.txt b/docs/api/examples/post_projectsprojectidportsudp.txt index 41085c1e..92658978 100644 --- a/docs/api/examples/post_projectsprojectidportsudp.txt +++ b/docs/api/examples/post_projectsprojectidportsudp.txt @@ -10,7 +10,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 25 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/ports/udp { diff --git a/docs/api/examples/post_projectsprojectidqemuvms.txt b/docs/api/examples/post_projectsprojectidqemuvms.txt index 66c72aa2..694fc484 100644 --- a/docs/api/examples/post_projectsprojectidqemuvms.txt +++ b/docs/api/examples/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": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_qemu_create_with_params0/linux.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpg645q6gq/qemu-system-x86_64", "ram": 1024}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_create_with_params0/linux.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64", "ram": 1024}' POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1 { - "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_qemu_create_with_params0/linux.img", + "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_create_with_params0/linux.img", "name": "PC TEST 1", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpg645q6gq/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64", "ram": 1024 } @@ -12,10 +12,10 @@ POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1 HTTP/1.1 201 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 1245 +CONTENT-LENGTH: 1246 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms { @@ -25,7 +25,7 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms "console": 2000, "console_type": "telnet", "cpu_throttling": 0, - "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_qemu_create_with_params0/linux.img", + "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_create_with_params0/linux.img", "hda_disk_image_md5sum": "c4ca4238a0b923820dcc509a6f75849b", "hdb_disk_image": "", "hdb_disk_image_md5sum": null, @@ -39,14 +39,14 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:f6:c6:00", + "mac_address": "00:00:ab:92:b0: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/tmpg645q6gq/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64", "ram": 1024, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1454taw7/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/8f451a59-cf3f-4008-9528-85d251aef6c6", - "vm_id": "8f451a59-cf3f-4008-9528-85d251aef6c6" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/e1e153f3-8712-4109-8c42-51716c5292b0", + "vm_id": "e1e153f3-8712-4109-8c42-51716c5292b0" } diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 19515f23..52357cc3 100644 --- a/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5eb1581b-0c90-4d07-88ea-5891d130103e/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a185b576-d8d3-4cbb-bf8c-6e2a2e8d26cd/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5eb1581b-0c90-4d07-88ea-5891d130103e/adapters/1/ports/0/nio HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a185b576-d8d3-4cbb-bf8c-6e2a2e8d26cd/adapters/1/ports/0/nio HTTP/1.1 { "ethernet_device": "eth0", "type": "nio_generic_ethernet" @@ -13,7 +13,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt index 028ef946..d55b6167 100644 --- a/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt +++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/446babb8-ec70-46f9-b781-643ce488d083/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ba4a8e07-5689-4333-bb5e-7d471c8f6862/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/446babb8-ec70-46f9-b781-643ce488d083/reload HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ba4a8e07-5689-4333-bb5e-7d471c8f6862/reload HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/reload diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidresume.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidresume.txt index 6fe0614e..f1150b99 100644 --- a/docs/api/examples/post_projectsprojectidqemuvmsvmidresume.txt +++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidresume.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f2c30f2f-67a3-41f6-8ed3-ea040cf46db9/resume' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5afe88e0-4136-4781-975e-c35062d9cf5b/resume' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f2c30f2f-67a3-41f6-8ed3-ea040cf46db9/resume HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5afe88e0-4136-4781-975e-c35062d9cf5b/resume HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/resume diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidstart.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidstart.txt index 021eac90..b4cdd9ea 100644 --- a/docs/api/examples/post_projectsprojectidqemuvmsvmidstart.txt +++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/04f46db1-625b-462b-aa40-675547c3a8fa/start' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a5272ab6-5e67-4e6a-879c-b2ea033b3477/start' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/04f46db1-625b-462b-aa40-675547c3a8fa/start HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a5272ab6-5e67-4e6a-879c-b2ea033b3477/start HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/start diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidstop.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidstop.txt index a3c1eb75..80a378bc 100644 --- a/docs/api/examples/post_projectsprojectidqemuvmsvmidstop.txt +++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6cc6eae5-225c-433a-be15-d60f5e1210d2/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/22a36a1b-ad36-4feb-a1ba-ca834b0240bc/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6cc6eae5-225c-433a-be15-d60f5e1210d2/stop HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/22a36a1b-ad36-4feb-a1ba-ca834b0240bc/stop HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/stop diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidsuspend.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidsuspend.txt index a407365a..d2e40fd3 100644 --- a/docs/api/examples/post_projectsprojectidqemuvmsvmidsuspend.txt +++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2be5e4a8-f5ef-4b3c-b496-729d61c66beb/suspend' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8a087a54-55db-48be-b604-303170e60260/suspend' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2be5e4a8-f5ef-4b3c-b496-729d61c66beb/suspend HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8a087a54-55db-48be-b604-303170e60260/suspend HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/suspend diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvms.txt b/docs/api/examples/post_projectsprojectidvirtualboxvms.txt index e3efcce8..4272e0a6 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvms.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvms.txt @@ -14,7 +14,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 409 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms { @@ -29,6 +29,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms "ram": 0, "use_any_adapter": false, "vm_directory": null, - "vm_id": "bee2cbbc-07a3-4f27-98c3-db5001a01a0d", + "vm_id": "d8a2de3e-a907-4d66-97fc-1e60c160fc89", "vmname": "VM1" } diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 95d6f1de..04d7b166 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/33f1c98b-0eb1-4387-b0f4-213f9b1c5bc0/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/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/573c5afd-ad65-4642-a46e-6275218d309b/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/33f1c98b-0eb1-4387-b0f4-213f9b1c5bc0/adapters/0/ports/0/nio HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/573c5afd-ad65-4642-a46e-6275218d309b/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", @@ -15,7 +15,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidreload.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidreload.txt index c886640f..6e970407 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidreload.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/78ed6b60-acd4-4340-87fa-9d4df0f82200/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/84bcef22-83ce-4800-8e8b-9ccf1acda2bd/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/78ed6b60-acd4-4340-87fa-9d4df0f82200/reload HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/84bcef22-83ce-4800-8e8b-9ccf1acda2bd/reload HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/reload diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidresume.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidresume.txt index 625466c8..680f57eb 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidresume.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidresume.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6ba54e29-d394-4526-baf9-f0d77799ecbd/resume' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/38b04342-a0b9-4109-813b-7cd553f9305e/resume' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6ba54e29-d394-4526-baf9-f0d77799ecbd/resume HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/38b04342-a0b9-4109-813b-7cd553f9305e/resume HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/resume diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstart.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstart.txt index 5bd862c4..2b230445 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstart.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a8635967-4e1f-4631-b8be-93d293ef5b75/start' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4975eca5-ed0e-477f-82d3-db64e9bc90f9/start' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a8635967-4e1f-4631-b8be-93d293ef5b75/start HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4975eca5-ed0e-477f-82d3-db64e9bc90f9/start HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/start diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstop.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstop.txt index de1917f3..abcf1d9f 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstop.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/04fb4675-c92e-409a-ac3e-23c5cf9dc45e/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f0537222-944c-4cd5-b324-b77ff6391490/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/04fb4675-c92e-409a-ac3e-23c5cf9dc45e/stop HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f0537222-944c-4cd5-b324-b77ff6391490/stop HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/stop diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidsuspend.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidsuspend.txt index 24830db8..36599cac 100644 --- a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidsuspend.txt +++ b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidsuspend.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/fb6ef07f-cc62-47b9-8b8f-76b4efaec6f3/suspend' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/711f6cb8-a81c-43ce-bc1a-479e764b3252/suspend' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/fb6ef07f-cc62-47b9-8b8f-76b4efaec6f3/suspend HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/711f6cb8-a81c-43ce-bc1a-479e764b3252/suspend HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}/suspend diff --git a/docs/api/examples/post_projectsprojectidvpcsvms.txt b/docs/api/examples/post_projectsprojectidvpcsvms.txt index 5c927110..3a78793f 100644 --- a/docs/api/examples/post_projectsprojectidvpcsvms.txt +++ b/docs/api/examples/post_projectsprojectidvpcsvms.txt @@ -12,7 +12,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 422 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms { @@ -22,6 +22,6 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms "startup_script": null, "startup_script_path": null, "status": "stopped", - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1454taw7/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/8b66a930-f1bb-49e8-98c9-09d02bb45aa7", - "vm_id": "8b66a930-f1bb-49e8-98c9-09d02bb45aa7" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/230eaad0-6e20-46cb-8903-83b870ae91b3", + "vm_id": "230eaad0-6e20-46cb-8903-83b870ae91b3" } diff --git a/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt index 07648c8d..d2830506 100644 --- a/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt +++ b/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a8957c94-8f09-4904-958c-d578ebb2c67d/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/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/09ccf7dd-09d1-47b9-b38f-1996ddd4d45e/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/a8957c94-8f09-4904-958c-d578ebb2c67d/adapters/0/ports/0/nio HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/09ccf7dd-09d1-47b9-b38f-1996ddd4d45e/adapters/0/ports/0/nio HTTP/1.1 { "lport": 4242, "rhost": "127.0.0.1", @@ -15,7 +15,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 89 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio { diff --git a/docs/api/examples/post_projectsprojectidvpcsvmsvmidreload.txt b/docs/api/examples/post_projectsprojectidvpcsvmsvmidreload.txt index ea52d117..285d3639 100644 --- a/docs/api/examples/post_projectsprojectidvpcsvmsvmidreload.txt +++ b/docs/api/examples/post_projectsprojectidvpcsvmsvmidreload.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6c7a70fb-9b41-4e51-b785-110ce0863354/reload' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/cca7480e-c9b9-4df9-8fe2-6de4c0a7266d/reload' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6c7a70fb-9b41-4e51-b785-110ce0863354/reload HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/cca7480e-c9b9-4df9-8fe2-6de4c0a7266d/reload HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}/reload diff --git a/docs/api/examples/post_projectsprojectidvpcsvmsvmidstart.txt b/docs/api/examples/post_projectsprojectidvpcsvmsvmidstart.txt index d4279988..e166d503 100644 --- a/docs/api/examples/post_projectsprojectidvpcsvmsvmidstart.txt +++ b/docs/api/examples/post_projectsprojectidvpcsvmsvmidstart.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/e1f5c0e2-56f0-4e2c-8bad-6c59c3281ee4/start' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fcd3c1ee-18d1-48d0-837e-7d12d1a03dd4/start' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/e1f5c0e2-56f0-4e2c-8bad-6c59c3281ee4/start HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fcd3c1ee-18d1-48d0-837e-7d12d1a03dd4/start HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}/start diff --git a/docs/api/examples/post_projectsprojectidvpcsvmsvmidstop.txt b/docs/api/examples/post_projectsprojectidvpcsvmsvmidstop.txt index f4c34e8d..68d8f1af 100644 --- a/docs/api/examples/post_projectsprojectidvpcsvmsvmidstop.txt +++ b/docs/api/examples/post_projectsprojectidvpcsvmsvmidstop.txt @@ -1,6 +1,6 @@ -curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/89fb69cc-003f-463e-b7d2-3c8ceed73470/stop' -d '{}' +curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/3f3863e4-bc9c-4e83-acac-da9cd43aa58c/stop' -d '{}' -POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/89fb69cc-003f-463e-b7d2-3c8ceed73470/stop HTTP/1.1 +POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/3f3863e4-bc9c-4e83-acac-da9cd43aa58c/stop HTTP/1.1 {} @@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive CONTENT-LENGTH: 0 DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}/stop diff --git a/docs/api/examples/post_version.txt b/docs/api/examples/post_version.txt index a3ed9531..eadd2ff7 100644 --- a/docs/api/examples/post_version.txt +++ b/docs/api/examples/post_version.txt @@ -1,20 +1,20 @@ -curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.4.0.dev1"}' +curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.4.0dev3"}' POST /v1/version HTTP/1.1 { - "version": "1.4.0.dev1" + "version": "1.4.0dev3" } HTTP/1.1 200 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 31 +CONTENT-LENGTH: 30 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/version { - "version": "1.4.0.dev1" + "version": "1.4.0dev3" } diff --git a/docs/api/examples/put_projectsprojectid.txt b/docs/api/examples/put_projectsprojectid.txt index 01f4fa5f..3249d0ba 100644 --- a/docs/api/examples/put_projectsprojectid.txt +++ b/docs/api/examples/put_projectsprojectid.txt @@ -1,9 +1,9 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/f839d9a0-4f42-402c-a7c9-62c962785607' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_update_path_project_non_l0"}' +curl -i -X PUT 'http://localhost:8000/v1/projects/13043fad-9bf7-4fc5-8002-a305e3170fec' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_update_path_project_non_l0"}' -PUT /v1/projects/f839d9a0-4f42-402c-a7c9-62c962785607 HTTP/1.1 +PUT /v1/projects/13043fad-9bf7-4fc5-8002-a305e3170fec HTTP/1.1 { "name": "second_name", - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_update_path_project_non_l0" + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_update_path_project_non_l0" } @@ -13,7 +13,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 100 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id} { diff --git a/docs/api/examples/put_projectsprojectidiouvmsvmid.txt b/docs/api/examples/put_projectsprojectidiouvmsvmid.txt index 93cfdae7..a7d375c7 100644 --- a/docs/api/examples/put_projectsprojectidiouvmsvmid.txt +++ b/docs/api/examples/put_projectsprojectidiouvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/cf340f09-e768-493d-ab47-ba3455cebc3d' -d '{"console": 2001, "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/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/05c6c5c9-07c9-4a49-976e-b01cb8e354bd' -d '{"console": 2001, "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/cf340f09-e768-493d-ab47-ba3455cebc3d HTTP/1.1 +PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/05c6c5c9-07c9-4a49-976e-b01cb8e354bd HTTP/1.1 { "console": 2001, "ethernet_adapters": 4, @@ -18,27 +18,27 @@ PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/cf340f09-e768-493d HTTP/1.1 200 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 799 +CONTENT-LENGTH: 800 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id} { "console": 2001, "ethernet_adapters": 4, - "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbeqacsc5/iourc", + "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpz2_ftfwa/iourc", "l1_keepalives": true, "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c", "name": "test", "nvram": 2048, - "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_iou_update0/iou.bin", + "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_update0/iou.bin", "private_config": null, "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", "ram": 512, "serial_adapters": 0, "startup_config": "startup-config.cfg", "use_default_iou_values": true, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjb4sz6y3/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/cf340f09-e768-493d-ab47-ba3455cebc3d", - "vm_id": "cf340f09-e768-493d-ab47-ba3455cebc3d" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/05c6c5c9-07c9-4a49-976e-b01cb8e354bd", + "vm_id": "05c6c5c9-07c9-4a49-976e-b01cb8e354bd" } diff --git a/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt index 026ca575..59a4fcff 100644 --- a/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt +++ b/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt @@ -1,9 +1,9 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/4e9e2bd5-6cba-4d64-a3f5-7d689f51d151' -d '{"console": 2001, "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_qemu_update0/linux.img", "name": "test", "ram": 1024}' +curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0' -d '{"console": 2001, "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_update0/linux.img", "name": "test", "ram": 1024}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/4e9e2bd5-6cba-4d64-a3f5-7d689f51d151 HTTP/1.1 +PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0 HTTP/1.1 { "console": 2001, - "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_qemu_update0/linux.img", + "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_update0/linux.img", "name": "test", "ram": 1024 } @@ -12,10 +12,10 @@ PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/4e9e2bd5-6cba-4d6 HTTP/1.1 200 ACCESS-CONTROL-ALLOW-ORIGIN: * CONNECTION: keep-alive -CONTENT-LENGTH: 1228 +CONTENT-LENGTH: 1229 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id} { @@ -27,7 +27,7 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id} "cpu_throttling": 0, "hda_disk_image": "", "hda_disk_image_md5sum": null, - "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-22/test_qemu_update0/linux.img", + "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_update0/linux.img", "hdb_disk_image_md5sum": "c4ca4238a0b923820dcc509a6f75849b", "hdc_disk_image": "", "hdc_disk_image_md5sum": null, @@ -39,14 +39,14 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id} "kernel_image": "", "kernel_image_md5sum": null, "legacy_networking": false, - "mac_address": "00:00:ab:d1:51:00", + "mac_address": "00:00:ab:c8:e0:00", "name": "test", "options": "", "platform": "x86_64", "process_priority": "low", "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80", - "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpg645q6gq/qemu-system-x86_64", + "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64", "ram": 1024, - "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1454taw7/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/4e9e2bd5-6cba-4d64-a3f5-7d689f51d151", - "vm_id": "4e9e2bd5-6cba-4d64-a3f5-7d689f51d151" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0", + "vm_id": "de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0" } diff --git a/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt index ff17e295..c86b27d7 100644 --- a/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt +++ b/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/82618463-4c91-4166-8c01-78a4b434813a' -d '{"console": 2010, "name": "test"}' +curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6399384f-5127-4af6-aab4-f255538e5e8a' -d '{"console": 2010, "name": "test"}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/82618463-4c91-4166-8c01-78a4b434813a HTTP/1.1 +PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6399384f-5127-4af6-aab4-f255538e5e8a HTTP/1.1 { "console": 2010, "name": "test" @@ -13,7 +13,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 413 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id} { @@ -28,6 +28,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id} "ram": 0, "use_any_adapter": false, "vm_directory": null, - "vm_id": "82618463-4c91-4166-8c01-78a4b434813a", + "vm_id": "6399384f-5127-4af6-aab4-f255538e5e8a", "vmname": "VMTEST" } diff --git a/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt index f5aec443..acce014b 100644 --- a/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt +++ b/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt @@ -1,6 +1,6 @@ -curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f46f9884-594c-4426-a46d-7699410ec0b1' -d '{"console": 2011, "name": "test", "startup_script": "ip 192.168.1.1"}' +curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/efb44969-3abd-40ab-9cae-fc0e46d8f221' -d '{"console": 2011, "name": "test", "startup_script": "ip 192.168.1.1"}' -PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f46f9884-594c-4426-a46d-7699410ec0b1 HTTP/1.1 +PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/efb44969-3abd-40ab-9cae-fc0e46d8f221 HTTP/1.1 { "console": 2011, "name": "test", @@ -14,7 +14,7 @@ CONNECTION: keep-alive CONTENT-LENGTH: 438 CONTENT-TYPE: application/json DATE: Thu, 08 Jan 2015 16:09:15 GMT -SERVER: Python/3.4 GNS3/1.4.0.dev1 +SERVER: Python/3.4 GNS3/1.4.0dev3 X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id} { @@ -24,6 +24,6 @@ X-ROUTE: /v1/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/tmp1454taw7/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f46f9884-594c-4426-a46d-7699410ec0b1", - "vm_id": "f46f9884-594c-4426-a46d-7699410ec0b1" + "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/efb44969-3abd-40ab-9cae-fc0e46d8f221", + "vm_id": "efb44969-3abd-40ab-9cae-fc0e46d8f221" } diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst index 7f0e65e4..1ff726ba 100644 --- a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst +++ b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst @@ -9,8 +9,8 @@ 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 ********************** @@ -38,8 +38,8 @@ 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 ********************** @@ -95,8 +95,8 @@ 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/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst index 97b14b9d..9d4af7dc 100644 --- a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst +++ b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst @@ -9,9 +9,9 @@ Add a NIO to a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **device_id**: UUID for the instance - **port_number**: Port on the device +- **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** @@ -139,9 +139,9 @@ Remove a NIO from a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **device_id**: UUID for the instance - **port_number**: Port on the device +- **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst index 19852f49..41cc168f 100644 --- a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst +++ b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst @@ -9,9 +9,9 @@ Start a packet capture on a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **device_id**: UUID for the instance - **port_number**: Port on the device +- **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst index cc312e43..9318bdd1 100644 --- a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst +++ b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst @@ -9,9 +9,9 @@ Stop a packet capture on a Dynamips device instance Parameters ********** -- **project_id**: UUID for the project -- **device_id**: UUID for the instance - **port_number**: Port on the device +- **device_id**: UUID for the instance +- **project_id**: UUID for the project Response status codes ********************** diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst index 01614d10..b5cd2bf1 100644 --- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter where the nio should be added +- **port_number**: Port on the adapter - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter +- **adapter_number**: Adapter where the nio should be added Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter from where the nio should be removed +- **port_number**: Port on the adapter - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter +- **adapter_number**: Adapter from where the nio should be removed Response status codes ********************** diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index e2764d21..b0def326 100644 --- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter +- **adapter_number**: Adapter to start a packet capture Response status codes ********************** diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 4d8ad822..0e499c37 100644 --- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a Dynamips VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter to stop a packet capture Response status codes ********************** diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst index dd563747..357e952a 100644 --- a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a IOU instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located +- **port_number**: Port where the nio should be added - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port where the nio should be added +- **adapter_number**: Network adapter where the nio is located Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a IOU instance Parameters ********** -- **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 - **vm_id**: UUID for the instance -- **port_number**: Port from where the nio should be removed +- **adapter_number**: Network adapter where the nio is located Response status codes ********************** diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index 2d1b1821..1d5b8893 100644 --- a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a IOU VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter +- **adapter_number**: Adapter to start a packet capture Response status codes ********************** diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 4f382d01..cd1b4d01 100644 --- a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a IOU VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter to stop a packet capture Response status codes ********************** diff --git a/docs/api/v1/project/projects.rst b/docs/api/v1/project/projects.rst index e9299195..dada2075 100644 --- a/docs/api/v1/project/projects.rst +++ b/docs/api/v1/project/projects.rst @@ -3,6 +3,21 @@ .. contents:: +GET /v1/projects +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +List projects opened on the server + +Response status codes +********************** +- **200**: Project list + +Sample session +*************** + + +.. literalinclude:: ../../examples/get_projects.txt + + POST /v1/projects ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Create a new project on the server diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst index eb2acb1e..fd552758 100644 --- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a Qemu VM instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Network adapter where the nio is located Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a Qemu VM instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Network adapter where the nio is located Response status codes ********************** diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst index a51f97e6..609f215e 100644 --- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter where the nio should be added +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter where the nio should be added Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter from where the nio should be removed +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter from where the nio should be removed Response status codes ********************** diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst index ab1b9206..aac9360e 100644 --- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst +++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst @@ -9,10 +9,10 @@ Start a packet capture on a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter to start a packet capture +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter to start a packet capture Response status codes ********************** diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst index 502d5ee7..040fc9af 100644 --- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst +++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst @@ -9,10 +9,10 @@ Stop a packet capture on a VirtualBox VM instance Parameters ********** -- **adapter_number**: Adapter to stop a packet capture +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter to stop a packet capture Response status codes ********************** diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst index 326f61a1..35cdd794 100644 --- a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a VMware VM instance Parameters ********** -- **adapter_number**: Adapter where the nio should be added +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter where the nio should be added Response status codes ********************** @@ -27,10 +27,10 @@ Remove a NIO from a VMware VM instance Parameters ********** -- **adapter_number**: Adapter from where the nio should be removed +- **port_number**: Port on the adapter (always 0) - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port on the adapter (always 0) +- **adapter_number**: Adapter from where the nio should be removed Response status codes ********************** diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst index 15783120..3812ef6c 100644 --- a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst +++ b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst @@ -9,10 +9,10 @@ Add a NIO to a VPCS instance Parameters ********** -- **adapter_number**: Network adapter where the nio is located +- **port_number**: Port where the nio should be added - **project_id**: UUID for the project - **vm_id**: UUID for the instance -- **port_number**: Port where the nio should be added +- **adapter_number**: Network adapter where the nio is located Response status codes ********************** @@ -33,10 +33,10 @@ Remove a NIO from a VPCS instance Parameters ********** -- **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 - **vm_id**: UUID for the instance -- **port_number**: Port from where the nio should be removed +- **adapter_number**: Network adapter where the nio is located Response status codes ********************** diff --git a/tests/handlers/test_upload.py b/tests/handlers/test_upload.py index d9cbc6af..477e3535 100644 --- a/tests/handlers/test_upload.py +++ b/tests/handlers/test_upload.py @@ -18,6 +18,7 @@ import aiohttp import asyncio +import pytest import os import tarfile from unittest.mock import patch @@ -26,6 +27,13 @@ from unittest.mock import patch from gns3server.config import Config +@pytest.yield_fixture(autouse=True) +def restore_working_dir(): + directory = os.getcwd() + yield + os.chdir(directory) + + def test_index_upload(server, tmpdir): Config.instance().set("Server", "images_path", str(tmpdir))