diff --git a/docs/api/examples/delete_projectsprojectid.txt b/docs/api/examples/delete_projectsprojectid.txt
index a7ecd00f..9b15153a 100644
--- a/docs/api/examples/delete_projectsprojectid.txt
+++ b/docs/api/examples/delete_projectsprojectid.txt
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}
diff --git a/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt b/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt
index ae31ce71..d1fa8cf3 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/becc8bf8-1936-4076-b7dd-ee83ba078907'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/32773db2-f466-4118-8bef-02b585f92619'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/becc8bf8-1936-4076-b7dd-ee83ba078907 HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/32773db2-f466-4118-8bef-02b585f92619 HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 94d35620..eb8f1a08 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/779f3f81-60ab-4d26-860c-75f915b1d70b/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/22fb7e95-ac48-466a-a5e7-a03d2c9b57aa/adapters/1/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/779f3f81-60ab-4d26-860c-75f915b1d70b/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/22fb7e95-ac48-466a-a5e7-a03d2c9b57aa/adapters/1/ports/0/nio HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 c8d13190..84a4fcde 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/6537c17b-2e47-46f9-b96b-6fc66382709f'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/df85e698-3851-4172-b195-2caeb3fc5cf6'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6537c17b-2e47-46f9-b96b-6fc66382709f HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/df85e698-3851-4172-b195-2caeb3fc5cf6 HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 3689a022..89e38b92 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/b54e4616-058f-413d-a589-0b7c5da20aa3/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2a5cfc20-5a1f-4180-897a-c90362a01832/adapters/1/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b54e4616-058f-413d-a589-0b7c5da20aa3/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/2a5cfc20-5a1f-4180-897a-c90362a01832/adapters/1/ports/0/nio HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 75b27845..f67cc1d4 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/387fb016-f1fc-4844-a25e-97c08ef77274/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c413ed57-0064-4e42-9cc0-59a6dc3143e0/adapters/0/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/387fb016-f1fc-4844-a25e-97c08ef77274/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c413ed57-0064-4e42-9cc0-59a6dc3143e0/adapters/0/ports/0/nio HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 ec2dd646..b50c3a72 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/6bc73868-fea6-449b-af5c-e7b746e4129d'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/44a0ec89-6cb1-4165-a4d5-ebf99963440f'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6bc73868-fea6-449b-af5c-e7b746e4129d HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/44a0ec89-6cb1-4165-a4d5-ebf99963440f HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 8c8e8be2..7a27263a 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/f7d1d6ad-422b-486a-8d23-1ff46cd8bc4b/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f12f73cc-dfd6-4b04-a731-1e0e6ead343a/adapters/0/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f7d1d6ad-422b-486a-8d23-1ff46cd8bc4b/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f12f73cc-dfd6-4b04-a731-1e0e6ead343a/adapters/0/ports/0/nio HTTP/1.1
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 780bc706..d332fbe2 100644
--- a/docs/api/examples/get_interfaces.txt
+++ b/docs/api/examples/get_interfaces.txt
@@ -9,7 +9,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 718
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/interfaces
[
@@ -25,10 +25,6 @@ X-ROUTE: /v1/interfaces
"id": "stf0",
"name": "stf0"
},
- {
- "id": "en0",
- "name": "en0"
- },
{
"id": "en1",
"name": "en1"
@@ -41,6 +37,10 @@ X-ROUTE: /v1/interfaces
"id": "en2",
"name": "en2"
},
+ {
+ "id": "en0",
+ "name": "en0"
+ },
{
"id": "p2p0",
"name": "p2p0"
diff --git a/docs/api/examples/get_projectsprojectid.txt b/docs/api/examples/get_projectsprojectid.txt
index ebe85d97..c2fd7629 100644
--- a/docs/api/examples/get_projectsprojectid.txt
+++ b/docs/api/examples/get_projectsprojectid.txt
@@ -9,13 +9,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}
{
- "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmphbzo0jp9",
+ "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpqyrnrqv5",
"name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmphbzo0jp9/00010203-0405-0607-0809-0a0b0c0d0e02",
+ "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpqyrnrqv5/00010203-0405-0607-0809-0a0b0c0d0e02",
"project_id": "00010203-0405-0607-0809-0a0b0c0d0e02",
"temporary": false
}
diff --git a/docs/api/examples/get_projectsprojectidiouvmsvmid.txt b/docs/api/examples/get_projectsprojectidiouvmsvmid.txt
index 688fa3d7..169d6822 100644
--- a/docs/api/examples/get_projectsprojectidiouvmsvmid.txt
+++ b/docs/api/examples/get_projectsprojectidiouvmsvmid.txt
@@ -1,15 +1,15 @@
-curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/ede1bba5-0723-4fd8-9e89-bdfffe5f5c8f'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/570b3403-25ed-44bb-ab47-cbead7965a46'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/ede1bba5-0723-4fd8-9e89-bdfffe5f5c8f HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/570b3403-25ed-44bb-ab47-cbead7965a46 HTTP/1.1
HTTP/1.1 200
CONNECTION: keep-alive
-CONTENT-LENGTH: 386
+CONTENT-LENGTH: 467
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}
{
@@ -20,10 +20,10 @@ X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}
"l1_keepalives": false,
"name": "PC TEST 1",
"nvram": 128,
- "path": "iou.bin",
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_iou_get0/iou.bin",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 256,
"serial_adapters": 2,
"use_default_iou_values": true,
- "vm_id": "ede1bba5-0723-4fd8-9e89-bdfffe5f5c8f"
+ "vm_id": "570b3403-25ed-44bb-ab47-cbead7965a46"
}
diff --git a/docs/api/examples/get_projectsprojectidiouvmsvmidinitialconfig.txt b/docs/api/examples/get_projectsprojectidiouvmsvmidinitialconfig.txt
index 4b3abdb5..fc6ef2c5 100644
--- a/docs/api/examples/get_projectsprojectidiouvmsvmidinitialconfig.txt
+++ b/docs/api/examples/get_projectsprojectidiouvmsvmidinitialconfig.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/821b0dc3-4cc0-4899-8184-75bfc22db584/initial_config'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/733d8688-05fd-4e25-86fb-9ce302264936/initial_config'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/821b0dc3-4cc0-4899-8184-75bfc22db584/initial_config HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/733d8688-05fd-4e25-86fb-9ce302264936/initial_config HTTP/1.1
@@ -9,7 +9,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/initial_config
{
diff --git a/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt
index 26de1035..0352bb8c 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/e3935d2d-2bf9-4cde-8c7e-0bd1d74c3dad'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/86cb38a5-d580-41b2-ab31-57dd5c2e2317'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e3935d2d-2bf9-4cde-8c7e-0bd1d74c3dad HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/86cb38a5-d580-41b2-ab31-57dd5c2e2317 HTTP/1.1
@@ -9,7 +9,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 597
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}
{
@@ -29,7 +29,7 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}
"options": "",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpyasp9636/qemu_x42",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpnb5_wdn4/qemu_x42",
"ram": 256,
- "vm_id": "e3935d2d-2bf9-4cde-8c7e-0bd1d74c3dad"
+ "vm_id": "86cb38a5-d580-41b2-ab31-57dd5c2e2317"
}
diff --git a/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt
index cd98bab1..808686b4 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/f49ff215-0872-4bf7-90c8-3d9ecc2b2f2b'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c6006b62-b9c1-4be0-9cc6-81d12bdd29d5'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f49ff215-0872-4bf7-90c8-3d9ecc2b2f2b HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c6006b62-b9c1-4be0-9cc6-81d12bdd29d5 HTTP/1.1
@@ -9,7 +9,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 361
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
{
@@ -22,6 +22,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 0,
"use_any_adapter": false,
- "vm_id": "f49ff215-0872-4bf7-90c8-3d9ecc2b2f2b",
+ "vm_id": "c6006b62-b9c1-4be0-9cc6-81d12bdd29d5",
"vmname": "VMTEST"
}
diff --git a/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt
index 195eb61a..218c2d63 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/3ff6ff9e-93de-45ae-a7ec-e296d406ffe1'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/3d70ec8d-d4af-4bb3-9bc2-1e7833f44a3e'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/3ff6ff9e-93de-45ae-a7ec-e296d406ffe1 HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/3d70ec8d-d4af-4bb3-9bc2-1e7833f44a3e HTTP/1.1
@@ -9,7 +9,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 220
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
{
@@ -18,5 +18,5 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"startup_script": null,
"startup_script_path": null,
- "vm_id": "3ff6ff9e-93de-45ae-a7ec-e296d406ffe1"
+ "vm_id": "3d70ec8d-d4af-4bb3-9bc2-1e7833f44a3e"
}
diff --git a/docs/api/examples/get_qemubinaries.txt b/docs/api/examples/get_qemubinaries.txt
index 003055b4..16ecb792 100644
--- a/docs/api/examples/get_qemubinaries.txt
+++ b/docs/api/examples/get_qemubinaries.txt
@@ -9,7 +9,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/qemu/binaries
[
diff --git a/docs/api/examples/get_version.txt b/docs/api/examples/get_version.txt
index d267bb31..f190f8b8 100644
--- a/docs/api/examples/get_version.txt
+++ b/docs/api/examples/get_version.txt
@@ -6,13 +6,13 @@ GET /v1/version HTTP/1.1
HTTP/1.1 200
CONNECTION: keep-alive
-CONTENT-LENGTH: 49
+CONTENT-LENGTH: 50
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/version
{
"local": true,
- "version": "1.3.1.rc2"
+ "version": "1.4.0.dev1"
}
diff --git a/docs/api/examples/post_configreload.txt b/docs/api/examples/post_configreload.txt
index 35f71f23..c6bead3d 100644
--- a/docs/api/examples/post_configreload.txt
+++ b/docs/api/examples/post_configreload.txt
@@ -8,6 +8,6 @@ HTTP/1.1 201
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/config/reload
diff --git a/docs/api/examples/post_projects.txt b/docs/api/examples/post_projects.txt
index c53e1fd7..83c6f912 100644
--- a/docs/api/examples/post_projects.txt
+++ b/docs/api/examples/post_projects.txt
@@ -11,13 +11,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects
{
- "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_6lclsv7",
+ "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpue5qtaa2",
"name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_6lclsv7/187543e2-5d46-4108-a623-cfdd31fa300e",
- "project_id": "187543e2-5d46-4108-a623-cfdd31fa300e",
+ "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpue5qtaa2/abc875ab-6e67-484c-8db0-4e05de5f00b0",
+ "project_id": "abc875ab-6e67-484c-8db0-4e05de5f00b0",
"temporary": false
}
diff --git a/docs/api/examples/post_projectsprojectidclose.txt b/docs/api/examples/post_projectsprojectidclose.txt
index a73b52d5..f0f7fa66 100644
--- a/docs/api/examples/post_projectsprojectidclose.txt
+++ b/docs/api/examples/post_projectsprojectidclose.txt
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/close
diff --git a/docs/api/examples/post_projectsprojectidcommit.txt b/docs/api/examples/post_projectsprojectidcommit.txt
index 1bc0885f..e76c4d40 100644
--- a/docs/api/examples/post_projectsprojectidcommit.txt
+++ b/docs/api/examples/post_projectsprojectidcommit.txt
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/commit
diff --git a/docs/api/examples/post_projectsprojectidiouvms.txt b/docs/api/examples/post_projectsprojectidiouvms.txt
index f7af542c..252cd4c3 100644
--- a/docs/api/examples/post_projectsprojectidiouvms.txt
+++ b/docs/api/examples/post_projectsprojectidiouvms.txt
@@ -1,40 +1,34 @@
-curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"ethernet_adapters": 0, "initial_config_content": "hostname test", "iourc_content": "test", "l1_keepalives": true, "name": "PC TEST 1", "nvram": 512, "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-4450/test_iou_create_with_params0/iou.bin", "ram": 1024, "serial_adapters": 4, "use_default_iou_values": true}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"initial_config_content": "hostname test", "name": "PC TEST 1", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_iou_create_initial_config0/iou.bin", "vm_id": "aaf267e2-745e-40b3-bce7-3e80f5230899"}'
POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms HTTP/1.1
{
- "ethernet_adapters": 0,
"initial_config_content": "hostname test",
- "iourc_content": "test",
- "l1_keepalives": true,
"name": "PC TEST 1",
- "nvram": 512,
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-4450/test_iou_create_with_params0/iou.bin",
- "ram": 1024,
- "serial_adapters": 4,
- "use_default_iou_values": true
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_iou_create_initial_config0/iou.bin",
+ "vm_id": "aaf267e2-745e-40b3-bce7-3e80f5230899"
}
HTTP/1.1 201
CONNECTION: keep-alive
-CONTENT-LENGTH: 466
+CONTENT-LENGTH: 501
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/iou/vms
{
"console": 2000,
- "ethernet_adapters": 0,
+ "ethernet_adapters": 2,
"initial_config": "initial-config.cfg",
- "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps796q8lx/iourc",
- "l1_keepalives": true,
+ "iourc_path": null,
+ "l1_keepalives": false,
"name": "PC TEST 1",
- "nvram": 512,
- "path": "iou.bin",
+ "nvram": 128,
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_iou_create_initial_config0/iou.bin",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "ram": 1024,
- "serial_adapters": 4,
+ "ram": 256,
+ "serial_adapters": 2,
"use_default_iou_values": true,
- "vm_id": "69f5842a-d4e5-45fe-a500-1010c72f1748"
+ "vm_id": "aaf267e2-745e-40b3-bce7-3e80f5230899"
}
diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 97dc6046..c66434a6 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/04648c72-4339-471e-aa12-57b42d7ea18b/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/iou/vms/5fff6292-2ac7-4f25-9fa7-5bdaaa7fbe84/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/04648c72-4339-471e-aa12-57b42d7ea18b/adapters/1/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5fff6292-2ac7-4f25-9fa7-5bdaaa7fbe84/adapters/1/ports/0/nio HTTP/1.1
{
"ethernet_device": "eth0",
"type": "nio_generic_ethernet"
@@ -12,7 +12,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 69
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 b91d6987..1f1ad3bf 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/6056b617-d0c4-4683-bc9e-d0130beec951/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/3101e74a-8456-4ccf-ba7a-fd1b3cdf0729/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/6056b617-d0c4-4683-bc9e-d0130beec951/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3101e74a-8456-4ccf-ba7a-fd1b3cdf0729/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
@@ -12,9 +12,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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/tmp367810hd/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
+ "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpossrvwje/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 519c2f2c..0c85536f 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/0fb3c393-7cda-4abc-ad76-a9e7af04abea/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/2309d25b-8095-4a1a-9478-6345dad9f579/adapters/0/ports/0/stop_capture' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/0fb3c393-7cda-4abc-ad76-a9e7af04abea/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/2309d25b-8095-4a1a-9478-6345dad9f579/adapters/0/ports/0/stop_capture HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 8bce1041..67c1ec57 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/b32c38db-3692-4719-b94f-2b3f664cd06f/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/c4018290-fe62-41c8-bf06-88d832eb0477/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b32c38db-3692-4719-b94f-2b3f664cd06f/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/c4018290-fe62-41c8-bf06-88d832eb0477/reload HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 5f5e6079..6666f708 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/55209a6f-8fe0-49d1-a884-b7cd09547b5c/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/2fe292e5-ab46-473a-bd91-edf0ea58fc47/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/55209a6f-8fe0-49d1-a884-b7cd09547b5c/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/2fe292e5-ab46-473a-bd91-edf0ea58fc47/start HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 66a5ebee..bee9429d 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/d893bd2c-d84e-4f89-ad84-f3bdfaf460b6/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8dc543e0-ae2c-45cc-bdc2-82baa781c8a7/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d893bd2c-d84e-4f89-ad84-f3bdfaf460b6/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/8dc543e0-ae2c-45cc-bdc2-82baa781c8a7/stop HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 6ee01042..7f5ee580 100644
--- a/docs/api/examples/post_projectsprojectidportsudp.txt
+++ b/docs/api/examples/post_projectsprojectidportsudp.txt
@@ -9,7 +9,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 7a780fa4..74beb465 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": "/tmp/hda", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpyasp9636/qemu_x42", "ram": 1024}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "/tmp/hda", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpnb5_wdn4/qemu_x42", "ram": 1024}'
POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1
{
"hda_disk_image": "/tmp/hda",
"name": "PC TEST 1",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpyasp9636/qemu_x42",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpnb5_wdn4/qemu_x42",
"ram": 1024
}
@@ -14,7 +14,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 606
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/qemu/vms
{
@@ -34,7 +34,7 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms
"options": "",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpyasp9636/qemu_x42",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpnb5_wdn4/qemu_x42",
"ram": 1024,
- "vm_id": "8c325041-39a8-4c31-b921-b66dadadc353"
+ "vm_id": "c0fd0a60-1952-47e7-a293-7a233c83ce8e"
}
diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 59d13e6a..1797d515 100644
--- a/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,21 +1,21 @@
-curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e791569e-7f95-4a1d-9f8d-b48611afeef3/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/d378a8bd-711d-47b1-aaa0-dfa0c3ff420b/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e791569e-7f95-4a1d-9f8d-b48611afeef3/adapters/1/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d378a8bd-711d-47b1-aaa0-dfa0c3ff420b/adapters/1/ports/0/nio HTTP/1.1
{
"ethernet_device": "eth0",
"type": "nio_generic_ethernet"
}
-HTTP/1.1 201
+HTTP/1.1 409
CONNECTION: keep-alive
-CONTENT-LENGTH: 69
+CONTENT-LENGTH: 89
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{
- "ethernet_device": "eth0",
- "type": "nio_generic_ethernet"
+ "message": "NIO of type nio_generic_ethernet is not supported",
+ "status": 409
}
diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt
index 5c2a2bf8..a80380b1 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/e6de45b1-048b-498b-9875-de76762532e9/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/96e58ba8-0d90-4f45-a410-ba738338b5f8/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e6de45b1-048b-498b-9875-de76762532e9/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/96e58ba8-0d90-4f45-a410-ba738338b5f8/reload HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 85ba0910..ebd6e3c9 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/d7152d7c-7f23-4d92-9ee1-fae132a50b3b/resume' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f112cd1e-d307-4f95-ab6b-8d2387d520d5/resume' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d7152d7c-7f23-4d92-9ee1-fae132a50b3b/resume HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f112cd1e-d307-4f95-ab6b-8d2387d520d5/resume HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 0cd46103..d484e275 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/031c1e57-577c-4ff4-91d1-da6fe0816fdd/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/14c7e896-28cf-4705-801c-76ab2a4ee387/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/031c1e57-577c-4ff4-91d1-da6fe0816fdd/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/14c7e896-28cf-4705-801c-76ab2a4ee387/start HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 31095727..9cb889e1 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/79ca17e8-0194-4682-bb2a-0bdd9f7d1e1a/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d730f891-a552-4df5-9399-fab1ed15358e/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/79ca17e8-0194-4682-bb2a-0bdd9f7d1e1a/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d730f891-a552-4df5-9399-fab1ed15358e/stop HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 2b8146c9..b45534fc 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/7e24f49b-51ea-410f-bc94-16fc58071493/suspend' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/64c8e5e5-056b-4ec8-9d86-912c7e053560/suspend' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7e24f49b-51ea-410f-bc94-16fc58071493/suspend HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/64c8e5e5-056b-4ec8-9d86-912c7e053560/suspend HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 bae91853..1cd38b1d 100644
--- a/docs/api/examples/post_projectsprojectidvirtualboxvms.txt
+++ b/docs/api/examples/post_projectsprojectidvirtualboxvms.txt
@@ -13,7 +13,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 355
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/virtualbox/vms
{
@@ -26,6 +26,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 0,
"use_any_adapter": false,
- "vm_id": "fd208626-81e5-449e-b145-fd6993f5097c",
+ "vm_id": "f9407c6b-39bf-4445-9d53-70676fe7e3dc",
"vmname": "VM1"
}
diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index cf095b1b..fa91f290 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/5463a797-0eb0-41d2-8b32-1efbd7a353cc/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/d18556e2-fc68-486c-a039-0cd9200322d3/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/5463a797-0eb0-41d2-8b32-1efbd7a353cc/adapters/0/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/d18556e2-fc68-486c-a039-0cd9200322d3/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@@ -14,7 +14,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 54f0322a..4004050e 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/f24209c8-671e-428a-9561-db4775f6b8a7/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/cb66c1db-e2f8-4149-9065-976db1af7afb/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f24209c8-671e-428a-9561-db4775f6b8a7/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/cb66c1db-e2f8-4149-9065-976db1af7afb/reload HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 039ec17f..cc304ddd 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/70df82f6-e868-4ab3-9be9-d456871f41dc/resume' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/158053af-713e-4a72-a05d-c33aa05208f7/resume' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/70df82f6-e868-4ab3-9be9-d456871f41dc/resume HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/158053af-713e-4a72-a05d-c33aa05208f7/resume HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 1f3ad83e..34ae9b83 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/354d48fe-cab6-41d8-8cc1-64716e02c3a8/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a18cc3a2-a31b-4d4a-b79a-0b1e714760fb/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/354d48fe-cab6-41d8-8cc1-64716e02c3a8/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a18cc3a2-a31b-4d4a-b79a-0b1e714760fb/start HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 9c16d5c2..41397c9e 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/90733316-a02a-490b-b8c4-e6ea4a32296a/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6b897ee5-9c9f-4de1-9858-2a0280d2e551/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/90733316-a02a-490b-b8c4-e6ea4a32296a/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6b897ee5-9c9f-4de1-9858-2a0280d2e551/stop HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 6cd4c9bc..f9cab5fe 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/0f257aa5-d61d-4ee9-872a-898462f7ecdf/suspend' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6b5139c6-3bcd-4edc-a37f-fd73d28cd9bd/suspend' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/0f257aa5-d61d-4ee9-872a-898462f7ecdf/suspend HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6b5139c6-3bcd-4edc-a37f-fd73d28cd9bd/suspend HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 629a420f..5d9f94ad 100644
--- a/docs/api/examples/post_projectsprojectidvpcsvms.txt
+++ b/docs/api/examples/post_projectsprojectidvpcsvms.txt
@@ -11,7 +11,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 220
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/vpcs/vms
{
@@ -20,5 +20,5 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"startup_script": null,
"startup_script_path": null,
- "vm_id": "68c6af80-0a82-406e-b051-24c95bd728f4"
+ "vm_id": "104b72e1-1d73-4153-989f-96731442f6a1"
}
diff --git a/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 360ffc76..fa73145e 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/4125e37f-2bf1-435c-a86c-ae1fce4c916a/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/b5d32250-bacf-4594-be35-e2d2d814a45c/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/4125e37f-2bf1-435c-a86c-ae1fce4c916a/adapters/0/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/b5d32250-bacf-4594-be35-e2d2d814a45c/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@@ -14,7 +14,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 7aa26e08..edc0e24e 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/4c5c5174-07bf-4f2a-93ab-cec244e24852/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/722b7e9d-ecc1-44cf-b743-609bb267ec65/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/4c5c5174-07bf-4f2a-93ab-cec244e24852/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/722b7e9d-ecc1-44cf-b743-609bb267ec65/reload HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 04eae9b0..ba660775 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/43ac3ea8-78a7-405e-ad5e-653293c48e66/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/0986e25f-6d7e-4a64-a8ea-b1a3a5541c46/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/43ac3ea8-78a7-405e-ad5e-653293c48e66/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/0986e25f-6d7e-4a64-a8ea-b1a3a5541c46/start HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 a8a44b4f..2271f66c 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/59df4b41-6a23-4c99-9370-600b3a2cff23/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a9b859ce-d847-402c-9db2-cd2d1bc4f67a/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/59df4b41-6a23-4c99-9370-600b3a2cff23/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/a9b859ce-d847-402c-9db2-cd2d1bc4f67a/stop HTTP/1.1
{}
@@ -8,6 +8,6 @@ HTTP/1.1 204
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
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 1bd3ea12..b26a6066 100644
--- a/docs/api/examples/post_version.txt
+++ b/docs/api/examples/post_version.txt
@@ -1,19 +1,19 @@
-curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.3.1.rc2"}'
+curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.4.0.dev1"}'
POST /v1/version HTTP/1.1
{
- "version": "1.3.1.rc2"
+ "version": "1.4.0.dev1"
}
HTTP/1.1 200
CONNECTION: keep-alive
-CONTENT-LENGTH: 30
+CONTENT-LENGTH: 31
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/version
{
- "version": "1.3.1.rc2"
+ "version": "1.4.0.dev1"
}
diff --git a/docs/api/examples/put_projectsprojectid.txt b/docs/api/examples/put_projectsprojectid.txt
index 54cf8429..13f3f6a7 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/b32aab45-411c-4171-9f20-357eaa00d54c' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-4450/test_update_path_project_non_l0"}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/ac4b48cf-f26c-4ab6-bce1-368fdffb112f' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_update_path_project_non_l0"}'
-PUT /v1/projects/b32aab45-411c-4171-9f20-357eaa00d54c HTTP/1.1
+PUT /v1/projects/ac4b48cf-f26c-4ab6-bce1-368fdffb112f HTTP/1.1
{
"name": "second_name",
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-4450/test_update_path_project_non_l0"
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_update_path_project_non_l0"
}
@@ -12,7 +12,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.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}
{
diff --git a/docs/api/examples/put_projectsprojectidiouvmsvmid.txt b/docs/api/examples/put_projectsprojectidiouvmsvmid.txt
index 80cd3523..fc1bc621 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/3812eced-e777-4f35-8c7e-e6736e34fcfd' -d '{"console": 2001, "ethernet_adapters": 4, "initial_config_content": "hostname test", "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "use_default_iou_values": true}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b75e3ec5-b42d-4e42-80a3-e79b2aab1efa' -d '{"console": 2001, "ethernet_adapters": 4, "initial_config_content": "hostname test", "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "use_default_iou_values": true}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3812eced-e777-4f35-8c7e-e6736e34fcfd HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b75e3ec5-b42d-4e42-80a3-e79b2aab1efa HTTP/1.1
{
"console": 2001,
"ethernet_adapters": 4,
@@ -17,24 +17,24 @@ PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3812eced-e777-4f35
HTTP/1.1 200
CONNECTION: keep-alive
-CONTENT-LENGTH: 461
+CONTENT-LENGTH: 545
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}
{
"console": 2001,
"ethernet_adapters": 4,
"initial_config": "initial-config.cfg",
- "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpws7fdl5e/iourc",
+ "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprshqaaaj/iourc",
"l1_keepalives": true,
"name": "test",
"nvram": 2048,
- "path": "iou.bin",
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-25/test_iou_update0/iou.bin",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 512,
"serial_adapters": 0,
"use_default_iou_values": true,
- "vm_id": "3812eced-e777-4f35-8c7e-e6736e34fcfd"
+ "vm_id": "b75e3ec5-b42d-4e42-80a3-e79b2aab1efa"
}
diff --git a/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt
index 288411b1..43bfd71f 100644
--- a/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt
+++ b/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e5b90e65-6f6a-4d44-b2d8-3a5c3a4a626b' -d '{"console": 2001, "hdb_disk_image": "/tmp/hdb", "name": "test", "ram": 1024}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8338f125-5b24-4bc9-a891-6ca1510396ad' -d '{"console": 2001, "hdb_disk_image": "/tmp/hdb", "name": "test", "ram": 1024}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/e5b90e65-6f6a-4d44-b2d8-3a5c3a4a626b HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8338f125-5b24-4bc9-a891-6ca1510396ad HTTP/1.1
{
"console": 2001,
"hdb_disk_image": "/tmp/hdb",
@@ -14,7 +14,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 601
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}
{
@@ -34,7 +34,7 @@ X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}
"options": "",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpyasp9636/qemu_x42",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpnb5_wdn4/qemu_x42",
"ram": 1024,
- "vm_id": "e5b90e65-6f6a-4d44-b2d8-3a5c3a4a626b"
+ "vm_id": "8338f125-5b24-4bc9-a891-6ca1510396ad"
}
diff --git a/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt
index 68ec4c22..b4070901 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/514963f5-93f8-4d18-bcd6-7d50ef7164a6' -d '{"console": 2010, "name": "test"}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4dac8148-a8d2-42a5-9f91-805c3490e0f6' -d '{"console": 2010, "name": "test"}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/514963f5-93f8-4d18-bcd6-7d50ef7164a6 HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4dac8148-a8d2-42a5-9f91-805c3490e0f6 HTTP/1.1
{
"console": 2010,
"name": "test"
@@ -12,7 +12,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 359
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
{
@@ -25,6 +25,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 0,
"use_any_adapter": false,
- "vm_id": "514963f5-93f8-4d18-bcd6-7d50ef7164a6",
+ "vm_id": "4dac8148-a8d2-42a5-9f91-805c3490e0f6",
"vmname": "VMTEST"
}
diff --git a/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt
index 70c8462c..f0007143 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/4905e649-6e81-446d-a60b-fd8b058a85e8' -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/19169b30-8673-43e6-a096-11a6ebea1538' -d '{"console": 2011, "name": "test", "startup_script": "ip 192.168.1.1"}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/4905e649-6e81-446d-a60b-fd8b058a85e8 HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/19169b30-8673-43e6-a096-11a6ebea1538 HTTP/1.1
{
"console": 2011,
"name": "test",
@@ -13,7 +13,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 236
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.3.1.rc2
+SERVER: Python/3.4 GNS3/1.4.0.dev1
X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
{
@@ -22,5 +22,5 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"startup_script": "ip 192.168.1.1",
"startup_script_path": "startup.vpc",
- "vm_id": "4905e649-6e81-446d-a60b-fd8b058a85e8"
+ "vm_id": "19169b30-8673-43e6-a096-11a6ebea1538"
}
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 0533ad08..f74e9656 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
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
+- **port_number**: Port on the device
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -128,9 +128,9 @@ Remove a NIO from a Dynamips device instance
Parameters
**********
-- **project_id**: UUID for the project
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
+- **port_number**: Port on the device
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst
index 117cd928..a33ba970 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
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
+- **port_number**: Port on the device
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst
index 9674ef65..75cf96a4 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
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
+- **port_number**: Port on the device
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/dynamipsvms.rst b/docs/api/v1/dynamips_vm/dynamipsvms.rst
new file mode 100644
index 00000000..476814cd
--- /dev/null
+++ b/docs/api/v1/dynamips_vm/dynamipsvms.rst
@@ -0,0 +1,13 @@
+/v1/dynamips/vms
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v1/dynamips/vms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the list of Dynamips VMS
+
+Response status codes
+**********************
+- **200**: List of Dynamips VM retrieved
+
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst
index 0ec4f747..9f8b27db 100644
--- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst
+++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmid.rst
@@ -9,8 +9,8 @@ Get a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -74,8 +74,8 @@ Update a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -110,7 +110,6 @@ Input
nvram | | integer | amount of NVRAM in KB |
platform | | string | platform |
power_supplies | | array | Power supplies status |
- private_config | | string | path to the IOS private configuration file |
private_config_base64 | | string | private configuration base64 encoded |
private_config_content | | string | Content of IOS private configuration file |
ram | | integer | amount of RAM in MB |
@@ -123,7 +122,6 @@ Input
slot5 | | | Network module slot 5 |
slot6 | | | Network module slot 6 |
sparsemem | | boolean | sparse memory feature |
- startup_config | | string | path to the IOS startup configuration file |
startup_config_base64 | | string | startup configuration base64 encoded |
startup_config_content | | string | Content of IOS startup configuration file |
system_id | | string | system ID |
@@ -188,8 +186,8 @@ Delete a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_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 c1c114ec..7886ad07 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter where the nio should be added
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -27,10 +27,10 @@ Remove a NIO from a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter from where the nio should be removed
- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter from where the nio should be removed
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
index 57271aac..6cc4d452 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter to start a packet capture
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
index c3b44232..ce104421 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter to stop a packet capture
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst
index 23bb67f3..d7d7df55 100644
--- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst
+++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidreload.rst
@@ -9,8 +9,8 @@ Reload a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst
index 73ce9d01..fcd48ab5 100644
--- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst
+++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst
index 24c3d2af..2dbd25b8 100644
--- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst
+++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstart.rst
@@ -9,8 +9,8 @@ Start a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst
index fca471b6..ff62c2c9 100644
--- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst
+++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidstop.rst
@@ -9,8 +9,8 @@ Stop a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst
index 54394e01..b6fb8a13 100644
--- a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst
+++ b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Dynamips VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/file.rst b/docs/api/v1/file.rst
new file mode 100644
index 00000000..47b74965
--- /dev/null
+++ b/docs/api/v1/file.rst
@@ -0,0 +1,8 @@
+File
+---------------------
+
+.. toctree::
+ :glob:
+ :maxdepth: 2
+
+ file/*
diff --git a/docs/api/v1/file/filesstream.rst b/docs/api/v1/file/filesstream.rst
new file mode 100644
index 00000000..7d61f7ce
--- /dev/null
+++ b/docs/api/v1/file/filesstream.rst
@@ -0,0 +1,24 @@
+/v1/files/stream
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v1/files/stream
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Stream a file from the server
+
+Response status codes
+**********************
+- **200**: File retrieved
+- **409**: Can't access to file
+- **404**: File doesn't exist
+
+Input
+*******
+.. raw:: html
+
+
+ Name | Mandatory | Type | Description |
+ location | ✔ | ['string'] | File path |
+
+
diff --git a/docs/api/v1/iou/iouvms.rst b/docs/api/v1/iou/iouvms.rst
new file mode 100644
index 00000000..80be4a0c
--- /dev/null
+++ b/docs/api/v1/iou/iouvms.rst
@@ -0,0 +1,13 @@
+/v1/iou/vms
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v1/iou/vms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the list of IOU VMS
+
+Response status codes
+**********************
+- **200**: List of IOU VM retrieved
+
diff --git a/docs/api/v1/iou/projectsprojectidiouvms.rst b/docs/api/v1/iou/projectsprojectidiouvms.rst
index 6387045e..e780349e 100644
--- a/docs/api/v1/iou/projectsprojectidiouvms.rst
+++ b/docs/api/v1/iou/projectsprojectidiouvms.rst
@@ -25,7 +25,8 @@ Input
Name | Mandatory | Type | Description |
console | | ['integer', 'null'] | console TCP port |
ethernet_adapters | | integer | How many ethernet adapters are connected to the IOU |
- initial_config_content | | ['string', 'null'] | Initial configuration of the IOU |
+ initial_config | | ['string', 'null'] | Path to the initial configuration of IOU |
+ initial_config_content | | ['string', 'null'] | Initial configuration of IOU |
iourc_content | | ['string', 'null'] | Content of the iourc file, if a file exist on servers this variable is ignored. It's mostly for compatibility with < 1.3 releases |
l1_keepalives | | ['boolean', 'null'] | Always up ethernet interface |
name | ✔ | string | IOU VM name |
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmid.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmid.rst
index 87bba3cf..6d98a4bc 100644
--- a/docs/api/v1/iou/projectsprojectidiouvmsvmid.rst
+++ b/docs/api/v1/iou/projectsprojectidiouvmsvmid.rst
@@ -9,8 +9,8 @@ Get a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -52,8 +52,8 @@ Update a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -70,7 +70,7 @@ Input
Name | Mandatory | Type | Description |
console | | ['integer', 'null'] | console TCP port |
ethernet_adapters | | ['integer', 'null'] | How many ethernet adapters are connected to the IOU |
- initial_config_content | | ['string', 'null'] | Initial configuration of the IOU |
+ initial_config_content | | ['string', 'null'] | Initial configuration of IOU |
iourc_content | | ['string', 'null'] | Content of the iourc file, if a file exist on servers this variable is ignored. It's mostly for compatibility with < 1.3 releases |
l1_keepalives | | ['boolean', 'null'] | Always up ethernet interface |
name | | ['string', 'null'] | IOU VM name |
@@ -115,8 +115,8 @@ Delete a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 748ed1e2..4f203c58 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port where the nio should be added
- **vm_id**: UUID for the instance
+- **adapter_number**: Network adapter where the nio is located
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port from where the nio should be removed
- **vm_id**: UUID for the instance
+- **adapter_number**: Network adapter where the nio is located
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
index cc7a521d..8886e031 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter to start a packet capture
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
index fb66ba89..a1b1d625 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter to stop a packet capture
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidreload.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidreload.rst
index 49be3d31..b8d8bb1d 100644
--- a/docs/api/v1/iou/projectsprojectidiouvmsvmidreload.rst
+++ b/docs/api/v1/iou/projectsprojectidiouvmsvmidreload.rst
@@ -9,8 +9,8 @@ Reload a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidstart.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidstart.rst
index 25a9e236..016018ff 100644
--- a/docs/api/v1/iou/projectsprojectidiouvmsvmidstart.rst
+++ b/docs/api/v1/iou/projectsprojectidiouvmsvmidstart.rst
@@ -9,8 +9,8 @@ Start a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidstop.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidstop.rst
index 220c81ad..e5aed265 100644
--- a/docs/api/v1/iou/projectsprojectidiouvmsvmidstop.rst
+++ b/docs/api/v1/iou/projectsprojectidiouvmsvmidstop.rst
@@ -9,8 +9,8 @@ Stop a IOU instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvms.rst b/docs/api/v1/qemu/projectsprojectidqemuvms.rst
index 6c3d8e65..62ce6757 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvms.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvms.rst
@@ -5,7 +5,7 @@
POST /v1/projects/**{project_id}**/qemu/vms
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Create a new Qemu.instance
+Create a new Qemu VM instance
Parameters
**********
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst
index 396d5db1..7cf89de6 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst
@@ -5,12 +5,12 @@
GET /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Get a Qemu.instance
+Get a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -54,12 +54,12 @@ Sample session
PUT /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Update a Qemu.instance
+Update a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -129,12 +129,12 @@ Sample session
DELETE /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Delete a Qemu.instance
+Delete a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index d9a76999..71edd895 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst
@@ -5,14 +5,14 @@
POST /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Add a NIO to a Qemu.instance
+Add a NIO to a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Network adapter where the nio is located
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -29,14 +29,14 @@ Sample session
DELETE /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Remove a NIO from a Qemu.instance
+Remove a NIO from a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Network adapter where the nio is located
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidreload.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidreload.rst
index 5b29cec3..e6d5207a 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidreload.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidreload.rst
@@ -5,12 +5,12 @@
POST /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/reload
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Reload a Qemu.instance
+Reload a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidresume.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidresume.rst
index 59b5c1f7..18438d24 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidresume.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidresume.rst
@@ -5,12 +5,12 @@
POST /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/resume
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Resume a Qemu.instance
+Resume a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstart.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstart.rst
index f5306892..a6d8b5b8 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstart.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstart.rst
@@ -5,12 +5,12 @@
POST /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/start
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Start a Qemu.instance
+Start a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstop.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstop.rst
index d5c41c96..6c3a7417 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstop.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidstop.rst
@@ -5,12 +5,12 @@
POST /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/stop
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Stop a Qemu.instance
+Stop a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidsuspend.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidsuspend.rst
index 63e8c94a..eba15bfc 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidsuspend.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidsuspend.rst
@@ -5,12 +5,12 @@
POST /v1/projects/**{project_id}**/qemu/vms/**{vm_id}**/suspend
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Suspend a Qemu.instance
+Suspend a Qemu VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/qemu/qemuvms.rst b/docs/api/v1/qemu/qemuvms.rst
new file mode 100644
index 00000000..fa8208c9
--- /dev/null
+++ b/docs/api/v1/qemu/qemuvms.rst
@@ -0,0 +1,13 @@
+/v1/qemu/vms
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v1/qemu/vms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the list of Qemu images
+
+Response status codes
+**********************
+- **200**: List of Qemu images retrieved
+
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmid.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmid.rst
index 6c974e12..d345c454 100644
--- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmid.rst
+++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmid.rst
@@ -9,8 +9,8 @@ Get a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -50,8 +50,8 @@ Update a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -109,8 +109,8 @@ Delete a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 19b76253..c6e4393b 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter where the nio should be added
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter from where the nio should be removed
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter from where the nio should be removed
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
index 47b4fdca..ac55cd81 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter to start a packet capture
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
index 057170b0..65899c26 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
+- **adapter_number**: Adapter to stop a packet capture
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst
index 9ae84c29..d3c83c0e 100644
--- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst
+++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidreload.rst
@@ -9,8 +9,8 @@ Reload a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst
index 0fb9d427..e05c62dc 100644
--- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst
+++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst
index 5e6a6c42..5901fdbf 100644
--- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst
+++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstart.rst
@@ -9,8 +9,8 @@ Start a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst
index 1eaac889..cc20ef18 100644
--- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst
+++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidstop.rst
@@ -9,8 +9,8 @@ Stop a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst
index ad7f469b..e957b666 100644
--- a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst
+++ b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a VirtualBox VM instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/vmware.rst b/docs/api/v1/vmware.rst
new file mode 100644
index 00000000..6a3cf3a0
--- /dev/null
+++ b/docs/api/v1/vmware.rst
@@ -0,0 +1,8 @@
+Vmware
+---------------------
+
+.. toctree::
+ :glob:
+ :maxdepth: 2
+
+ vmware/*
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevms.rst b/docs/api/v1/vmware/projectsprojectidvmwarevms.rst
new file mode 100644
index 00000000..bb8ea8a1
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevms.rst
@@ -0,0 +1,49 @@
+/v1/projects/{project_id}/vmware/vms
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Create a new VMware VM instance
+
+Parameters
+**********
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **201**: Instance created
+- **409**: Conflict
+
+Input
+*******
+.. raw:: html
+
+
+ Name | Mandatory | Type | Description |
+ console | | integer | console TCP port |
+ enable_remote_console | | boolean | enable the remote console |
+ headless | | boolean | headless mode |
+ linked_clone | ✔ | boolean | either the VM is a linked clone or not |
+ name | ✔ | string | VMware VM instance name |
+ vm_id | | string | VMware VM instance identifier |
+ vmx_path | ✔ | string | path to the vmx file |
+
+
+Output
+*******
+.. raw:: html
+
+
+ Name | Mandatory | Type | Description |
+ console | | integer | console TCP port |
+ enable_remote_console | | boolean | enable the remote console |
+ headless | | boolean | headless mode |
+ name | ✔ | string | VMware VM instance name |
+ project_id | ✔ | string | Project UUID |
+ vm_id | ✔ | string | VMware VM instance UUID |
+ vmx_path | | string | path to the vmx file |
+
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmid.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmid.rst
new file mode 100644
index 00000000..54445e72
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmid.rst
@@ -0,0 +1,96 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Get a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **200**: Success
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+
+Output
+*******
+.. raw:: html
+
+
+ Name | Mandatory | Type | Description |
+ console | | integer | console TCP port |
+ enable_remote_console | | boolean | enable the remote console |
+ headless | | boolean | headless mode |
+ name | ✔ | string | VMware VM instance name |
+ project_id | ✔ | string | Project UUID |
+ vm_id | ✔ | string | VMware VM instance UUID |
+ vmx_path | | string | path to the vmx file |
+
+
+
+PUT /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Update a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **200**: Instance updated
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **409**: Conflict
+
+Input
+*******
+.. raw:: html
+
+
+ Name | Mandatory | Type | Description |
+ console | | integer | console TCP port |
+ enable_remote_console | | boolean | enable the remote console |
+ headless | | boolean | headless mode |
+ name | | string | VMware VM instance name |
+ vmx_path | | string | path to the vmx file |
+
+
+Output
+*******
+.. raw:: html
+
+
+ Name | Mandatory | Type | Description |
+ console | | integer | console TCP port |
+ enable_remote_console | | boolean | enable the remote console |
+ headless | | boolean | headless mode |
+ name | ✔ | string | VMware VM instance name |
+ project_id | ✔ | string | Project UUID |
+ vm_id | ✔ | string | VMware VM instance UUID |
+ vmx_path | | string | path to the vmx file |
+
+
+
+DELETE /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Delete a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance deleted
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidreload.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidreload.rst
new file mode 100644
index 00000000..48cc00cc
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidreload.rst
@@ -0,0 +1,20 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/reload
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/reload
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Reload a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance reloaded
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidresume.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidresume.rst
new file mode 100644
index 00000000..f8a72a32
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidresume.rst
@@ -0,0 +1,20 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/resume
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/resume
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Resume a suspended VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance resumed
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidstart.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidstart.rst
new file mode 100644
index 00000000..b15387b7
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidstart.rst
@@ -0,0 +1,20 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/start
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/start
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Start a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance started
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidstop.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidstop.rst
new file mode 100644
index 00000000..6cc98d74
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidstop.rst
@@ -0,0 +1,20 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/stop
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/stop
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Stop a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance stopped
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidsuspend.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidsuspend.rst
new file mode 100644
index 00000000..d1e80e27
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidsuspend.rst
@@ -0,0 +1,20 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/suspend
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/suspend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Suspend a VMware VM instance
+
+Parameters
+**********
+- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance suspended
+
diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmid.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmid.rst
index 08762d16..0ff49d0a 100644
--- a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmid.rst
+++ b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmid.rst
@@ -9,8 +9,8 @@ Get a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -45,8 +45,8 @@ Update a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -93,8 +93,8 @@ Delete a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 7592c97c..21a4ae02 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
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port where the nio should be added
- **vm_id**: UUID for the instance
+- **adapter_number**: Network adapter where the nio is located
+- **project_id**: UUID for the project
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
-- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port from where the nio should be removed
- **vm_id**: UUID for the instance
+- **adapter_number**: Network adapter where the nio is located
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidreload.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidreload.rst
index 224798fd..0aa2eea1 100644
--- a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidreload.rst
+++ b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidreload.rst
@@ -9,8 +9,8 @@ Reload a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstart.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstart.rst
index b87f43a6..838a512b 100644
--- a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstart.rst
+++ b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstart.rst
@@ -9,8 +9,8 @@ Start a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstop.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstop.rst
index 269c8953..606cc8fb 100644
--- a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstop.rst
+++ b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidstop.rst
@@ -9,8 +9,8 @@ Stop a VPCS instance
Parameters
**********
-- **project_id**: UUID for the project
- **vm_id**: UUID for the instance
+- **project_id**: UUID for the project
Response status codes
**********************
diff --git a/tests/modules/iou/test_iou_vm.py b/tests/modules/iou/test_iou_vm.py
index 398c2215..fab4d48f 100644
--- a/tests/modules/iou/test_iou_vm.py
+++ b/tests/modules/iou/test_iou_vm.py
@@ -342,7 +342,7 @@ def test_enable_l1_keepalives(loop, vm):
def test_start_capture(vm, tmpdir, manager, free_console_port, loop):
output_file = str(tmpdir / "test.pcap")
- nio = manager.create_nio(vm.iouyap_path, {"type": "nio_udp", "lport": free_console_port, "rport": free_console_port, "rhost": "192.168.1.2"})
+ nio = manager.create_nio(vm.iouyap_path, {"type": "nio_udp", "lport": free_console_port, "rport": free_console_port, "rhost": "127.0.0.1"})
vm.adapter_add_nio_binding(0, 0, nio)
loop.run_until_complete(asyncio.async(vm.start_capture(0, 0, output_file)))
assert vm._adapters[0].get_nio(0).capturing
@@ -351,7 +351,7 @@ def test_start_capture(vm, tmpdir, manager, free_console_port, loop):
def test_stop_capture(vm, tmpdir, manager, free_console_port, loop):
output_file = str(tmpdir / "test.pcap")
- nio = manager.create_nio(vm.iouyap_path, {"type": "nio_udp", "lport": free_console_port, "rport": free_console_port, "rhost": "192.168.1.2"})
+ nio = manager.create_nio(vm.iouyap_path, {"type": "nio_udp", "lport": free_console_port, "rport": free_console_port, "rhost": "127.0.0.1"})
vm.adapter_add_nio_binding(0, 0, nio)
loop.run_until_complete(vm.start_capture(0, 0, output_file))
assert vm._adapters[0].get_nio(0).capturing