diff --git a/docs/api/examples/delete_projectsprojectid.txt b/docs/api/examples/delete_projectsprojectid.txt
index f3240174..3b468701 100644
--- a/docs/api/examples/delete_projectsprojectid.txt
+++ b/docs/api/examples/delete_projectsprojectid.txt
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}
diff --git a/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt b/docs/api/examples/delete_projectsprojectidiouvmsvmid.txt
index e78459a5..751d40da 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/d7c56046-7535-45f4-aeca-1b5821c6717c'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/468f944e-e195-4a5d-b192-8c954f46d028'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/d7c56046-7535-45f4-aeca-1b5821c6717c HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/468f944e-e195-4a5d-b192-8c954f46d028 HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 b773322e..d0e16c24 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/983db82c-d39d-435d-b586-66ef2cb032b9/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/85c30dd1-bb4f-4826-aa67-74574ffc400a/adapters/1/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/983db82c-d39d-435d-b586-66ef2cb032b9/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/85c30dd1-bb4f-4826-aa67-74574ffc400a/adapters/1/ports/0/nio HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 ab63b7f6..cabb07ad 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/0d65d66c-3220-4ef1-a5e2-7064d3b1e576'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d18deaf3-f59a-423d-8de6-0fab7b3ac21e'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/0d65d66c-3220-4ef1-a5e2-7064d3b1e576 HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/d18deaf3-f59a-423d-8de6-0fab7b3ac21e HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 9c22f2fe..8d109e99 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/c65c1cf0-27d4-4fe1-91bb-6f3f70b379bf/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/56a77fc8-cdb4-417b-aacd-dc8cbd47736a/adapters/1/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/c65c1cf0-27d4-4fe1-91bb-6f3f70b379bf/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/56a77fc8-cdb4-417b-aacd-dc8cbd47736a/adapters/1/ports/0/nio HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 b6abbae0..04c5e824 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/739ee208-b0bd-466f-98bf-a48da2bb17b3/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/1e9000cf-f12d-48d7-8d17-814c048fd2dd/adapters/0/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/739ee208-b0bd-466f-98bf-a48da2bb17b3/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/1e9000cf-f12d-48d7-8d17-814c048fd2dd/adapters/0/ports/0/nio HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 f3a0e7e1..01c91f9e 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/12ac0a2f-d5d3-4d92-a996-87870c8b1ad0'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c8f5fb77-a38c-44dc-8cc3-effc463c96b4'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/12ac0a2f-d5d3-4d92-a996-87870c8b1ad0 HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c8f5fb77-a38c-44dc-8cc3-effc463c96b4 HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 37936857..c5dad901 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/6f19c6a0-c705-493c-8ed8-bbce923ef60b/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/01e74a7c-c765-4273-bef3-fdfe7cc1ddfa/adapters/0/ports/0/nio'
-DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/6f19c6a0-c705-493c-8ed8-bbce923ef60b/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/01e74a7c-c765-4273-bef3-fdfe7cc1ddfa/adapters/0/ports/0/nio HTTP/1.1
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 594b62e1..5109d1f8 100644
--- a/docs/api/examples/get_interfaces.txt
+++ b/docs/api/examples/get_interfaces.txt
@@ -7,10 +7,10 @@ GET /v1/interfaces HTTP/1.1
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 1264
+CONTENT-LENGTH: 6181
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/interfaces
[
@@ -31,12 +31,12 @@ X-ROUTE: /v1/interfaces
},
{
"id": "en0",
- "ip_address": "192.168.84.118",
+ "ip_address": "",
"name": "en0"
},
{
"id": "en1",
- "ip_address": "",
+ "ip_address": "192.168.84.114",
"name": "en1"
},
{
@@ -61,7 +61,7 @@ X-ROUTE: /v1/interfaces
},
{
"id": "vboxnet0",
- "ip_address": "172.16.43.1",
+ "ip_address": "",
"name": "vboxnet0"
},
{
@@ -74,14 +74,259 @@ X-ROUTE: /v1/interfaces
"ip_address": "",
"name": "vboxnet2"
},
+ {
+ "id": "vboxnet3",
+ "ip_address": "192.168.99.1",
+ "name": "vboxnet3"
+ },
{
"id": "vmnet1",
"ip_address": "172.16.16.1",
"name": "vmnet1"
},
+ {
+ "id": "vmnet2",
+ "ip_address": "172.16.0.1",
+ "name": "vmnet2"
+ },
+ {
+ "id": "vmnet3",
+ "ip_address": "172.16.1.1",
+ "name": "vmnet3"
+ },
+ {
+ "id": "vmnet4",
+ "ip_address": "172.16.2.1",
+ "name": "vmnet4"
+ },
+ {
+ "id": "vmnet5",
+ "ip_address": "172.16.3.1",
+ "name": "vmnet5"
+ },
+ {
+ "id": "vmnet6",
+ "ip_address": "172.16.4.1",
+ "name": "vmnet6"
+ },
+ {
+ "id": "vmnet7",
+ "ip_address": "172.16.5.1",
+ "name": "vmnet7"
+ },
{
"id": "vmnet8",
"ip_address": "192.168.229.1",
"name": "vmnet8"
+ },
+ {
+ "id": "vmnet9",
+ "ip_address": "172.16.6.1",
+ "name": "vmnet9"
+ },
+ {
+ "id": "vmnet10",
+ "ip_address": "172.16.7.1",
+ "name": "vmnet10"
+ },
+ {
+ "id": "vmnet11",
+ "ip_address": "172.16.8.1",
+ "name": "vmnet11"
+ },
+ {
+ "id": "vmnet12",
+ "ip_address": "172.16.9.1",
+ "name": "vmnet12"
+ },
+ {
+ "id": "vmnet13",
+ "ip_address": "172.16.10.1",
+ "name": "vmnet13"
+ },
+ {
+ "id": "vmnet14",
+ "ip_address": "172.16.11.1",
+ "name": "vmnet14"
+ },
+ {
+ "id": "vmnet15",
+ "ip_address": "172.16.12.1",
+ "name": "vmnet15"
+ },
+ {
+ "id": "vmnet16",
+ "ip_address": "172.16.13.1",
+ "name": "vmnet16"
+ },
+ {
+ "id": "vmnet17",
+ "ip_address": "172.16.14.1",
+ "name": "vmnet17"
+ },
+ {
+ "id": "vmnet18",
+ "ip_address": "172.16.15.1",
+ "name": "vmnet18"
+ },
+ {
+ "id": "vmnet19",
+ "ip_address": "172.16.17.1",
+ "name": "vmnet19"
+ },
+ {
+ "id": "vmnet20",
+ "ip_address": "172.16.18.1",
+ "name": "vmnet20"
+ },
+ {
+ "id": "vmnet21",
+ "ip_address": "172.16.19.1",
+ "name": "vmnet21"
+ },
+ {
+ "id": "vmnet22",
+ "ip_address": "172.16.20.1",
+ "name": "vmnet22"
+ },
+ {
+ "id": "vmnet23",
+ "ip_address": "172.16.21.1",
+ "name": "vmnet23"
+ },
+ {
+ "id": "vmnet24",
+ "ip_address": "172.16.22.1",
+ "name": "vmnet24"
+ },
+ {
+ "id": "vmnet25",
+ "ip_address": "172.16.23.1",
+ "name": "vmnet25"
+ },
+ {
+ "id": "vmnet26",
+ "ip_address": "172.16.24.1",
+ "name": "vmnet26"
+ },
+ {
+ "id": "vmnet27",
+ "ip_address": "172.16.25.1",
+ "name": "vmnet27"
+ },
+ {
+ "id": "vmnet28",
+ "ip_address": "172.16.26.1",
+ "name": "vmnet28"
+ },
+ {
+ "id": "vmnet29",
+ "ip_address": "172.16.27.1",
+ "name": "vmnet29"
+ },
+ {
+ "id": "vmnet30",
+ "ip_address": "172.16.28.1",
+ "name": "vmnet30"
+ },
+ {
+ "id": "vmnet31",
+ "ip_address": "172.16.29.1",
+ "name": "vmnet31"
+ },
+ {
+ "id": "vmnet32",
+ "ip_address": "172.16.30.1",
+ "name": "vmnet32"
+ },
+ {
+ "id": "vmnet33",
+ "ip_address": "172.16.31.1",
+ "name": "vmnet33"
+ },
+ {
+ "id": "vmnet34",
+ "ip_address": "172.16.32.1",
+ "name": "vmnet34"
+ },
+ {
+ "id": "vmnet35",
+ "ip_address": "172.16.33.1",
+ "name": "vmnet35"
+ },
+ {
+ "id": "vmnet36",
+ "ip_address": "172.16.34.1",
+ "name": "vmnet36"
+ },
+ {
+ "id": "vmnet37",
+ "ip_address": "172.16.35.1",
+ "name": "vmnet37"
+ },
+ {
+ "id": "vmnet38",
+ "ip_address": "172.16.36.1",
+ "name": "vmnet38"
+ },
+ {
+ "id": "vmnet39",
+ "ip_address": "172.16.37.1",
+ "name": "vmnet39"
+ },
+ {
+ "id": "vmnet40",
+ "ip_address": "172.16.38.1",
+ "name": "vmnet40"
+ },
+ {
+ "id": "vmnet41",
+ "ip_address": "172.16.39.1",
+ "name": "vmnet41"
+ },
+ {
+ "id": "vmnet42",
+ "ip_address": "172.16.40.1",
+ "name": "vmnet42"
+ },
+ {
+ "id": "vmnet43",
+ "ip_address": "172.16.41.1",
+ "name": "vmnet43"
+ },
+ {
+ "id": "vmnet44",
+ "ip_address": "172.16.42.1",
+ "name": "vmnet44"
+ },
+ {
+ "id": "vmnet45",
+ "ip_address": "172.16.43.1",
+ "name": "vmnet45"
+ },
+ {
+ "id": "vmnet46",
+ "ip_address": "172.16.44.1",
+ "name": "vmnet46"
+ },
+ {
+ "id": "vmnet47",
+ "ip_address": "172.16.45.1",
+ "name": "vmnet47"
+ },
+ {
+ "id": "vmnet48",
+ "ip_address": "172.16.46.1",
+ "name": "vmnet48"
+ },
+ {
+ "id": "vmnet49",
+ "ip_address": "172.16.47.1",
+ "name": "vmnet49"
+ },
+ {
+ "id": "vmnet50",
+ "ip_address": "172.16.48.1",
+ "name": "vmnet50"
}
]
diff --git a/docs/api/examples/get_iouvms.txt b/docs/api/examples/get_iouvms.txt
index 9a66abc9..a34e9cfc 100644
--- a/docs/api/examples/get_iouvms.txt
+++ b/docs/api/examples/get_iouvms.txt
@@ -7,14 +7,15 @@ GET /v1/iou/vms HTTP/1.1
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 45
+CONTENT-LENGTH: 72
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/iou/vms
[
{
- "filename": "iou.bin"
+ "filename": "iou.bin",
+ "path": "iou.bin"
}
]
diff --git a/docs/api/examples/get_projects.txt b/docs/api/examples/get_projects.txt
index 8b13df8d..857fed6c 100644
--- a/docs/api/examples/get_projects.txt
+++ b/docs/api/examples/get_projects.txt
@@ -10,21 +10,21 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 656
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects
[
{
- "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw",
+ "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppth7jfny",
"name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw/00010203-0405-0607-0809-0a0b0c0d0e0f",
+ "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppth7jfny/00010203-0405-0607-0809-0a0b0c0d0e0f",
"project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f",
"temporary": false
},
{
- "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw",
+ "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppth7jfny",
"name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp49p2ascw/00010203-0405-0607-0809-0a0b0c0d0e0b",
+ "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppth7jfny/00010203-0405-0607-0809-0a0b0c0d0e0b",
"project_id": "00010203-0405-0607-0809-0a0b0c0d0e0b",
"temporary": false
}
diff --git a/docs/api/examples/get_projectsprojectid.txt b/docs/api/examples/get_projectsprojectid.txt
index 9b1e9ff3..bfa6e8b1 100644
--- a/docs/api/examples/get_projectsprojectid.txt
+++ b/docs/api/examples/get_projectsprojectid.txt
@@ -10,13 +10,13 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 297
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}
{
- "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph5jkq_a4",
+ "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpytbnsctl",
"name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph5jkq_a4/00010203-0405-0607-0809-0a0b0c0d0e02",
+ "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpytbnsctl/00010203-0405-0607-0809-0a0b0c0d0e02",
"project_id": "00010203-0405-0607-0809-0a0b0c0d0e02",
"temporary": false
}
diff --git a/docs/api/examples/get_projectsprojectidfiles.txt b/docs/api/examples/get_projectsprojectidfiles.txt
index a75f639c..d5ce89fc 100644
--- a/docs/api/examples/get_projectsprojectidfiles.txt
+++ b/docs/api/examples/get_projectsprojectidfiles.txt
@@ -10,7 +10,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 204
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/files
[
diff --git a/docs/api/examples/get_projectsprojectidiouvmsvmid.txt b/docs/api/examples/get_projectsprojectidiouvmsvmid.txt
index 6b9159dd..59469c12 100644
--- a/docs/api/examples/get_projectsprojectidiouvmsvmid.txt
+++ b/docs/api/examples/get_projectsprojectidiouvmsvmid.txt
@@ -1,16 +1,16 @@
-curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/637d55e9-5f91-4de0-bb81-58905a4245b9'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/1c801186-7a6d-4e92-9a10-9d61e8bdc25a'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/637d55e9-5f91-4de0-bb81-58905a4245b9 HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/1c801186-7a6d-4e92-9a10-9d61e8bdc25a HTTP/1.1
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 722
+CONTENT-LENGTH: 721
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}
{
@@ -21,13 +21,13 @@ X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}
"md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
"name": "PC TEST 1",
"nvram": 128,
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_get0/iou.bin",
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_iou_get0/iou.bin",
"private_config": null,
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 256,
"serial_adapters": 2,
"startup_config": null,
"use_default_iou_values": true,
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/637d55e9-5f91-4de0-bb81-58905a4245b9",
- "vm_id": "637d55e9-5f91-4de0-bb81-58905a4245b9"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph6drru9t/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/1c801186-7a6d-4e92-9a10-9d61e8bdc25a",
+ "vm_id": "1c801186-7a6d-4e92-9a10-9d61e8bdc25a"
}
diff --git a/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt b/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt
index 633ca7a6..331061fc 100644
--- a/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt
+++ b/docs/api/examples/get_projectsprojectidiouvmsvmidconfigs.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/88536f60-dc74-4319-ba22-1a8e1919fe69/configs'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/46c8a3b3-12a2-42ff-9542-0d9e43dea734/configs'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/88536f60-dc74-4319-ba22-1a8e1919fe69/configs HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/46c8a3b3-12a2-42ff-9542-0d9e43dea734/configs HTTP/1.1
@@ -10,7 +10,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 40
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}/configs
{
diff --git a/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt
index 51cbfa4f..8834ad93 100644
--- a/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt
+++ b/docs/api/examples/get_projectsprojectidqemuvmsvmid.txt
@@ -1,47 +1,55 @@
-curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7b21f651-636f-40e3-9556-631b64ce6a0f'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a5c7b71e-03a5-4fe8-a7c5-ec5bd6e60a62'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7b21f651-636f-40e3-9556-631b64ce6a0f HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a5c7b71e-03a5-4fe8-a7c5-ec5bd6e60a62 HTTP/1.1
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 1108
+CONTENT-LENGTH: 1336
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}
{
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
+ "boot_priority": "c",
+ "cdrom_image": "",
+ "cdrom_image_md5sum": null,
"console": 2000,
"console_type": "telnet",
"cpu_throttling": 0,
+ "cpus": 1,
"hda_disk_image": "",
"hda_disk_image_md5sum": null,
+ "hda_disk_interface": "ide",
"hdb_disk_image": "",
"hdb_disk_image_md5sum": null,
+ "hdb_disk_interface": "ide",
"hdc_disk_image": "",
"hdc_disk_image_md5sum": null,
+ "hdc_disk_interface": "ide",
"hdd_disk_image": "",
"hdd_disk_image_md5sum": null,
+ "hdd_disk_interface": "ide",
"initrd": "",
"initrd_md5sum": null,
"kernel_command_line": "",
"kernel_image": "",
"kernel_image_md5sum": null,
"legacy_networking": false,
- "mac_address": "00:00:ab:6a:0f:00",
+ "mac_address": "00:00:ab:0a:62:00",
"name": "PC TEST 1",
"options": "",
"platform": "x86_64",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3zzynydr/qemu-system-x86_64",
"ram": 256,
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/7b21f651-636f-40e3-9556-631b64ce6a0f",
- "vm_id": "7b21f651-636f-40e3-9556-631b64ce6a0f"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbbmb6tc1/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/a5c7b71e-03a5-4fe8-a7c5-ec5bd6e60a62",
+ "vm_id": "a5c7b71e-03a5-4fe8-a7c5-ec5bd6e60a62"
}
diff --git a/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/get_projectsprojectidvirtualboxvmsvmid.txt
index 883bdc76..3980dd80 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/55f30d6b-9308-4960-9edf-b50a1015393b'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/2210fd53-0ea3-4c66-8de0-9cceedb471fe'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/55f30d6b-9308-4960-9edf-b50a1015393b HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/2210fd53-0ea3-4c66-8de0-9cceedb471fe HTTP/1.1
@@ -10,7 +10,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 415
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
{
@@ -25,6 +25,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
"ram": 0,
"use_any_adapter": false,
"vm_directory": null,
- "vm_id": "55f30d6b-9308-4960-9edf-b50a1015393b",
+ "vm_id": "2210fd53-0ea3-4c66-8de0-9cceedb471fe",
"vmname": "VMTEST"
}
diff --git a/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/get_projectsprojectidvpcsvmsvmid.txt
index 9af61db6..3c93307b 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/f567fd70-ecbc-4fde-9b58-3639810def3f'
+curl -i -X GET 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/521f3776-d6d0-42a3-ac6d-7dc0c19d7fad'
-GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/f567fd70-ecbc-4fde-9b58-3639810def3f HTTP/1.1
+GET /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/521f3776-d6d0-42a3-ac6d-7dc0c19d7fad HTTP/1.1
@@ -10,7 +10,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 422
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
{
@@ -20,6 +20,6 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
"startup_script": null,
"startup_script_path": null,
"status": "stopped",
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f567fd70-ecbc-4fde-9b58-3639810def3f",
- "vm_id": "f567fd70-ecbc-4fde-9b58-3639810def3f"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbbmb6tc1/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/521f3776-d6d0-42a3-ac6d-7dc0c19d7fad",
+ "vm_id": "521f3776-d6d0-42a3-ac6d-7dc0c19d7fad"
}
diff --git a/docs/api/examples/get_qemubinaries.txt b/docs/api/examples/get_qemubinaries.txt
index 19220df1..410245d7 100644
--- a/docs/api/examples/get_qemubinaries.txt
+++ b/docs/api/examples/get_qemubinaries.txt
@@ -10,7 +10,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 134
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/qemu/binaries
[
diff --git a/docs/api/examples/get_version.txt b/docs/api/examples/get_version.txt
index 83468219..466035b6 100644
--- a/docs/api/examples/get_version.txt
+++ b/docs/api/examples/get_version.txt
@@ -7,13 +7,13 @@ GET /v1/version HTTP/1.1
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 49
+CONTENT-LENGTH: 50
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/version
{
"local": true,
- "version": "1.4.0dev3"
+ "version": "1.4.0.dev9"
}
diff --git a/docs/api/examples/post_configreload.txt b/docs/api/examples/post_configreload.txt
index 3ba05d55..765dfb2a 100644
--- a/docs/api/examples/post_configreload.txt
+++ b/docs/api/examples/post_configreload.txt
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/config/reload
diff --git a/docs/api/examples/post_projects.txt b/docs/api/examples/post_projects.txt
index 7d2614e3..bb87e491 100644
--- a/docs/api/examples/post_projects.txt
+++ b/docs/api/examples/post_projects.txt
@@ -12,13 +12,13 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 297
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects
{
- "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpa178xv0w",
+ "location": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpz4njup0u",
"name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpa178xv0w/d6a59a61-52e7-471a-8930-ef27a313e606",
- "project_id": "d6a59a61-52e7-471a-8930-ef27a313e606",
+ "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpz4njup0u/2547d75b-6059-4cff-a2ff-ac78ad5b98c7",
+ "project_id": "2547d75b-6059-4cff-a2ff-ac78ad5b98c7",
"temporary": false
}
diff --git a/docs/api/examples/post_projectsprojectidclose.txt b/docs/api/examples/post_projectsprojectidclose.txt
index 92b1be85..97018360 100644
--- a/docs/api/examples/post_projectsprojectidclose.txt
+++ b/docs/api/examples/post_projectsprojectidclose.txt
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/close
diff --git a/docs/api/examples/post_projectsprojectidcommit.txt b/docs/api/examples/post_projectsprojectidcommit.txt
index bb017c54..11396e95 100644
--- a/docs/api/examples/post_projectsprojectidcommit.txt
+++ b/docs/api/examples/post_projectsprojectidcommit.txt
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/commit
diff --git a/docs/api/examples/post_projectsprojectidiouvms.txt b/docs/api/examples/post_projectsprojectidiouvms.txt
index c0464565..8a46b970 100644
--- a/docs/api/examples/post_projectsprojectidiouvms.txt
+++ b/docs/api/examples/post_projectsprojectidiouvms.txt
@@ -1,21 +1,21 @@
-curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_create_startup_config0/iou.bin", "startup_config_content": "hostname test", "vm_id": "8f682934-a104-40f3-b70f-c4078ef89bc0"}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_iou_create_startup_config0/iou.bin", "startup_config_content": "hostname test", "vm_id": "57ca3a20-ffd9-4b99-b35c-038552374f05"}'
POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms HTTP/1.1
{
"name": "PC TEST 1",
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_create_startup_config0/iou.bin",
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_iou_create_startup_config0/iou.bin",
"startup_config_content": "hostname test",
- "vm_id": "8f682934-a104-40f3-b70f-c4078ef89bc0"
+ "vm_id": "57ca3a20-ffd9-4b99-b35c-038552374f05"
}
HTTP/1.1 201
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 756
+CONTENT-LENGTH: 755
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/iou/vms
{
@@ -26,13 +26,13 @@ X-ROUTE: /v1/projects/{project_id}/iou/vms
"md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
"name": "PC TEST 1",
"nvram": 128,
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_create_startup_config0/iou.bin",
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_iou_create_startup_config0/iou.bin",
"private_config": null,
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 256,
"serial_adapters": 2,
"startup_config": "startup-config.cfg",
"use_default_iou_values": true,
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/8f682934-a104-40f3-b70f-c4078ef89bc0",
- "vm_id": "8f682934-a104-40f3-b70f-c4078ef89bc0"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph6drru9t/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/57ca3a20-ffd9-4b99-b35c-038552374f05",
+ "vm_id": "57ca3a20-ffd9-4b99-b35c-038552374f05"
}
diff --git a/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index c3291054..624bcdee 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/fda1e4a4-a7c8-4011-96ec-dc266b81f8fb/adapters/1/ports/0/nio' -d '{"ethernet_device": "lo0", "type": "nio_generic_ethernet"}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3ae4cab0-1bd0-4382-9192-5b78868d1626/adapters/1/ports/0/nio' -d '{"ethernet_device": "lo0", "type": "nio_generic_ethernet"}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/fda1e4a4-a7c8-4011-96ec-dc266b81f8fb/adapters/1/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3ae4cab0-1bd0-4382-9192-5b78868d1626/adapters/1/ports/0/nio HTTP/1.1
{
"ethernet_device": "lo0",
"type": "nio_generic_ethernet"
@@ -13,7 +13,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 68
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 e1750dca..15d01f47 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/6f21b20f-9d37-4dd1-a169-6eb17ec7da59/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/98a1fa54-ff5e-4119-85a5-20a7b5fdac31/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/6f21b20f-9d37-4dd1-a169-6eb17ec7da59/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/98a1fa54-ff5e-4119-85a5-20a7b5fdac31/adapters/0/ports/0/start_capture HTTP/1.1
{
"capture_file_name": "test.pcap",
"data_link_type": "DLT_EN10MB"
@@ -13,9 +13,9 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 158
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
+ "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph6drru9t/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 781962ba..cffef79a 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/f7c0218d-7822-4eb0-be89-d74cc1eb138f/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/68c9da1c-6960-4c6e-aea1-e4f76e313341/adapters/0/ports/0/stop_capture' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f7c0218d-7822-4eb0-be89-d74cc1eb138f/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/68c9da1c-6960-4c6e-aea1-e4f76e313341/adapters/0/ports/0/stop_capture HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 3177a79c..e63fa6e0 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/463da942-6b35-4edf-a046-8ec4c65ba755/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7aecd0ae-3b0d-4b00-b8b6-0de9caffd102/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/463da942-6b35-4edf-a046-8ec4c65ba755/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7aecd0ae-3b0d-4b00-b8b6-0de9caffd102/reload HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 63c5d4e6..7784fea1 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/0e16aefc-8fa8-4123-8497-1190b8366c7c/start' -d '{"iourc_content": "test"}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f932ec58-f509-44e6-8b30-aa0de3cc98e8/start' -d '{"iourc_content": "test"}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/0e16aefc-8fa8-4123-8497-1190b8366c7c/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f932ec58-f509-44e6-8b30-aa0de3cc98e8/start HTTP/1.1
{
"iourc_content": "test"
}
@@ -11,6 +11,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 9aeede89..e07154ac 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/5d163f0c-de53-41db-911b-9fb1b8752685/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/abbc1d5d-0b77-41e2-8681-75ad954e32c6/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5d163f0c-de53-41db-911b-9fb1b8752685/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/abbc1d5d-0b77-41e2-8681-75ad954e32c6/stop HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 92658978..dbdb5d11 100644
--- a/docs/api/examples/post_projectsprojectidportsudp.txt
+++ b/docs/api/examples/post_projectsprojectidportsudp.txt
@@ -10,7 +10,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 25
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 694fc484..4774a9f2 100644
--- a/docs/api/examples/post_projectsprojectidqemuvms.txt
+++ b/docs/api/examples/post_projectsprojectidqemuvms.txt
@@ -1,10 +1,10 @@
-curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_create_with_params0/linux.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64", "ram": 1024}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_qemu_create_with_params0/linux.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3zzynydr/qemu-system-x86_64", "ram": 1024}'
POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1
{
- "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_create_with_params0/linux.img",
+ "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_qemu_create_with_params0/linux.img",
"name": "PC TEST 1",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3zzynydr/qemu-system-x86_64",
"ram": 1024
}
@@ -12,41 +12,49 @@ POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1
HTTP/1.1 201
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 1246
+CONTENT-LENGTH: 1473
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/qemu/vms
{
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
+ "boot_priority": "c",
+ "cdrom_image": "",
+ "cdrom_image_md5sum": null,
"console": 2000,
"console_type": "telnet",
"cpu_throttling": 0,
- "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_create_with_params0/linux.img",
+ "cpus": 1,
+ "hda_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_qemu_create_with_params0/linux.img",
"hda_disk_image_md5sum": "c4ca4238a0b923820dcc509a6f75849b",
+ "hda_disk_interface": "ide",
"hdb_disk_image": "",
"hdb_disk_image_md5sum": null,
+ "hdb_disk_interface": "ide",
"hdc_disk_image": "",
"hdc_disk_image_md5sum": null,
+ "hdc_disk_interface": "ide",
"hdd_disk_image": "",
"hdd_disk_image_md5sum": null,
+ "hdd_disk_interface": "ide",
"initrd": "",
"initrd_md5sum": null,
"kernel_command_line": "",
"kernel_image": "",
"kernel_image_md5sum": null,
"legacy_networking": false,
- "mac_address": "00:00:ab:92:b0:00",
+ "mac_address": "00:00:ab:71:f2:00",
"name": "PC TEST 1",
"options": "",
"platform": "x86_64",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3zzynydr/qemu-system-x86_64",
"ram": 1024,
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/e1e153f3-8712-4109-8c42-51716c5292b0",
- "vm_id": "e1e153f3-8712-4109-8c42-51716c5292b0"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbbmb6tc1/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/72f88dce-6c67-4e46-b42d-81a8c4f371f2",
+ "vm_id": "72f88dce-6c67-4e46-b42d-81a8c4f371f2"
}
diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 52357cc3..dbfaa317 100644
--- a/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a185b576-d8d3-4cbb-bf8c-6e2a2e8d26cd/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/270ea3e8-d916-440b-bc8c-5ce63bbc71b5/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a185b576-d8d3-4cbb-bf8c-6e2a2e8d26cd/adapters/1/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/270ea3e8-d916-440b-bc8c-5ce63bbc71b5/adapters/1/ports/0/nio HTTP/1.1
{
"ethernet_device": "eth0",
"type": "nio_generic_ethernet"
@@ -13,7 +13,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 89
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
{
diff --git a/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt b/docs/api/examples/post_projectsprojectidqemuvmsvmidreload.txt
index d55b6167..4bc01a84 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/ba4a8e07-5689-4333-bb5e-7d471c8f6862/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7ba8c4e8-af84-4c2c-85f7-825e8321ba5d/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ba4a8e07-5689-4333-bb5e-7d471c8f6862/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/7ba8c4e8-af84-4c2c-85f7-825e8321ba5d/reload HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 f1150b99..2ecaef2e 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/5afe88e0-4136-4781-975e-c35062d9cf5b/resume' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/68376eea-9e5a-4dd8-97c5-c3155b02cd8e/resume' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5afe88e0-4136-4781-975e-c35062d9cf5b/resume HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/68376eea-9e5a-4dd8-97c5-c3155b02cd8e/resume HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 b4cdd9ea..7694e319 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/a5272ab6-5e67-4e6a-879c-b2ea033b3477/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/1f8a3aaa-fb64-4c51-a9e2-019215012aab/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a5272ab6-5e67-4e6a-879c-b2ea033b3477/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/1f8a3aaa-fb64-4c51-a9e2-019215012aab/start HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 80a378bc..b003cf01 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/22a36a1b-ad36-4feb-a1ba-ca834b0240bc/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/79c98a6f-9a1b-44c3-be28-ed2f924e3960/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/22a36a1b-ad36-4feb-a1ba-ca834b0240bc/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/79c98a6f-9a1b-44c3-be28-ed2f924e3960/stop HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 d2e40fd3..45480ac1 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/8a087a54-55db-48be-b604-303170e60260/suspend' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/52cfc381-0cb0-4d90-868d-8554ef5a9a33/suspend' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8a087a54-55db-48be-b604-303170e60260/suspend HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/52cfc381-0cb0-4d90-868d-8554ef5a9a33/suspend HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 4272e0a6..33bce505 100644
--- a/docs/api/examples/post_projectsprojectidvirtualboxvms.txt
+++ b/docs/api/examples/post_projectsprojectidvirtualboxvms.txt
@@ -14,7 +14,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 409
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/virtualbox/vms
{
@@ -29,6 +29,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms
"ram": 0,
"use_any_adapter": false,
"vm_directory": null,
- "vm_id": "d8a2de3e-a907-4d66-97fc-1e60c160fc89",
+ "vm_id": "7d54caf7-ab92-4a5f-8795-1ebdfcc6994b",
"vmname": "VM1"
}
diff --git a/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 04d7b166..9d6e8fbe 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/573c5afd-ad65-4642-a46e-6275218d309b/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/5815ff12-a889-492e-97ca-be06a45f03ce/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/573c5afd-ad65-4642-a46e-6275218d309b/adapters/0/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/5815ff12-a889-492e-97ca-be06a45f03ce/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@@ -15,7 +15,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 89
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 6e970407..c67e84fc 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/84bcef22-83ce-4800-8e8b-9ccf1acda2bd/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c4c394ec-3785-4e37-908a-a88a01055a8a/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/84bcef22-83ce-4800-8e8b-9ccf1acda2bd/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c4c394ec-3785-4e37-908a-a88a01055a8a/reload HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 680f57eb..bd72ded4 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/38b04342-a0b9-4109-813b-7cd553f9305e/resume' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a30c8568-dd5f-417e-95c6-45568972d2c5/resume' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/38b04342-a0b9-4109-813b-7cd553f9305e/resume HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a30c8568-dd5f-417e-95c6-45568972d2c5/resume HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 2b230445..5e8ccc56 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/4975eca5-ed0e-477f-82d3-db64e9bc90f9/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6bedf287-1a80-452d-b000-078166f7b3e0/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4975eca5-ed0e-477f-82d3-db64e9bc90f9/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6bedf287-1a80-452d-b000-078166f7b3e0/start HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 abcf1d9f..c20b2535 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/f0537222-944c-4cd5-b324-b77ff6391490/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/8d39aad0-03e2-423b-8684-584892e116ab/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f0537222-944c-4cd5-b324-b77ff6391490/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/8d39aad0-03e2-423b-8684-584892e116ab/stop HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 36599cac..f80beb8d 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/711f6cb8-a81c-43ce-bc1a-479e764b3252/suspend' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a2fed430-ad13-45fc-935f-07618993f272/suspend' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/711f6cb8-a81c-43ce-bc1a-479e764b3252/suspend HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a2fed430-ad13-45fc-935f-07618993f272/suspend HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 3a78793f..7f768a80 100644
--- a/docs/api/examples/post_projectsprojectidvpcsvms.txt
+++ b/docs/api/examples/post_projectsprojectidvpcsvms.txt
@@ -12,7 +12,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 422
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/vpcs/vms
{
@@ -22,6 +22,6 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms
"startup_script": null,
"startup_script_path": null,
"status": "stopped",
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/230eaad0-6e20-46cb-8903-83b870ae91b3",
- "vm_id": "230eaad0-6e20-46cb-8903-83b870ae91b3"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbbmb6tc1/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/a0f4ad58-4583-4ec1-9790-4841ca5f6d56",
+ "vm_id": "a0f4ad58-4583-4ec1-9790-4841ca5f6d56"
}
diff --git a/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index d2830506..8dcbfa04 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/09ccf7dd-09d1-47b9-b38f-1996ddd4d45e/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/4d4e08b5-7efa-4890-bf58-a81cd087964e/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/09ccf7dd-09d1-47b9-b38f-1996ddd4d45e/adapters/0/ports/0/nio HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/4d4e08b5-7efa-4890-bf58-a81cd087964e/adapters/0/ports/0/nio HTTP/1.1
{
"lport": 4242,
"rhost": "127.0.0.1",
@@ -15,7 +15,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 89
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 285d3639..d62e93b8 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/cca7480e-c9b9-4df9-8fe2-6de4c0a7266d/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/75e55a54-4e51-4219-bdb2-f3fe9225cdae/reload' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/cca7480e-c9b9-4df9-8fe2-6de4c0a7266d/reload HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/75e55a54-4e51-4219-bdb2-f3fe9225cdae/reload HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 e166d503..ed870b14 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/fcd3c1ee-18d1-48d0-837e-7d12d1a03dd4/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/29f179ce-e68a-4e77-9fe6-fdb98b308f0c/start' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/fcd3c1ee-18d1-48d0-837e-7d12d1a03dd4/start HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/29f179ce-e68a-4e77-9fe6-fdb98b308f0c/start HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
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 68d8f1af..31a14f3d 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/3f3863e4-bc9c-4e83-acac-da9cd43aa58c/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/b5eb5059-41ef-41e5-a075-7fe980dbdcf5/stop' -d '{}'
-POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/3f3863e4-bc9c-4e83-acac-da9cd43aa58c/stop HTTP/1.1
+POST /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/b5eb5059-41ef-41e5-a075-7fe980dbdcf5/stop HTTP/1.1
{}
@@ -9,6 +9,6 @@ ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
CONTENT-LENGTH: 0
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}/stop
diff --git a/docs/api/examples/post_qemuimg.txt b/docs/api/examples/post_qemuimg.txt
new file mode 100644
index 00000000..c265f4bf
--- /dev/null
+++ b/docs/api/examples/post_qemuimg.txt
@@ -0,0 +1,23 @@
+curl -i -X POST 'http://localhost:8000/v1/qemu/img' -d '{"cluster_size": 64, "format": "qcow2", "lazy_refcounts": "off", "path": "/tmp/hda.qcow2", "preallocation": "metadata", "qemu_img": "/tmp/qemu-img", "refcount_bits": 12, "size": 100}'
+
+POST /v1/qemu/img HTTP/1.1
+{
+ "cluster_size": 64,
+ "format": "qcow2",
+ "lazy_refcounts": "off",
+ "path": "/tmp/hda.qcow2",
+ "preallocation": "metadata",
+ "qemu_img": "/tmp/qemu-img",
+ "refcount_bits": 12,
+ "size": 100
+}
+
+
+HTTP/1.1 201
+ACCESS-CONTROL-ALLOW-ORIGIN: *
+CONNECTION: keep-alive
+CONTENT-LENGTH: 0
+DATE: Thu, 08 Jan 2015 16:09:15 GMT
+SERVER: Python/3.4 GNS3/1.4.0.dev9
+X-ROUTE: /v1/qemu/img
+
diff --git a/docs/api/examples/post_version.txt b/docs/api/examples/post_version.txt
index eadd2ff7..42117d6c 100644
--- a/docs/api/examples/post_version.txt
+++ b/docs/api/examples/post_version.txt
@@ -1,20 +1,20 @@
-curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.4.0dev3"}'
+curl -i -X POST 'http://localhost:8000/v1/version' -d '{"version": "1.4.0.dev9"}'
POST /v1/version HTTP/1.1
{
- "version": "1.4.0dev3"
+ "version": "1.4.0.dev9"
}
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
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.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/version
{
- "version": "1.4.0dev3"
+ "version": "1.4.0.dev9"
}
diff --git a/docs/api/examples/put_projectsprojectid.txt b/docs/api/examples/put_projectsprojectid.txt
index 3249d0ba..480bdd32 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/13043fad-9bf7-4fc5-8002-a305e3170fec' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_update_path_project_non_l0"}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/51887c6f-8fde-40e7-8904-d4e54fcdb7b4' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_update_path_project_non_l0"}'
-PUT /v1/projects/13043fad-9bf7-4fc5-8002-a305e3170fec HTTP/1.1
+PUT /v1/projects/51887c6f-8fde-40e7-8904-d4e54fcdb7b4 HTTP/1.1
{
"name": "second_name",
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_update_path_project_non_l0"
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_update_path_project_non_l0"
}
@@ -13,7 +13,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 100
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}
{
diff --git a/docs/api/examples/put_projectsprojectidiouvmsvmid.txt b/docs/api/examples/put_projectsprojectidiouvmsvmid.txt
index a7d375c7..53331a22 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/05c6c5c9-07c9-4a49-976e-b01cb8e354bd' -d '{"console": 2001, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/790ce54d-8d28-4e33-9a5a-27cae20fc0f2' -d '{"console": 2001, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/05c6c5c9-07c9-4a49-976e-b01cb8e354bd HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/790ce54d-8d28-4e33-9a5a-27cae20fc0f2 HTTP/1.1
{
"console": 2001,
"ethernet_adapters": 4,
@@ -18,27 +18,27 @@ PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/05c6c5c9-07c9-4a49
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 800
+CONTENT-LENGTH: 799
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/iou/vms/{vm_id}
{
"console": 2001,
"ethernet_adapters": 4,
- "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpz2_ftfwa/iourc",
+ "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcnfdf4ax/iourc",
"l1_keepalives": true,
"md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
"name": "test",
"nvram": 2048,
- "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_iou_update0/iou.bin",
+ "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_iou_update0/iou.bin",
"private_config": null,
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
"ram": 512,
"serial_adapters": 0,
"startup_config": "startup-config.cfg",
"use_default_iou_values": true,
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppq32cm3b/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/05c6c5c9-07c9-4a49-976e-b01cb8e354bd",
- "vm_id": "05c6c5c9-07c9-4a49-976e-b01cb8e354bd"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmph6drru9t/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/790ce54d-8d28-4e33-9a5a-27cae20fc0f2",
+ "vm_id": "790ce54d-8d28-4e33-9a5a-27cae20fc0f2"
}
diff --git a/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt
index 59a4fcff..cb09ce6b 100644
--- a/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt
+++ b/docs/api/examples/put_projectsprojectidqemuvmsvmid.txt
@@ -1,9 +1,9 @@
-curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0' -d '{"console": 2001, "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_update0/linux.img", "name": "test", "ram": 1024}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b2e10803-4587-4ff9-9efe-d9e761965dba' -d '{"console": 2001, "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_qemu_update0/linux.img", "name": "test", "ram": 1024}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0 HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b2e10803-4587-4ff9-9efe-d9e761965dba HTTP/1.1
{
"console": 2001,
- "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_update0/linux.img",
+ "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_qemu_update0/linux.img",
"name": "test",
"ram": 1024
}
@@ -12,41 +12,49 @@ PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/de90c8c0-b2d9-441
HTTP/1.1 200
ACCESS-CONTROL-ALLOW-ORIGIN: *
CONNECTION: keep-alive
-CONTENT-LENGTH: 1229
+CONTENT-LENGTH: 1456
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/qemu/vms/{vm_id}
{
"acpi_shutdown": false,
"adapter_type": "e1000",
"adapters": 1,
+ "boot_priority": "c",
+ "cdrom_image": "",
+ "cdrom_image_md5sum": null,
"console": 2001,
"console_type": "telnet",
"cpu_throttling": 0,
+ "cpus": 1,
"hda_disk_image": "",
"hda_disk_image_md5sum": null,
- "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-398/test_qemu_update0/linux.img",
+ "hda_disk_interface": "ide",
+ "hdb_disk_image": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-54/test_qemu_update0/linux.img",
"hdb_disk_image_md5sum": "c4ca4238a0b923820dcc509a6f75849b",
+ "hdb_disk_interface": "ide",
"hdc_disk_image": "",
"hdc_disk_image_md5sum": null,
+ "hdc_disk_interface": "ide",
"hdd_disk_image": "",
"hdd_disk_image_md5sum": null,
+ "hdd_disk_interface": "ide",
"initrd": "",
"initrd_md5sum": null,
"kernel_command_line": "",
"kernel_image": "",
"kernel_image_md5sum": null,
"legacy_networking": false,
- "mac_address": "00:00:ab:c8:e0:00",
+ "mac_address": "00:00:ab:5d:ba:00",
"name": "test",
"options": "",
"platform": "x86_64",
"process_priority": "low",
"project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
- "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprq6c6gsq/qemu-system-x86_64",
+ "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3zzynydr/qemu-system-x86_64",
"ram": 1024,
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0",
- "vm_id": "de90c8c0-b2d9-4415-b6ca-06f2fd51c8e0"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbbmb6tc1/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/b2e10803-4587-4ff9-9efe-d9e761965dba",
+ "vm_id": "b2e10803-4587-4ff9-9efe-d9e761965dba"
}
diff --git a/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/put_projectsprojectidvirtualboxvmsvmid.txt
index c86b27d7..12834f4a 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/6399384f-5127-4af6-aab4-f255538e5e8a' -d '{"console": 2010, "name": "test"}'
+curl -i -X PUT 'http://localhost:8000/v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f4886c2a-98fb-471b-bba3-89ea75ad8c27' -d '{"console": 2010, "name": "test"}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/6399384f-5127-4af6-aab4-f255538e5e8a HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f4886c2a-98fb-471b-bba3-89ea75ad8c27 HTTP/1.1
{
"console": 2010,
"name": "test"
@@ -13,7 +13,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 413
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
{
@@ -28,6 +28,6 @@ X-ROUTE: /v1/projects/{project_id}/virtualbox/vms/{vm_id}
"ram": 0,
"use_any_adapter": false,
"vm_directory": null,
- "vm_id": "6399384f-5127-4af6-aab4-f255538e5e8a",
+ "vm_id": "f4886c2a-98fb-471b-bba3-89ea75ad8c27",
"vmname": "VMTEST"
}
diff --git a/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/put_projectsprojectidvpcsvmsvmid.txt
index acce014b..0024edde 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/efb44969-3abd-40ab-9cae-fc0e46d8f221' -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/c13cc286-c384-4d39-8fbb-24ce2d9a6024' -d '{"console": 2011, "name": "test", "startup_script": "ip 192.168.1.1"}'
-PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/efb44969-3abd-40ab-9cae-fc0e46d8f221 HTTP/1.1
+PUT /v1/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/c13cc286-c384-4d39-8fbb-24ce2d9a6024 HTTP/1.1
{
"console": 2011,
"name": "test",
@@ -14,7 +14,7 @@ CONNECTION: keep-alive
CONTENT-LENGTH: 438
CONTENT-TYPE: application/json
DATE: Thu, 08 Jan 2015 16:09:15 GMT
-SERVER: Python/3.4 GNS3/1.4.0dev3
+SERVER: Python/3.4 GNS3/1.4.0.dev9
X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
{
@@ -24,6 +24,6 @@ X-ROUTE: /v1/projects/{project_id}/vpcs/vms/{vm_id}
"startup_script": "ip 192.168.1.1",
"startup_script_path": "startup.vpc",
"status": "stopped",
- "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjtnbwbkt/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/efb44969-3abd-40ab-9cae-fc0e46d8f221",
- "vm_id": "efb44969-3abd-40ab-9cae-fc0e46d8f221"
+ "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbbmb6tc1/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/c13cc286-c384-4d39-8fbb-24ce2d9a6024",
+ "vm_id": "c13cc286-c384-4d39-8fbb-24ce2d9a6024"
}
diff --git a/docs/api/v1/docker.rst b/docs/api/v1/docker.rst
new file mode 100644
index 00000000..2e700cc8
--- /dev/null
+++ b/docs/api/v1/docker.rst
@@ -0,0 +1,8 @@
+Docker
+---------------------
+
+.. toctree::
+ :glob:
+ :maxdepth: 2
+
+ docker/*
diff --git a/docs/api/v1/docker/dockerimages.rst b/docs/api/v1/docker/dockerimages.rst
new file mode 100644
index 00000000..d282af92
--- /dev/null
+++ b/docs/api/v1/docker/dockerimages.rst
@@ -0,0 +1,13 @@
+/v1/docker/images
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v1/docker/images
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Get all available Docker images
+
+Response status codes
+**********************
+- **200**: Success
+
diff --git a/docs/api/v1/docker/projectsprojectiddockerimages.rst b/docs/api/v1/docker/projectsprojectiddockerimages.rst
new file mode 100644
index 00000000..01f41cc4
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimages.rst
@@ -0,0 +1,49 @@
+/v1/projects/{project_id}/docker/images
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/docker/images
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Create a new Docker container
+
+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 |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | console | | string | console name |
+ | imagename | | string | Docker image name |
+ | name | | string | Docker container name |
+ | startcmd | | string | Docker CMD entry |
+ | vm_id | | | Docker VM instance identifier |
+
+
+Output
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | cid | | string | Docker container ID |
+ | image | | string | Docker image name |
+ | name | | string | Docker container name |
+ | project_id | ✔ | string | Project UUID |
+ | vm_id | ✔ | string | Docker container instance UUID |
+
+
diff --git a/docs/api/v1/docker/projectsprojectiddockerimagesid.rst b/docs/api/v1/docker/projectsprojectiddockerimagesid.rst
new file mode 100644
index 00000000..6a9e006d
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimagesid.rst
@@ -0,0 +1,20 @@
+/v1/projects/{project_id}/docker/images/{id}
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+DELETE /v1/projects/**{project_id}**/docker/images/**{id}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Delete a Docker container
+
+Parameters
+**********
+- **id**: ID for the container
+- **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/docker/projectsprojectiddockerimagesidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/docker/projectsprojectiddockerimagesidadaptersadapternumberdportsportnumberdnio.rst
new file mode 100644
index 00000000..c80e82ab
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimagesidadaptersadapternumberdportsportnumberdnio.rst
@@ -0,0 +1,40 @@
+/v1/projects/{project_id}/docker/images/{id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/docker/images/**{id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Add a NIO to a Docker container
+
+Parameters
+**********
+- **adapter_number**: Adapter where the nio should be added
+- **id**: ID of the container
+- **project_id**: UUID for the project
+- **port_number**: Port on the adapter
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **201**: NIO created
+- **404**: Instance doesn't exist
+
+
+DELETE /v1/projects/**{project_id}**/docker/images/**{id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Remove a NIO from a Docker container
+
+Parameters
+**********
+- **adapter_number**: Adapter where the nio should be added
+- **id**: ID of the container
+- **project_id**: UUID for the project
+- **port_number**: Port on the adapter
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: NIO deleted
+
diff --git a/docs/api/v1/docker/projectsprojectiddockerimagesidreload.rst b/docs/api/v1/docker/projectsprojectiddockerimagesidreload.rst
new file mode 100644
index 00000000..df8104d0
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimagesidreload.rst
@@ -0,0 +1,50 @@
+/v1/projects/{project_id}/docker/images/{id}/reload
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/docker/images/**{id}**/reload
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Restart a Docker container
+
+Parameters
+**********
+- **id**: ID of the container
+- **project_id**: UUID of the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance restarted
+
+Input
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | console | | string | console name |
+ | imagename | | string | Docker image name |
+ | name | | string | Docker container name |
+ | startcmd | | string | Docker CMD entry |
+ | vm_id | | | Docker VM instance identifier |
+
+
+Output
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | cid | | string | Docker container ID |
+ | image | | string | Docker image name |
+ | name | | string | Docker container name |
+ | project_id | ✔ | string | Project UUID |
+ | vm_id | ✔ | string | Docker container instance UUID |
+
+
diff --git a/docs/api/v1/docker/projectsprojectiddockerimagesidstart.rst b/docs/api/v1/docker/projectsprojectiddockerimagesidstart.rst
new file mode 100644
index 00000000..49fb5e28
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimagesidstart.rst
@@ -0,0 +1,50 @@
+/v1/projects/{project_id}/docker/images/{id}/start
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/docker/images/**{id}**/start
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Start a Docker container
+
+Parameters
+**********
+- **id**: ID of the container
+- **project_id**: UUID of the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance started
+
+Input
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | console | | string | console name |
+ | imagename | | string | Docker image name |
+ | name | | string | Docker container name |
+ | startcmd | | string | Docker CMD entry |
+ | vm_id | | | Docker VM instance identifier |
+
+
+Output
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | cid | | string | Docker container ID |
+ | image | | string | Docker image name |
+ | name | | string | Docker container name |
+ | project_id | ✔ | string | Project UUID |
+ | vm_id | ✔ | string | Docker container instance UUID |
+
+
diff --git a/docs/api/v1/docker/projectsprojectiddockerimagesidstop.rst b/docs/api/v1/docker/projectsprojectiddockerimagesidstop.rst
new file mode 100644
index 00000000..797eb66c
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimagesidstop.rst
@@ -0,0 +1,50 @@
+/v1/projects/{project_id}/docker/images/{id}/stop
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/docker/images/**{id}**/stop
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Stop a Docker container
+
+Parameters
+**********
+- **id**: ID of the container
+- **project_id**: UUID of the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance stopped
+
+Input
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | console | | string | console name |
+ | imagename | | string | Docker image name |
+ | name | | string | Docker container name |
+ | startcmd | | string | Docker CMD entry |
+ | vm_id | | | Docker VM instance identifier |
+
+
+Output
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | cid | | string | Docker container ID |
+ | image | | string | Docker image name |
+ | name | | string | Docker container name |
+ | project_id | ✔ | string | Project UUID |
+ | vm_id | ✔ | string | Docker container instance UUID |
+
+
diff --git a/docs/api/v1/docker/projectsprojectiddockerimagesidsuspend.rst b/docs/api/v1/docker/projectsprojectiddockerimagesidsuspend.rst
new file mode 100644
index 00000000..11297147
--- /dev/null
+++ b/docs/api/v1/docker/projectsprojectiddockerimagesidsuspend.rst
@@ -0,0 +1,50 @@
+/v1/projects/{project_id}/docker/images/{id}/suspend
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/docker/images/**{id}**/suspend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Pause a Docker container
+
+Parameters
+**********
+- **id**: ID of the container
+- **project_id**: UUID of the project
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance paused
+
+Input
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | console | | string | console name |
+ | imagename | | string | Docker image name |
+ | name | | string | Docker container name |
+ | startcmd | | string | Docker CMD entry |
+ | vm_id | | | Docker VM instance identifier |
+
+
+Output
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | string | Docker adapter type |
+ | adapters | | integer | number of adapters |
+ | cid | | string | Docker container ID |
+ | image | | string | Docker image name |
+ | name | | string | Docker container name |
+ | project_id | ✔ | string | Project UUID |
+ | vm_id | ✔ | string | Docker container instance UUID |
+
+
diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst
index 0d8e9eab..2ccc6822 100644
--- a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst
+++ b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceid.rst
@@ -60,10 +60,10 @@ Ethernet switch port
| Name | Mandatory | Type | Description |
+ | ethertype | | enum | Possible values: , 0x8100, 0x88A8, 0x9100, 0x9200 |
| port | ✔ | integer | Port number |
| type | ✔ | enum | Possible values: access, dot1q, qinq |
| vlan | ✔ | integer | VLAN number |
- | ethertype | ✔ | enum | Possible values: 0x8100, 0x88A8, 0x9100, 0x9200 |
Body
@@ -104,3 +104,4 @@ Response status codes
- **400**: Invalid request
- **404**: Instance doesn't exist
- **204**: Instance deleted
+
diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst
index 9d4af7dc..4bbd4479 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
**********
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
- **project_id**: UUID for the project
+- **port_number**: Port on the device
Response status codes
**********************
@@ -139,9 +139,9 @@ Remove a NIO from a Dynamips device instance
Parameters
**********
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
- **project_id**: UUID for the project
+- **port_number**: Port on the device
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst
index 41cc168f..fc6abef3 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
**********
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
- **project_id**: UUID for the project
+- **port_number**: Port on the device
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst b/docs/api/v1/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst
index 9318bdd1..716c458d 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
**********
-- **port_number**: Port on the device
- **device_id**: UUID for the instance
- **project_id**: UUID for the project
+- **port_number**: Port on the device
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/dynamipsvmsfilename.rst b/docs/api/v1/dynamips_vm/dynamipsvmspath.rst
similarity index 85%
rename from docs/api/v1/dynamips_vm/dynamipsvmsfilename.rst
rename to docs/api/v1/dynamips_vm/dynamipsvmspath.rst
index ed7e219c..375c93c6 100644
--- a/docs/api/v1/dynamips_vm/dynamipsvmsfilename.rst
+++ b/docs/api/v1/dynamips_vm/dynamipsvmspath.rst
@@ -1,9 +1,9 @@
-/v1/dynamips/vms/{filename}
+/v1/dynamips/vms/{path}
----------------------------------------------------------------------------------------------------------------------
.. contents::
-POST /v1/dynamips/vms/**{filename}**
+POST /v1/dynamips/vms/**{path}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upload Dynamips image.
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index b5cd2bf1..f82bcb16 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
**********
-- **port_number**: Port on the adapter
+- **adapter_number**: Adapter where the nio should be added
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter where the nio should be added
Response status codes
**********************
@@ -27,10 +27,10 @@ Remove a NIO from a Dynamips VM instance
Parameters
**********
-- **port_number**: Port on the adapter
+- **adapter_number**: Adapter from where the nio should be removed
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter from where the nio should be removed
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
index b0def326..46143c8a 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
**********
-- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to start a packet capture
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter to start a packet capture
Response status codes
**********************
diff --git a/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/dynamips_vm/projectsprojectiddynamipsvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
index 0e499c37..9042c222 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
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter to stop a packet capture
Response status codes
**********************
diff --git a/docs/api/v1/iou/iouvmsfilename.rst b/docs/api/v1/iou/iouvmspath.rst
similarity index 87%
rename from docs/api/v1/iou/iouvmsfilename.rst
rename to docs/api/v1/iou/iouvmspath.rst
index 3772f59a..da07a57c 100644
--- a/docs/api/v1/iou/iouvmsfilename.rst
+++ b/docs/api/v1/iou/iouvmspath.rst
@@ -1,9 +1,9 @@
-/v1/iou/vms/{filename}
+/v1/iou/vms/{path}
----------------------------------------------------------------------------------------------------------------------
.. contents::
-POST /v1/iou/vms/**{filename}**
+POST /v1/iou/vms/**{path}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upload IOU image.
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 357e952a..76550e02 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
**********
-- **port_number**: Port where the nio should be added
+- **adapter_number**: Network adapter where the nio is located
- **project_id**: UUID for the project
+- **port_number**: Port where the nio should be added
- **vm_id**: UUID for the instance
-- **adapter_number**: Network adapter where the nio is located
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a IOU instance
Parameters
**********
-- **port_number**: Port from where the nio should be removed
+- **adapter_number**: Network adapter where the nio is located
- **project_id**: UUID for the project
+- **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
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
index 1d5b8893..fce888b0 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
**********
-- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to start a packet capture
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter to start a packet capture
Response status codes
**********************
diff --git a/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/iou/projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
index cd1b4d01..93b8fd8d 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
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter to stop a packet capture
Response status codes
**********************
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvms.rst b/docs/api/v1/qemu/projectsprojectidqemuvms.rst
index 50a4cfe7..57d61b55 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvms.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvms.rst
@@ -26,17 +26,25 @@ Input
| acpi_shutdown | | ['boolean', 'null'] | ACPI shutdown support |
| adapter_type | | ['string', 'null'] | QEMU adapter type |
| adapters | | ['integer', 'null'] | number of adapters |
+ | boot_priority | | enum | Possible values: c, d |
+ | cdrom_image | | string | QEMU cdrom image path |
+ | cdrom_image_md5sum | | ['string', 'null'] | QEMU cdrom image checksum |
| console | | ['integer', 'null'] | console TCP port |
| console_type | | enum | Possible values: telnet, vnc |
| cpu_throttling | | ['integer', 'null'] | Percentage of CPU allowed for QEMU |
+ | cpus | | ['integer', 'null'] | number of vCPUs |
| hda_disk_image | | string | QEMU hda disk image path |
| hda_disk_image_md5sum | | ['string', 'null'] | QEMU hda disk image checksum |
+ | hda_disk_interface | | string | QEMU hda interface |
| hdb_disk_image | | string | QEMU hdb disk image path |
| hdb_disk_image_md5sum | | ['string', 'null'] | QEMU hdb disk image checksum |
+ | hdb_disk_interface | | string | QEMU hdb interface |
| hdc_disk_image | | string | QEMU hdc disk image path |
| hdc_disk_image_md5sum | | ['string', 'null'] | QEMU hdc disk image checksum |
+ | hdc_disk_interface | | string | QEMU hdc interface |
| hdd_disk_image | | string | QEMU hdd disk image path |
| hdd_disk_image_md5sum | | ['string', 'null'] | QEMU hdd disk image checksum |
+ | hdd_disk_interface | | string | QEMU hdd interface |
| initrd | | string | QEMU initrd path |
| initrd_md5sum | | ['string', 'null'] | QEMU initrd path |
| kernel_command_line | | ['string', 'null'] | QEMU kernel command line |
@@ -62,17 +70,25 @@ Output
| acpi_shutdown | ✔ | boolean | ACPI shutdown support |
| adapter_type | ✔ | string | QEMU adapter type |
| adapters | ✔ | integer | number of adapters |
+ | boot_priority | ✔ | enum | Possible values: c, d |
+ | cdrom_image | ✔ | string | QEMU cdrom image path |
+ | cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
| console | ✔ | integer | console TCP port |
| console_type | ✔ | enum | Possible values: telnet, vnc |
| cpu_throttling | ✔ | integer | Percentage of CPU allowed for QEMU |
+ | cpus | ✔ | ['integer', 'null'] | number of vCPUs |
| hda_disk_image | ✔ | string | QEMU hda disk image path |
| hda_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hda disk image checksum |
+ | hda_disk_interface | ✔ | string | QEMU hda interface |
| hdb_disk_image | ✔ | string | QEMU hdb disk image path |
| hdb_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdb disk image checksum |
+ | hdb_disk_interface | ✔ | string | QEMU hdb interface |
| hdc_disk_image | ✔ | string | QEMU hdc disk image path |
| hdc_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdc disk image checksum |
+ | hdc_disk_interface | ✔ | string | QEMU hdc interface |
| hdd_disk_image | ✔ | string | QEMU hdd disk image path |
| hdd_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdd disk image checksum |
+ | hdd_disk_interface | ✔ | string | QEMU hdd interface |
| initrd | ✔ | string | QEMU initrd path |
| initrd_md5sum | ✔ | ['string', 'null'] | QEMU initrd path |
| kernel_command_line | ✔ | string | QEMU kernel command line |
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst
index cc6476e6..c4888dda 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmid.rst
@@ -27,17 +27,25 @@ Output
| acpi_shutdown | ✔ | boolean | ACPI shutdown support |
| adapter_type | ✔ | string | QEMU adapter type |
| adapters | ✔ | integer | number of adapters |
+ | boot_priority | ✔ | enum | Possible values: c, d |
+ | cdrom_image | ✔ | string | QEMU cdrom image path |
+ | cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
| console | ✔ | integer | console TCP port |
| console_type | ✔ | enum | Possible values: telnet, vnc |
| cpu_throttling | ✔ | integer | Percentage of CPU allowed for QEMU |
+ | cpus | ✔ | ['integer', 'null'] | number of vCPUs |
| hda_disk_image | ✔ | string | QEMU hda disk image path |
| hda_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hda disk image checksum |
+ | hda_disk_interface | ✔ | string | QEMU hda interface |
| hdb_disk_image | ✔ | string | QEMU hdb disk image path |
| hdb_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdb disk image checksum |
+ | hdb_disk_interface | ✔ | string | QEMU hdb interface |
| hdc_disk_image | ✔ | string | QEMU hdc disk image path |
| hdc_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdc disk image checksum |
+ | hdc_disk_interface | ✔ | string | QEMU hdc interface |
| hdd_disk_image | ✔ | string | QEMU hdd disk image path |
| hdd_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdd disk image checksum |
+ | hdd_disk_interface | ✔ | string | QEMU hdd interface |
| initrd | ✔ | string | QEMU initrd path |
| initrd_md5sum | ✔ | ['string', 'null'] | QEMU initrd path |
| kernel_command_line | ✔ | string | QEMU kernel command line |
@@ -88,17 +96,25 @@ Input
| acpi_shutdown | | ['boolean', 'null'] | ACPI shutdown support |
| adapter_type | | ['string', 'null'] | QEMU adapter type |
| adapters | | ['integer', 'null'] | number of adapters |
+ | boot_priority | | enum | Possible values: c, d |
+ | cdrom_image | | string | QEMU cdrom image path |
+ | cdrom_image_md5sum | | ['string', 'null'] | QEMU cdrom image checksum |
| console | | ['integer', 'null'] | console TCP port |
| console_type | | enum | Possible values: telnet, vnc |
| cpu_throttling | | ['integer', 'null'] | Percentage of CPU allowed for QEMU |
+ | cpus | | ['integer', 'null'] | number of vCPUs |
| hda_disk_image | | string | QEMU hda disk image path |
| hda_disk_image_md5sum | | ['string', 'null'] | QEMU hda disk image checksum |
+ | hda_disk_interface | | string | QEMU hda interface |
| hdb_disk_image | | string | QEMU hdb disk image path |
| hdb_disk_image_md5sum | | ['string', 'null'] | QEMU hdb disk image checksum |
+ | hdb_disk_interface | | string | QEMU hdb interface |
| hdc_disk_image | | string | QEMU hdc disk image path |
| hdc_disk_image_md5sum | | ['string', 'null'] | QEMU hdc disk image checksum |
+ | hdc_disk_interface | | string | QEMU hdc interface |
| hdd_disk_image | | string | QEMU hdd disk image path |
| hdd_disk_image_md5sum | | ['string', 'null'] | QEMU hdd disk image checksum |
+ | hdd_disk_interface | | string | QEMU hdd interface |
| initrd | | string | QEMU initrd path |
| initrd_md5sum | | ['string', 'null'] | QEMU initrd path |
| kernel_command_line | | ['string', 'null'] | QEMU kernel command line |
@@ -123,17 +139,25 @@ Output
| acpi_shutdown | ✔ | boolean | ACPI shutdown support |
| adapter_type | ✔ | string | QEMU adapter type |
| adapters | ✔ | integer | number of adapters |
+ | boot_priority | ✔ | enum | Possible values: c, d |
+ | cdrom_image | ✔ | string | QEMU cdrom image path |
+ | cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
| console | ✔ | integer | console TCP port |
| console_type | ✔ | enum | Possible values: telnet, vnc |
| cpu_throttling | ✔ | integer | Percentage of CPU allowed for QEMU |
+ | cpus | ✔ | ['integer', 'null'] | number of vCPUs |
| hda_disk_image | ✔ | string | QEMU hda disk image path |
| hda_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hda disk image checksum |
+ | hda_disk_interface | ✔ | string | QEMU hda interface |
| hdb_disk_image | ✔ | string | QEMU hdb disk image path |
| hdb_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdb disk image checksum |
+ | hdb_disk_interface | ✔ | string | QEMU hdb interface |
| hdc_disk_image | ✔ | string | QEMU hdc disk image path |
| hdc_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdc disk image checksum |
+ | hdc_disk_interface | ✔ | string | QEMU hdc interface |
| hdd_disk_image | ✔ | string | QEMU hdd disk image path |
| hdd_disk_image_md5sum | ✔ | ['string', 'null'] | QEMU hdd disk image checksum |
+ | hdd_disk_interface | ✔ | string | QEMU hdd interface |
| initrd | ✔ | string | QEMU initrd path |
| initrd_md5sum | ✔ | ['string', 'null'] | QEMU initrd path |
| kernel_command_line | ✔ | string | QEMU kernel command line |
diff --git a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index fd552758..2f51aa70 100644
--- a/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v1/qemu/projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Qemu VM instance
Parameters
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Network adapter where the nio is located
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Network adapter where the nio is located
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a Qemu VM instance
Parameters
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Network adapter where the nio is located
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Network adapter where the nio is located
Response status codes
**********************
diff --git a/docs/api/v1/qemu/qemuimg.rst b/docs/api/v1/qemu/qemuimg.rst
new file mode 100644
index 00000000..b94c4da8
--- /dev/null
+++ b/docs/api/v1/qemu/qemuimg.rst
@@ -0,0 +1,39 @@
+/v1/qemu/img
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/qemu/img
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Create a Qemu image
+
+Response status codes
+**********************
+- **201**: Image created
+
+Input
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | adapter_type | | enum | Possible values: ide, lsilogic, buslogic, legacyESX |
+ | cluster_size | | integer | |
+ | format | ✔ | enum | Possible values: qcow2, qcow, vpc, vdi, vmdk, raw |
+ | lazy_refcounts | | enum | Possible values: on, off |
+ | path | ✔ | string | Absolute or relative path of the image |
+ | preallocation | | enum | Possible values: off, metadata, falloc, full |
+ | qemu_img | ✔ | string | Path to the qemu-img binary |
+ | refcount_bits | | integer | |
+ | size | ✔ | integer | Image size in M |
+ | static | | enum | Possible values: on, off |
+ | subformat | | enum | Possible values: dynamic, fixed, streamOptimized, twoGbMaxExtentSparse, twoGbMaxExtentFlat, monolithicSparse, monolithicFlat |
+ | zeroed_grain | | enum | Possible values: on, off |
+
+
+Sample session
+***************
+
+
+.. literalinclude:: ../../examples/post_qemuimg.txt
+
diff --git a/docs/api/v1/qemu/qemuvmsfilename.rst b/docs/api/v1/qemu/qemuvmspath.rst
similarity index 86%
rename from docs/api/v1/qemu/qemuvmsfilename.rst
rename to docs/api/v1/qemu/qemuvmspath.rst
index b44f4ce2..625ed024 100644
--- a/docs/api/v1/qemu/qemuvmsfilename.rst
+++ b/docs/api/v1/qemu/qemuvmspath.rst
@@ -1,9 +1,9 @@
-/v1/qemu/vms/{filename}
+/v1/qemu/vms/{path:.+}
----------------------------------------------------------------------------------------------------------------------
.. contents::
-POST /v1/qemu/vms/**{filename}**
+POST /v1/qemu/vms/**{path:.+}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upload Qemu image.
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 609f215e..05be923d 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
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter where the nio should be added
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter where the nio should be added
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a VirtualBox VM instance
Parameters
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter from where the nio should be removed
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter from where the nio should be removed
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
index aac9360e..7ba235ee 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
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to start a packet capture
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter to start a packet capture
Response status codes
**********************
diff --git a/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/virtualbox/projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
index 040fc9af..1f329813 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
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter to stop a packet capture
Response status codes
**********************
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevms.rst b/docs/api/v1/vmware/projectsprojectidvmwarevms.rst
index 204a43d1..cf422e4c 100644
--- a/docs/api/v1/vmware/projectsprojectidvmwarevms.rst
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevms.rst
@@ -32,6 +32,7 @@ Input
| linked_clone | ✔ | boolean | either the VM is a linked clone or not |
| name | ✔ | string | VMware VM instance name |
| use_any_adapter | | boolean | allow GNS3 to use any VMware adapter |
+ | use_ubridge | | boolean | use uBridge for network connections |
| vm_id | | string | VMware VM instance identifier |
| vmx_path | ✔ | string | path to the vmx file |
@@ -51,6 +52,7 @@ Output
| name | ✔ | string | VMware VM instance name |
| project_id | ✔ | string | Project UUID |
| use_any_adapter | | boolean | allow GNS3 to use any VMware adapter |
+ | use_ubridge | | boolean | use uBridge for network connections |
| vm_directory | | ['string', 'null'] | |
| 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
index b3f4ca7f..f3359fb0 100644
--- a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmid.rst
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmid.rst
@@ -33,6 +33,7 @@ Output
| name | ✔ | string | VMware VM instance name |
| project_id | ✔ | string | Project UUID |
| use_any_adapter | | boolean | allow GNS3 to use any VMware adapter |
+ | use_ubridge | | boolean | use uBridge for network connections |
| vm_directory | | ['string', 'null'] | |
| vm_id | ✔ | string | VMware VM instance UUID |
| vmx_path | | string | path to the vmx file |
@@ -69,6 +70,7 @@ Input
| headless | | boolean | headless mode |
| name | | string | VMware VM instance name |
| use_any_adapter | | boolean | allow GNS3 to use any VMware adapter |
+ | use_ubridge | | boolean | use uBridge for network connections |
| vmx_path | | string | path to the vmx file |
@@ -87,6 +89,7 @@ Output
| name | ✔ | string | VMware VM instance name |
| project_id | ✔ | string | Project UUID |
| use_any_adapter | | boolean | allow GNS3 to use any VMware adapter |
+ | use_ubridge | | boolean | use uBridge for network connections |
| vm_directory | | ['string', 'null'] | |
| vm_id | ✔ | string | VMware VM instance UUID |
| vmx_path | | string | path to the vmx file |
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 35cdd794..e7812909 100644
--- a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VMware VM instance
Parameters
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter where the nio should be added
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter where the nio should be added
Response status codes
**********************
@@ -27,10 +27,10 @@ Remove a NIO from a VMware VM instance
Parameters
**********
-- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter from where the nio should be removed
- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
- **vm_id**: UUID for the instance
-- **adapter_number**: Adapter from where the nio should be removed
Response status codes
**********************
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
new file mode 100644
index 00000000..422894cc
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -0,0 +1,31 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/start_capture
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Start a packet capture on a VMware VM instance
+
+Parameters
+**********
+- **adapter_number**: Adapter to start a packet capture
+- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
+- **vm_id**: UUID for the instance
+
+Response status codes
+**********************
+- **200**: Capture started
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+
+Input
+*******
+.. raw:: html
+
+
+ | Name | Mandatory | Type | Description |
+ | capture_file_name | ✔ | string | Capture file name |
+
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
new file mode 100644
index 00000000..9f2f4925
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -0,0 +1,22 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/stop_capture
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Stop a packet capture on a VMware VM instance
+
+Parameters
+**********
+- **adapter_number**: Adapter to stop a packet capture
+- **project_id**: UUID for the project
+- **port_number**: Port on the adapter (always 0)
+- **vm_id**: UUID for the instance
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Capture stopped
+
diff --git a/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst
new file mode 100644
index 00000000..0b30ef4b
--- /dev/null
+++ b/docs/api/v1/vmware/projectsprojectidvmwarevmsvmidinterfacesvmnet.rst
@@ -0,0 +1,18 @@
+/v1/projects/{project_id}/vmware/vms/{vm_id}/interfaces/vmnet
+----------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v1/projects/**{project_id}**/vmware/vms/**{vm_id}**/interfaces/vmnet
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allocate a VMware VMnet interface on the server
+
+Parameters
+**********
+- **project_id**: The UUID of the project
+- **vm_id**: UUID for the instance
+
+Response status codes
+**********************
+- **201**: VMnet interface allocated
+
diff --git a/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v1/vpcs/projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 3812ef6c..b43d1e1d 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
**********
-- **port_number**: Port where the nio should be added
+- **adapter_number**: Network adapter where the nio is located
- **project_id**: UUID for the project
+- **port_number**: Port where the nio should be added
- **vm_id**: UUID for the instance
-- **adapter_number**: Network adapter where the nio is located
Response status codes
**********************
@@ -33,10 +33,10 @@ Remove a NIO from a VPCS instance
Parameters
**********
-- **port_number**: Port from where the nio should be removed
+- **adapter_number**: Network adapter where the nio is located
- **project_id**: UUID for the project
+- **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
Response status codes
**********************
diff --git a/scripts/documentation.sh b/scripts/documentation.sh
index 41111993..91d9e026 100755
--- a/scripts/documentation.sh
+++ b/scripts/documentation.sh
@@ -29,6 +29,8 @@ rm -Rf docs/api/
mkdir -p docs/api/examples
py.test -v
+
+export PYTHONPATH=.
python3 gns3server/web/documentation.py
cd docs
make html
diff --git a/tests/modules/test_base_vm.py b/tests/modules/test_base_vm.py
index 27467c94..94fdcd31 100644
--- a/tests/modules/test_base_vm.py
+++ b/tests/modules/test_base_vm.py
@@ -48,12 +48,12 @@ def test_temporary_directory(project, manager):
def test_console(project, manager):
vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
- vm.console = 2001
- assert vm.console == 2001
+ vm.console = 2011
+ assert vm.console == 2011
def test_console_vnc_invalid(project, manager):
vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
vm.console_type = "vnc"
with pytest.raises(VMError):
- vm.console = 2002
+ vm.console = 2012