From 19b035d7e4e5c43726136ca32252e50a1868ee92 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@gns3.net>
Date: Fri, 22 Jul 2016 13:54:57 +0200
Subject: [PATCH] Update documentation

---
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...delete_projectsprojectidiounodesnodeid.txt |   4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...elete_projectsprojectidqemunodesnodeid.txt |   4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...elete_projectsprojectidvpcsnodesnodeid.txt |   4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 .../compute_get_networkinterfaces.txt         |   6 +-
 ...te_get_projectsprojectidiounodesnodeid.txt |  10 +-
 ...projectsprojectidiounodesnodeidconfigs.txt |   4 +-
 ...e_get_projectsprojectidqemunodesnodeid.txt |  14 +-
 ...projectsprojectidvirtualboxnodesnodeid.txt |   8 +-
 ...e_get_projectsprojectidvpcsnodesnodeid.txt |  10 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...ternumberdportsportnumberdstartcapture.txt |   6 +-
 ...pternumberdportsportnumberdstopcapture.txt |   4 +-
 ...compute_post_projectsprojectidiounodes.txt |  10 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...ternumberdportsportnumberdstartcapture.txt |   6 +-
 ...pternumberdportsportnumberdstopcapture.txt |   4 +-
 ..._projectsprojectidiounodesnodeidreload.txt |   4 +-
 ...t_projectsprojectidiounodesnodeidstart.txt |  12 +-
 ...st_projectsprojectidiounodesnodeidstop.txt |   4 +-
 ...ompute_post_projectsprojectidqemunodes.txt |  14 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...projectsprojectidqemunodesnodeidreload.txt |   4 +-
 ...projectsprojectidqemunodesnodeidresume.txt |   4 +-
 ..._projectsprojectidqemunodesnodeidstart.txt |  14 +-
 ...t_projectsprojectidqemunodesnodeidstop.txt |   4 +-
 ...rojectsprojectidqemunodesnodeidsuspend.txt |   4 +-
 ..._post_projectsprojectidvirtualboxnodes.txt |   4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...tsprojectidvirtualboxnodesnodeidreload.txt |   4 +-
 ...tsprojectidvirtualboxnodesnodeidresume.txt |   4 +-
 ...ctsprojectidvirtualboxnodesnodeidstart.txt |   4 +-
 ...ectsprojectidvirtualboxnodesnodeidstop.txt |   4 +-
 ...sprojectidvirtualboxnodesnodeidsuspend.txt |   4 +-
 ...ompute_post_projectsprojectidvpcsnodes.txt |   6 +-
 ...ptersadapternumberdportsportnumberdnio.txt |   4 +-
 ...projectsprojectidvpcsnodesnodeidreload.txt |   4 +-
 ..._projectsprojectidvpcsnodesnodeidstart.txt |  10 +-
 ...t_projectsprojectidvpcsnodesnodeidstop.txt |   4 +-
 .../compute_put_projectsprojectid.txt         |   4 +-
 ...put_projectsprojectiddockernodesnodeid.txt |  14 +-
 ...te_put_projectsprojectidiounodesnodeid.txt |  14 +-
 ...e_put_projectsprojectidqemunodesnodeid.txt |  16 +-
 ...projectsprojectidvirtualboxnodesnodeid.txt |  10 +-
 ...e_put_projectsprojectidvpcsnodesnodeid.txt |  12 +-
 .../controller_delete_projectsprojectid.txt   |   4 +-
 ...ete_projectsprojectiddrawingsdrawingid.txt |   4 +-
 ...er_delete_projectsprojectidlinkslinkid.txt |   4 +-
 ...er_delete_projectsprojectidnodesnodeid.txt |   4 +-
 docs/api/examples/controller_get_projects.txt |   2 +-
 .../controller_get_projectsprojectid.txt      |   8 +-
 ...ntroller_get_projectsprojectiddrawings.txt |   8 +-
 .../controller_get_projectsprojectidlinks.txt |  12 +-
 .../controller_get_projectsprojectidnodes.txt |  12 +-
 ...projectidnodesnodeiddynamipsautoidlepc.txt |   4 +-
 ...ctidnodesnodeiddynamipsidlepcproposals.txt |   4 +-
 .../api/examples/controller_post_projects.txt |   2 +-
 .../examples/controller_post_projectsload.txt |   4 +-
 ...controller_post_projectsprojectidclose.txt |   8 +-
 ...troller_post_projectsprojectiddrawings.txt |   8 +-
 ...controller_post_projectsprojectidlinks.txt |  16 +-
 ...ojectsprojectidlinkslinkidstartcapture.txt |   8 +-
 ...rojectsprojectidlinkslinkidstopcapture.txt |   8 +-
 ...controller_post_projectsprojectidnodes.txt |  12 +-
 ...ost_projectsprojectidnodesnodeidreload.txt |   4 +-
 ...post_projectsprojectidnodesnodeidstart.txt |   4 +-
 ..._post_projectsprojectidnodesnodeidstop.txt |   4 +-
 ...st_projectsprojectidnodesnodeidsuspend.txt |   4 +-
 ...ller_post_projectsprojectidnodesreload.txt |   4 +-
 ...oller_post_projectsprojectidnodesstart.txt |   4 +-
 ...roller_post_projectsprojectidnodesstop.txt |   4 +-
 ...ler_post_projectsprojectidnodessuspend.txt |   4 +-
 .../controller_post_projectsprojectidopen.txt |   8 +-
 ...put_projectsprojectiddrawingsdrawingid.txt |   8 +-
 ...oller_put_projectsprojectidnodesnodeid.txt |  12 +-
 docs/api/notifications/drawing.created.json   |   4 +-
 docs/api/notifications/drawing.deleted.json   |   4 +-
 docs/api/notifications/drawing.updated.json   |   4 +-
 docs/api/notifications/link.created.json      |   8 +-
 docs/api/notifications/link.deleted.json      |   4 +-
 docs/api/notifications/link.updated.json      |   8 +-
 docs/api/notifications/node.deleted.json      |   6 +-
 docs/api/notifications/node.updated.json      |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 .../projectsprojectidatmswitchnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...ectsprojectidatmswitchnodesnodeidstart.rst |   2 +-
 ...jectsprojectidatmswitchnodesnodeidstop.rst |   2 +-
 ...tsprojectidatmswitchnodesnodeidsuspend.rst |   2 +-
 .../projectsprojectidcloudnodesnodeid.rst     |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...projectsprojectidcloudnodesnodeidstart.rst |   2 +-
 .../projectsprojectidcloudnodesnodeidstop.rst |   2 +-
 ...ojectsprojectidcloudnodesnodeidsuspend.rst |   2 +-
 .../projectsprojectiddockernodesnodeid.rst    |   4 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...rojectsprojectiddockernodesnodeidpause.rst |   2 +-
 ...ojectsprojectiddockernodesnodeidreload.rst |   2 +-
 ...rojectsprojectiddockernodesnodeidstart.rst |   2 +-
 ...projectsprojectiddockernodesnodeidstop.rst |   2 +-
 ...jectsprojectiddockernodesnodeidunpause.rst |   2 +-
 .../projectsprojectiddynamipsnodesnodeid.rst  |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...projectiddynamipsnodesnodeidautoidlepc.rst |   2 +-
 ...ctsprojectiddynamipsnodesnodeidconfigs.rst |   2 +-
 ...rojectiddynamipsnodesnodeidconfigssave.rst |   2 +-
 ...ctiddynamipsnodesnodeididlepcproposals.rst |   2 +-
 ...ectsprojectiddynamipsnodesnodeidreload.rst |   2 +-
 ...ectsprojectiddynamipsnodesnodeidresume.rst |   2 +-
 ...jectsprojectiddynamipsnodesnodeidstart.rst |   2 +-
 ...ojectsprojectiddynamipsnodesnodeidstop.rst |   2 +-
 ...ctsprojectiddynamipsnodesnodeidsuspend.rst |   2 +-
 ...rojectsprojectidethernethubnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...tsprojectidethernethubnodesnodeidstart.rst |   2 +-
 ...ctsprojectidethernethubnodesnodeidstop.rst |   2 +-
 ...projectidethernethubnodesnodeidsuspend.rst |   2 +-
 ...ectsprojectidethernetswitchnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...rojectidethernetswitchnodesnodeidstart.rst |   2 +-
 ...projectidethernetswitchnodesnodeidstop.rst |   2 +-
 ...jectidethernetswitchnodesnodeidsuspend.rst |   2 +-
 ...tsprojectidframerelayswitchnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...jectidframerelayswitchnodesnodeidstart.rst |   2 +-
 ...ojectidframerelayswitchnodesnodeidstop.rst |   2 +-
 ...ctidframerelayswitchnodesnodeidsuspend.rst |   2 +-
 .../compute/iou/projectsprojectidiounodes.rst |  33 +-
 .../iou/projectsprojectidiounodesnodeid.rst   | 100 +--
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...projectsprojectidiounodesnodeidconfigs.rst |   2 +-
 ...ectsprojectidiounodesnodeidconfigssave.rst |   2 +-
 .../projectsprojectidiounodesnodeidreload.rst |   2 +-
 .../projectsprojectidiounodesnodeidstart.rst  |  35 +-
 .../projectsprojectidiounodesnodeidstop.rst   |   2 +-
 .../qemu/projectsprojectidqemunodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...projectsprojectidqemunodesnodeidreload.rst |   2 +-
 ...projectsprojectidqemunodesnodeidresume.rst |   2 +-
 .../projectsprojectidqemunodesnodeidstart.rst |   2 +-
 .../projectsprojectidqemunodesnodeidstop.rst  |   2 +-
 ...rojectsprojectidqemunodesnodeidsuspend.rst |   2 +-
 ...projectsprojectidvirtualboxnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...tsprojectidvirtualboxnodesnodeidreload.rst |   2 +-
 ...tsprojectidvirtualboxnodesnodeidresume.rst |   2 +-
 ...ctsprojectidvirtualboxnodesnodeidstart.rst |   2 +-
 ...ectsprojectidvirtualboxnodesnodeidstop.rst |   2 +-
 ...sprojectidvirtualboxnodesnodeidsuspend.rst |   2 +-
 .../projectsprojectidvmwarenodesnodeid.rst    |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...jectidvmwarenodesnodeidinterfacesvmnet.rst |   2 +-
 ...ojectsprojectidvmwarenodesnodeidreload.rst |   2 +-
 ...ojectsprojectidvmwarenodesnodeidresume.rst |   2 +-
 ...rojectsprojectidvmwarenodesnodeidstart.rst |   2 +-
 ...projectsprojectidvmwarenodesnodeidstop.rst |   2 +-
 ...jectsprojectidvmwarenodesnodeidsuspend.rst |   2 +-
 .../vpcs/projectsprojectidvpcsnodesnodeid.rst |   6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |  12 +-
 ...ternumberdportsportnumberdstartcapture.rst |   6 +-
 ...pternumberdportsportnumberdstopcapture.rst |   6 +-
 ...projectsprojectidvpcsnodesnodeidreload.rst |   2 +-
 .../projectsprojectidvpcsnodesnodeidstart.rst |   2 +-
 .../projectsprojectidvpcsnodesnodeidstop.rst  |   2 +-
 .../link/projectsprojectidlinkslinkid.rst     |   4 +-
 .../link/projectsprojectidlinkslinkidpcap.rst |   2 +-
 ...ojectsprojectidlinkslinkidstartcapture.rst |   2 +-
 ...rojectsprojectidlinkslinkidstopcapture.rst |   2 +-
 .../node/projectsprojectidnodesnodeid.rst     |   2 +-
 ...projectidnodesnodeiddynamipsautoidlepc.rst |   2 +-
 ...ctidnodesnodeiddynamipsidlepcproposals.rst |   2 +-
 .../projectsprojectidnodesnodeidreload.rst    |   2 +-
 .../projectsprojectidnodesnodeidstart.rst     |   2 +-
 .../node/projectsprojectidnodesnodeidstop.rst |   2 +-
 .../projectsprojectidnodesnodeidsuspend.rst   |   2 +-
 .../project/projectsprojectidexport.rst       |  18 +
 .../project/projectsprojectidfilespath.rst    |  34 +
 .../project/projectsprojectidimport.rst       |  31 +
 docs/gns3_file.json                           | 666 +++++++++---------
 tests/controller/test_import_project.py       |  39 +-
 205 files changed, 1043 insertions(+), 945 deletions(-)
 create mode 100644 docs/api/v2/controller/project/projectsprojectidexport.rst
 create mode 100644 docs/api/v2/controller/project/projectsprojectidfilespath.rst
 create mode 100644 docs/api/v2/controller/project/projectsprojectidimport.rst

diff --git a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index e5b8efa9..c2310a48 100644
--- a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/82ca5e3a-263b-4076-bf54-feb09024e01d/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2b3ef2f1-06ac-44ab-a980-2bbf3df3d4a9/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/82ca5e3a-263b-4076-bf54-feb09024e01d/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2b3ef2f1-06ac-44ab-a980-2bbf3df3d4a9/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt
index eae9b0a2..d7802620 100644
--- a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d9265805-3d28-464b-9ca3-3f8dc82aa1ff'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/cb93b35e-f756-426d-953e-df347513e8d8'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d9265805-3d28-464b-9ca3-3f8dc82aa1ff HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/cb93b35e-f756-426d-953e-df347513e8d8 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index dca0a972..bbcf24a1 100644
--- a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/20375ab7-2a69-4ef0-84de-7826a45afe0a/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2d5ed591-b7f7-4fd9-87da-2a8041aff861/adapters/1/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/20375ab7-2a69-4ef0-84de-7826a45afe0a/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2d5ed591-b7f7-4fd9-87da-2a8041aff861/adapters/1/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt
index 837dcab5..baba77cb 100644
--- a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5fbd9ddc-3bfc-4e92-8103-5ba376658f77'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b83255ec-827a-49cd-acb5-ba55a3355fe0'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5fbd9ddc-3bfc-4e92-8103-5ba376658f77 HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/b83255ec-827a-49cd-acb5-ba55a3355fe0 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index a580dee0..37612835 100644
--- a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/e67627fe-c17d-4b3d-bf15-46515c7669db/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/9eccc91e-6ce6-442c-84ba-97969ceb043a/adapters/1/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/e67627fe-c17d-4b3d-bf15-46515c7669db/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/9eccc91e-6ce6-442c-84ba-97969ceb043a/adapters/1/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 10c90db0..15fe0bd3 100644
--- a/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/ddd8fd45-92c8-4647-ba8b-4c49e6c22831/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2f32627f-c346-4f51-a492-f2078b6b4caa/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/ddd8fd45-92c8-4647-ba8b-4c49e6c22831/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/2f32627f-c346-4f51-a492-f2078b6b4caa/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
index f49f3a30..367e8f8d 100644
--- a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/9f15e6d8-dad3-428f-91d9-647fe2bb2b4c'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0c6d314f-8345-471b-9a43-9eebc8d8ea6d'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/9f15e6d8-dad3-428f-91d9-647fe2bb2b4c HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0c6d314f-8345-471b-9a43-9eebc8d8ea6d HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 7b4fce67..8e8cf87f 100644
--- a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/da796d1b-a9b7-4d60-a8da-04a079d31036/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/1288b33c-169d-4aa3-a8f9-ba91537c4aa8/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/da796d1b-a9b7-4d60-a8da-04a079d31036/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/1288b33c-169d-4aa3-a8f9-ba91537c4aa8/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_get_networkinterfaces.txt b/docs/api/examples/compute_get_networkinterfaces.txt
index 9e92fdc2..1ec91cf6 100644
--- a/docs/api/examples/compute_get_networkinterfaces.txt
+++ b/docs/api/examples/compute_get_networkinterfaces.txt
@@ -5,7 +5,7 @@ GET /v2/compute/network/interfaces HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 40795
+CONTENT-LENGTH: 40821
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -28,7 +28,7 @@ X-ROUTE: /v2/compute/network/interfaces
     },
     {
         "id": "en1",
-        "ip_address": "",
+        "ip_address": "192.168.84.106",
         "mac_address": "68:a8:6d:4a:c3:16",
         "name": "en1",
         "type": "ethernet"
@@ -112,7 +112,7 @@ X-ROUTE: /v2/compute/network/interfaces
     },
     {
         "id": "vboxnet7",
-        "ip_address": "",
+        "ip_address": "192.168.63.1",
         "mac_address": "0a:00:27:00:00:07",
         "name": "vboxnet7",
         "type": "ethernet"
diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
index cea5a314..c056e379 100644
--- a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b397906a-a988-47ec-a843-2a970d875ac0'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/e4f6564d-1d40-4840-80c2-ecea2f29a14a'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b397906a-a988-47ec-a843-2a970d875ac0 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/e4f6564d-1d40-4840-80c2-ecea2f29a14a HTTP/1.1
 
 
 
@@ -13,15 +13,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5711,
+    "console": 5712,
     "console_type": "telnet",
     "ethernet_adapters": 2,
     "iourc_path": null,
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/project-files/iou/b397906a-a988-47ec-a843-2a970d875ac0",
-    "node_id": "b397906a-a988-47ec-a843-2a970d875ac0",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/project-files/iou/e4f6564d-1d40-4840-80c2-ecea2f29a14a",
+    "node_id": "e4f6564d-1d40-4840-80c2-ecea2f29a14a",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt
index 843c70b9..a5e09230 100644
--- a/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt
+++ b/docs/api/examples/compute_get_projectsprojectidiounodesnodeidconfigs.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4e59b33c-3448-4f67-9179-29231222fb92/configs'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7c791ef3-51ef-4440-8cea-e6ee70c40475/configs'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4e59b33c-3448-4f67-9179-29231222fb92/configs HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7c791ef3-51ef-4440-8cea-e6ee70c40475/configs HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
index 7c01e385..8a49b5d9 100644
--- a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/09669b25-c5b5-4996-aff6-1692ef559371'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/54c0602e-b77c-4285-a25f-be4a15016364'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/09669b25-c5b5-4996-aff6-1692ef559371 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/54c0602e-b77c-4285-a25f-be4a15016364 HTTP/1.1
 
 
 
@@ -19,7 +19,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5711,
+    "console": 5712,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -41,15 +41,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:93:71:00",
+    "mac_address": "00:dd:80:63:64:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/09669b25-c5b5-4996-aff6-1692ef559371",
-    "node_id": "09669b25-c5b5-4996-aff6-1692ef559371",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/54c0602e-b77c-4285-a25f-be4a15016364",
+    "node_id": "54c0602e-b77c-4285-a25f-be4a15016364",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcdk456cd/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpohgwih_d/qemu-system-x86_64",
     "ram": 256,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
index f6b0364b..80f6f9ed 100644
--- a/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6608f74f-ff43-40a0-a269-235d55020297'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c6dac8af-3ae6-40d0-a45a-eaaf5a34a227'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6608f74f-ff43-40a0-a269-235d55020297 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/c6dac8af-3ae6-40d0-a45a-eaaf5a34a227 HTTP/1.1
 
 
 
@@ -15,13 +15,13 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
     "acpi_shutdown": false,
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "adapters": 0,
-    "console": 5712,
+    "console": 5713,
     "enable_remote_console": false,
     "headless": false,
     "linked_clone": false,
     "name": "VMTEST",
     "node_directory": null,
-    "node_id": "6608f74f-ff43-40a0-a269-235d55020297",
+    "node_id": "c6dac8af-3ae6-40d0-a45a-eaaf5a34a227",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "ram": 0,
     "status": "stopped",
diff --git a/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
index 0fc1815e..52f098c7 100644
--- a/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/ab1ed56e-5d39-4f6e-9c8f-9a09ea6aeff3'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/fc5ca6c0-ee4d-4be8-a91f-afc4a94b9256'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/ab1ed56e-5d39-4f6e-9c8f-9a09ea6aeff3 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/fc5ca6c0-ee4d-4be8-a91f-afc4a94b9256 HTTP/1.1
 
 
 
@@ -13,11 +13,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5720,
+    "console": 5721,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/ab1ed56e-5d39-4f6e-9c8f-9a09ea6aeff3",
-    "node_id": "ab1ed56e-5d39-4f6e-9c8f-9a09ea6aeff3",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/fc5ca6c0-ee4d-4be8-a91f-afc4a94b9256",
+    "node_id": "fc5ca6c0-ee4d-4be8-a91f-afc4a94b9256",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 36141601..d9df6670 100644
--- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/548a2652-f5a7-4446-a4ae-f2af78ae4d18/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2f9bb9bb-9c14-4034-8da0-212e3d20ba15/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/548a2652-f5a7-4446-a4ae-f2af78ae4d18/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2f9bb9bb-9c14-4034-8da0-212e3d20ba15/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
index 70f67749..97303fcf 100644
--- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ee7112c1-6dbe-4dfa-aa59-f1f1043d5d7d/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/86eaf1ae-228b-4070-b67f-3b6a63ddb60c/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/ee7112c1-6dbe-4dfa-aa59-f1f1043d5d7d/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/86eaf1ae-228b-4070-b67f-3b6a63ddb60c/adapters/0/ports/0/start_capture HTTP/1.1
 {
     "capture_file_name": "test.pcap",
     "data_link_type": "DLT_EN10MB"
@@ -15,5 +15,5 @@ SERVER: Python/3.5 GNS3/2.0.0dev1
 X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
 
 {
-    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/tmp/captures/test.pcap"
+    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/tmp/captures/test.pcap"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
index 1401c749..f8be29a9 100644
--- a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/7c0007cf-aaab-4742-ab07-3e642743c59d/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/945d4525-7f44-477c-bf5e-8ece7d1c870d/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/7c0007cf-aaab-4742-ab07-3e642743c59d/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/945d4525-7f44-477c-bf5e-8ece7d1c870d/adapters/0/ports/0/stop_capture HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodes.txt b/docs/api/examples/compute_post_projectsprojectidiounodes.txt
index fd6f3d6f..6e11442d 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodes.txt
@@ -1,9 +1,9 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "e949a095-7ac3-455d-a9a3-827cc093dcbf", "path": "iou.bin", "startup_config_content": "hostname test"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes' -d '{"name": "PC TEST 1", "node_id": "5913b5cf-035d-40e0-a094-918bfe4b223a", "path": "iou.bin", "startup_config_content": "hostname test"}'
 
 POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes HTTP/1.1
 {
     "name": "PC TEST 1",
-    "node_id": "e949a095-7ac3-455d-a9a3-827cc093dcbf",
+    "node_id": "5913b5cf-035d-40e0-a094-918bfe4b223a",
     "path": "iou.bin",
     "startup_config_content": "hostname test"
 }
@@ -18,15 +18,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes
 
 {
     "command_line": "",
-    "console": 5711,
+    "console": 5712,
     "console_type": "telnet",
     "ethernet_adapters": 2,
     "iourc_path": null,
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/project-files/iou/e949a095-7ac3-455d-a9a3-827cc093dcbf",
-    "node_id": "e949a095-7ac3-455d-a9a3-827cc093dcbf",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/project-files/iou/5913b5cf-035d-40e0-a094-918bfe4b223a",
+    "node_id": "5913b5cf-035d-40e0-a094-918bfe4b223a",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index f6451573..3fc99799 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7f61de6b-5445-4dc8-b59a-acbed677c8e5/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1f5895d0-cf8c-48ab-852c-e11fbd8a3982/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/7f61de6b-5445-4dc8-b59a-acbed677c8e5/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1f5895d0-cf8c-48ab-852c-e11fbd8a3982/adapters/1/ports/0/nio HTTP/1.1
 {
     "ethernet_device": "bridge0",
     "type": "nio_ethernet"
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
index 38a17931..e7b97b74 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/108ab602-1115-4a10-aa68-19e234653eb8/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c6114408-b83b-4eb1-a32f-b00786b63271/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/108ab602-1115-4a10-aa68-19e234653eb8/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c6114408-b83b-4eb1-a32f-b00786b63271/adapters/0/ports/0/start_capture HTTP/1.1
 {
     "capture_file_name": "test.pcap",
     "data_link_type": "DLT_EN10MB"
@@ -15,5 +15,5 @@ SERVER: Python/3.5 GNS3/2.0.0dev1
 X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
 
 {
-    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/tmp/captures/test.pcap"
+    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/tmp/captures/test.pcap"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
index 7dd9886a..3761b23f 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2b9a10f8-3a78-4871-bfb4-4f3fc283c2fd/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b4a7f87a-a27c-4c19-938e-dc0341de0a81/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2b9a10f8-3a78-4871-bfb4-4f3fc283c2fd/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/b4a7f87a-a27c-4c19-938e-dc0341de0a81/adapters/0/ports/0/stop_capture HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt
index 2a3da43e..e92b0a17 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/086c923b-aeff-4af4-a882-e72ce326af89/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f4e416f5-e5ec-493e-adcf-eadc46f86587/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/086c923b-aeff-4af4-a882-e72ce326af89/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f4e416f5-e5ec-493e-adcf-eadc46f86587/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
index aad51930..6667c605 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/e36c0c6f-3680-4d92-b223-3381d9b65f85/start' -d '{"iourc_content": "test"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/37995599-2a0f-4eba-b661-ab9a353af9af/start' -d '{"iourc_content": "test"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/e36c0c6f-3680-4d92-b223-3381d9b65f85/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/37995599-2a0f-4eba-b661-ab9a353af9af/start HTTP/1.1
 {
     "iourc_content": "test"
 }
@@ -15,15 +15,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start
 
 {
     "command_line": "",
-    "console": 5711,
+    "console": 5712,
     "console_type": "telnet",
     "ethernet_adapters": 2,
-    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1d1feg2r/iourc",
+    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprk3014is/iourc",
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/project-files/iou/e36c0c6f-3680-4d92-b223-3381d9b65f85",
-    "node_id": "e36c0c6f-3680-4d92-b223-3381d9b65f85",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/project-files/iou/37995599-2a0f-4eba-b661-ab9a353af9af",
+    "node_id": "37995599-2a0f-4eba-b661-ab9a353af9af",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt
index ad45b26b..ee58825e 100644
--- a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/6784d0f6-46fd-45dd-868f-087a04db64bd/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/0713a75e-ee3d-4904-a750-0632969b439a/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/6784d0f6-46fd-45dd-868f-087a04db64bd/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/0713a75e-ee3d-4904-a750-0632969b439a/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
index c316cbe2..fbfb43dd 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
@@ -1,10 +1,10 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcdk456cd/qemu-system-x86_64", "ram": 1024}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpohgwih_d/qemu-system-x86_64", "ram": 1024}'
 
 POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes HTTP/1.1
 {
     "hda_disk_image": "linux\u8f7d.img",
     "name": "PC TEST 1",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcdk456cd/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpohgwih_d/qemu-system-x86_64",
     "ram": 1024
 }
 
@@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5711,
+    "console": 5712,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -46,15 +46,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:69:cf:00",
+    "mac_address": "00:dd:80:97:69:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/c1335902-4980-4f17-a4dd-9c986b2069cf",
-    "node_id": "c1335902-4980-4f17-a4dd-9c986b2069cf",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/d491a199-67ab-487f-a9a9-4e4657489769",
+    "node_id": "d491a199-67ab-487f-a9a9-4e4657489769",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcdk456cd/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpohgwih_d/qemu-system-x86_64",
     "ram": 1024,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 79c7c5f6..f4449d97 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ced87984-9f9f-495d-a18f-a68efe201c11/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/59d404ea-718d-44b9-976d-7a8cffe857d1/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ced87984-9f9f-495d-a18f-a68efe201c11/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/59d404ea-718d-44b9-976d-7a8cffe857d1/adapters/1/ports/0/nio HTTP/1.1
 {
     "ethernet_device": "eth0",
     "type": "nio_ethernet"
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
index bbd7589b..1da401c6 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/3c8b883b-9346-40fa-94d5-bdf878dd2cc6/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c66cd69f-a16e-4f3b-b273-c5bb3919aa6f/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/3c8b883b-9346-40fa-94d5-bdf878dd2cc6/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c66cd69f-a16e-4f3b-b273-c5bb3919aa6f/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
index f07ba5ef..cd0452ff 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/20594862-1fa6-478c-af2c-650dc21a158d/resume' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/fbc22414-5ca4-4279-8831-cc9cc8da72c2/resume' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/20594862-1fa6-478c-af2c-650dc21a158d/resume HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/fbc22414-5ca4-4279-8831-cc9cc8da72c2/resume HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
index 124e3643..a957cd63 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5f361fdf-df83-4aa7-b28d-17887634bb6b/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/00459e30-4fac-41cf-bbef-2a5dba39f47c/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/5f361fdf-df83-4aa7-b28d-17887634bb6b/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/00459e30-4fac-41cf-bbef-2a5dba39f47c/start HTTP/1.1
 {}
 
 
@@ -19,7 +19,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5711,
+    "console": 5712,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -41,15 +41,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}/start
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:bb:6b:00",
+    "mac_address": "00:dd:80:f4:7c:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/5f361fdf-df83-4aa7-b28d-17887634bb6b",
-    "node_id": "5f361fdf-df83-4aa7-b28d-17887634bb6b",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/00459e30-4fac-41cf-bbef-2a5dba39f47c",
+    "node_id": "00459e30-4fac-41cf-bbef-2a5dba39f47c",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcdk456cd/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpohgwih_d/qemu-system-x86_64",
     "ram": 256,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
index ec21c9de..31353ee3 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/d4fed5a1-cabb-469f-8e01-67850ea774ea/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/fff154a4-b585-4ffe-b3c3-c7263d48cd8a/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/d4fed5a1-cabb-469f-8e01-67850ea774ea/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/fff154a4-b585-4ffe-b3c3-c7263d48cd8a/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
index 014470e8..12aa0f36 100644
--- a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
+++ b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/cbb32a8f-703f-477e-840b-8f90fc9cde60/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a1f4da5d-5e1f-4d95-9e10-1844cdd793c1/suspend' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/cbb32a8f-703f-477e-840b-8f90fc9cde60/suspend HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a1f4da5d-5e1f-4d95-9e10-1844cdd793c1/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
index add4e63a..4da34a86 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
@@ -19,13 +19,13 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes
     "acpi_shutdown": false,
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "adapters": 0,
-    "console": 5711,
+    "console": 5712,
     "enable_remote_console": false,
     "headless": false,
     "linked_clone": false,
     "name": "VM1",
     "node_directory": null,
-    "node_id": "68e1fcae-42cb-48bd-8ffa-5db5a182a643",
+    "node_id": "49869e55-29f7-438b-ad0b-cf240d399b9a",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "ram": 0,
     "status": "stopped",
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 3541130e..a20d2417 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/8190efe2-e19c-4ef9-b716-c1a706ffd6c0/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5424b741-a94e-4128-b452-b9567057ef39/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/8190efe2-e19c-4ef9-b716-c1a706ffd6c0/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5424b741-a94e-4128-b452-b9567057ef39/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
index 11e8fa4c..8539d8a6 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/d3a55de8-7c27-4082-8058-0cc8e06ffccb/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/de53c6ae-1e45-49dc-a975-2c7ceff86927/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/d3a55de8-7c27-4082-8058-0cc8e06ffccb/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/de53c6ae-1e45-49dc-a975-2c7ceff86927/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
index 610eb69b..f21c2df8 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b4e2e8fc-f29f-4917-80e4-179643a28045/resume' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/842b2246-9d1e-414b-b28b-64b5ec8c6a7f/resume' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b4e2e8fc-f29f-4917-80e4-179643a28045/resume HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/842b2246-9d1e-414b-b28b-64b5ec8c6a7f/resume HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
index 24150077..8d14d6ad 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/e9801914-fb16-42c8-aabe-2c47ce82c2e9/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/4d3c8f80-1e2b-4413-8eb7-06713d95a66d/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/e9801914-fb16-42c8-aabe-2c47ce82c2e9/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/4d3c8f80-1e2b-4413-8eb7-06713d95a66d/start HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
index 4019116a..9babf2cc 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6e397ac6-4cf6-4163-abca-3e1e4d30cc1b/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b679cf79-135f-4090-a760-e32028adcbeb/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/6e397ac6-4cf6-4163-abca-3e1e4d30cc1b/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b679cf79-135f-4090-a760-e32028adcbeb/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
index b1319644..02536a92 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a3717ef6-2de2-437e-8ecc-040368798469/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/0f80391a-1421-4971-b208-8276a343882a/suspend' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a3717ef6-2de2-437e-8ecc-040368798469/suspend HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/0f80391a-1421-4971-b208-8276a343882a/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
index 184d36cc..b22b08ea 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
@@ -15,11 +15,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes
 
 {
     "command_line": "",
-    "console": 5720,
+    "console": 5721,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/e376fd8f-0852-4af2-8eab-1d6cbcda99e0",
-    "node_id": "e376fd8f-0852-4af2-8eab-1d6cbcda99e0",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/214cf5da-3383-4b73-8369-0eab8dc718d3",
+    "node_id": "214cf5da-3383-4b73-8369-0eab8dc718d3",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index eb1898c8..3bed5d86 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4fe6c447-705a-451d-aae5-596530f405b3/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/fa939ac9-39ee-4e75-a07d-dea1b3024642/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4fe6c447-705a-451d-aae5-596530f405b3/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/fa939ac9-39ee-4e75-a07d-dea1b3024642/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
index d1aec5b2..fde80209 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/ce85a25e-15c6-4e27-85f8-f20fb63db5fa/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/fb050a25-8377-4e92-934b-4d212da587ea/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/ce85a25e-15c6-4e27-85f8-f20fb63db5fa/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/fb050a25-8377-4e92-934b-4d212da587ea/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
index f598942c..83eca94b 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/19643991-7e9c-4d16-bc74-e20485066598/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f9240f44-b653-4010-ac2e-cb38d80e96d7/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/19643991-7e9c-4d16-bc74-e20485066598/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f9240f44-b653-4010-ac2e-cb38d80e96d7/start HTTP/1.1
 {}
 
 
@@ -13,11 +13,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/start
 
 {
     "command_line": "",
-    "console": 5720,
+    "console": 5721,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/19643991-7e9c-4d16-bc74-e20485066598",
-    "node_id": "19643991-7e9c-4d16-bc74-e20485066598",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f9240f44-b653-4010-ac2e-cb38d80e96d7",
+    "node_id": "f9240f44-b653-4010-ac2e-cb38d80e96d7",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
index f2eb3ee2..b4a50047 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/7c84b4c0-8ec0-42d6-9645-38979066289c/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e2de4ebc-1136-43fe-8d4b-5a37b9e89592/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/7c84b4c0-8ec0-42d6-9645-38979066289c/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e2de4ebc-1136-43fe-8d4b-5a37b9e89592/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_put_projectsprojectid.txt b/docs/api/examples/compute_put_projectsprojectid.txt
index 91648da2..afff59f7 100644
--- a/docs/api/examples/compute_put_projectsprojectid.txt
+++ b/docs/api/examples/compute_put_projectsprojectid.txt
@@ -1,9 +1,9 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/90010203-0405-0607-0809-0a0b0c0d0e0b' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_update_path_project_non_l0"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/90010203-0405-0607-0809-0a0b0c0d0e0b' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_update_path_project_non_l0"}'
 
 PUT /v2/compute/projects/90010203-0405-0607-0809-0a0b0c0d0e0b HTTP/1.1
 {
     "name": "second_name",
-    "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_update_path_project_non_l0"
+    "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_update_path_project_non_l0"
 }
 
 
diff --git a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
index eb587116..67639e67 100644
--- a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/40be906f-c587-494d-b845-c87db90737b1' -d '{"console": 5713, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/8bd7d0bb-a0cc-4f5d-b8dd-bd0039a0f169' -d '{"console": 5714, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/40be906f-c587-494d-b845-c87db90737b1 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/8bd7d0bb-a0cc-4f5d-b8dd-bd0039a0f169 HTTP/1.1
 {
-    "console": 5713,
+    "console": 5714,
     "environment": "GNS3=1\nGNS4=0",
     "name": "test",
     "start_command": "yes"
@@ -18,8 +18,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}
 
 {
     "adapters": 2,
-    "aux": 5712,
-    "console": 5713,
+    "aux": 5713,
+    "console": 5714,
     "console_http_path": "/",
     "console_http_port": 80,
     "console_resolution": "1280x1024",
@@ -28,8 +28,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/docker/nodes/{node_id}
     "environment": "GNS3=1\nGNS4=0",
     "image": "nginx:latest",
     "name": "test",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/project-files/docker/40be906f-c587-494d-b845-c87db90737b1",
-    "node_id": "40be906f-c587-494d-b845-c87db90737b1",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/project-files/docker/8bd7d0bb-a0cc-4f5d-b8dd-bd0039a0f169",
+    "node_id": "8bd7d0bb-a0cc-4f5d-b8dd-bd0039a0f169",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "start_command": "yes",
     "status": "stopped"
diff --git a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
index 0f0127e8..a448f75f 100644
--- a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/000a9b96-c2f2-433a-b60b-a292388363e2' -d '{"console": 5712, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/99fcf923-1d1f-451f-808d-0562446ab983' -d '{"console": 5713, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/000a9b96-c2f2-433a-b60b-a292388363e2 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/99fcf923-1d1f-451f-808d-0562446ab983 HTTP/1.1
 {
-    "console": 5712,
+    "console": 5713,
     "ethernet_adapters": 4,
     "iourc_content": "test",
     "l1_keepalives": true,
@@ -24,15 +24,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5712,
+    "console": 5713,
     "console_type": "telnet",
     "ethernet_adapters": 4,
-    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1i3dv2rj/iourc",
+    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprys_zk85/iourc",
     "l1_keepalives": true,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "test",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_json4/project-files/iou/000a9b96-c2f2-433a-b60b-a292388363e2",
-    "node_id": "000a9b96-c2f2-433a-b60b-a292388363e2",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_json4/project-files/iou/99fcf923-1d1f-451f-808d-0562446ab983",
+    "node_id": "99fcf923-1d1f-451f-808d-0562446ab983",
     "nvram": 2048,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
index 2bdab6d3..f8b9bc3d 100644
--- a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ec18071e-4681-48ad-8670-e2b6d537b839' -d '{"console": 5712, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/975c8cc2-230b-4bcf-9b3c-799668a38f75' -d '{"console": 5713, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/ec18071e-4681-48ad-8670-e2b6d537b839 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/975c8cc2-230b-4bcf-9b3c-799668a38f75 HTTP/1.1
 {
-    "console": 5712,
+    "console": 5713,
     "hdb_disk_image": "linux\u8f7d.img",
     "name": "test",
     "ram": 1024
@@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "cdrom_image": "",
     "cdrom_image_md5sum": null,
     "command_line": "",
-    "console": 5712,
+    "console": 5713,
     "console_type": "telnet",
     "cpu_throttling": 0,
     "cpus": 1,
@@ -46,15 +46,15 @@ X-ROUTE: /v2/compute/projects/{project_id}/qemu/nodes/{node_id}
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:dd:80:b8:39:00",
+    "mac_address": "00:dd:80:8f:75:00",
     "name": "test",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/ec18071e-4681-48ad-8670-e2b6d537b839",
-    "node_id": "ec18071e-4681-48ad-8670-e2b6d537b839",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/975c8cc2-230b-4bcf-9b3c-799668a38f75",
+    "node_id": "975c8cc2-230b-4bcf-9b3c-799668a38f75",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcdk456cd/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpohgwih_d/qemu-system-x86_64",
     "ram": 1024,
     "status": "stopped",
     "usage": ""
diff --git a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
index 9ba1b6d3..3e6373a8 100644
--- a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/f4e6444e-3c16-4b48-bb71-1378e6c5c22a' -d '{"console": 5721, "name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/373e36f5-6128-4a99-969d-baa2ced74b71' -d '{"console": 5722, "name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/f4e6444e-3c16-4b48-bb71-1378e6c5c22a HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/373e36f5-6128-4a99-969d-baa2ced74b71 HTTP/1.1
 {
-    "console": 5721,
+    "console": 5722,
     "name": "test"
 }
 
@@ -18,13 +18,13 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
     "acpi_shutdown": false,
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "adapters": 0,
-    "console": 5721,
+    "console": 5722,
     "enable_remote_console": false,
     "headless": false,
     "linked_clone": false,
     "name": "test",
     "node_directory": null,
-    "node_id": "f4e6444e-3c16-4b48-bb71-1378e6c5c22a",
+    "node_id": "373e36f5-6128-4a99-969d-baa2ced74b71",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "ram": 0,
     "status": "stopped",
diff --git a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
index 1ca2998b..2fa14980 100644
--- a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
@@ -1,8 +1,8 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/c741536a-f06d-43b6-9684-cc5cd48861dd' -d '{"console": 5722, "name": "test", "startup_script": "ip 192.168.1.1"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/43749238-108e-46d4-8972-a201ab3f041c' -d '{"console": 5723, "name": "test", "startup_script": "ip 192.168.1.1"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/c741536a-f06d-43b6-9684-cc5cd48861dd HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/43749238-108e-46d4-8972-a201ab3f041c HTTP/1.1
 {
-    "console": 5722,
+    "console": 5723,
     "name": "test",
     "startup_script": "ip 192.168.1.1"
 }
@@ -17,11 +17,11 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
 
 {
     "command_line": "",
-    "console": 5722,
+    "console": 5723,
     "console_type": "telnet",
     "name": "test",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzqod7tpw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/c741536a-f06d-43b6-9684-cc5cd48861dd",
-    "node_id": "c741536a-f06d-43b6-9684-cc5cd48861dd",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm3d7sd4g/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/43749238-108e-46d4-8972-a201ab3f041c",
+    "node_id": "43749238-108e-46d4-8972-a201ab3f041c",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": "ip 192.168.1.1",
     "startup_script_path": "startup.vpc",
diff --git a/docs/api/examples/controller_delete_projectsprojectid.txt b/docs/api/examples/controller_delete_projectsprojectid.txt
index 6a16e8df..b075f5b5 100644
--- a/docs/api/examples/controller_delete_projectsprojectid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/217765ab-468a-497b-957f-7e851ed1b0d9'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/38eb454f-0e47-4c31-9eb9-4996036e076e'
 
-DELETE /v2/projects/217765ab-468a-497b-957f-7e851ed1b0d9 HTTP/1.1
+DELETE /v2/projects/38eb454f-0e47-4c31-9eb9-4996036e076e HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
index 11411a7d..b6db3160 100644
--- a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/d75dc250-7d7b-4d0b-8a06-ae2853c2304f/drawings/cc2439b5-3009-4c6a-ba87-c51795a6f461'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/3bfa063a-bbfb-4c46-aefd-39b73c8ee707/drawings/a816efd7-0c3e-4267-8891-011de8389855'
 
-DELETE /v2/projects/d75dc250-7d7b-4d0b-8a06-ae2853c2304f/drawings/cc2439b5-3009-4c6a-ba87-c51795a6f461 HTTP/1.1
+DELETE /v2/projects/3bfa063a-bbfb-4c46-aefd-39b73c8ee707/drawings/a816efd7-0c3e-4267-8891-011de8389855 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
index 02a63961..85b4956c 100644
--- a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/a0e491a9-93d2-479a-9bb6-7f0d79999ec0/links/0fe9e5db-8b7f-41e1-922b-a58aabd4100f'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/0f1adb1a-e58d-47ae-92a5-a0f4ed1858b2/links/b9be3e2e-4090-43a9-95a0-f95b30f441eb'
 
-DELETE /v2/projects/a0e491a9-93d2-479a-9bb6-7f0d79999ec0/links/0fe9e5db-8b7f-41e1-922b-a58aabd4100f HTTP/1.1
+DELETE /v2/projects/0f1adb1a-e58d-47ae-92a5-a0f4ed1858b2/links/b9be3e2e-4090-43a9-95a0-f95b30f441eb HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
index 620d536e..bf2bd069 100644
--- a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/1df6389f-befc-4f18-9dce-dc3679ffc4c2/nodes/e32f99c7-128d-4003-ba94-94cd3c005c9e'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/9f98296f-7740-45a2-a40f-e6db8c356318/nodes/65b24f26-b0a1-416b-9a00-822e256954e9'
 
-DELETE /v2/projects/1df6389f-befc-4f18-9dce-dc3679ffc4c2/nodes/e32f99c7-128d-4003-ba94-94cd3c005c9e HTTP/1.1
+DELETE /v2/projects/9f98296f-7740-45a2-a40f-e6db8c356318/nodes/65b24f26-b0a1-416b-9a00-822e256954e9 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_get_projects.txt b/docs/api/examples/controller_get_projects.txt
index 67293a9f..e7bbbe21 100644
--- a/docs/api/examples/controller_get_projects.txt
+++ b/docs/api/examples/controller_get_projects.txt
@@ -15,7 +15,7 @@ X-ROUTE: /v2/projects
     {
         "filename": "test.gns3",
         "name": "test",
-        "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1130/test_list_projects1",
+        "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-1615/test_list_projects1",
         "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f",
         "status": "opened"
     }
diff --git a/docs/api/examples/controller_get_projectsprojectid.txt b/docs/api/examples/controller_get_projectsprojectid.txt
index d49d2982..2331db11 100644
--- a/docs/api/examples/controller_get_projectsprojectid.txt
+++ b/docs/api/examples/controller_get_projectsprojectid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/17850018-125c-4c94-acc0-8f7fed551b85'
+curl -i -X GET 'http://localhost:3080/v2/projects/7e9f04f0-3d50-4e8e-acf0-0181436113a2'
 
-GET /v2/projects/17850018-125c-4c94-acc0-8f7fed551b85 HTTP/1.1
+GET /v2/projects/7e9f04f0-3d50-4e8e-acf0-0181436113a2 HTTP/1.1
 
 
 
@@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id}
 {
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprvgpe8o0/projects/17850018-125c-4c94-acc0-8f7fed551b85",
-    "project_id": "17850018-125c-4c94-acc0-8f7fed551b85",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpckxarug_/projects/7e9f04f0-3d50-4e8e-acf0-0181436113a2",
+    "project_id": "7e9f04f0-3d50-4e8e-acf0-0181436113a2",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_get_projectsprojectiddrawings.txt b/docs/api/examples/controller_get_projectsprojectiddrawings.txt
index 524c74eb..f277b840 100644
--- a/docs/api/examples/controller_get_projectsprojectiddrawings.txt
+++ b/docs/api/examples/controller_get_projectsprojectiddrawings.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/653341bc-edd6-458a-90ab-25fd65c0f4b3/drawings'
+curl -i -X GET 'http://localhost:3080/v2/projects/8136bd49-a9e0-43a2-8012-e49d539bc0b4/drawings'
 
-GET /v2/projects/653341bc-edd6-458a-90ab-25fd65c0f4b3/drawings HTTP/1.1
+GET /v2/projects/8136bd49-a9e0-43a2-8012-e49d539bc0b4/drawings HTTP/1.1
 
 
 
@@ -13,8 +13,8 @@ X-ROUTE: /v2/projects/{project_id}/drawings
 
 [
     {
-        "drawing_id": "c1457dac-9864-46f3-ba41-5a62479273bf",
-        "project_id": "653341bc-edd6-458a-90ab-25fd65c0f4b3",
+        "drawing_id": "7d8a9489-e8f8-4cab-ad67-c71d26c6d570",
+        "project_id": "8136bd49-a9e0-43a2-8012-e49d539bc0b4",
         "rotation": 0,
         "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
         "x": 10,
diff --git a/docs/api/examples/controller_get_projectsprojectidlinks.txt b/docs/api/examples/controller_get_projectsprojectidlinks.txt
index de722e5a..2d51422a 100644
--- a/docs/api/examples/controller_get_projectsprojectidlinks.txt
+++ b/docs/api/examples/controller_get_projectsprojectidlinks.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/6cd75a96-97e6-469d-a742-b604f65c674d/links'
+curl -i -X GET 'http://localhost:3080/v2/projects/8d82f6d1-a010-4dc0-bd01-77155280e3b8/links'
 
-GET /v2/projects/6cd75a96-97e6-469d-a742-b604f65c674d/links HTTP/1.1
+GET /v2/projects/8d82f6d1-a010-4dc0-bd01-77155280e3b8/links HTTP/1.1
 
 
 
@@ -16,7 +16,7 @@ X-ROUTE: /v2/projects/{project_id}/links
         "capture_file_name": null,
         "capture_file_path": null,
         "capturing": false,
-        "link_id": "0df81303-95fb-4bb8-bea1-82678f247781",
+        "link_id": "3a5d720e-c005-421a-ba55-c4f9ba6b7fd8",
         "nodes": [
             {
                 "adapter_number": 0,
@@ -27,7 +27,7 @@ X-ROUTE: /v2/projects/{project_id}/links
                     "x": -10,
                     "y": -10
                 },
-                "node_id": "4bff4d24-9fe4-42d4-a26a-4e69aeafde11",
+                "node_id": "54888447-9a71-4a5c-9d0c-ebc39433fed6",
                 "port_number": 3
             },
             {
@@ -39,10 +39,10 @@ X-ROUTE: /v2/projects/{project_id}/links
                     "x": -10,
                     "y": -10
                 },
-                "node_id": "2b0ee7aa-7500-4f8a-8bd7-248eb5a55df9",
+                "node_id": "c8e9784f-4a8f-4a1f-826a-e095d55d10c8",
                 "port_number": 4
             }
         ],
-        "project_id": "6cd75a96-97e6-469d-a742-b604f65c674d"
+        "project_id": "8d82f6d1-a010-4dc0-bd01-77155280e3b8"
     }
 ]
diff --git a/docs/api/examples/controller_get_projectsprojectidnodes.txt b/docs/api/examples/controller_get_projectsprojectidnodes.txt
index 3c97874d..8b50dcec 100644
--- a/docs/api/examples/controller_get_projectsprojectidnodes.txt
+++ b/docs/api/examples/controller_get_projectsprojectidnodes.txt
@@ -1,11 +1,11 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/ba784a62-27bb-49ce-b801-e5bf16dd4bf1/nodes'
+curl -i -X GET 'http://localhost:3080/v2/projects/1e2f0577-9ba9-4c61-9a57-f85f2dd81cc7/nodes'
 
-GET /v2/projects/ba784a62-27bb-49ce-b801-e5bf16dd4bf1/nodes HTTP/1.1
+GET /v2/projects/1e2f0577-9ba9-4c61-9a57-f85f2dd81cc7/nodes HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 806
+CONTENT-LENGTH: 810
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -22,15 +22,15 @@ X-ROUTE: /v2/projects/{project_id}/nodes
         "label": {
             "rotation": 0,
             "style": "font-size: 10;font-familly: Verdana",
-            "text": "",
+            "text": "test",
             "x": -17,
             "y": -25
         },
         "name": "test",
         "node_directory": null,
-        "node_id": "dd18808b-0499-4da2-a17e-550949de0591",
+        "node_id": "9dab4635-2ad4-4b19-b222-3810f483b977",
         "node_type": "vpcs",
-        "project_id": "ba784a62-27bb-49ce-b801-e5bf16dd4bf1",
+        "project_id": "1e2f0577-9ba9-4c61-9a57-f85f2dd81cc7",
         "properties": {
             "startup_script": "echo test"
         },
diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
index 887850ca..bf02ad62 100644
--- a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
+++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/ae53ebc4-e6bc-44af-a6f7-5aef0d7f3c4d/nodes/6c4ebfd8-9e2b-44a8-b365-58df1d3a1b80/dynamips/auto_idlepc'
+curl -i -X GET 'http://localhost:3080/v2/projects/339656cd-0ce9-481f-b4ef-358c1ac0fac6/nodes/f50e6309-1048-47b1-acaf-b60e5855e812/dynamips/auto_idlepc'
 
-GET /v2/projects/ae53ebc4-e6bc-44af-a6f7-5aef0d7f3c4d/nodes/6c4ebfd8-9e2b-44a8-b365-58df1d3a1b80/dynamips/auto_idlepc HTTP/1.1
+GET /v2/projects/339656cd-0ce9-481f-b4ef-358c1ac0fac6/nodes/f50e6309-1048-47b1-acaf-b60e5855e812/dynamips/auto_idlepc HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
index cd192923..aa472bab 100644
--- a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
+++ b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/fbeb0661-da69-4f6c-9c3f-7c8964d623f6/nodes/82c31081-f9ea-45e3-a82d-d137236b078f/dynamips/idlepc_proposals'
+curl -i -X GET 'http://localhost:3080/v2/projects/46581e8f-d9f1-46fd-a072-b327ea821383/nodes/7615fe23-3526-4a5c-882c-99bd2e162e0b/dynamips/idlepc_proposals'
 
-GET /v2/projects/fbeb0661-da69-4f6c-9c3f-7c8964d623f6/nodes/82c31081-f9ea-45e3-a82d-d137236b078f/dynamips/idlepc_proposals HTTP/1.1
+GET /v2/projects/46581e8f-d9f1-46fd-a072-b327ea821383/nodes/7615fe23-3526-4a5c-882c-99bd2e162e0b/dynamips/idlepc_proposals HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_post_projects.txt b/docs/api/examples/controller_post_projects.txt
index f479c4ba..ff33996f 100644
--- a/docs/api/examples/controller_post_projects.txt
+++ b/docs/api/examples/controller_post_projects.txt
@@ -17,7 +17,7 @@ X-ROUTE: /v2/projects
 {
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpae61hifl/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1c1w2tok/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
     "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsload.txt b/docs/api/examples/controller_post_projectsload.txt
index 429f9881..2b26a73d 100644
--- a/docs/api/examples/controller_post_projectsload.txt
+++ b/docs/api/examples/controller_post_projectsload.txt
@@ -16,7 +16,7 @@ X-ROUTE: /v2/projects/load
 {
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9vj03m0s/projects/c4773495-7a7a-4ba5-9c13-de34b0ddf039",
-    "project_id": "c4773495-7a7a-4ba5-9c13-de34b0ddf039",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpcflvzj3w/projects/38b1f122-36b5-40a9-a7e1-a93f37acb6af",
+    "project_id": "38b1f122-36b5-40a9-a7e1-a93f37acb6af",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidclose.txt b/docs/api/examples/controller_post_projectsprojectidclose.txt
index 797055b1..8a342ee2 100644
--- a/docs/api/examples/controller_post_projectsprojectidclose.txt
+++ b/docs/api/examples/controller_post_projectsprojectidclose.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/7f9bc4b5-4a44-4be6-a222-808d3e68f1c6/close' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/f035eff7-1f81-49ad-a201-8c842bb84c3a/close' -d '{}'
 
-POST /v2/projects/7f9bc4b5-4a44-4be6-a222-808d3e68f1c6/close HTTP/1.1
+POST /v2/projects/f035eff7-1f81-49ad-a201-8c842bb84c3a/close HTTP/1.1
 {}
 
 
@@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id}/close
 {
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpsjf1l314/projects/7f9bc4b5-4a44-4be6-a222-808d3e68f1c6",
-    "project_id": "7f9bc4b5-4a44-4be6-a222-808d3e68f1c6",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm94m69wa/projects/f035eff7-1f81-49ad-a201-8c842bb84c3a",
+    "project_id": "f035eff7-1f81-49ad-a201-8c842bb84c3a",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectiddrawings.txt b/docs/api/examples/controller_post_projectsprojectiddrawings.txt
index 1468521e..500e0791 100644
--- a/docs/api/examples/controller_post_projectsprojectiddrawings.txt
+++ b/docs/api/examples/controller_post_projectsprojectiddrawings.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/8aadced3-304f-42b2-ad58-fe4ec9f80806/drawings' -d '{"svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>", "x": 10, "y": 20, "z": 0}'
+curl -i -X POST 'http://localhost:3080/v2/projects/9449db23-6aba-4527-a3cb-5e0ace8abd99/drawings' -d '{"svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>", "x": 10, "y": 20, "z": 0}'
 
-POST /v2/projects/8aadced3-304f-42b2-ad58-fe4ec9f80806/drawings HTTP/1.1
+POST /v2/projects/9449db23-6aba-4527-a3cb-5e0ace8abd99/drawings HTTP/1.1
 {
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 10,
@@ -17,8 +17,8 @@ SERVER: Python/3.5 GNS3/2.0.0dev1
 X-ROUTE: /v2/projects/{project_id}/drawings
 
 {
-    "drawing_id": "d2b17a50-3b8e-4148-bc1e-8bdd13becfe6",
-    "project_id": "8aadced3-304f-42b2-ad58-fe4ec9f80806",
+    "drawing_id": "2d1208b7-599e-4146-b1d2-a10982621ecb",
+    "project_id": "9449db23-6aba-4527-a3cb-5e0ace8abd99",
     "rotation": 0,
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 10,
diff --git a/docs/api/examples/controller_post_projectsprojectidlinks.txt b/docs/api/examples/controller_post_projectsprojectidlinks.txt
index 7500684b..8b79e771 100644
--- a/docs/api/examples/controller_post_projectsprojectidlinks.txt
+++ b/docs/api/examples/controller_post_projectsprojectidlinks.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/586cdc63-228c-4c73-bb84-6db50bb19a2a/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "ac0eb48c-1911-46a3-94ac-52bedb77f0fc", "port_number": 3}, {"adapter_number": 2, "node_id": "fd3ca37f-4d1b-48a6-9912-d135a8b31ed9", "port_number": 4}]}'
+curl -i -X POST 'http://localhost:3080/v2/projects/0440a070-64dd-4bca-9368-8c9f04e67a82/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "b097d38a-cef2-4beb-8080-d984d894ee69", "port_number": 3}, {"adapter_number": 2, "node_id": "353a552d-eecb-4ba5-9fbc-64af28984d7b", "port_number": 4}]}'
 
-POST /v2/projects/586cdc63-228c-4c73-bb84-6db50bb19a2a/links HTTP/1.1
+POST /v2/projects/0440a070-64dd-4bca-9368-8c9f04e67a82/links HTTP/1.1
 {
     "nodes": [
         {
@@ -10,12 +10,12 @@ POST /v2/projects/586cdc63-228c-4c73-bb84-6db50bb19a2a/links HTTP/1.1
                 "x": 42,
                 "y": 0
             },
-            "node_id": "ac0eb48c-1911-46a3-94ac-52bedb77f0fc",
+            "node_id": "b097d38a-cef2-4beb-8080-d984d894ee69",
             "port_number": 3
         },
         {
             "adapter_number": 2,
-            "node_id": "fd3ca37f-4d1b-48a6-9912-d135a8b31ed9",
+            "node_id": "353a552d-eecb-4ba5-9fbc-64af28984d7b",
             "port_number": 4
         }
     ]
@@ -33,7 +33,7 @@ X-ROUTE: /v2/projects/{project_id}/links
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "04c65f22-757f-4e07-8df0-d05913a17028",
+    "link_id": "a2c18baf-c87c-492f-968f-761706a3574c",
     "nodes": [
         {
             "adapter_number": 0,
@@ -42,7 +42,7 @@ X-ROUTE: /v2/projects/{project_id}/links
                 "x": 42,
                 "y": 0
             },
-            "node_id": "ac0eb48c-1911-46a3-94ac-52bedb77f0fc",
+            "node_id": "b097d38a-cef2-4beb-8080-d984d894ee69",
             "port_number": 3
         },
         {
@@ -54,9 +54,9 @@ X-ROUTE: /v2/projects/{project_id}/links
                 "x": -10,
                 "y": -10
             },
-            "node_id": "fd3ca37f-4d1b-48a6-9912-d135a8b31ed9",
+            "node_id": "353a552d-eecb-4ba5-9fbc-64af28984d7b",
             "port_number": 4
         }
     ],
-    "project_id": "586cdc63-228c-4c73-bb84-6db50bb19a2a"
+    "project_id": "0440a070-64dd-4bca-9368-8c9f04e67a82"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
index 45da33e4..1b7aefc4 100644
--- a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
+++ b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/92411b77-b847-4b82-9502-5fa742e292f6/links/0e85b6d3-d91f-4b37-979e-e2ba47f77630/start_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/4b771c3c-5344-4384-a307-35b5f5ff8c92/links/2515aaa7-ce74-4812-8a25-b6d78b8b7378/start_capture' -d '{}'
 
-POST /v2/projects/92411b77-b847-4b82-9502-5fa742e292f6/links/0e85b6d3-d91f-4b37-979e-e2ba47f77630/start_capture HTTP/1.1
+POST /v2/projects/4b771c3c-5344-4384-a307-35b5f5ff8c92/links/2515aaa7-ce74-4812-8a25-b6d78b8b7378/start_capture HTTP/1.1
 {}
 
 
@@ -15,7 +15,7 @@ X-ROUTE: /v2/projects/{project_id}/links/{link_id}/start_capture
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "0e85b6d3-d91f-4b37-979e-e2ba47f77630",
+    "link_id": "2515aaa7-ce74-4812-8a25-b6d78b8b7378",
     "nodes": [],
-    "project_id": "92411b77-b847-4b82-9502-5fa742e292f6"
+    "project_id": "4b771c3c-5344-4384-a307-35b5f5ff8c92"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
index 39a58c22..c8a3c503 100644
--- a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
+++ b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/9b4b9a48-5b77-4523-ab6e-e72556452acf/links/0f08d53f-f379-4aef-9115-2316d4ea6cec/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/ab4b1299-fda7-4314-af02-da51dc8bcfba/links/4acdbe58-0fa5-45bc-8e38-c95852302c03/stop_capture' -d '{}'
 
-POST /v2/projects/9b4b9a48-5b77-4523-ab6e-e72556452acf/links/0f08d53f-f379-4aef-9115-2316d4ea6cec/stop_capture HTTP/1.1
+POST /v2/projects/ab4b1299-fda7-4314-af02-da51dc8bcfba/links/4acdbe58-0fa5-45bc-8e38-c95852302c03/stop_capture HTTP/1.1
 {}
 
 
@@ -15,7 +15,7 @@ X-ROUTE: /v2/projects/{project_id}/links/{link_id}/stop_capture
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "0f08d53f-f379-4aef-9115-2316d4ea6cec",
+    "link_id": "4acdbe58-0fa5-45bc-8e38-c95852302c03",
     "nodes": [],
-    "project_id": "9b4b9a48-5b77-4523-ab6e-e72556452acf"
+    "project_id": "ab4b1299-fda7-4314-af02-da51dc8bcfba"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidnodes.txt b/docs/api/examples/controller_post_projectsprojectidnodes.txt
index 8e9156b6..eca31c22 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodes.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodes.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/2473b969-a5a8-4448-aa8b-69225a48133a/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
+curl -i -X POST 'http://localhost:3080/v2/projects/9349f15d-1bdb-4a0b-8f67-16af020d4463/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
 
-POST /v2/projects/2473b969-a5a8-4448-aa8b-69225a48133a/nodes HTTP/1.1
+POST /v2/projects/9349f15d-1bdb-4a0b-8f67-16af020d4463/nodes HTTP/1.1
 {
     "compute_id": "example.com",
     "name": "test",
@@ -12,7 +12,7 @@ POST /v2/projects/2473b969-a5a8-4448-aa8b-69225a48133a/nodes HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 686
+CONTENT-LENGTH: 690
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -28,15 +28,15 @@ X-ROUTE: /v2/projects/{project_id}/nodes
     "label": {
         "rotation": 0,
         "style": "font-size: 10;font-familly: Verdana",
-        "text": "",
+        "text": "test",
         "x": -17,
         "y": -25
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "d396a010-d75f-44ca-b943-1bbd9352a3ea",
+    "node_id": "f7c9e8dd-be7d-4733-ad67-6ecd27d476c6",
     "node_type": "vpcs",
-    "project_id": "2473b969-a5a8-4448-aa8b-69225a48133a",
+    "project_id": "9349f15d-1bdb-4a0b-8f67-16af020d4463",
     "properties": {
         "startup_script": "echo test"
     },
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
index 111930c1..1e780125 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/7ce830f3-2092-4008-a4f7-88bbbac6efe7/nodes/3b105ab0-3bbd-4805-8eed-edaeb0c51170/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/2a0d8e7b-af13-4e0a-9a3a-ab3bd5e3be84/nodes/4bc29ac1-ca1c-4de0-b30a-a75edf0635cf/reload' -d '{}'
 
-POST /v2/projects/7ce830f3-2092-4008-a4f7-88bbbac6efe7/nodes/3b105ab0-3bbd-4805-8eed-edaeb0c51170/reload HTTP/1.1
+POST /v2/projects/2a0d8e7b-af13-4e0a-9a3a-ab3bd5e3be84/nodes/4bc29ac1-ca1c-4de0-b30a-a75edf0635cf/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
index 7c191096..ad0f9691 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/a1b17539-66ff-468f-8433-54bcb220645a/nodes/5f08f708-76d4-4edb-a5d6-1efee902f080/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/368ca0b2-72e0-4d0c-a974-c1930dac31bd/nodes/074bb9ee-71fd-40ad-8954-7c0c2d8c1d80/start' -d '{}'
 
-POST /v2/projects/a1b17539-66ff-468f-8433-54bcb220645a/nodes/5f08f708-76d4-4edb-a5d6-1efee902f080/start HTTP/1.1
+POST /v2/projects/368ca0b2-72e0-4d0c-a974-c1930dac31bd/nodes/074bb9ee-71fd-40ad-8954-7c0c2d8c1d80/start HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
index b6793815..dd845b95 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/73cf2dcd-329b-46a2-9a2a-55b35a96eec1/nodes/13d84927-a2ad-4b9f-9354-0808587fb63d/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/0f6df111-846c-42bd-b932-14e18c7fbbcc/nodes/61c2e423-df24-44bc-bf57-7c373dc05837/stop' -d '{}'
 
-POST /v2/projects/73cf2dcd-329b-46a2-9a2a-55b35a96eec1/nodes/13d84927-a2ad-4b9f-9354-0808587fb63d/stop HTTP/1.1
+POST /v2/projects/0f6df111-846c-42bd-b932-14e18c7fbbcc/nodes/61c2e423-df24-44bc-bf57-7c373dc05837/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
index e319d1a8..f0189b27 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/71c9579d-50d3-4156-a3a1-1dfc48cc2cf2/nodes/eb643bea-a400-4295-bb25-618fce641a89/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/8c89c990-c2e5-46c1-85f7-d3966772ba40/nodes/e7441ee5-2c60-4e73-896e-2d49344777ec/suspend' -d '{}'
 
-POST /v2/projects/71c9579d-50d3-4156-a3a1-1dfc48cc2cf2/nodes/eb643bea-a400-4295-bb25-618fce641a89/suspend HTTP/1.1
+POST /v2/projects/8c89c990-c2e5-46c1-85f7-d3966772ba40/nodes/e7441ee5-2c60-4e73-896e-2d49344777ec/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
index ea15b716..4ea82cf4 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/35122903-af0e-4447-8ec9-bda1ebffa850/nodes/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/3f6380d1-0110-4d00-8e1d-55009cf11a86/nodes/reload' -d '{}'
 
-POST /v2/projects/35122903-af0e-4447-8ec9-bda1ebffa850/nodes/reload HTTP/1.1
+POST /v2/projects/3f6380d1-0110-4d00-8e1d-55009cf11a86/nodes/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
index 73355783..73f0d48f 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/946aeb66-69ba-4f4e-a90a-05bff3fedb07/nodes/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/9aa737af-509e-4714-b24c-369671a83a96/nodes/start' -d '{}'
 
-POST /v2/projects/946aeb66-69ba-4f4e-a90a-05bff3fedb07/nodes/start HTTP/1.1
+POST /v2/projects/9aa737af-509e-4714-b24c-369671a83a96/nodes/start HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
index ba7cd312..ba0fe849 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/5eb4c12e-1b5e-44d1-b6e2-86472ab358f9/nodes/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/423165ca-8b0d-42c4-bb0e-b25c171626fd/nodes/stop' -d '{}'
 
-POST /v2/projects/5eb4c12e-1b5e-44d1-b6e2-86472ab358f9/nodes/stop HTTP/1.1
+POST /v2/projects/423165ca-8b0d-42c4-bb0e-b25c171626fd/nodes/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
index 5e9a187c..d3f16bb6 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/62d8b443-9500-4f52-a710-d11035b60602/nodes/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/437ff4c1-dcb2-4885-81b2-b5ea1ad65336/nodes/suspend' -d '{}'
 
-POST /v2/projects/62d8b443-9500-4f52-a710-d11035b60602/nodes/suspend HTTP/1.1
+POST /v2/projects/437ff4c1-dcb2-4885-81b2-b5ea1ad65336/nodes/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidopen.txt b/docs/api/examples/controller_post_projectsprojectidopen.txt
index ae9890bf..835342ad 100644
--- a/docs/api/examples/controller_post_projectsprojectidopen.txt
+++ b/docs/api/examples/controller_post_projectsprojectidopen.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/ffd8f122-4f50-424d-a9a3-52e6050e5ad5/open' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/5444d366-9ec2-40c7-8fb8-7c01746e3cf2/open' -d '{}'
 
-POST /v2/projects/ffd8f122-4f50-424d-a9a3-52e6050e5ad5/open HTTP/1.1
+POST /v2/projects/5444d366-9ec2-40c7-8fb8-7c01746e3cf2/open HTTP/1.1
 {}
 
 
@@ -14,7 +14,7 @@ X-ROUTE: /v2/projects/{project_id}/open
 {
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9bwybve2/projects/ffd8f122-4f50-424d-a9a3-52e6050e5ad5",
-    "project_id": "ffd8f122-4f50-424d-a9a3-52e6050e5ad5",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp_jtyu9qk/projects/5444d366-9ec2-40c7-8fb8-7c01746e3cf2",
+    "project_id": "5444d366-9ec2-40c7-8fb8-7c01746e3cf2",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
index dbd22d45..2bb581f2 100644
--- a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
+++ b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/projects/1b8627ab-0930-4284-a88e-493f2c68b921/drawings/bafaf7a8-25f8-439a-8c73-7652bb389aef' -d '{"x": 42}'
+curl -i -X PUT 'http://localhost:3080/v2/projects/488ca1f9-a404-43d3-87e9-ec82f1e33fb7/drawings/7a33ad88-12fd-4d5e-a373-0d9220c71f5a' -d '{"x": 42}'
 
-PUT /v2/projects/1b8627ab-0930-4284-a88e-493f2c68b921/drawings/bafaf7a8-25f8-439a-8c73-7652bb389aef HTTP/1.1
+PUT /v2/projects/488ca1f9-a404-43d3-87e9-ec82f1e33fb7/drawings/7a33ad88-12fd-4d5e-a373-0d9220c71f5a HTTP/1.1
 {
     "x": 42
 }
@@ -14,8 +14,8 @@ SERVER: Python/3.5 GNS3/2.0.0dev1
 X-ROUTE: /v2/projects/{project_id}/drawings/{drawing_id}
 
 {
-    "drawing_id": "bafaf7a8-25f8-439a-8c73-7652bb389aef",
-    "project_id": "1b8627ab-0930-4284-a88e-493f2c68b921",
+    "drawing_id": "7a33ad88-12fd-4d5e-a373-0d9220c71f5a",
+    "project_id": "488ca1f9-a404-43d3-87e9-ec82f1e33fb7",
     "rotation": 0,
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 42,
diff --git a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt
index 5cfbe48a..aea916b8 100644
--- a/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt
+++ b/docs/api/examples/controller_put_projectsprojectidnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/projects/6a7e6d00-3e6c-42b8-9d00-80bd8cf349af/nodes/ea04239b-a376-4748-9da2-2dd5fef1e8c0' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
+curl -i -X PUT 'http://localhost:3080/v2/projects/57b14348-d5cd-4082-b9af-5cbe41d59d9f/nodes/64078814-e8a2-43ca-bbea-b649f6e97c5f' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
 
-PUT /v2/projects/6a7e6d00-3e6c-42b8-9d00-80bd8cf349af/nodes/ea04239b-a376-4748-9da2-2dd5fef1e8c0 HTTP/1.1
+PUT /v2/projects/57b14348-d5cd-4082-b9af-5cbe41d59d9f/nodes/64078814-e8a2-43ca-bbea-b649f6e97c5f HTTP/1.1
 {
     "compute_id": "example.com",
     "name": "test",
@@ -12,7 +12,7 @@ PUT /v2/projects/6a7e6d00-3e6c-42b8-9d00-80bd8cf349af/nodes/ea04239b-a376-4748-9
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 643
+CONTENT-LENGTH: 647
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -28,15 +28,15 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
     "label": {
         "rotation": 0,
         "style": "font-size: 10;font-familly: Verdana",
-        "text": "",
+        "text": "test",
         "x": -17,
         "y": -25
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "ea04239b-a376-4748-9da2-2dd5fef1e8c0",
+    "node_id": "64078814-e8a2-43ca-bbea-b649f6e97c5f",
     "node_type": "vpcs",
-    "project_id": "6a7e6d00-3e6c-42b8-9d00-80bd8cf349af",
+    "project_id": "57b14348-d5cd-4082-b9af-5cbe41d59d9f",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/notifications/drawing.created.json b/docs/api/notifications/drawing.created.json
index f3b467e9..89fbc91c 100644
--- a/docs/api/notifications/drawing.created.json
+++ b/docs/api/notifications/drawing.created.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "c1457dac-9864-46f3-ba41-5a62479273bf",
-    "project_id": "653341bc-edd6-458a-90ab-25fd65c0f4b3",
+    "drawing_id": "7d8a9489-e8f8-4cab-ad67-c71d26c6d570",
+    "project_id": "8136bd49-a9e0-43a2-8012-e49d539bc0b4",
     "rotation": 0,
     "svg": "<svg height=\"210\" width=\"500\"><line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"200\" style=\"stroke:rgb(255,0,0);stroke-width:2\" /></svg>",
     "x": 10,
diff --git a/docs/api/notifications/drawing.deleted.json b/docs/api/notifications/drawing.deleted.json
index 7d904af9..4a2e5d28 100644
--- a/docs/api/notifications/drawing.deleted.json
+++ b/docs/api/notifications/drawing.deleted.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "cc2439b5-3009-4c6a-ba87-c51795a6f461",
-    "project_id": "d75dc250-7d7b-4d0b-8a06-ae2853c2304f",
+    "drawing_id": "a816efd7-0c3e-4267-8891-011de8389855",
+    "project_id": "3bfa063a-bbfb-4c46-aefd-39b73c8ee707",
     "rotation": 0,
     "svg": "<svg></svg>",
     "x": 0,
diff --git a/docs/api/notifications/drawing.updated.json b/docs/api/notifications/drawing.updated.json
index 95292063..303aae9f 100644
--- a/docs/api/notifications/drawing.updated.json
+++ b/docs/api/notifications/drawing.updated.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "bafaf7a8-25f8-439a-8c73-7652bb389aef",
-    "project_id": "1b8627ab-0930-4284-a88e-493f2c68b921",
+    "drawing_id": "7a33ad88-12fd-4d5e-a373-0d9220c71f5a",
+    "project_id": "488ca1f9-a404-43d3-87e9-ec82f1e33fb7",
     "rotation": 0,
     "x": 42,
     "y": 20,
diff --git a/docs/api/notifications/link.created.json b/docs/api/notifications/link.created.json
index 4e1bc330..d2dea5ce 100644
--- a/docs/api/notifications/link.created.json
+++ b/docs/api/notifications/link.created.json
@@ -2,7 +2,7 @@
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "0df81303-95fb-4bb8-bea1-82678f247781",
+    "link_id": "3a5d720e-c005-421a-ba55-c4f9ba6b7fd8",
     "nodes": [
         {
             "adapter_number": 0,
@@ -13,7 +13,7 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "4bff4d24-9fe4-42d4-a26a-4e69aeafde11",
+            "node_id": "54888447-9a71-4a5c-9d0c-ebc39433fed6",
             "port_number": 3
         },
         {
@@ -25,9 +25,9 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "2b0ee7aa-7500-4f8a-8bd7-248eb5a55df9",
+            "node_id": "c8e9784f-4a8f-4a1f-826a-e095d55d10c8",
             "port_number": 4
         }
     ],
-    "project_id": "6cd75a96-97e6-469d-a742-b604f65c674d"
+    "project_id": "8d82f6d1-a010-4dc0-bd01-77155280e3b8"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/link.deleted.json b/docs/api/notifications/link.deleted.json
index fd81a025..2e4ce501 100644
--- a/docs/api/notifications/link.deleted.json
+++ b/docs/api/notifications/link.deleted.json
@@ -2,7 +2,7 @@
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "0fe9e5db-8b7f-41e1-922b-a58aabd4100f",
+    "link_id": "b9be3e2e-4090-43a9-95a0-f95b30f441eb",
     "nodes": [],
-    "project_id": "a0e491a9-93d2-479a-9bb6-7f0d79999ec0"
+    "project_id": "0f1adb1a-e58d-47ae-92a5-a0f4ed1858b2"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/link.updated.json b/docs/api/notifications/link.updated.json
index 03e1e1b8..fc1dc0bc 100644
--- a/docs/api/notifications/link.updated.json
+++ b/docs/api/notifications/link.updated.json
@@ -2,7 +2,7 @@
     "capture_file_name": null,
     "capture_file_path": null,
     "capturing": false,
-    "link_id": "deab2256-4c0d-4873-b98e-32baa61fe269",
+    "link_id": "6d5a6cca-006f-4611-a016-cb5cbad218c7",
     "nodes": [
         {
             "adapter_number": 0,
@@ -11,7 +11,7 @@
                 "x": 64,
                 "y": 0
             },
-            "node_id": "c6132283-2d3c-424f-abda-d834978331f7",
+            "node_id": "b04b19fe-8053-46ee-bd20-3591edf873bb",
             "port_number": 3
         },
         {
@@ -23,9 +23,9 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "d96ee9e4-4864-4bb5-9208-5294c63f4b97",
+            "node_id": "633daae6-4069-48cc-b8ab-b3e93c309a49",
             "port_number": 4
         }
     ],
-    "project_id": "6a3e146f-a338-4807-8925-51d9a1551c14"
+    "project_id": "a7427d10-d89b-4f96-b93c-3ef46fe8aae8"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/node.deleted.json b/docs/api/notifications/node.deleted.json
index 3bccb198..87d41002 100644
--- a/docs/api/notifications/node.deleted.json
+++ b/docs/api/notifications/node.deleted.json
@@ -8,15 +8,15 @@
     "label": {
         "rotation": 0,
         "style": "font-size: 10;font-familly: Verdana",
-        "text": "",
+        "text": "test",
         "x": -17,
         "y": -25
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "e32f99c7-128d-4003-ba94-94cd3c005c9e",
+    "node_id": "65b24f26-b0a1-416b-9a00-822e256954e9",
     "node_type": "vpcs",
-    "project_id": "1df6389f-befc-4f18-9dce-dc3679ffc4c2",
+    "project_id": "9f98296f-7740-45a2-a40f-e6db8c356318",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/notifications/node.updated.json b/docs/api/notifications/node.updated.json
index fc6adb82..66f1ffc3 100644
--- a/docs/api/notifications/node.updated.json
+++ b/docs/api/notifications/node.updated.json
@@ -8,15 +8,15 @@
     "label": {
         "rotation": 0,
         "style": "font-size: 10;font-familly: Verdana",
-        "text": "",
+        "text": "test",
         "x": -17,
         "y": -25
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "eb568d98-56e6-4ba8-8d45-62cdf10610e2",
+    "node_id": "c10d4f21-4f52-4de2-a84c-a5beeff49e95",
     "node_type": "vpcs",
-    "project_id": "d3ac3171-aa3b-4b46-a325-8891812f2180",
+    "project_id": "3f125837-0591-45d3-8740-e054e2222710",
     "properties": {
         "startup_config": "test.cfg"
     },
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index eb99b932..ad62fa8c 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an ATM switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
index 740fc5be..7ba756c5 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -81,8 +81,8 @@ Delete an ATM switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 24c705ea..5418f9ef 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to an ATM switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from an ATM switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 99625971..8501288e 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an ATM switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
index 121048b4..8b113ea0 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an ATM switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
index 97de81c8..d51ff99a 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an ATM switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
index d893d4d8..f3fb5f76 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend an ATM Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
index 630167ab..40992d7c 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -39,8 +39,8 @@ Update a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -144,8 +144,8 @@ Delete a cloud instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index c5e002bd..76adfd79 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a cloud instance
 
 Parameters
 **********
-- **port_number**: Port on the cloud
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the cloud
+- **adapter_number**: Adapter on the cloud (always 0)
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a cloud instance
 
 Parameters
 **********
-- **port_number**: Port on the cloud
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the cloud
+- **adapter_number**: Adapter on the cloud (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 3b895e26..5729bf7d 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a cloud instance
 
 Parameters
 **********
-- **port_number**: Port on the cloud
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the cloud
+- **adapter_number**: Adapter on the cloud (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 655a6363..50f62db8 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a cloud instance
 
 Parameters
 **********
-- **port_number**: Port on the cloud
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the cloud (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the cloud
+- **adapter_number**: Adapter on the cloud (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
index 7332ec76..64a379fa 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a cloud
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
index 6a1070a7..06a1d80d 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a cloud
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
index 28c5de49..01641dad 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a cloud
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
index 0828a3c9..6371c4df 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
@@ -9,8 +9,8 @@ Delete a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -25,8 +25,8 @@ Update a Docker instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 368516e7..40015c75 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Docker container
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter where the nio should be added
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a Docker container
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter where the nio should be added
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 31c47c34..12e4fefb 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Docker container instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e9865a1f..d9e297a2 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Docker container instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
index 62ea8357..6e2b1547 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
@@ -9,8 +9,8 @@ Pause a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
index 12b5d9e1..f88df489 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
@@ -9,8 +9,8 @@ Restart a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
index 073462cb..cf4c5131 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
index 88ca6b9a..f1f688d4 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
index 327ed120..281800d0 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
@@ -9,8 +9,8 @@ Unpause a Docker container
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
index c7f7a768..9d3650df 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -79,8 +79,8 @@ Update a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -202,8 +202,8 @@ Delete a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 0c4e4893..ec77053d 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Dynamips VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter where the nio should be added
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a Dynamips VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter from where the nio should be removed
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter from where the nio should be removed
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index fba18906..a9814119 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Dynamips VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index aefafdea..40ee8371 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Dynamips VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
index 81a775f4..8e8d4f54 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
@@ -9,8 +9,8 @@ Retrieve the idlepc proposals
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigs.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigs.rst
index 09ddcdd1..924bbdca 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigs.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigs.rst
@@ -9,8 +9,8 @@ Retrieve the startup and private configs content
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigssave.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigssave.rst
index be0bba50..4bd6f4c2 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigssave.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidconfigssave.rst
@@ -9,8 +9,8 @@ Save the startup and private configs content
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
index 53d61343..c5cde1de 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
@@ -9,8 +9,8 @@ Retrieve the idlepc proposals
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
index 9ae98a06..655f3522 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
index d45ede09..53f7ef21 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
index de898325..0729560f 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
index c9b01c50..e09a2d31 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
index 075f3df6..ffa73f96 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Dynamips VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
index b47b6e7f..55c25116 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -97,8 +97,8 @@ Delete an Ethernet hub instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 23847ea1..b0092229 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to an Ethernet hub instance
 
 Parameters
 **********
-- **port_number**: Port on the hub
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the hub
+- **adapter_number**: Adapter on the hub (always 0)
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from an Ethernet hub instance
 
 Parameters
 **********
-- **port_number**: Port on the hub
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the hub
+- **adapter_number**: Adapter on the hub (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index a42bacb0..bf7a28dd 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an Ethernet hub instance
 
 Parameters
 **********
-- **port_number**: Port on the hub
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the hub
+- **adapter_number**: Adapter on the hub (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 1bfbbad8..17170cad 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an Ethernet hub instance
 
 Parameters
 **********
-- **port_number**: Port on the hub
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the hub (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the hub
+- **adapter_number**: Adapter on the hub (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
index 275d9a62..04d7e9d2 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an Ethernet hub
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
index 7a98a5dc..5ea86cc0 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an Ethernet hub
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
index 1ee67e63..f3b3158a 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend an Ethernet hub
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
index d47bf391..f94fd64d 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -100,8 +100,8 @@ Delete an Ethernet switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index e496cf2c..1001a7eb 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to an Ethernet switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from an Ethernet switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index d84c0738..77ea715c 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an Ethernet switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index fe1458aa..0e8d7ff5 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an Ethernet switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
index a3d3d51d..a5b9c7a4 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an Ethernet switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
index a5b5e5ec..6ac3a291 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an Ethernet switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
index 89755223..8751dcc5 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend an Ethernet switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
index 245dce77..018e6d1a 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -38,8 +38,8 @@ Update a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -81,8 +81,8 @@ Delete a Frame Relay switch instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 9f35deea..682156d1 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Frame Relay switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a Frame Relay switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 508ae1f7..08a55a5a 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Frame Relay switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index dfa8f5d1..693ce7ca 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Frame Relay switch instance
 
 Parameters
 **********
-- **port_number**: Port on the switch
-- **node_id**: Node UUID
-- **adapter_number**: Adapter on the switch (always 0)
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the switch
+- **adapter_number**: Adapter on the switch (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
index 89a7a3c9..0b1ae513 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Frame Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
index 9d6e3273..e8f144f1 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Frame Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
index aae9bc87..13a417da 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Frame Relay switch
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodes.rst b/docs/api/v2/compute/iou/projectsprojectidiounodes.rst
index 7f91de3c..103b5930 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodes.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodes.rst
@@ -48,25 +48,28 @@ Output
 
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
-    <tr><td>command_line</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
-    <tr><td>console</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
+    <tr><td>command_line</td>                    <td> </td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
+    <tr><td>console</td>                    <td> </td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: telnet</td>                     </tr>
-    <tr><td>ethernet_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>ethernet_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>iourc_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Content of the iourc file. Ignored if Null</td>                     </tr>
     <tr><td>iourc_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the iourc file used by remote servers</td>                     </tr>
-    <tr><td>l1_keepalives</td>                    <td>&#10004;</td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
-    <tr><td>md5sum</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
-    <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
+    <tr><td>l1_keepalives</td>                    <td> </td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
+    <tr><td>md5sum</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>string</td>                     <td>Path to the node working directory</td>                     </tr>
-    <tr><td>node_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
-    <tr><td>nvram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
-    <tr><td>path</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
-    <tr><td>private_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
-    <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
-    <tr><td>ram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
-    <tr><td>serial_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
-    <tr><td>startup_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
+    <tr><td>nvram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
+    <tr><td>path</td>                    <td> </td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
+    <tr><td>private_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Private-config of IOU</td>                     </tr>
+    <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
+    <tr><td>serial_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
+    <tr><td>startup_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Startup-config of IOU</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
-    <tr><td>use_default_iou_values</td>                    <td>&#10004;</td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
+    <tr><td>use_default_iou_values</td>                    <td> </td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
     </table>
 
 Sample session
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
index 889351bd..e939e427 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
@@ -9,8 +9,8 @@ Get an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -24,25 +24,28 @@ Output
 
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
-    <tr><td>command_line</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
-    <tr><td>console</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
+    <tr><td>command_line</td>                    <td> </td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
+    <tr><td>console</td>                    <td> </td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: telnet</td>                     </tr>
-    <tr><td>ethernet_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>ethernet_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>iourc_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Content of the iourc file. Ignored if Null</td>                     </tr>
     <tr><td>iourc_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the iourc file used by remote servers</td>                     </tr>
-    <tr><td>l1_keepalives</td>                    <td>&#10004;</td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
-    <tr><td>md5sum</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
-    <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
+    <tr><td>l1_keepalives</td>                    <td> </td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
+    <tr><td>md5sum</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>string</td>                     <td>Path to the node working directory</td>                     </tr>
-    <tr><td>node_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
-    <tr><td>nvram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
-    <tr><td>path</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
-    <tr><td>private_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
-    <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
-    <tr><td>ram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
-    <tr><td>serial_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
-    <tr><td>startup_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
+    <tr><td>nvram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
+    <tr><td>path</td>                    <td> </td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
+    <tr><td>private_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Private-config of IOU</td>                     </tr>
+    <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
+    <tr><td>serial_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
+    <tr><td>startup_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Startup-config of IOU</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
-    <tr><td>use_default_iou_values</td>                    <td>&#10004;</td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
+    <tr><td>use_default_iou_values</td>                    <td> </td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
     </table>
 
 Sample session
@@ -58,8 +61,8 @@ Update an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -74,21 +77,27 @@ Input
 
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
-    <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
-    <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: telnet, null</td>                     </tr>
-    <tr><td>ethernet_adapters</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>command_line</td>                    <td> </td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
+    <tr><td>console</td>                    <td> </td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
+    <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: telnet</td>                     </tr>
+    <tr><td>ethernet_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
     <tr><td>iourc_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Content of the iourc file. Ignored if Null</td>                     </tr>
-    <tr><td>l1_keepalives</td>                    <td> </td>                     <td>['boolean', 'null']</td>                     <td>Always up ethernet interface</td>                     </tr>
+    <tr><td>iourc_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the iourc file used by remote servers</td>                     </tr>
+    <tr><td>l1_keepalives</td>                    <td> </td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
     <tr><td>md5sum</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
-    <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>IOU VM name</td>                     </tr>
-    <tr><td>nvram</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Allocated NVRAM KB</td>                     </tr>
-    <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of iou binary</td>                     </tr>
-    <tr><td>private_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path to the private-config of IOU</td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
+    <tr><td>node_directory</td>                    <td> </td>                     <td>string</td>                     <td>Path to the node working directory</td>                     </tr>
+    <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
+    <tr><td>nvram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
+    <tr><td>path</td>                    <td> </td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
+    <tr><td>private_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
     <tr><td>private_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Private-config of IOU</td>                     </tr>
-    <tr><td>ram</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Allocated RAM MB</td>                     </tr>
-    <tr><td>serial_adapters</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
-    <tr><td>startup_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path to the startup-config of IOU</td>                     </tr>
+    <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
+    <tr><td>serial_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
+    <tr><td>startup_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
     <tr><td>startup_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Startup-config of IOU</td>                     </tr>
+    <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     <tr><td>use_default_iou_values</td>                    <td> </td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
     </table>
 
@@ -98,25 +107,28 @@ Output
 
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
-    <tr><td>command_line</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
-    <tr><td>console</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
+    <tr><td>command_line</td>                    <td> </td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
+    <tr><td>console</td>                    <td> </td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: telnet</td>                     </tr>
-    <tr><td>ethernet_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>ethernet_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>iourc_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Content of the iourc file. Ignored if Null</td>                     </tr>
     <tr><td>iourc_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the iourc file used by remote servers</td>                     </tr>
-    <tr><td>l1_keepalives</td>                    <td>&#10004;</td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
-    <tr><td>md5sum</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
-    <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
+    <tr><td>l1_keepalives</td>                    <td> </td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
+    <tr><td>md5sum</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>string</td>                     <td>Path to the node working directory</td>                     </tr>
-    <tr><td>node_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
-    <tr><td>nvram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
-    <tr><td>path</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
-    <tr><td>private_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
-    <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
-    <tr><td>ram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
-    <tr><td>serial_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
-    <tr><td>startup_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
+    <tr><td>nvram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
+    <tr><td>path</td>                    <td> </td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
+    <tr><td>private_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Private-config of IOU</td>                     </tr>
+    <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
+    <tr><td>serial_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
+    <tr><td>startup_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Startup-config of IOU</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
-    <tr><td>use_default_iou_values</td>                    <td>&#10004;</td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
+    <tr><td>use_default_iou_values</td>                    <td> </td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
     </table>
 
 Sample session
@@ -132,8 +144,8 @@ Delete an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 4a403512..55c4588e 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a IOU instance
 
 Parameters
 **********
-- **port_number**: Port where the nio should be added
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port where the nio should be added
+- **adapter_number**: Network adapter where the nio is located
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a IOU instance
 
 Parameters
 **********
-- **port_number**: Port from where the nio should be removed
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port from where the nio should be removed
+- **adapter_number**: Network adapter where the nio is located
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index d768d993..95fe90e3 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on an IOU VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index ac879287..8525b401 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on an IOU VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigs.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigs.rst
index 3fb62188..dd00efc8 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigs.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigs.rst
@@ -9,8 +9,8 @@ Retrieve the startup and private configs content
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigssave.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigssave.rst
index 8af1013b..2d6eaa6b 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigssave.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidconfigssave.rst
@@ -9,8 +9,8 @@ Save the startup and private configs content
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
index 86ada843..fcf350cd 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
index ce771822..57defba5 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -33,25 +33,28 @@ Output
 
     <table>
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
-    <tr><td>command_line</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
-    <tr><td>console</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
+    <tr><td>command_line</td>                    <td> </td>                     <td>string</td>                     <td>Last command line used by GNS3 to start QEMU</td>                     </tr>
+    <tr><td>console</td>                    <td> </td>                     <td>integer</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: telnet</td>                     </tr>
-    <tr><td>ethernet_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>ethernet_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many ethernet adapters are connected to the IOU</td>                     </tr>
+    <tr><td>iourc_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Content of the iourc file. Ignored if Null</td>                     </tr>
     <tr><td>iourc_path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the iourc file used by remote servers</td>                     </tr>
-    <tr><td>l1_keepalives</td>                    <td>&#10004;</td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
-    <tr><td>md5sum</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
-    <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
+    <tr><td>l1_keepalives</td>                    <td> </td>                     <td>boolean</td>                     <td>Always up ethernet interface</td>                     </tr>
+    <tr><td>md5sum</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Checksum of iou binary</td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>string</td>                     <td>Path to the node working directory</td>                     </tr>
-    <tr><td>node_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
-    <tr><td>nvram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
-    <tr><td>path</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
-    <tr><td>private_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
-    <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
-    <tr><td>ram</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
-    <tr><td>serial_adapters</td>                    <td>&#10004;</td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
-    <tr><td>startup_config</td>                    <td>&#10004;</td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>IOU VM UUID</td>                     </tr>
+    <tr><td>nvram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated NVRAM KB</td>                     </tr>
+    <tr><td>path</td>                    <td> </td>                     <td>string</td>                     <td>Path of iou binary</td>                     </tr>
+    <tr><td>private_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the private-config content relative to project directory</td>                     </tr>
+    <tr><td>private_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Private-config of IOU</td>                     </tr>
+    <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>ram</td>                    <td> </td>                     <td>integer</td>                     <td>Allocated RAM MB</td>                     </tr>
+    <tr><td>serial_adapters</td>                    <td> </td>                     <td>integer</td>                     <td>How many serial adapters are connected to the IOU</td>                     </tr>
+    <tr><td>startup_config</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Path of the startup-config content relative to project directory</td>                     </tr>
+    <tr><td>startup_config_content</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Startup-config of IOU</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
-    <tr><td>use_default_iou_values</td>                    <td>&#10004;</td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
+    <tr><td>use_default_iou_values</td>                    <td> </td>                     <td>['boolean', 'null']</td>                     <td>Use default IOU values</td>                     </tr>
     </table>
 
 Sample session
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
index e1df8aa9..45c52663 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop an IOU instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
index afa11ec4..4f357856 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -80,8 +80,8 @@ Update a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -197,8 +197,8 @@ Delete a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index ea783f76..5087526e 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a Qemu VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Network adapter where the nio is located
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a Qemu VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Network adapter where the nio is located
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 74d4bcd6..b9a3790f 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a Qemu VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index f66829de..c2c6abe5 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a Qemu VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
index dff97a96..57a0c1c4 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
index b19656e5..ab5190f3 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
index 1cf2ac05..07abd6fa 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
index bcd612d6..e25400f6 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
index 306e3189..dd81c58d 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a Qemu VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
index 1d78f182..33ff7a23 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -54,8 +54,8 @@ Update a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -123,8 +123,8 @@ Delete a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 473068ea..c5ac72d1 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VirtualBox VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter where the nio should be added
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a VirtualBox VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter from where the nio should be removed
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter from where the nio should be removed
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 15ef9840..b0e83a1d 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a VirtualBox VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index fd5fc15e..ceaaa96c 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a VirtualBox VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
index ba593e10..03b5c253 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
index 50e1bba3..c3c15852 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
index 62ead042..999f5bca 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
index 202424dc..5f116158 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
index e1dad875..212c6ebf 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a VirtualBox VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
index 4fea23d3..b5fcf5d8 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -47,8 +47,8 @@ Update a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -108,8 +108,8 @@ Delete a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 07ca0b6e..f5ed8d65 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VMware VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter where the nio should be added
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter where the nio should be added
 
 Response status codes
 **********************
@@ -27,10 +27,10 @@ Remove a NIO from a VMware VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter from where the nio should be removed
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter from where the nio should be removed
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 16355c71..9919c916 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a VMware VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e30134f4..4f4da5b1 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a VMware VM instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter (always 0)
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter (always 0)
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
index 16913e56..d3672687 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
@@ -9,8 +9,8 @@ Allocate a VMware VMnet interface on the server
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
index d63d89d9..33f5c50b 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
index 84d21d6c..ac7c95ef 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
@@ -9,8 +9,8 @@ Resume a suspended VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
index 3240f8da..d6c21dbf 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
index a260c0c8..a60da50d 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
index b2306c74..1c9a83cd 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a VMware VM instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
index 641002f8..a1b3a95d 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -49,8 +49,8 @@ Update a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
@@ -103,8 +103,8 @@ Delete a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index b6066424..8af0e4c1 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,10 +9,10 @@ Add a NIO to a VPCS instance
 
 Parameters
 **********
-- **port_number**: Port where the nio should be added
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port where the nio should be added
+- **adapter_number**: Network adapter where the nio is located
 
 Response status codes
 **********************
@@ -33,10 +33,10 @@ Remove a NIO from a VPCS instance
 
 Parameters
 **********
-- **port_number**: Port from where the nio should be removed
-- **node_id**: Node UUID
-- **adapter_number**: Network adapter where the nio is located
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port from where the nio should be removed
+- **adapter_number**: Network adapter where the nio is located
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 7d670d72..30e6fc6c 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,10 +9,10 @@ Start a packet capture on a VPCS instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to start a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to start a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index adb95828..2c1d78bf 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,10 +9,10 @@ Stop a packet capture on a VPCS instance
 
 Parameters
 **********
-- **port_number**: Port on the adapter
-- **node_id**: Node UUID
-- **adapter_number**: Adapter to stop a packet capture
 - **project_id**: Project UUID
+- **node_id**: Node UUID
+- **port_number**: Port on the adapter
+- **adapter_number**: Adapter to stop a packet capture
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
index e3cc4ec9..1689078c 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
index 6f438a4f..d40a2398 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
index 280dbca1..779f0ad5 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a VPCS instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
index db905435..0d62948b 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
@@ -9,8 +9,8 @@ Update a link instance
 
 Parameters
 **********
-- **link_id**: Link UUID
 - **project_id**: Project UUID
+- **link_id**: Link UUID
 
 Response status codes
 **********************
@@ -52,8 +52,8 @@ Delete a link instance
 
 Parameters
 **********
-- **link_id**: Link UUID
 - **project_id**: Project UUID
+- **link_id**: Link UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
index 45885529..b40eba31 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
@@ -9,8 +9,8 @@ Steam the pcap capture file
 
 Parameters
 **********
-- **link_id**: Link UUID
 - **project_id**: Project UUID
+- **link_id**: Link UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
index 0bcdbfc5..9e57489f 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
@@ -9,8 +9,8 @@ Start capture on a link instance. By default we consider it as an Ethernet link
 
 Parameters
 **********
-- **link_id**: Link UUID
 - **project_id**: Project UUID
+- **link_id**: Link UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst
index 53c97524..da2bcb29 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst
@@ -9,8 +9,8 @@ Stop capture on a link instance
 
 Parameters
 **********
-- **link_id**: Link UUID
 - **project_id**: Project UUID
+- **link_id**: Link UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
index d487b606..6bbb3d13 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
@@ -80,8 +80,8 @@ Delete a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
index cc04c2e5..3b74b947 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
@@ -9,8 +9,8 @@ Compute the IDLE PC for a Dynamips node
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
index e5e05092..3ee287e4 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
@@ -9,8 +9,8 @@ Compute a list of potential idle PC for a node
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
index 4a1cad95..f6042bb2 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
@@ -9,8 +9,8 @@ Reload a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
index da8b3162..a43ed2cd 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
index 5d933fdf..11b00841 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
@@ -9,8 +9,8 @@ Stop a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
index cd92b436..7d9e0b6e 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
@@ -9,8 +9,8 @@ Suspend a node instance
 
 Parameters
 **********
-- **node_id**: Node UUID
 - **project_id**: Project UUID
+- **node_id**: Node UUID
 
 Response status codes
 **********************
diff --git a/docs/api/v2/controller/project/projectsprojectidexport.rst b/docs/api/v2/controller/project/projectsprojectidexport.rst
new file mode 100644
index 00000000..d7cafbb6
--- /dev/null
+++ b/docs/api/v2/controller/project/projectsprojectidexport.rst
@@ -0,0 +1,18 @@
+/v2/projects/{project_id}/export
+------------------------------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v2/projects/**{project_id}**/export
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Export a project as a portable archive
+
+Parameters
+**********
+- **project_id**: Project UUID
+
+Response status codes
+**********************
+- **200**: File returned
+- **404**: The project doesn't exist
+
diff --git a/docs/api/v2/controller/project/projectsprojectidfilespath.rst b/docs/api/v2/controller/project/projectsprojectidfilespath.rst
new file mode 100644
index 00000000..21a1c0cb
--- /dev/null
+++ b/docs/api/v2/controller/project/projectsprojectidfilespath.rst
@@ -0,0 +1,34 @@
+/v2/projects/{project_id}/files/{path:.+}
+------------------------------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v2/projects/**{project_id}**/files/**{path:.+}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Get a file from a project. Beware you have warranty to be able to access only to file global to the project (for example README.txt)
+
+Parameters
+**********
+- **project_id**: Project UUID
+
+Response status codes
+**********************
+- **200**: File returned
+- **403**: Permission denied
+- **404**: The file doesn't exist
+
+
+POST /v2/projects/**{project_id}**/files/**{path:.+}**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Write a file to a project
+
+Parameters
+**********
+- **project_id**: Project UUID
+
+Response status codes
+**********************
+- **200**: File returned
+- **403**: Permission denied
+- **404**: The path doesn't exist
+
diff --git a/docs/api/v2/controller/project/projectsprojectidimport.rst b/docs/api/v2/controller/project/projectsprojectidimport.rst
new file mode 100644
index 00000000..edc55af0
--- /dev/null
+++ b/docs/api/v2/controller/project/projectsprojectidimport.rst
@@ -0,0 +1,31 @@
+/v2/projects/{project_id}/import
+------------------------------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v2/projects/**{project_id}**/import
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Import a project from a portable archive
+
+Parameters
+**********
+- **project_id**: Project UUID
+
+Response status codes
+**********************
+- **200**: Project imported
+- **403**: Forbidden to import project
+
+Output
+*******
+.. raw:: html
+
+    <table>
+    <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
+    <tr><td>filename</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project filename</td>                     </tr>
+    <tr><td>name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project name</td>                     </tr>
+    <tr><td>path</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Project directory</td>                     </tr>
+    <tr><td>project_id</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
+    <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: opened, closed</td>                     </tr>
+    </table>
+
diff --git a/docs/gns3_file.json b/docs/gns3_file.json
index 0b3cea41..63bf2f95 100644
--- a/docs/gns3_file.json
+++ b/docs/gns3_file.json
@@ -1,100 +1,210 @@
 {
-    "type": "object",
     "description": "The topology",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "required": [
-        "project_id",
-        "type",
-        "revision",
-        "version",
-        "name",
-        "topology"
-    ],
-    "additionalProperties": false,
     "properties": {
-        "version": {
-            "type": "string",
-            "description": "Version of the GNS3 software which have update the file for the last time"
-        },
-        "type": {
-            "enum": [
-                "topology"
-            ],
-            "description": "Type of file. It's always topology"
-        },
-        "name": {
-            "type": "string",
-            "description": "Name of the project"
+        "auto_start": {
+            "description": "Start the topology when opened",
+            "type": "boolean"
         },
         "topology": {
-            "type": "object",
             "description": "The topology content",
             "properties": {
-                "nodes": {
+                "computes": {
+                    "description": "Computes servers",
                     "items": {
+                        "description": "Request validation to a GNS3 compute object instance",
                         "properties": {
-                            "z": {
+                            "user": {
+                                "description": "User for authentication",
+                                "type": [
+                                    "string",
+                                    "null"
+                                ]
+                            },
+                            "port": {
+                                "description": "Server port",
+                                "type": "integer"
+                            },
+                            "version": {
+                                "description": "Version of the GNS3 remote compute server",
+                                "type": [
+                                    "string",
+                                    "null"
+                                ]
+                            },
+                            "memory_usage_percent": {
+                                "description": "RAM usage of the compute. Read only",
+                                "minimum": 0,
+                                "type": [
+                                    "number",
+                                    "null"
+                                ],
+                                "maximum": 100
+                            },
+                            "compute_id": {
+                                "description": "Server identifier",
+                                "type": "string"
+                            },
+                            "name": {
+                                "description": "Server name",
+                                "type": "string"
+                            },
+                            "cpu_usage_percent": {
+                                "description": "CPU usage of the compute. Read only",
+                                "minimum": 0,
+                                "type": [
+                                    "number",
+                                    "null"
+                                ],
+                                "maximum": 100
+                            },
+                            "protocol": {
+                                "description": "Server protocol",
+                                "enum": [
+                                    "http",
+                                    "https"
+                                ]
+                            },
+                            "connected": {
+                                "description": "Whether the controller is connected to the compute server or not",
+                                "type": "boolean"
+                            },
+                            "host": {
+                                "description": "Server host",
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "$schema": "http://json-schema.org/draft-04/schema#",
+                        "required": [
+                            "compute_id",
+                            "protocol",
+                            "host",
+                            "port",
+                            "name"
+                        ],
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "drawings": {
+                    "description": "Drawings elements",
+                    "items": {
+                        "description": "An drawing object",
+                        "properties": {
+                            "rotation": {
+                                "description": "Rotation of the element",
+                                "maximum": 360,
                                 "type": "integer",
-                                "description": "Z position of the node"
+                                "minimum": 0
+                            },
+                            "y": {
+                                "description": "Y property",
+                                "type": "integer"
+                            },
+                            "drawing_id": {
+                                "description": "Drawing UUID",
+                                "maxLength": 36,
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+                            },
+                            "project_id": {
+                                "description": "Project UUID",
+                                "maxLength": 36,
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+                            },
+                            "z": {
+                                "description": "Z property",
+                                "type": "integer"
+                            },
+                            "x": {
+                                "description": "X property",
+                                "type": "integer"
+                            },
+                            "svg": {
+                                "description": "SVG content of the drawing",
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "$schema": "http://json-schema.org/draft-04/schema#",
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "nodes": {
+                    "description": "Nodes elements",
+                    "items": {
+                        "description": "A node object",
+                        "properties": {
+                            "symbol": {
+                                "description": "Symbol of the node",
+                                "minLength": 1,
+                                "type": "string"
+                            },
+                            "y": {
+                                "description": "Y position of the node",
+                                "type": "integer"
+                            },
+                            "command_line": {
+                                "description": "Command line use to start the node",
+                                "type": [
+                                    "null",
+                                    "string"
+                                ]
+                            },
+                            "console_host": {
+                                "description": "Console host",
+                                "minLength": 1,
+                                "type": "string"
+                            },
+                            "compute_id": {
+                                "description": "Compute identifier",
+                                "type": "string"
+                            },
+                            "node_directory": {
+                                "description": "Working directory of the node. Read only",
+                                "type": [
+                                    "null",
+                                    "string"
+                                ]
+                            },
+                            "z": {
+                                "description": "Z position of the node",
+                                "type": "integer"
+                            },
+                            "console": {
+                                "description": "Console TCP port",
+                                "minimum": 1,
+                                "type": [
+                                    "integer",
+                                    "null"
+                                ],
+                                "maximum": 65535
+                            },
+                            "properties": {
+                                "description": "Properties specific to an emulator",
+                                "type": "object"
                             },
                             "status": {
+                                "description": "Status of the node",
                                 "enum": [
                                     "stopped",
                                     "started",
                                     "suspended"
-                                ],
-                                "description": "Status of the node"
+                                ]
                             },
-                            "symbol": {
+                            "node_id": {
+                                "description": "Node UUID",
+                                "maxLength": 36,
+                                "minLength": 36,
                                 "type": "string",
-                                "description": "Symbol of the node",
-                                "minLength": 1
-                            },
-                            "console_host": {
-                                "type": "string",
-                                "description": "Console host",
-                                "minLength": 1
-                            },
-                            "label": {
-                                "type": "object",
-                                "properties": {
-                                    "text": {
-                                        "type": "string"
-                                    },
-                                    "y": {
-                                        "type": "integer",
-                                        "description": "Relative Y position of the label"
-                                    },
-                                    "rotation": {
-                                        "type": "integer",
-                                        "description": "Rotation of the label"
-                                    },
-                                    "style": {
-                                        "type": "string",
-                                        "description": "SVG style attribute"
-                                    },
-                                    "x": {
-                                        "type": "integer",
-                                        "description": "Relative X position of the label"
-                                    }
-                                },
-                                "required": [
-                                    "text",
-                                    "x",
-                                    "y"
-                                ],
-                                "additionalProperties": false
-                            },
-                            "compute_id": {
-                                "type": "string",
-                                "description": "Compute identifier"
-                            },
-                            "name": {
-                                "type": "string",
-                                "description": "Node name",
-                                "minLength": 1
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
                             },
                             "node_type": {
+                                "description": "Type of node",
                                 "enum": [
                                     "cloud",
                                     "ethernet_hub",
@@ -108,340 +218,230 @@
                                     "vmware",
                                     "iou",
                                     "qemu"
-                                ],
-                                "description": "Type of node"
+                                ]
                             },
-                            "properties": {
+                            "label": {
+                                "properties": {
+                                    "rotation": {
+                                        "description": "Rotation of the label",
+                                        "type": "integer"
+                                    },
+                                    "text": {
+                                        "type": "string"
+                                    },
+                                    "y": {
+                                        "description": "Relative Y position of the label",
+                                        "type": "integer"
+                                    },
+                                    "x": {
+                                        "description": "Relative X position of the label",
+                                        "type": "integer"
+                                    },
+                                    "style": {
+                                        "description": "SVG style attribute",
+                                        "type": "string"
+                                    }
+                                },
+                                "additionalProperties": false,
                                 "type": "object",
-                                "description": "Properties specific to an emulator"
+                                "required": [
+                                    "text",
+                                    "x",
+                                    "y"
+                                ]
                             },
                             "width": {
-                                "type": "integer",
-                                "description": "Width of the node"
-                            },
-                            "console": {
-                                "type": [
-                                    "integer",
-                                    "null"
-                                ],
-                                "description": "Console TCP port",
-                                "maximum": 65535,
-                                "minimum": 1
-                            },
-                            "node_directory": {
-                                "type": [
-                                    "null",
-                                    "string"
-                                ],
-                                "description": "Working directory of the node. Read only"
-                            },
-                            "y": {
-                                "type": "integer",
-                                "description": "Y position of the node"
-                            },
-                            "node_id": {
-                                "maxLength": 36,
-                                "type": "string",
-                                "description": "Node UUID",
-                                "minLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-                            },
-                            "x": {
-                                "type": "integer",
-                                "description": "X position of the node"
-                            },
-                            "command_line": {
-                                "type": [
-                                    "null",
-                                    "string"
-                                ],
-                                "description": "Command line use to start the node"
-                            },
-                            "height": {
-                                "type": "integer",
-                                "description": "Height of the node"
+                                "description": "Width of the node",
+                                "type": "integer"
                             },
                             "project_id": {
-                                "maxLength": 36,
-                                "type": "string",
                                 "description": "Project UUID",
+                                "maxLength": 36,
                                 "minLength": 36,
+                                "type": "string",
                                 "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
                             },
+                            "name": {
+                                "description": "Node name",
+                                "minLength": 1,
+                                "type": "string"
+                            },
+                            "x": {
+                                "description": "X position of the node",
+                                "type": "integer"
+                            },
+                            "height": {
+                                "description": "Height of the node",
+                                "type": "integer"
+                            },
                             "console_type": {
+                                "description": "Console type",
                                 "enum": [
                                     "serial",
                                     "vnc",
                                     "telnet",
                                     null
-                                ],
-                                "description": "Console type"
+                                ]
                             }
                         },
-                        "type": "object",
-                        "description": "A node object",
                         "additionalProperties": false,
-                        "$schema": "http://json-schema.org/draft-04/schema#"
-                    },
-                    "type": "array",
-                    "description": "Nodes elements"
-                },
-                "drawings": {
-                    "items": {
-                        "additionalProperties": false,
-                        "type": "object",
-                        "description": "An drawing object",
                         "$schema": "http://json-schema.org/draft-04/schema#",
-                        "properties": {
-                            "z": {
-                                "type": "integer",
-                                "description": "Z property"
-                            },
-                            "y": {
-                                "type": "integer",
-                                "description": "Y property"
-                            },
-                            "rotation": {
-                                "type": "integer",
-                                "description": "Rotation of the element",
-                                "maximum": 360,
-                                "minimum": 0
-                            },
-                            "svg": {
-                                "type": "string",
-                                "description": "SVG content of the drawing"
-                            },
-                            "drawing_id": {
-                                "maxLength": 36,
-                                "type": "string",
-                                "description": "Drawing UUID",
-                                "minLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-                            },
-                            "project_id": {
-                                "maxLength": 36,
-                                "type": "string",
-                                "description": "Project UUID",
-                                "minLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-                            },
-                            "x": {
-                                "type": "integer",
-                                "description": "X property"
-                            }
-                        }
+                        "type": "object"
                     },
-                    "type": "array",
-                    "description": "Drawings elements"
+                    "type": "array"
                 },
                 "links": {
+                    "description": "Link elements",
                     "items": {
-                        "type": "object",
                         "description": "A link object",
-                        "$schema": "http://json-schema.org/draft-04/schema#",
-                        "required": [
-                            "nodes"
-                        ],
-                        "additionalProperties": false,
                         "properties": {
-                            "project_id": {
-                                "maxLength": 36,
-                                "type": "string",
-                                "description": "Project UUID",
-                                "minLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-                            },
-                            "capture_file_path": {
-                                "type": [
-                                    "string",
-                                    "null"
-                                ],
-                                "description": "Read only property. The full path of the capture file if capture is running"
-                            },
-                            "link_id": {
-                                "maxLength": 36,
-                                "type": "string",
-                                "description": "Link UUID",
-                                "minLength": 36,
-                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-                            },
-                            "capturing": {
-                                "type": "boolean",
-                                "description": "Read only property. True if a capture running on the link"
-                            },
-                            "capture_file_name": {
-                                "type": [
-                                    "string",
-                                    "null"
-                                ],
-                                "description": "Read only property. The name of the capture file if capture is running"
-                            },
                             "nodes": {
+                                "description": "List of the VMS",
                                 "items": {
-                                    "type": "object",
                                     "properties": {
-                                        "port_number": {
-                                            "type": "integer",
-                                            "description": "Port number"
+                                        "adapter_number": {
+                                            "description": "Adapter number",
+                                            "type": "integer"
+                                        },
+                                        "node_id": {
+                                            "description": "Node UUID",
+                                            "maxLength": 36,
+                                            "minLength": 36,
+                                            "type": "string",
+                                            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
                                         },
                                         "label": {
-                                            "type": "object",
                                             "properties": {
+                                                "rotation": {
+                                                    "description": "Rotation of the label",
+                                                    "type": "integer"
+                                                },
                                                 "text": {
                                                     "type": "string"
                                                 },
                                                 "y": {
-                                                    "type": "integer",
-                                                    "description": "Relative Y position of the label"
-                                                },
-                                                "rotation": {
-                                                    "type": "integer",
-                                                    "description": "Rotation of the label"
-                                                },
-                                                "style": {
-                                                    "type": "string",
-                                                    "description": "SVG style attribute"
+                                                    "description": "Relative Y position of the label",
+                                                    "type": "integer"
                                                 },
                                                 "x": {
-                                                    "type": "integer",
-                                                    "description": "Relative X position of the label"
+                                                    "description": "Relative X position of the label",
+                                                    "type": "integer"
+                                                },
+                                                "style": {
+                                                    "description": "SVG style attribute",
+                                                    "type": "string"
                                                 }
                                             },
+                                            "additionalProperties": false,
+                                            "type": "object",
                                             "required": [
                                                 "text",
                                                 "x",
                                                 "y"
-                                            ],
-                                            "additionalProperties": false
+                                            ]
                                         },
-                                        "node_id": {
-                                            "maxLength": 36,
-                                            "type": "string",
-                                            "description": "Node UUID",
-                                            "minLength": 36,
-                                            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-                                        },
-                                        "adapter_number": {
-                                            "type": "integer",
-                                            "description": "Adapter number"
+                                        "port_number": {
+                                            "description": "Port number",
+                                            "type": "integer"
                                         }
                                     },
+                                    "additionalProperties": false,
+                                    "type": "object",
                                     "required": [
                                         "node_id",
                                         "adapter_number",
                                         "port_number"
-                                    ],
-                                    "additionalProperties": false
+                                    ]
                                 },
-                                "type": "array",
-                                "description": "List of the VMS"
-                            }
-                        }
-                    },
-                    "type": "array",
-                    "description": "Link elements"
-                },
-                "computes": {
-                    "items": {
-                        "properties": {
-                            "host": {
-                                "type": "string",
-                                "description": "Server host"
+                                "type": "array"
                             },
-                            "protocol": {
-                                "enum": [
-                                    "http",
-                                    "https"
-                                ],
-                                "description": "Server protocol"
+                            "capturing": {
+                                "description": "Read only property. True if a capture running on the link",
+                                "type": "boolean"
                             },
-                            "memory_usage_percent": {
-                                "type": [
-                                    "number",
-                                    "null"
-                                ],
-                                "description": "RAM usage of the compute. Read only",
-                                "maximum": 100,
-                                "minimum": 0
-                            },
-                            "version": {
+                            "capture_file_path": {
+                                "description": "Read only property. The full path of the capture file if capture is running",
                                 "type": [
                                     "string",
                                     "null"
-                                ],
-                                "description": "Version of the GNS3 remote compute server"
+                                ]
                             },
-                            "user": {
+                            "project_id": {
+                                "description": "Project UUID",
+                                "maxLength": 36,
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+                            },
+                            "link_id": {
+                                "description": "Link UUID",
+                                "maxLength": 36,
+                                "minLength": 36,
+                                "type": "string",
+                                "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+                            },
+                            "capture_file_name": {
+                                "description": "Read only property. The name of the capture file if capture is running",
                                 "type": [
                                     "string",
                                     "null"
-                                ],
-                                "description": "User for authentication"
-                            },
-                            "compute_id": {
-                                "type": "string",
-                                "description": "Server identifier"
-                            },
-                            "cpu_usage_percent": {
-                                "type": [
-                                    "number",
-                                    "null"
-                                ],
-                                "description": "CPU usage of the compute. Read only",
-                                "maximum": 100,
-                                "minimum": 0
-                            },
-                            "port": {
-                                "type": "integer",
-                                "description": "Server port"
-                            },
-                            "name": {
-                                "type": "string",
-                                "description": "Server name"
-                            },
-                            "connected": {
-                                "type": "boolean",
-                                "description": "Whether the controller is connected to the compute server or not"
+                                ]
                             }
                         },
-                        "type": "object",
-                        "description": "Request validation to a GNS3 compute object instance",
                         "additionalProperties": false,
+                        "$schema": "http://json-schema.org/draft-04/schema#",
                         "required": [
-                            "compute_id",
-                            "protocol",
-                            "host",
-                            "port",
-                            "name"
+                            "nodes"
                         ],
-                        "$schema": "http://json-schema.org/draft-04/schema#"
+                        "type": "object"
                     },
-                    "type": "array",
-                    "description": "Computes servers"
+                    "type": "array"
                 }
             },
+            "additionalProperties": false,
+            "type": "object",
             "required": [
                 "nodes",
                 "links",
                 "drawings",
                 "computes"
-            ],
-            "additionalProperties": false
-        },
-        "auto_start": {
-            "type": "boolean",
-            "description": "Start the topology when opened"
-        },
-        "revision": {
-            "type": "integer",
-            "description": "Version of the .gns3 specification."
+            ]
         },
         "project_id": {
-            "maxLength": 36,
-            "type": "string",
             "description": "Project UUID",
+            "maxLength": 36,
             "minLength": 36,
+            "type": "string",
             "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+        },
+        "version": {
+            "description": "Version of the GNS3 software which have update the file for the last time",
+            "type": "string"
+        },
+        "name": {
+            "description": "Name of the project",
+            "type": "string"
+        },
+        "type": {
+            "description": "Type of file. It's always topology",
+            "enum": [
+                "topology"
+            ]
+        },
+        "revision": {
+            "description": "Version of the .gns3 specification.",
+            "type": "integer"
         }
-    }
+    },
+    "additionalProperties": false,
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "required": [
+        "project_id",
+        "type",
+        "revision",
+        "version",
+        "name",
+        "topology"
+    ],
+    "type": "object"
 }
\ No newline at end of file
diff --git a/tests/controller/test_import_project.py b/tests/controller/test_import_project.py
index 440c1c9f..3732d967 100644
--- a/tests/controller/test_import_project.py
+++ b/tests/controller/test_import_project.py
@@ -128,7 +128,6 @@ def test_import_with_images(tmpdir, async_run, controller):
     assert os.path.exists(path), path
 
 
-
 def test_import_iou_non_linux(linux_platform, async_run, tmpdir, controller):
     """
     On non linux host IOU should be local
@@ -140,12 +139,12 @@ def test_import_iou_non_linux(linux_platform, async_run, tmpdir, controller):
         "name": "test",
         "type": "topology",
         "topology": {
-             "nodes": [
-                  {
-                      "compute_id": "local",
-                      "node_type": "iou",
-                      "properties": {}
-                  }
+            "nodes": [
+                {
+                    "compute_id": "local",
+                    "node_type": "iou",
+                    "properties": {}
+                }
             ],
             "links": [],
             "computes": [],
@@ -170,7 +169,6 @@ def test_import_iou_non_linux(linux_platform, async_run, tmpdir, controller):
         assert topo["topology"]["nodes"][0]["compute_id"] == "local"
 
 
-
 def test_import_iou_non_linux(windows_platform, async_run, tmpdir, controller):
     """
     On non linux host IOU should be moved to the GNS3 VM
@@ -182,18 +180,18 @@ def test_import_iou_non_linux(windows_platform, async_run, tmpdir, controller):
         "name": "test",
         "type": "topology",
         "topology": {
-             "nodes": [
-                  {
-                      "compute_id": "local",
-                      "node_type": "iou",
-                      "properties": {}
-                  },
-                  {
-                      "compute_id": "local",
-                      "node_type": "vpcs",
-                      "properties": {}
-                  }
-             ],
+            "nodes": [
+                {
+                    "compute_id": "local",
+                    "node_type": "iou",
+                    "properties": {}
+                },
+                {
+                    "compute_id": "local",
+                    "node_type": "vpcs",
+                    "properties": {}
+                }
+            ],
             "links": [],
             "computes": [],
             "drawings": []
@@ -216,4 +214,3 @@ def test_import_iou_non_linux(windows_platform, async_run, tmpdir, controller):
         topo = json.load(f)
         assert topo["topology"]["nodes"][0]["compute_id"] == "vm"
         assert topo["topology"]["nodes"][1]["compute_id"] == "local"
-