From 803064d5cf05aa62a357a9aacbbe91410253224b Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@gns3.net>
Date: Wed, 14 Sep 2016 15:24:27 +0200
Subject: [PATCH] Rebuild documentation

---
 ...lete_projectsprojectidcloudnodesnodeid.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...delete_projectsprojectidiounodesnodeid.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...delete_projectsprojectidnatnodesnodeid.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...elete_projectsprojectidqemunodesnodeid.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...elete_projectsprojectidvpcsnodesnodeid.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 .../api/examples/compute_get_capabilities.txt |    2 +-
 .../compute_get_networkinterfaces.txt         | 1778 +----------------
 docs/api/examples/compute_get_projects.txt    |    4 +-
 ..._get_projectsprojectidcloudnodesnodeid.txt |  888 +-------
 ...te_get_projectsprojectidiounodesnodeid.txt |    8 +-
 ...te_get_projectsprojectidnatnodesnodeid.txt |   16 +-
 ...e_get_projectsprojectidqemunodesnodeid.txt |   12 +-
 ...projectsprojectidvirtualboxnodesnodeid.txt |    6 +-
 ...e_get_projectsprojectidvpcsnodesnodeid.txt |    8 +-
 ...mpute_post_projectsprojectidcloudnodes.txt |  884 +-------
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...ternumberdportsportnumberdstartcapture.txt |    6 +-
 ...pternumberdportsportnumberdstopcapture.txt |    4 +-
 ...compute_post_projectsprojectidiounodes.txt |    8 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...ternumberdportsportnumberdstartcapture.txt |    6 +-
 ...pternumberdportsportnumberdstopcapture.txt |    4 +-
 ..._projectsprojectidiounodesnodeidreload.txt |    4 +-
 ...t_projectsprojectidiounodesnodeidstart.txt |    8 +-
 ...st_projectsprojectidiounodesnodeidstop.txt |    4 +-
 ...compute_post_projectsprojectidnatnodes.txt |   12 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...ompute_post_projectsprojectidqemunodes.txt |   12 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...projectsprojectidqemunodesnodeidreload.txt |    4 +-
 ...projectsprojectidqemunodesnodeidresume.txt |    4 +-
 ..._projectsprojectidqemunodesnodeidstart.txt |   12 +-
 ...t_projectsprojectidqemunodesnodeidstop.txt |    4 +-
 ...rojectsprojectidqemunodesnodeidsuspend.txt |    4 +-
 ..._post_projectsprojectidvirtualboxnodes.txt |    2 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...tsprojectidvirtualboxnodesnodeidreload.txt |    4 +-
 ...tsprojectidvirtualboxnodesnodeidresume.txt |    4 +-
 ...ctsprojectidvirtualboxnodesnodeidstart.txt |    4 +-
 ...ectsprojectidvirtualboxnodesnodeidstop.txt |    4 +-
 ...sprojectidvirtualboxnodesnodeidsuspend.txt |    4 +-
 ...ompute_post_projectsprojectidvpcsnodes.txt |    4 +-
 ...ptersadapternumberdportsportnumberdnio.txt |    4 +-
 ...projectsprojectidvpcsnodesnodeidreload.txt |    4 +-
 ..._projectsprojectidvpcsnodesnodeidstart.txt |    8 +-
 ...t_projectsprojectidvpcsnodesnodeidstop.txt |    4 +-
 ..._put_projectsprojectidcloudnodesnodeid.txt |  888 +-------
 ...put_projectsprojectiddockernodesnodeid.txt |    8 +-
 ...te_put_projectsprojectidiounodesnodeid.txt |    8 +-
 ...te_put_projectsprojectidnatnodesnodeid.txt |   16 +-
 ...e_put_projectsprojectidqemunodesnodeid.txt |   12 +-
 ...projectsprojectidvirtualboxnodesnodeid.txt |    6 +-
 ...e_put_projectsprojectidvpcsnodesnodeid.txt |    8 +-
 .../controller_delete_projectsprojectid.txt   |    4 +-
 ...ete_projectsprojectiddrawingsdrawingid.txt |    4 +-
 ...er_delete_projectsprojectidlinkslinkid.txt |    4 +-
 ...er_delete_projectsprojectidnodesnodeid.txt |    4 +-
 ...e_projectsprojectidsnapshotssnapshotid.txt |    4 +-
 docs/api/examples/controller_get_gns3vm.txt   |    6 +-
 .../examples/controller_get_gns3vmengines.txt |   21 +-
 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 |   25 +-
 ...projectidnodesnodeiddynamipsautoidlepc.txt |    4 +-
 ...ctidnodesnodeiddynamipsidlepcproposals.txt |    4 +-
 ...troller_get_projectsprojectidsnapshots.txt |   10 +-
 .../api/examples/controller_post_projects.txt |    2 +-
 .../examples/controller_post_projectsload.txt |    4 +-
 ...controller_post_projectsprojectidclose.txt |    8 +-
 ...troller_post_projectsprojectiddrawings.txt |    8 +-
 ...roller_post_projectsprojectidduplicate.txt |    8 +-
 ...controller_post_projectsprojectidlinks.txt |   16 +-
 ...ojectsprojectidlinkslinkidstartcapture.txt |    8 +-
 ...rojectsprojectidlinkslinkidstopcapture.txt |    8 +-
 ...controller_post_projectsprojectidnodes.txt |   25 +-
 ...ost_projectsprojectidnodesnodeidreload.txt |   25 +-
 ...post_projectsprojectidnodesnodeidstart.txt |   25 +-
 ..._post_projectsprojectidnodesnodeidstop.txt |   25 +-
 ...st_projectsprojectidnodesnodeidsuspend.txt |   25 +-
 ...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 +-
 ...roller_post_projectsprojectidsnapshots.txt |   10 +-
 ...ctsprojectidsnapshotssnapshotidrestore.txt |    8 +-
 .../controller_put_projectsprojectid.txt      |    2 +-
 ...put_projectsprojectiddrawingsdrawingid.txt |    8 +-
 ...oller_put_projectsprojectidnodesnodeid.txt |   25 +-
 docs/api/notifications/compute.updated.json   |   32 +-
 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      |   19 +-
 docs/api/notifications/node.updated.json      |   50 +-
 docs/api/notifications/project.closed.json    |    4 +-
 docs/api/notifications/project.updated.json   |    2 +-
 docs/api/notifications/snapshot.restored.json |    6 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 .../cloud/projectsprojectidcloudnodes.rst     |    4 +-
 .../projectsprojectidcloudnodesnodeid.rst     |    6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 .../projectsprojectidethernethubnodes.rst     |    4 +-
 ...rojectsprojectidethernethubnodesnodeid.rst |    6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 .../projectsprojectidethernetswitchnodes.rst  |    4 +-
 ...ectsprojectidethernetswitchnodesnodeid.rst |    6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 .../compute/nat/projectsprojectidnatnodes.rst |    4 +-
 .../nat/projectsprojectidnatnodesnodeid.rst   |    6 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...ptersadapternumberdportsportnumberdnio.rst |    4 +-
 ...ternumberdportsportnumberdstartcapture.rst |    2 +-
 ...pternumberdportsportnumberdstopcapture.rst |    2 +-
 ...rojectsprojectidvpcsnodesnodeidsuspend.rst |   20 +
 .../link/projectsprojectidlinkslinkid.rst     |    4 +-
 .../link/projectsprojectidlinkslinkidpcap.rst |    4 +-
 ...ojectsprojectidlinkslinkidstartcapture.rst |    2 +-
 ...rojectsprojectidlinkslinkidstopcapture.rst |    2 +-
 .../node/projectsprojectidnodes.rst           |    8 +
 .../node/projectsprojectidnodesnodeid.rst     |    8 +
 .../projectsprojectidnodesnodeidreload.rst    |    4 +
 .../projectsprojectidnodesnodeidstart.rst     |    4 +
 .../node/projectsprojectidnodesnodeidstop.rst |    4 +
 .../projectsprojectidnodesnodeidsuspend.rst   |    4 +
 .../node/projectsprojectidnodesreload.rst     |    4 +
 .../node/projectsprojectidnodesstart.rst      |    4 +
 .../node/projectsprojectidnodesstop.rst       |    4 +
 .../node/projectsprojectidnodessuspend.rst    |    4 +
 docs/gns3_file.json                           |  697 ++++---
 174 files changed, 1059 insertions(+), 5157 deletions(-)
 create mode 100644 docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst

diff --git a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
index 56b13b98..50a4a77b 100644
--- a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/cc542a13-874e-4d16-b6e9-9cad0bfe3b93'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/41e83f3d-8456-473f-8195-516a1f738801'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/cc542a13-874e-4d16-b6e9-9cad0bfe3b93 HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/41e83f3d-8456-473f-8195-516a1f738801 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 808a534f..7205b86f 100644
--- a/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/6a1c7cea-6610-4ffe-aceb-3219cd0d0ec1/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/77548610-5538-4f30-9de6-9104d2fb8370/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/6a1c7cea-6610-4ffe-aceb-3219cd0d0ec1/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/77548610-5538-4f30-9de6-9104d2fb8370/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index b3e16bd0..a127cee3 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/a36a487a-dced-4e76-a6ea-d15bb8ad88db/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2f12b49b-d282-419c-ab2e-94579b9d19c6/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/a36a487a-dced-4e76-a6ea-d15bb8ad88db/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/2f12b49b-d282-419c-ab2e-94579b9d19c6/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 070156db..9a76482c 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/5bc11f8c-b5ea-4aef-ba83-c74451f36693'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f97a8bd6-3799-452e-b3a3-d7fc4fd2f16f'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/5bc11f8c-b5ea-4aef-ba83-c74451f36693 HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f97a8bd6-3799-452e-b3a3-d7fc4fd2f16f HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 16959172..69f7d7bf 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/e91beca3-58ce-4aba-9493-42f3b4525cb3/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1fef5d59-4568-43c1-b7d5-5de22a145243/adapters/1/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/e91beca3-58ce-4aba-9493-42f3b4525cb3/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/1fef5d59-4568-43c1-b7d5-5de22a145243/adapters/1/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt
index 3d4ce331..4c614b43 100644
--- a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/32b858c9-ae11-4c35-8282-75d468e16c49'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/08932e82-3f90-44c6-aac9-f599a1fed13a'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/32b858c9-ae11-4c35-8282-75d468e16c49 HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/08932e82-3f90-44c6-aac9-f599a1fed13a HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 9f2e8b80..231721c9 100644
--- a/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a94ef927-8990-4f15-bcb8-9d8e269b9664/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a3ed88f8-6639-4655-b67b-423f20906e1a/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a94ef927-8990-4f15-bcb8-9d8e269b9664/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a3ed88f8-6639-4655-b67b-423f20906e1a/adapters/0/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 c1837edd..ba2e6d76 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/6e641104-4fee-4ef4-bd12-b37beee0d12a'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7e12bebe-49da-48c1-8ec1-cf63635029fd'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/6e641104-4fee-4ef4-bd12-b37beee0d12a HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7e12bebe-49da-48c1-8ec1-cf63635029fd HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index b40466c7..226fd7ff 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/2001cf01-22c0-4bc4-b105-a62b2d966bc2/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdd1115c-ded9-4b2f-8560-d555bb12f643/adapters/1/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2001cf01-22c0-4bc4-b105-a62b2d966bc2/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bdd1115c-ded9-4b2f-8560-d555bb12f643/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 39ff89ca..f409db82 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/5ed503b4-6381-4b0c-903f-e509a7b55918/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5edf41d8-1041-48d4-ba8b-c53695d59fc1/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5ed503b4-6381-4b0c-903f-e509a7b55918/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/5edf41d8-1041-48d4-ba8b-c53695d59fc1/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 decb64c9..44dc6c4d 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/d825429d-d6f4-445c-9a0f-9c42dc2b426c'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0cb7dac8-87ec-4882-9062-2f4000a1653d'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/d825429d-d6f4-445c-9a0f-9c42dc2b426c HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/0cb7dac8-87ec-4882-9062-2f4000a1653d HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 4c33b7cb..bd671099 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/27f7db39-8425-4d8e-a7e5-1bc388e94212/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/bc9a8630-043d-473a-bfd4-0e5def6bdfb5/adapters/0/ports/0/nio'
 
-DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/27f7db39-8425-4d8e-a7e5-1bc388e94212/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/bc9a8630-043d-473a-bfd4-0e5def6bdfb5/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/compute_get_capabilities.txt b/docs/api/examples/compute_get_capabilities.txt
index 7c36187c..b1144589 100644
--- a/docs/api/examples/compute_get_capabilities.txt
+++ b/docs/api/examples/compute_get_capabilities.txt
@@ -14,9 +14,9 @@ X-ROUTE: /v2/compute/capabilities
 {
     "node_types": [
         "cloud",
-        "nat",
         "ethernet_hub",
         "ethernet_switch",
+        "nat",
         "vpcs",
         "virtualbox",
         "dynamips",
diff --git a/docs/api/examples/compute_get_networkinterfaces.txt b/docs/api/examples/compute_get_networkinterfaces.txt
index 76e34923..6195e33d 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: 49096
+CONTENT-LENGTH: 3351
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -69,1298 +69,34 @@ X-ROUTE: /v2/compute/network/interfaces
         "type": "ethernet"
     },
     {
-        "id": "vboxnet0",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:00",
-        "name": "vboxnet0",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet1",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:01",
-        "name": "vboxnet1",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet2",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:02",
-        "name": "vboxnet2",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet3",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:03",
-        "name": "vboxnet3",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet4",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:04",
-        "name": "vboxnet4",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet5",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:05",
-        "name": "vboxnet5",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet6",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:06",
-        "name": "vboxnet6",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vboxnet7",
-        "ip_address": "",
-        "mac_address": "0a:00:27:00:00:07",
-        "name": "vboxnet7",
-        "netmask": "",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet1",
-        "ip_address": "172.16.16.1",
-        "mac_address": "00:50:56:c0:00:01",
-        "name": "vmnet1",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet10",
-        "ip_address": "172.16.7.1",
-        "mac_address": "00:50:56:c0:00:0a",
-        "name": "vmnet10",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet100",
-        "ip_address": "172.16.98.1",
-        "mac_address": "00:50:56:c0:00:64",
-        "name": "vmnet100",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet101",
-        "ip_address": "172.16.99.1",
-        "mac_address": "00:50:56:c0:00:65",
-        "name": "vmnet101",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet102",
-        "ip_address": "172.16.100.1",
-        "mac_address": "00:50:56:c0:00:66",
-        "name": "vmnet102",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet103",
-        "ip_address": "172.16.101.1",
-        "mac_address": "00:50:56:c0:00:67",
-        "name": "vmnet103",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet104",
-        "ip_address": "172.16.102.1",
-        "mac_address": "00:50:56:c0:00:68",
-        "name": "vmnet104",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet105",
-        "ip_address": "172.16.103.1",
-        "mac_address": "00:50:56:c0:00:69",
-        "name": "vmnet105",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet106",
-        "ip_address": "172.16.104.1",
-        "mac_address": "00:50:56:c0:00:6a",
-        "name": "vmnet106",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet107",
-        "ip_address": "172.16.105.1",
-        "mac_address": "00:50:56:c0:00:6b",
-        "name": "vmnet107",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet108",
-        "ip_address": "172.16.106.1",
-        "mac_address": "00:50:56:c0:00:6c",
-        "name": "vmnet108",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet109",
-        "ip_address": "172.16.107.1",
-        "mac_address": "00:50:56:c0:00:6d",
-        "name": "vmnet109",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet11",
-        "ip_address": "172.16.8.1",
-        "mac_address": "00:50:56:c0:00:0b",
-        "name": "vmnet11",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet110",
-        "ip_address": "172.16.108.1",
-        "mac_address": "00:50:56:c0:00:6e",
-        "name": "vmnet110",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet111",
-        "ip_address": "172.16.109.1",
-        "mac_address": "00:50:56:c0:00:6f",
-        "name": "vmnet111",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet112",
-        "ip_address": "172.16.110.1",
-        "mac_address": "00:50:56:c0:00:70",
-        "name": "vmnet112",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet113",
-        "ip_address": "172.16.111.1",
-        "mac_address": "00:50:56:c0:00:71",
-        "name": "vmnet113",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet114",
-        "ip_address": "172.16.112.1",
-        "mac_address": "00:50:56:c0:00:72",
-        "name": "vmnet114",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet115",
-        "ip_address": "172.16.113.1",
-        "mac_address": "00:50:56:c0:00:73",
-        "name": "vmnet115",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet116",
-        "ip_address": "172.16.114.1",
-        "mac_address": "00:50:56:c0:00:74",
-        "name": "vmnet116",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet117",
-        "ip_address": "172.16.115.1",
-        "mac_address": "00:50:56:c0:00:75",
-        "name": "vmnet117",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet118",
-        "ip_address": "172.16.116.1",
-        "mac_address": "00:50:56:c0:00:76",
-        "name": "vmnet118",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet119",
-        "ip_address": "172.16.117.1",
-        "mac_address": "00:50:56:c0:00:77",
-        "name": "vmnet119",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet12",
-        "ip_address": "172.16.9.1",
-        "mac_address": "00:50:56:c0:00:0c",
-        "name": "vmnet12",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet120",
-        "ip_address": "172.16.118.1",
-        "mac_address": "00:50:56:c0:00:78",
-        "name": "vmnet120",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet121",
-        "ip_address": "172.16.119.1",
-        "mac_address": "00:50:56:c0:00:79",
-        "name": "vmnet121",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet122",
-        "ip_address": "172.16.120.1",
-        "mac_address": "00:50:56:c0:00:7a",
-        "name": "vmnet122",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet123",
-        "ip_address": "172.16.121.1",
-        "mac_address": "00:50:56:c0:00:7b",
-        "name": "vmnet123",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet124",
-        "ip_address": "172.16.122.1",
-        "mac_address": "00:50:56:c0:00:7c",
-        "name": "vmnet124",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet125",
-        "ip_address": "172.16.123.1",
-        "mac_address": "00:50:56:c0:00:7d",
-        "name": "vmnet125",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet126",
-        "ip_address": "172.16.124.1",
-        "mac_address": "00:50:56:c0:00:7e",
-        "name": "vmnet126",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet127",
-        "ip_address": "172.16.125.1",
-        "mac_address": "00:50:56:c0:00:7f",
-        "name": "vmnet127",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet128",
-        "ip_address": "172.16.126.1",
-        "mac_address": "00:50:56:c0:00:80",
-        "name": "vmnet128",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet129",
-        "ip_address": "172.16.127.1",
-        "mac_address": "00:50:56:c0:00:81",
-        "name": "vmnet129",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet13",
-        "ip_address": "172.16.10.1",
-        "mac_address": "00:50:56:c0:00:0d",
-        "name": "vmnet13",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet130",
-        "ip_address": "172.16.128.1",
-        "mac_address": "00:50:56:c0:00:82",
-        "name": "vmnet130",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet131",
-        "ip_address": "172.16.129.1",
-        "mac_address": "00:50:56:c0:00:83",
-        "name": "vmnet131",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet132",
-        "ip_address": "172.16.130.1",
-        "mac_address": "00:50:56:c0:00:84",
-        "name": "vmnet132",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet133",
-        "ip_address": "172.16.131.1",
-        "mac_address": "00:50:56:c0:00:85",
-        "name": "vmnet133",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet134",
-        "ip_address": "172.16.132.1",
-        "mac_address": "00:50:56:c0:00:86",
-        "name": "vmnet134",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet135",
-        "ip_address": "172.16.133.1",
-        "mac_address": "00:50:56:c0:00:87",
-        "name": "vmnet135",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet136",
-        "ip_address": "172.16.134.1",
-        "mac_address": "00:50:56:c0:00:88",
-        "name": "vmnet136",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet137",
-        "ip_address": "172.16.135.1",
-        "mac_address": "00:50:56:c0:00:89",
-        "name": "vmnet137",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet138",
-        "ip_address": "172.16.136.1",
-        "mac_address": "00:50:56:c0:00:8a",
-        "name": "vmnet138",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet139",
-        "ip_address": "172.16.137.1",
-        "mac_address": "00:50:56:c0:00:8b",
-        "name": "vmnet139",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet14",
-        "ip_address": "172.16.11.1",
-        "mac_address": "00:50:56:c0:00:0e",
-        "name": "vmnet14",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet140",
-        "ip_address": "172.16.138.1",
-        "mac_address": "00:50:56:c0:00:8c",
-        "name": "vmnet140",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet141",
-        "ip_address": "172.16.139.1",
-        "mac_address": "00:50:56:c0:00:8d",
-        "name": "vmnet141",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet142",
-        "ip_address": "172.16.140.1",
-        "mac_address": "00:50:56:c0:00:8e",
-        "name": "vmnet142",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet143",
-        "ip_address": "172.16.141.1",
-        "mac_address": "00:50:56:c0:00:8f",
-        "name": "vmnet143",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet144",
-        "ip_address": "172.16.142.1",
-        "mac_address": "00:50:56:c0:00:90",
-        "name": "vmnet144",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet145",
-        "ip_address": "172.16.143.1",
-        "mac_address": "00:50:56:c0:00:91",
-        "name": "vmnet145",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet146",
-        "ip_address": "172.16.144.1",
-        "mac_address": "00:50:56:c0:00:92",
-        "name": "vmnet146",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet147",
-        "ip_address": "172.16.145.1",
-        "mac_address": "00:50:56:c0:00:93",
-        "name": "vmnet147",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet148",
-        "ip_address": "172.16.146.1",
-        "mac_address": "00:50:56:c0:00:94",
-        "name": "vmnet148",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet149",
-        "ip_address": "172.16.147.1",
-        "mac_address": "00:50:56:c0:00:95",
-        "name": "vmnet149",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet15",
-        "ip_address": "172.16.12.1",
-        "mac_address": "00:50:56:c0:00:0f",
-        "name": "vmnet15",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet150",
-        "ip_address": "172.16.148.1",
-        "mac_address": "00:50:56:c0:00:96",
-        "name": "vmnet150",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet151",
-        "ip_address": "172.16.149.1",
-        "mac_address": "00:50:56:c0:00:97",
-        "name": "vmnet151",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet152",
-        "ip_address": "172.16.150.1",
-        "mac_address": "00:50:56:c0:00:98",
-        "name": "vmnet152",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet153",
-        "ip_address": "172.16.151.1",
-        "mac_address": "00:50:56:c0:00:99",
-        "name": "vmnet153",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet154",
-        "ip_address": "172.16.152.1",
-        "mac_address": "00:50:56:c0:00:9a",
-        "name": "vmnet154",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet155",
-        "ip_address": "172.16.153.1",
-        "mac_address": "00:50:56:c0:00:9b",
-        "name": "vmnet155",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet156",
-        "ip_address": "172.16.154.1",
-        "mac_address": "00:50:56:c0:00:9c",
-        "name": "vmnet156",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet157",
-        "ip_address": "172.16.155.1",
-        "mac_address": "00:50:56:c0:00:9d",
-        "name": "vmnet157",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet158",
-        "ip_address": "172.16.156.1",
-        "mac_address": "00:50:56:c0:00:9e",
-        "name": "vmnet158",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet159",
-        "ip_address": "172.16.157.1",
-        "mac_address": "00:50:56:c0:00:9f",
-        "name": "vmnet159",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet16",
-        "ip_address": "172.16.13.1",
-        "mac_address": "00:50:56:c0:00:10",
-        "name": "vmnet16",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet160",
-        "ip_address": "172.16.158.1",
-        "mac_address": "00:50:56:c0:00:a0",
-        "name": "vmnet160",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet161",
-        "ip_address": "172.16.159.1",
-        "mac_address": "00:50:56:c0:00:a1",
-        "name": "vmnet161",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet162",
-        "ip_address": "172.16.160.1",
-        "mac_address": "00:50:56:c0:00:a2",
-        "name": "vmnet162",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet163",
-        "ip_address": "172.16.161.1",
-        "mac_address": "00:50:56:c0:00:a3",
-        "name": "vmnet163",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet164",
-        "ip_address": "172.16.162.1",
-        "mac_address": "00:50:56:c0:00:a4",
-        "name": "vmnet164",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet165",
-        "ip_address": "172.16.163.1",
-        "mac_address": "00:50:56:c0:00:a5",
-        "name": "vmnet165",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet166",
-        "ip_address": "172.16.164.1",
-        "mac_address": "00:50:56:c0:00:a6",
-        "name": "vmnet166",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet167",
-        "ip_address": "172.16.165.1",
-        "mac_address": "00:50:56:c0:00:a7",
-        "name": "vmnet167",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet168",
-        "ip_address": "172.16.166.1",
-        "mac_address": "00:50:56:c0:00:a8",
-        "name": "vmnet168",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet169",
-        "ip_address": "172.16.167.1",
-        "mac_address": "00:50:56:c0:00:a9",
-        "name": "vmnet169",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet17",
-        "ip_address": "172.16.14.1",
-        "mac_address": "00:50:56:c0:00:11",
-        "name": "vmnet17",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet170",
-        "ip_address": "172.16.168.1",
-        "mac_address": "00:50:56:c0:00:aa",
-        "name": "vmnet170",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet171",
-        "ip_address": "172.16.169.1",
-        "mac_address": "00:50:56:c0:00:ab",
-        "name": "vmnet171",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet172",
-        "ip_address": "172.16.170.1",
-        "mac_address": "00:50:56:c0:00:ac",
-        "name": "vmnet172",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet173",
-        "ip_address": "172.16.171.1",
-        "mac_address": "00:50:56:c0:00:ad",
-        "name": "vmnet173",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet174",
-        "ip_address": "172.16.172.1",
-        "mac_address": "00:50:56:c0:00:ae",
-        "name": "vmnet174",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet175",
-        "ip_address": "172.16.173.1",
-        "mac_address": "00:50:56:c0:00:af",
-        "name": "vmnet175",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet176",
-        "ip_address": "172.16.174.1",
-        "mac_address": "00:50:56:c0:00:b0",
-        "name": "vmnet176",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet177",
-        "ip_address": "172.16.175.1",
-        "mac_address": "00:50:56:c0:00:b1",
-        "name": "vmnet177",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet178",
-        "ip_address": "172.16.176.1",
-        "mac_address": "00:50:56:c0:00:b2",
-        "name": "vmnet178",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet179",
-        "ip_address": "172.16.177.1",
-        "mac_address": "00:50:56:c0:00:b3",
-        "name": "vmnet179",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet18",
-        "ip_address": "172.16.15.1",
-        "mac_address": "00:50:56:c0:00:12",
-        "name": "vmnet18",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet180",
-        "ip_address": "172.16.178.1",
-        "mac_address": "00:50:56:c0:00:b4",
-        "name": "vmnet180",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet181",
-        "ip_address": "172.16.179.1",
-        "mac_address": "00:50:56:c0:00:b5",
-        "name": "vmnet181",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet182",
-        "ip_address": "172.16.180.1",
-        "mac_address": "00:50:56:c0:00:b6",
-        "name": "vmnet182",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet183",
-        "ip_address": "172.16.181.1",
-        "mac_address": "00:50:56:c0:00:b7",
-        "name": "vmnet183",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet184",
-        "ip_address": "172.16.182.1",
-        "mac_address": "00:50:56:c0:00:b8",
-        "name": "vmnet184",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet185",
-        "ip_address": "172.16.183.1",
-        "mac_address": "00:50:56:c0:00:b9",
-        "name": "vmnet185",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet186",
-        "ip_address": "172.16.184.1",
-        "mac_address": "00:50:56:c0:00:ba",
-        "name": "vmnet186",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet187",
-        "ip_address": "172.16.185.1",
-        "mac_address": "00:50:56:c0:00:bb",
-        "name": "vmnet187",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet188",
-        "ip_address": "172.16.186.1",
-        "mac_address": "00:50:56:c0:00:bc",
-        "name": "vmnet188",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet189",
-        "ip_address": "172.16.187.1",
-        "mac_address": "00:50:56:c0:00:bd",
-        "name": "vmnet189",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet19",
-        "ip_address": "172.16.17.1",
-        "mac_address": "00:50:56:c0:00:13",
-        "name": "vmnet19",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet190",
-        "ip_address": "172.16.188.1",
-        "mac_address": "00:50:56:c0:00:be",
-        "name": "vmnet190",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet191",
-        "ip_address": "172.16.189.1",
-        "mac_address": "00:50:56:c0:00:bf",
-        "name": "vmnet191",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet192",
-        "ip_address": "172.16.190.1",
-        "mac_address": "00:50:56:c0:00:c0",
-        "name": "vmnet192",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet193",
-        "ip_address": "172.16.191.1",
-        "mac_address": "00:50:56:c0:00:c1",
-        "name": "vmnet193",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet194",
-        "ip_address": "172.16.192.1",
-        "mac_address": "00:50:56:c0:00:c2",
-        "name": "vmnet194",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet195",
-        "ip_address": "172.16.193.1",
-        "mac_address": "00:50:56:c0:00:c3",
-        "name": "vmnet195",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet196",
-        "ip_address": "172.16.194.1",
-        "mac_address": "00:50:56:c0:00:c4",
-        "name": "vmnet196",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet197",
-        "ip_address": "172.16.195.1",
-        "mac_address": "00:50:56:c0:00:c5",
-        "name": "vmnet197",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet198",
-        "ip_address": "172.16.196.1",
-        "mac_address": "00:50:56:c0:00:c6",
-        "name": "vmnet198",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet199",
-        "ip_address": "172.16.197.1",
-        "mac_address": "00:50:56:c0:00:c7",
-        "name": "vmnet199",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet2",
-        "ip_address": "172.16.0.1",
-        "mac_address": "00:50:56:c0:00:02",
-        "name": "vmnet2",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet20",
-        "ip_address": "172.16.18.1",
-        "mac_address": "00:50:56:c0:00:14",
-        "name": "vmnet20",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet200",
-        "ip_address": "172.16.198.1",
-        "mac_address": "00:50:56:c0:00:c8",
-        "name": "vmnet200",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet201",
-        "ip_address": "172.16.199.1",
-        "mac_address": "00:50:56:c0:00:c9",
-        "name": "vmnet201",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet202",
-        "ip_address": "172.16.200.1",
-        "mac_address": "00:50:56:c0:00:ca",
-        "name": "vmnet202",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet203",
-        "ip_address": "172.16.201.1",
-        "mac_address": "00:50:56:c0:00:cb",
-        "name": "vmnet203",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet204",
-        "ip_address": "172.16.202.1",
-        "mac_address": "00:50:56:c0:00:cc",
-        "name": "vmnet204",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet205",
-        "ip_address": "172.16.203.1",
-        "mac_address": "00:50:56:c0:00:cd",
-        "name": "vmnet205",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet206",
-        "ip_address": "172.16.204.1",
-        "mac_address": "00:50:56:c0:00:ce",
-        "name": "vmnet206",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet207",
-        "ip_address": "172.16.205.1",
-        "mac_address": "00:50:56:c0:00:cf",
-        "name": "vmnet207",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet208",
-        "ip_address": "172.16.206.1",
-        "mac_address": "00:50:56:c0:00:d0",
-        "name": "vmnet208",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet209",
-        "ip_address": "172.16.207.1",
-        "mac_address": "00:50:56:c0:00:d1",
-        "name": "vmnet209",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet21",
-        "ip_address": "172.16.19.1",
-        "mac_address": "00:50:56:c0:00:15",
-        "name": "vmnet21",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet210",
-        "ip_address": "172.16.208.1",
-        "mac_address": "00:50:56:c0:00:d2",
-        "name": "vmnet210",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet211",
-        "ip_address": "172.16.209.1",
-        "mac_address": "00:50:56:c0:00:d3",
-        "name": "vmnet211",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet212",
-        "ip_address": "172.16.210.1",
-        "mac_address": "00:50:56:c0:00:d4",
-        "name": "vmnet212",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet213",
-        "ip_address": "172.16.211.1",
-        "mac_address": "00:50:56:c0:00:d5",
-        "name": "vmnet213",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet214",
-        "ip_address": "172.16.212.1",
-        "mac_address": "00:50:56:c0:00:d6",
-        "name": "vmnet214",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet215",
-        "ip_address": "172.16.213.1",
-        "mac_address": "00:50:56:c0:00:d7",
-        "name": "vmnet215",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet216",
-        "ip_address": "172.16.214.1",
-        "mac_address": "00:50:56:c0:00:d8",
-        "name": "vmnet216",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet217",
-        "ip_address": "172.16.215.1",
-        "mac_address": "00:50:56:c0:00:d9",
-        "name": "vmnet217",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet218",
-        "ip_address": "172.16.216.1",
-        "mac_address": "00:50:56:c0:00:da",
-        "name": "vmnet218",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet219",
-        "ip_address": "172.16.217.1",
-        "mac_address": "00:50:56:c0:00:db",
-        "name": "vmnet219",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet22",
-        "ip_address": "172.16.20.1",
-        "mac_address": "00:50:56:c0:00:16",
-        "name": "vmnet22",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet220",
-        "ip_address": "172.16.218.1",
-        "mac_address": "00:50:56:c0:00:dc",
-        "name": "vmnet220",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet23",
-        "ip_address": "172.16.21.1",
-        "mac_address": "00:50:56:c0:00:17",
-        "name": "vmnet23",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet24",
-        "ip_address": "172.16.22.1",
-        "mac_address": "00:50:56:c0:00:18",
-        "name": "vmnet24",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet25",
-        "ip_address": "172.16.23.1",
-        "mac_address": "00:50:56:c0:00:19",
-        "name": "vmnet25",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet26",
-        "ip_address": "172.16.24.1",
-        "mac_address": "00:50:56:c0:00:1a",
-        "name": "vmnet26",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet27",
-        "ip_address": "172.16.25.1",
-        "mac_address": "00:50:56:c0:00:1b",
-        "name": "vmnet27",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet28",
-        "ip_address": "172.16.26.1",
-        "mac_address": "00:50:56:c0:00:1c",
-        "name": "vmnet28",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet29",
-        "ip_address": "172.16.27.1",
-        "mac_address": "00:50:56:c0:00:1d",
-        "name": "vmnet29",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet3",
-        "ip_address": "172.16.1.1",
-        "mac_address": "00:50:56:c0:00:03",
-        "name": "vmnet3",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet30",
-        "ip_address": "172.16.28.1",
-        "mac_address": "00:50:56:c0:00:1e",
-        "name": "vmnet30",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet31",
-        "ip_address": "172.16.29.1",
-        "mac_address": "00:50:56:c0:00:1f",
-        "name": "vmnet31",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet32",
-        "ip_address": "172.16.30.1",
-        "mac_address": "00:50:56:c0:00:20",
-        "name": "vmnet32",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet33",
-        "ip_address": "172.16.31.1",
-        "mac_address": "00:50:56:c0:00:21",
-        "name": "vmnet33",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet34",
-        "ip_address": "172.16.32.1",
-        "mac_address": "00:50:56:c0:00:22",
-        "name": "vmnet34",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet35",
-        "ip_address": "172.16.33.1",
-        "mac_address": "00:50:56:c0:00:23",
-        "name": "vmnet35",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet36",
-        "ip_address": "172.16.34.1",
-        "mac_address": "00:50:56:c0:00:24",
-        "name": "vmnet36",
+        "id": "vmnet1",
+        "ip_address": "172.16.16.1",
+        "mac_address": "00:50:56:c0:00:01",
+        "name": "vmnet1",
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
     {
-        "id": "vmnet37",
-        "ip_address": "172.16.35.1",
-        "mac_address": "00:50:56:c0:00:25",
-        "name": "vmnet37",
+        "id": "vmnet10",
+        "ip_address": "172.16.7.1",
+        "mac_address": "00:50:56:c0:00:0a",
+        "name": "vmnet10",
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
     {
-        "id": "vmnet38",
-        "ip_address": "172.16.36.1",
-        "mac_address": "00:50:56:c0:00:26",
-        "name": "vmnet38",
+        "id": "vmnet2",
+        "ip_address": "172.16.0.1",
+        "mac_address": "00:50:56:c0:00:02",
+        "name": "vmnet2",
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
     {
-        "id": "vmnet39",
-        "ip_address": "172.16.37.1",
-        "mac_address": "00:50:56:c0:00:27",
-        "name": "vmnet39",
+        "id": "vmnet3",
+        "ip_address": "172.16.1.1",
+        "mac_address": "00:50:56:c0:00:03",
+        "name": "vmnet3",
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
@@ -1372,86 +108,6 @@ X-ROUTE: /v2/compute/network/interfaces
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
-    {
-        "id": "vmnet40",
-        "ip_address": "172.16.38.1",
-        "mac_address": "00:50:56:c0:00:28",
-        "name": "vmnet40",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet41",
-        "ip_address": "172.16.39.1",
-        "mac_address": "00:50:56:c0:00:29",
-        "name": "vmnet41",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet42",
-        "ip_address": "172.16.40.1",
-        "mac_address": "00:50:56:c0:00:2a",
-        "name": "vmnet42",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet43",
-        "ip_address": "172.16.41.1",
-        "mac_address": "00:50:56:c0:00:2b",
-        "name": "vmnet43",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet44",
-        "ip_address": "172.16.42.1",
-        "mac_address": "00:50:56:c0:00:2c",
-        "name": "vmnet44",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet45",
-        "ip_address": "172.16.43.1",
-        "mac_address": "00:50:56:c0:00:2d",
-        "name": "vmnet45",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet46",
-        "ip_address": "172.16.44.1",
-        "mac_address": "00:50:56:c0:00:2e",
-        "name": "vmnet46",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet47",
-        "ip_address": "172.16.45.1",
-        "mac_address": "00:50:56:c0:00:2f",
-        "name": "vmnet47",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet48",
-        "ip_address": "172.16.46.1",
-        "mac_address": "00:50:56:c0:00:30",
-        "name": "vmnet48",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet49",
-        "ip_address": "172.16.47.1",
-        "mac_address": "00:50:56:c0:00:31",
-        "name": "vmnet49",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
     {
         "id": "vmnet5",
         "ip_address": "172.16.3.1",
@@ -1460,86 +116,6 @@ X-ROUTE: /v2/compute/network/interfaces
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
-    {
-        "id": "vmnet50",
-        "ip_address": "172.16.48.1",
-        "mac_address": "00:50:56:c0:00:32",
-        "name": "vmnet50",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet51",
-        "ip_address": "172.16.49.1",
-        "mac_address": "00:50:56:c0:00:33",
-        "name": "vmnet51",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet52",
-        "ip_address": "172.16.50.1",
-        "mac_address": "00:50:56:c0:00:34",
-        "name": "vmnet52",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet53",
-        "ip_address": "172.16.51.1",
-        "mac_address": "00:50:56:c0:00:35",
-        "name": "vmnet53",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet54",
-        "ip_address": "172.16.52.1",
-        "mac_address": "00:50:56:c0:00:36",
-        "name": "vmnet54",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet55",
-        "ip_address": "172.16.53.1",
-        "mac_address": "00:50:56:c0:00:37",
-        "name": "vmnet55",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet56",
-        "ip_address": "172.16.54.1",
-        "mac_address": "00:50:56:c0:00:38",
-        "name": "vmnet56",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet57",
-        "ip_address": "172.16.55.1",
-        "mac_address": "00:50:56:c0:00:39",
-        "name": "vmnet57",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet58",
-        "ip_address": "172.16.56.1",
-        "mac_address": "00:50:56:c0:00:3a",
-        "name": "vmnet58",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet59",
-        "ip_address": "172.16.57.1",
-        "mac_address": "00:50:56:c0:00:3b",
-        "name": "vmnet59",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
     {
         "id": "vmnet6",
         "ip_address": "172.16.4.1",
@@ -1548,86 +124,6 @@ X-ROUTE: /v2/compute/network/interfaces
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
-    {
-        "id": "vmnet60",
-        "ip_address": "172.16.58.1",
-        "mac_address": "00:50:56:c0:00:3c",
-        "name": "vmnet60",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet61",
-        "ip_address": "172.16.59.1",
-        "mac_address": "00:50:56:c0:00:3d",
-        "name": "vmnet61",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet62",
-        "ip_address": "172.16.60.1",
-        "mac_address": "00:50:56:c0:00:3e",
-        "name": "vmnet62",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet63",
-        "ip_address": "172.16.61.1",
-        "mac_address": "00:50:56:c0:00:3f",
-        "name": "vmnet63",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet64",
-        "ip_address": "172.16.62.1",
-        "mac_address": "00:50:56:c0:00:40",
-        "name": "vmnet64",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet65",
-        "ip_address": "172.16.63.1",
-        "mac_address": "00:50:56:c0:00:41",
-        "name": "vmnet65",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet66",
-        "ip_address": "172.16.64.1",
-        "mac_address": "00:50:56:c0:00:42",
-        "name": "vmnet66",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet67",
-        "ip_address": "172.16.65.1",
-        "mac_address": "00:50:56:c0:00:43",
-        "name": "vmnet67",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet68",
-        "ip_address": "172.16.66.1",
-        "mac_address": "00:50:56:c0:00:44",
-        "name": "vmnet68",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet69",
-        "ip_address": "172.16.67.1",
-        "mac_address": "00:50:56:c0:00:45",
-        "name": "vmnet69",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
     {
         "id": "vmnet7",
         "ip_address": "172.16.5.1",
@@ -1636,86 +132,6 @@ X-ROUTE: /v2/compute/network/interfaces
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
-    {
-        "id": "vmnet70",
-        "ip_address": "172.16.68.1",
-        "mac_address": "00:50:56:c0:00:46",
-        "name": "vmnet70",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet71",
-        "ip_address": "172.16.69.1",
-        "mac_address": "00:50:56:c0:00:47",
-        "name": "vmnet71",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet72",
-        "ip_address": "172.16.70.1",
-        "mac_address": "00:50:56:c0:00:48",
-        "name": "vmnet72",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet73",
-        "ip_address": "172.16.71.1",
-        "mac_address": "00:50:56:c0:00:49",
-        "name": "vmnet73",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet74",
-        "ip_address": "172.16.72.1",
-        "mac_address": "00:50:56:c0:00:4a",
-        "name": "vmnet74",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet75",
-        "ip_address": "172.16.73.1",
-        "mac_address": "00:50:56:c0:00:4b",
-        "name": "vmnet75",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet76",
-        "ip_address": "172.16.74.1",
-        "mac_address": "00:50:56:c0:00:4c",
-        "name": "vmnet76",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet77",
-        "ip_address": "172.16.75.1",
-        "mac_address": "00:50:56:c0:00:4d",
-        "name": "vmnet77",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet78",
-        "ip_address": "172.16.76.1",
-        "mac_address": "00:50:56:c0:00:4e",
-        "name": "vmnet78",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet79",
-        "ip_address": "172.16.77.1",
-        "mac_address": "00:50:56:c0:00:4f",
-        "name": "vmnet79",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
     {
         "id": "vmnet8",
         "ip_address": "192.168.229.1",
@@ -1724,86 +140,6 @@ X-ROUTE: /v2/compute/network/interfaces
         "netmask": "255.255.255.0",
         "type": "ethernet"
     },
-    {
-        "id": "vmnet80",
-        "ip_address": "172.16.78.1",
-        "mac_address": "00:50:56:c0:00:50",
-        "name": "vmnet80",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet81",
-        "ip_address": "172.16.79.1",
-        "mac_address": "00:50:56:c0:00:51",
-        "name": "vmnet81",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet82",
-        "ip_address": "172.16.80.1",
-        "mac_address": "00:50:56:c0:00:52",
-        "name": "vmnet82",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet83",
-        "ip_address": "172.16.81.1",
-        "mac_address": "00:50:56:c0:00:53",
-        "name": "vmnet83",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet84",
-        "ip_address": "172.16.82.1",
-        "mac_address": "00:50:56:c0:00:54",
-        "name": "vmnet84",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet85",
-        "ip_address": "172.16.83.1",
-        "mac_address": "00:50:56:c0:00:55",
-        "name": "vmnet85",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet86",
-        "ip_address": "172.16.84.1",
-        "mac_address": "00:50:56:c0:00:56",
-        "name": "vmnet86",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet87",
-        "ip_address": "172.16.85.1",
-        "mac_address": "00:50:56:c0:00:57",
-        "name": "vmnet87",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet88",
-        "ip_address": "172.16.86.1",
-        "mac_address": "00:50:56:c0:00:58",
-        "name": "vmnet88",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet89",
-        "ip_address": "172.16.87.1",
-        "mac_address": "00:50:56:c0:00:59",
-        "name": "vmnet89",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
     {
         "id": "vmnet9",
         "ip_address": "172.16.6.1",
@@ -1811,85 +147,5 @@ X-ROUTE: /v2/compute/network/interfaces
         "name": "vmnet9",
         "netmask": "255.255.255.0",
         "type": "ethernet"
-    },
-    {
-        "id": "vmnet90",
-        "ip_address": "172.16.88.1",
-        "mac_address": "00:50:56:c0:00:5a",
-        "name": "vmnet90",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet91",
-        "ip_address": "172.16.89.1",
-        "mac_address": "00:50:56:c0:00:5b",
-        "name": "vmnet91",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet92",
-        "ip_address": "172.16.90.1",
-        "mac_address": "00:50:56:c0:00:5c",
-        "name": "vmnet92",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet93",
-        "ip_address": "172.16.91.1",
-        "mac_address": "00:50:56:c0:00:5d",
-        "name": "vmnet93",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet94",
-        "ip_address": "172.16.92.1",
-        "mac_address": "00:50:56:c0:00:5e",
-        "name": "vmnet94",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet95",
-        "ip_address": "172.16.93.1",
-        "mac_address": "00:50:56:c0:00:5f",
-        "name": "vmnet95",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet96",
-        "ip_address": "172.16.94.1",
-        "mac_address": "00:50:56:c0:00:60",
-        "name": "vmnet96",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet97",
-        "ip_address": "172.16.95.1",
-        "mac_address": "00:50:56:c0:00:61",
-        "name": "vmnet97",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet98",
-        "ip_address": "172.16.96.1",
-        "mac_address": "00:50:56:c0:00:62",
-        "name": "vmnet98",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
-    },
-    {
-        "id": "vmnet99",
-        "ip_address": "172.16.97.1",
-        "mac_address": "00:50:56:c0:00:63",
-        "name": "vmnet99",
-        "netmask": "255.255.255.0",
-        "type": "ethernet"
     }
 ]
diff --git a/docs/api/examples/compute_get_projects.txt b/docs/api/examples/compute_get_projects.txt
index efcab351..e2e41882 100644
--- a/docs/api/examples/compute_get_projects.txt
+++ b/docs/api/examples/compute_get_projects.txt
@@ -14,10 +14,10 @@ X-ROUTE: /v2/compute/projects
 [
     {
         "name": "test",
-        "project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b"
+        "project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f"
     },
     {
         "name": "test",
-        "project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f"
+        "project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b"
     }
 ]
diff --git a/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt
index 85b158f3..165114b7 100644
--- a/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidcloudnodesnodeid.txt
@@ -1,11 +1,11 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/a577ec14-fd92-46f0-8d14-6b4cb6e856c0'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/34630f62-2144-4dd8-bf6f-a44a606b1a47'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/a577ec14-fd92-46f0-8d14-6b4cb6e856c0 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/34630f62-2144-4dd8-bf6f-a44a606b1a47 HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 19808
+CONTENT-LENGTH: 1593
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -42,921 +42,49 @@ X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
             "type": "ethernet"
         },
         {
-            "name": "vboxnet0",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet1",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet2",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet3",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet4",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet5",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet6",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet7",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet1",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet10",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet100",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet101",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet102",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet103",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet104",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet105",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet106",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet107",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet108",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet109",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet11",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet110",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet111",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet112",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet113",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet114",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet115",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet116",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet117",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet118",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet119",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet12",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet120",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet121",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet122",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet123",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet124",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet125",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet126",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet127",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet128",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet129",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet13",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet130",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet131",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet132",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet133",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet134",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet135",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet136",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet137",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet138",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet139",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet14",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet140",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet141",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet142",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet143",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet144",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet145",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet146",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet147",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet148",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet149",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet15",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet150",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet151",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet152",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet153",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet154",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet155",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet156",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet157",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet158",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet159",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet16",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet160",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet161",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet162",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet163",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet164",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet165",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet166",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet167",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet168",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet169",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet17",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet170",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet171",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet172",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet173",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet174",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet175",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet176",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet177",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet178",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet179",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet18",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet180",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet181",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet182",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet183",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet184",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet185",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet186",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet187",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet188",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet189",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet19",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet190",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet191",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet192",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet193",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet194",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet195",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet196",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet197",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet198",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet199",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet2",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet20",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet200",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet201",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet202",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet203",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet204",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet205",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet206",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet207",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet208",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet209",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet21",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet210",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet211",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet212",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet213",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet214",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet215",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet216",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet217",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet218",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet219",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet22",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet220",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet23",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet24",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet25",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet26",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet27",
+            "name": "vmnet1",
             "type": "ethernet"
         },
         {
-            "name": "vmnet28",
+            "name": "vmnet10",
             "type": "ethernet"
         },
         {
-            "name": "vmnet29",
+            "name": "vmnet2",
             "type": "ethernet"
         },
         {
             "name": "vmnet3",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet30",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet31",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet32",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet33",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet34",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet35",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet36",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet37",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet38",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet39",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet4",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet40",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet41",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet42",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet43",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet44",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet45",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet46",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet47",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet48",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet49",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet5",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet50",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet51",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet52",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet53",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet54",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet55",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet56",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet57",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet58",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet59",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet6",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet60",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet61",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet62",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet63",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet64",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet65",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet66",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet67",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet68",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet69",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet7",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet70",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet71",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet72",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet73",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet74",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet75",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet76",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet77",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet78",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet79",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet8",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet80",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet81",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet82",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet83",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet84",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet85",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet86",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet87",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet88",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet89",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet9",
             "type": "ethernet"
-        },
-        {
-            "name": "vmnet90",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet91",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet92",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet93",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet94",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet95",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet96",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet97",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet98",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet99",
-            "type": "ethernet"
         }
     ],
     "name": "Cloud 1",
-    "node_id": "a577ec14-fd92-46f0-8d14-6b4cb6e856c0",
-    "ports": [],
+    "node_id": "34630f62-2144-4dd8-bf6f-a44a606b1a47",
+    "ports_mapping": [],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "status": "started"
 }
diff --git a/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidiounodesnodeid.txt
index 1bead8c0..cd2a69ef 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/2e31f185-ba34-4abf-8f1f-a8353358202c'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/058d18a2-92ca-4122-827b-26076d3cdd66'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/2e31f185-ba34-4abf-8f1f-a8353358202c HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/058d18a2-92ca-4122-827b-26076d3cdd66 HTTP/1.1
 
 
 
@@ -19,8 +19,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-311/test_json5/project-files/iou/2e31f185-ba34-4abf-8f1f-a8353358202c",
-    "node_id": "2e31f185-ba34-4abf-8f1f-a8353358202c",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/058d18a2-92ca-4122-827b-26076d3cdd66",
+    "node_id": "058d18a2-92ca-4122-827b-26076d3cdd66",
     "nvram": 128,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt
index d585cfc3..cf25a866 100644
--- a/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt
+++ b/docs/api/examples/compute_get_projectsprojectidnatnodesnodeid.txt
@@ -1,11 +1,11 @@
-curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/82d46bae-c93f-43d4-b9c6-9c761b2ac723'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/8a6c287b-a7dd-456b-82e5-878fe3ddb13f'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/82d46bae-c93f-43d4-b9c6-9c761b2ac723 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/8a6c287b-a7dd-456b-82e5-878fe3ddb13f HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 325
+CONTENT-LENGTH: 337
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -13,12 +13,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
 
 {
     "name": "Nat 1",
-    "node_id": "82d46bae-c93f-43d4-b9c6-9c761b2ac723",
-    "ports": [
+    "node_id": "8a6c287b-a7dd-456b-82e5-878fe3ddb13f",
+    "ports_mapping": [
         {
-            "interface": "eth1",
-            "name": "nat0",
-            "port_number": 1,
+            "interface": "virbr0",
+            "name": "virbr0",
+            "port_number": 0,
             "type": "ethernet"
         }
     ],
diff --git a/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_get_projectsprojectidqemunodesnodeid.txt
index b38764a5..f157a2fb 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/fcd4fe2c-9810-41d1-b138-bba259673ece'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8dbcde24-cf90-48bd-a0fb-de2e208d7573'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/fcd4fe2c-9810-41d1-b138-bba259673ece HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8dbcde24-cf90-48bd-a0fb-de2e208d7573 HTTP/1.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:3e:ce:00",
+    "mac_address": "00:dd:80:75:73:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/fcd4fe2c-9810-41d1-b138-bba259673ece",
-    "node_id": "fcd4fe2c-9810-41d1-b138-bba259673ece",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/8dbcde24-cf90-48bd-a0fb-de2e208d7573",
+    "node_id": "8dbcde24-cf90-48bd-a0fb-de2e208d7573",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1qzj1p83/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/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 bb449eb8..87bf2a0e 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/828c994a-efd0-4e74-8476-14d2b2865bbd'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bd5a4841-7543-4c38-bad8-d1477bb28f67'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/828c994a-efd0-4e74-8476-14d2b2865bbd HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bd5a4841-7543-4c38-bad8-d1477bb28f67 HTTP/1.1
 
 
 
@@ -21,7 +21,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
     "linked_clone": false,
     "name": "VMTEST",
     "node_directory": null,
-    "node_id": "828c994a-efd0-4e74-8476-14d2b2865bbd",
+    "node_id": "bd5a4841-7543-4c38-bad8-d1477bb28f67",
     "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 8216a7c2..48fcd176 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/f71793ba-3071-484d-be05-db5063e69d46'
+curl -i -X GET 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f3e04996-caaa-4b4f-9e6b-0a75464f32d5'
 
-GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f71793ba-3071-484d-be05-db5063e69d46 HTTP/1.1
+GET /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/f3e04996-caaa-4b4f-9e6b-0a75464f32d5 HTTP/1.1
 
 
 
@@ -16,8 +16,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
     "console": 5720,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f71793ba-3071-484d-be05-db5063e69d46",
-    "node_id": "f71793ba-3071-484d-be05-db5063e69d46",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/f3e04996-caaa-4b4f-9e6b-0a75464f32d5",
+    "node_id": "f3e04996-caaa-4b4f-9e6b-0a75464f32d5",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "startup_script": null,
     "startup_script_path": null,
diff --git a/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt b/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt
index 71712eb1..eb99a4f0 100644
--- a/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidcloudnodes.txt
@@ -7,7 +7,7 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes HTTP/
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 19808
+CONTENT-LENGTH: 1593
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -44,921 +44,49 @@ X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes
             "type": "ethernet"
         },
         {
-            "name": "vboxnet0",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet1",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet2",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet3",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet4",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet5",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet6",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet7",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet1",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet10",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet100",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet101",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet102",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet103",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet104",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet105",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet106",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet107",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet108",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet109",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet11",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet110",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet111",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet112",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet113",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet114",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet115",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet116",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet117",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet118",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet119",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet12",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet120",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet121",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet122",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet123",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet124",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet125",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet126",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet127",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet128",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet129",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet13",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet130",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet131",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet132",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet133",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet134",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet135",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet136",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet137",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet138",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet139",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet14",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet140",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet141",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet142",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet143",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet144",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet145",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet146",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet147",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet148",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet149",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet15",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet150",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet151",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet152",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet153",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet154",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet155",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet156",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet157",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet158",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet159",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet16",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet160",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet161",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet162",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet163",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet164",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet165",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet166",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet167",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet168",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet169",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet17",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet170",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet171",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet172",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet173",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet174",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet175",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet176",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet177",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet178",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet179",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet18",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet180",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet181",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet182",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet183",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet184",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet185",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet186",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet187",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet188",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet189",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet19",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet190",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet191",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet192",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet193",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet194",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet195",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet196",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet197",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet198",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet199",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet2",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet20",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet200",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet201",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet202",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet203",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet204",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet205",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet206",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet207",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet208",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet209",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet21",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet210",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet211",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet212",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet213",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet214",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet215",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet216",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet217",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet218",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet219",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet22",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet220",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet23",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet24",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet25",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet26",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet27",
+            "name": "vmnet1",
             "type": "ethernet"
         },
         {
-            "name": "vmnet28",
+            "name": "vmnet10",
             "type": "ethernet"
         },
         {
-            "name": "vmnet29",
+            "name": "vmnet2",
             "type": "ethernet"
         },
         {
             "name": "vmnet3",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet30",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet31",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet32",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet33",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet34",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet35",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet36",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet37",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet38",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet39",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet4",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet40",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet41",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet42",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet43",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet44",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet45",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet46",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet47",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet48",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet49",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet5",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet50",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet51",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet52",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet53",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet54",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet55",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet56",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet57",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet58",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet59",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet6",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet60",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet61",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet62",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet63",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet64",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet65",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet66",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet67",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet68",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet69",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet7",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet70",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet71",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet72",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet73",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet74",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet75",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet76",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet77",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet78",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet79",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet8",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet80",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet81",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet82",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet83",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet84",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet85",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet86",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet87",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet88",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet89",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet9",
             "type": "ethernet"
-        },
-        {
-            "name": "vmnet90",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet91",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet92",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet93",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet94",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet95",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet96",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet97",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet98",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet99",
-            "type": "ethernet"
         }
     ],
     "name": "Cloud 1",
-    "node_id": "1bd434db-4dec-4e4c-924f-d8ea21a1a5f9",
-    "ports": [],
+    "node_id": "6f4beb91-7921-4f1c-b9cd-ffeac5aa93f2",
+    "ports_mapping": [],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "status": "started"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index a34ca09c..e3cf1924 100644
--- a/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/450786c3-e12e-4fd5-bed0-d4ef34bd5c57/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/cloud/nodes/2082261d-96d5-4ca7-9668-175ab9c3a328/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/cloud/nodes/450786c3-e12e-4fd5-bed0-d4ef34bd5c57/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2082261d-96d5-4ca7-9668-175ab9c3a328/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 23768dff..b91daaec 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/72f0b846-4b14-459a-8b82-7d0b2b5246c8/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/72a5e8e7-52dc-4524-afe1-867723a01ad0/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/72f0b846-4b14-459a-8b82-7d0b2b5246c8/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/72a5e8e7-52dc-4524-afe1-867723a01ad0/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 40d89ef0..108d5830 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/d464bb56-e328-4d84-bab3-4f8e5872125b/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/06b94241-1c19-43ad-9fdb-ab34f8955968/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/d464bb56-e328-4d84-bab3-4f8e5872125b/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/06b94241-1c19-43ad-9fdb-ab34f8955968/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-311/test_json5/tmp/captures/test.pcap"
+    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/tmp/captures/test.pcap"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
index fa6c3d26..d1e62b54 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/9fdb7c14-b4f2-414a-8e50-11b796064263/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/525765d2-3b72-4b91-98b3-312bece7b8ff/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/9fdb7c14-b4f2-414a-8e50-11b796064263/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/525765d2-3b72-4b91-98b3-312bece7b8ff/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 4ef5b7df..155a18b3 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": "5715b228-58f0-420b-949b-8b4319e8fb5c", "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": "67b7e870-fe42-4301-9862-7cd32811b424", "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": "5715b228-58f0-420b-949b-8b4319e8fb5c",
+    "node_id": "67b7e870-fe42-4301-9862-7cd32811b424",
     "path": "iou.bin",
     "startup_config_content": "hostname test"
 }
@@ -24,8 +24,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-311/test_json5/project-files/iou/5715b228-58f0-420b-949b-8b4319e8fb5c",
-    "node_id": "5715b228-58f0-420b-949b-8b4319e8fb5c",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/67b7e870-fe42-4301-9862-7cd32811b424",
+    "node_id": "67b7e870-fe42-4301-9862-7cd32811b424",
     "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 a98cb7de..357f55b4 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/9195792e-61eb-4304-b25f-4fd1603d87c1/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/222d17b2-661c-4fee-bb74-a224daa0eb21/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_ethernet"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/9195792e-61eb-4304-b25f-4fd1603d87c1/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/222d17b2-661c-4fee-bb74-a224daa0eb21/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 aa78173e..6a351156 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/bac7558b-815a-418f-94d4-f439b31609e4/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/764dd16d-0415-4fb8-a824-9c127a0d3555/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/bac7558b-815a-418f-94d4-f439b31609e4/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/764dd16d-0415-4fb8-a824-9c127a0d3555/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-311/test_json5/tmp/captures/test.pcap"
+    "pcap_file_path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/tmp/captures/test.pcap"
 }
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
index 085d96f6..d72805be 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/d9248289-21c5-405d-bd1a-71d65d8f4d21/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4aa61165-026e-487c-a0ec-6aa054b656f3/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/d9248289-21c5-405d-bd1a-71d65d8f4d21/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4aa61165-026e-487c-a0ec-6aa054b656f3/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 6c63826d..36327a42 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/233c92cc-0d86-4102-81b3-3f7632ad4b9d/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4b3e858d-c676-45e3-b359-70910b9aa900/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/233c92cc-0d86-4102-81b3-3f7632ad4b9d/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/4b3e858d-c676-45e3-b359-70910b9aa900/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidiounodesnodeidstart.txt
index 3f0eee97..ab9d2b60 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/65f984aa-5e12-47a4-91d7-365af01bdcc2/start' -d '{"iourc_content": "test"}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f04a8f46-d27f-4a47-81f5-23d490e2f113/start' -d '{"iourc_content": "test"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/65f984aa-5e12-47a4-91d7-365af01bdcc2/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/f04a8f46-d27f-4a47-81f5-23d490e2f113/start HTTP/1.1
 {
     "iourc_content": "test"
 }
@@ -21,8 +21,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}/start
     "l1_keepalives": false,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "PC TEST 1",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-311/test_json5/project-files/iou/65f984aa-5e12-47a4-91d7-365af01bdcc2",
-    "node_id": "65f984aa-5e12-47a4-91d7-365af01bdcc2",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/f04a8f46-d27f-4a47-81f5-23d490e2f113",
+    "node_id": "f04a8f46-d27f-4a47-81f5-23d490e2f113",
     "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 6f79ba00..fe25e7ab 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/29764528-ae1d-4c1d-b193-54145a7d8c15/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c45c676f-28a2-472f-95f0-f9e48e24608c/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/29764528-ae1d-4c1d-b193-54145a7d8c15/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/c45c676f-28a2-472f-95f0-f9e48e24608c/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidnatnodes.txt b/docs/api/examples/compute_post_projectsprojectidnatnodes.txt
index 5912134a..32392712 100644
--- a/docs/api/examples/compute_post_projectsprojectidnatnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidnatnodes.txt
@@ -7,7 +7,7 @@ POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes HTTP/1.
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 325
+CONTENT-LENGTH: 337
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -15,12 +15,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes
 
 {
     "name": "Nat 1",
-    "node_id": "71001d69-522e-4c19-ab07-e4a9a002ea94",
-    "ports": [
+    "node_id": "01896f4d-3570-4605-b689-b1a9cb3099f5",
+    "ports_mapping": [
         {
-            "interface": "eth1",
-            "name": "nat0",
-            "port_number": 1,
+            "interface": "virbr0",
+            "name": "virbr0",
+            "port_number": 0,
             "type": "ethernet"
         }
     ],
diff --git a/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
index 4097e67b..4469a541 100644
--- a/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/bc572389-2f58-4202-8510-66c7a2a5b219/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/nat/nodes/64d8f00d-794a-4ceb-bcb7-473e95159332/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/nat/nodes/bc572389-2f58-4202-8510-66c7a2a5b219/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/64d8f00d-794a-4ceb-bcb7-473e95159332/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodes.txt b/docs/api/examples/compute_post_projectsprojectidqemunodes.txt
index 07f48f8c..15c80c1a 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/tmp1qzj1p83/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/tmp1uokww80/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/tmp1qzj1p83/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/qemu-system-x86_64",
     "ram": 1024
 }
 
@@ -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:42:d7:00",
+    "mac_address": "00:dd:80:7b:ae:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/a4b94490-6246-44dc-82cc-b7ff02fd42d7",
-    "node_id": "a4b94490-6246-44dc-82cc-b7ff02fd42d7",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/d6932073-021c-4487-b7ae-598fdd5b7bae",
+    "node_id": "d6932073-021c-4487-b7ae-598fdd5b7bae",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1qzj1p83/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/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 4bc37c06..e5aa30f7 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/29401064-f0a7-4a27-9e21-f674007a0f7a/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/1dd8bd1c-9b93-460e-b89f-3edf32d4cfed/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_ethernet"}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/29401064-f0a7-4a27-9e21-f674007a0f7a/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/1dd8bd1c-9b93-460e-b89f-3edf32d4cfed/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 57bb698b..62e997ec 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/a5061c79-6870-4b2e-87e1-6633171bb779/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/4d02fea0-afec-4674-9036-0a5b201ea147/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/a5061c79-6870-4b2e-87e1-6633171bb779/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/4d02fea0-afec-4674-9036-0a5b201ea147/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
index 892812a6..c1144b7e 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/aba644c6-1a0f-4c44-89c4-e7f7d0b52fe8/resume' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e8db19b-a05b-40dc-9b0b-5856ef87476c/resume' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/aba644c6-1a0f-4c44-89c4-e7f7d0b52fe8/resume HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/8e8db19b-a05b-40dc-9b0b-5856ef87476c/resume HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
index 770b8d35..a9cc86ae 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/bc2bd9c3-1ba3-40d9-b846-51bd96983475/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7f6708f3-7dfc-44cf-8fb9-60167d910d19/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/bc2bd9c3-1ba3-40d9-b846-51bd96983475/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/7f6708f3-7dfc-44cf-8fb9-60167d910d19/start HTTP/1.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:34:75:00",
+    "mac_address": "00:dd:80:0d:19:00",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/bc2bd9c3-1ba3-40d9-b846-51bd96983475",
-    "node_id": "bc2bd9c3-1ba3-40d9-b846-51bd96983475",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/7f6708f3-7dfc-44cf-8fb9-60167d910d19",
+    "node_id": "7f6708f3-7dfc-44cf-8fb9-60167d910d19",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1qzj1p83/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/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 4307d8de..fabe0033 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/c6bafe0f-0202-4327-92a6-292c7c1714e8/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/35a8aa8f-8a84-4dde-b8b8-d19cef00b6b6/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/c6bafe0f-0202-4327-92a6-292c7c1714e8/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/35a8aa8f-8a84-4dde-b8b8-d19cef00b6b6/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
index d4231de1..9a5de598 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/77781dcd-ea91-4084-b520-6ef95f3b20e2/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2a5eca63-0705-4d1a-8d2e-f5479349e7c2/suspend' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/77781dcd-ea91-4084-b520-6ef95f3b20e2/suspend HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/2a5eca63-0705-4d1a-8d2e-f5479349e7c2/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
index 165777d9..5bbf0d97 100644
--- a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodes.txt
@@ -25,7 +25,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes
     "linked_clone": false,
     "name": "VM1",
     "node_directory": null,
-    "node_id": "26ac7779-ec36-4e9d-94d8-62361b29c9d8",
+    "node_id": "8dd097ca-91eb-4e28-9467-0ab62d2388aa",
     "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 dee3a001..d288749e 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/6c56be36-fcea-4773-ac70-ea77aaee975a/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/3efce36b-25eb-40e4-8d55-f65220445f99/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/6c56be36-fcea-4773-ac70-ea77aaee975a/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/3efce36b-25eb-40e4-8d55-f65220445f99/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 676cb454..e05834f6 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/7216430a-e89f-4cca-974d-dd618d56ac47/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/9f394bd7-f78d-4786-8ce2-cf09ce8aa0ad/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/7216430a-e89f-4cca-974d-dd618d56ac47/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/9f394bd7-f78d-4786-8ce2-cf09ce8aa0ad/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
index 7e8b5726..bc44d69e 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/222f1da1-0fb1-40bb-922d-6068ecac32d2/resume' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b30bdd7d-d7ce-472c-a5be-959b44f279f7/resume' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/222f1da1-0fb1-40bb-922d-6068ecac32d2/resume HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/b30bdd7d-d7ce-472c-a5be-959b44f279f7/resume HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
index 5a0fb8fc..670ed4fe 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/ee0d4d3d-6ae7-47b1-ab3f-0a1dbe69d2ea/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/fcf6ad7a-0842-4ec0-b54b-37fe977896fd/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/ee0d4d3d-6ae7-47b1-ab3f-0a1dbe69d2ea/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/fcf6ad7a-0842-4ec0-b54b-37fe977896fd/start HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
index 01927e93..ea7d2e07 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/1e9bac81-a029-43d5-92a6-ea8673a65991/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a35f2693-692b-4aa4-bd1b-6e3a5e7844e4/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/1e9bac81-a029-43d5-92a6-ea8673a65991/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/a35f2693-692b-4aa4-bd1b-6e3a5e7844e4/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt b/docs/api/examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
index 888c8953..eb35fd20 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/03c6edcc-e783-443e-975a-b3eac4ed34cd/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/714c5575-f45b-4cd8-b7b6-940215e36973/suspend' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/03c6edcc-e783-443e-975a-b3eac4ed34cd/suspend HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/714c5575-f45b-4cd8-b7b6-940215e36973/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
index af684245..e1dfa62b 100644
--- a/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
+++ b/docs/api/examples/compute_post_projectsprojectidvpcsnodes.txt
@@ -18,8 +18,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes
     "console": 5720,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/5733a9a0-05be-4d3c-94ee-80b517f29bc2",
-    "node_id": "5733a9a0-05be-4d3c-94ee-80b517f29bc2",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/28993ca5-cc72-4766-911e-6f88f9cb0dd2",
+    "node_id": "28993ca5-cc72-4766-911e-6f88f9cb0dd2",
     "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 e39c9fa5..17a3ca9c 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/5dc42324-e40c-418e-99f5-5e2b5d920d08/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/2e6458fb-9415-4d48-a2a5-fd67a04db517/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/5dc42324-e40c-418e-99f5-5e2b5d920d08/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/2e6458fb-9415-4d48-a2a5-fd67a04db517/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 7165b1dc..bc8f8f65 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/4f127a7f-86af-4188-b1d2-a4a0f37961af/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b8c8bedf-74e4-4dd5-8d43-d1d8bca1c0b9/reload' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/4f127a7f-86af-4188-b1d2-a4a0f37961af/reload HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b8c8bedf-74e4-4dd5-8d43-d1d8bca1c0b9/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt b/docs/api/examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
index 27b12c66..d171c591 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/752da6c4-fd2d-4c55-a6cf-30a1a88f1048/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b32c3c1e-d6f2-4012-9430-6dc13c815f7a/start' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/752da6c4-fd2d-4c55-a6cf-30a1a88f1048/start HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/b32c3c1e-d6f2-4012-9430-6dc13c815f7a/start HTTP/1.1
 {}
 
 
@@ -16,8 +16,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/start
     "console": 5720,
     "console_type": "telnet",
     "name": "PC TEST 1",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/752da6c4-fd2d-4c55-a6cf-30a1a88f1048",
-    "node_id": "752da6c4-fd2d-4c55-a6cf-30a1a88f1048",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/b32c3c1e-d6f2-4012-9430-6dc13c815f7a",
+    "node_id": "b32c3c1e-d6f2-4012-9430-6dc13c815f7a",
     "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 7335ddd8..0bd21f55 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/284de9e5-36a5-48c5-b684-a7535c3e4f22/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a7eff962-25e6-4f2d-a877-86c7fa144b1c/stop' -d '{}'
 
-POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/284de9e5-36a5-48c5-b684-a7535c3e4f22/stop HTTP/1.1
+POST /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/a7eff962-25e6-4f2d-a877-86c7fa144b1c/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt
index b2aeaddd..f9f86ff0 100644
--- a/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidcloudnodesnodeid.txt
@@ -1,13 +1,13 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2cf9d65f-8859-43f1-969e-a717b3e53352' -d '{"name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/e7b150e3-b03a-4a17-a28f-90e7a84e89d3' -d '{"name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/2cf9d65f-8859-43f1-969e-a717b3e53352 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/cloud/nodes/e7b150e3-b03a-4a17-a28f-90e7a84e89d3 HTTP/1.1
 {
     "name": "test"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 19805
+CONTENT-LENGTH: 1590
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -44,921 +44,49 @@ X-ROUTE: /v2/compute/projects/{project_id}/cloud/nodes/{node_id}
             "type": "ethernet"
         },
         {
-            "name": "vboxnet0",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet1",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet2",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet3",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet4",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet5",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet6",
-            "type": "ethernet"
-        },
-        {
-            "name": "vboxnet7",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet1",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet10",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet100",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet101",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet102",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet103",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet104",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet105",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet106",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet107",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet108",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet109",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet11",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet110",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet111",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet112",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet113",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet114",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet115",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet116",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet117",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet118",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet119",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet12",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet120",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet121",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet122",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet123",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet124",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet125",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet126",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet127",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet128",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet129",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet13",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet130",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet131",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet132",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet133",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet134",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet135",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet136",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet137",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet138",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet139",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet14",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet140",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet141",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet142",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet143",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet144",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet145",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet146",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet147",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet148",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet149",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet15",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet150",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet151",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet152",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet153",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet154",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet155",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet156",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet157",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet158",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet159",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet16",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet160",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet161",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet162",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet163",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet164",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet165",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet166",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet167",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet168",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet169",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet17",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet170",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet171",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet172",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet173",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet174",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet175",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet176",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet177",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet178",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet179",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet18",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet180",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet181",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet182",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet183",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet184",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet185",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet186",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet187",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet188",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet189",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet19",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet190",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet191",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet192",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet193",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet194",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet195",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet196",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet197",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet198",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet199",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet2",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet20",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet200",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet201",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet202",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet203",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet204",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet205",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet206",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet207",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet208",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet209",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet21",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet210",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet211",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet212",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet213",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet214",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet215",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet216",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet217",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet218",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet219",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet22",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet220",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet23",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet24",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet25",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet26",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet27",
+            "name": "vmnet1",
             "type": "ethernet"
         },
         {
-            "name": "vmnet28",
+            "name": "vmnet10",
             "type": "ethernet"
         },
         {
-            "name": "vmnet29",
+            "name": "vmnet2",
             "type": "ethernet"
         },
         {
             "name": "vmnet3",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet30",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet31",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet32",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet33",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet34",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet35",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet36",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet37",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet38",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet39",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet4",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet40",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet41",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet42",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet43",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet44",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet45",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet46",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet47",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet48",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet49",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet5",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet50",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet51",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet52",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet53",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet54",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet55",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet56",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet57",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet58",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet59",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet6",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet60",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet61",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet62",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet63",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet64",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet65",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet66",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet67",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet68",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet69",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet7",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet70",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet71",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet72",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet73",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet74",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet75",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet76",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet77",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet78",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet79",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet8",
             "type": "ethernet"
         },
-        {
-            "name": "vmnet80",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet81",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet82",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet83",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet84",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet85",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet86",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet87",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet88",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet89",
-            "type": "ethernet"
-        },
         {
             "name": "vmnet9",
             "type": "ethernet"
-        },
-        {
-            "name": "vmnet90",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet91",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet92",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet93",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet94",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet95",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet96",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet97",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet98",
-            "type": "ethernet"
-        },
-        {
-            "name": "vmnet99",
-            "type": "ethernet"
         }
     ],
     "name": "test",
-    "node_id": "2cf9d65f-8859-43f1-969e-a717b3e53352",
-    "ports": [],
+    "node_id": "e7b150e3-b03a-4a17-a28f-90e7a84e89d3",
+    "ports_mapping": [],
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "status": "started"
 }
diff --git a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
index f3c58eb1..2143c034 100644
--- a/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectiddockernodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/cb569790-f7ff-4c77-a3ee-9f8586699e6e' -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/b11cabf9-ffa8-470d-bc83-e9f047ba09e9' -d '{"console": 5713, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/cb569790-f7ff-4c77-a3ee-9f8586699e6e HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/nodes/b11cabf9-ffa8-470d-bc83-e9f047ba09e9 HTTP/1.1
 {
     "console": 5713,
     "environment": "GNS3=1\nGNS4=0",
@@ -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-311/test_json5/project-files/docker/cb569790-f7ff-4c77-a3ee-9f8586699e6e",
-    "node_id": "cb569790-f7ff-4c77-a3ee-9f8586699e6e",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/docker/b11cabf9-ffa8-470d-bc83-e9f047ba09e9",
+    "node_id": "b11cabf9-ffa8-470d-bc83-e9f047ba09e9",
     "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 62d815e6..a8ba3a58 100644
--- a/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidiounodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/52e439c4-8dc0-4e6f-9507-b525c2066e04' -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/79e87d08-c942-472c-baac-dbb34526882e' -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}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/52e439c4-8dc0-4e6f-9507-b525c2066e04 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/nodes/79e87d08-c942-472c-baac-dbb34526882e HTTP/1.1
 {
     "console": 5712,
     "ethernet_adapters": 4,
@@ -30,8 +30,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/iou/nodes/{node_id}
     "l1_keepalives": true,
     "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c",
     "name": "test",
-    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-311/test_json5/project-files/iou/52e439c4-8dc0-4e6f-9507-b525c2066e04",
-    "node_id": "52e439c4-8dc0-4e6f-9507-b525c2066e04",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_json5/project-files/iou/79e87d08-c942-472c-baac-dbb34526882e",
+    "node_id": "79e87d08-c942-472c-baac-dbb34526882e",
     "nvram": 2048,
     "path": "iou.bin",
     "private_config": null,
diff --git a/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt
index 8ffb6c4a..8a4e7dec 100644
--- a/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidnatnodesnodeid.txt
@@ -1,13 +1,13 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a1d2a112-bbdc-4d9b-ba29-5149a4a7ef72' -d '{"name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b945c3a0-b7f5-4bf3-8173-85f032b61b53' -d '{"name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/a1d2a112-bbdc-4d9b-ba29-5149a4a7ef72 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/nat/nodes/b945c3a0-b7f5-4bf3-8173-85f032b61b53 HTTP/1.1
 {
     "name": "test"
 }
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 324
+CONTENT-LENGTH: 336
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -15,12 +15,12 @@ X-ROUTE: /v2/compute/projects/{project_id}/nat/nodes/{node_id}
 
 {
     "name": "test",
-    "node_id": "a1d2a112-bbdc-4d9b-ba29-5149a4a7ef72",
-    "ports": [
+    "node_id": "b945c3a0-b7f5-4bf3-8173-85f032b61b53",
+    "ports_mapping": [
         {
-            "interface": "eth1",
-            "name": "nat0",
-            "port_number": 1,
+            "interface": "virbr0",
+            "name": "virbr0",
+            "port_number": 0,
             "type": "ethernet"
         }
     ],
diff --git a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
index c37f3a1e..0aabd84a 100644
--- a/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidqemunodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/f20c993a-5959-4c5b-b69c-a0ff161a3135' -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/acb10e2a-f47c-4a95-8551-0e5f76fc206c' -d '{"console": 5712, "hdb_disk_image": "linux\u8f7d.img", "name": "test", "ram": 1024}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/f20c993a-5959-4c5b-b69c-a0ff161a3135 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/nodes/acb10e2a-f47c-4a95-8551-0e5f76fc206c HTTP/1.1
 {
     "console": 5712,
     "hdb_disk_image": "linux\u8f7d.img",
@@ -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:31:35:00",
+    "mac_address": "00:dd:80:20:6c:00",
     "name": "test",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/f20c993a-5959-4c5b-b69c-a0ff161a3135",
-    "node_id": "f20c993a-5959-4c5b-b69c-a0ff161a3135",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/acb10e2a-f47c-4a95-8551-0e5f76fc206c",
+    "node_id": "acb10e2a-f47c-4a95-8551-0e5f76fc206c",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1qzj1p83/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1uokww80/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 7650bcf5..db42e4e8 100644
--- a/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/914a6816-13eb-4b29-a79b-eb19c2b327da' -d '{"console": 5721, "name": "test"}'
+curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bb7fb45b-8c96-4fdd-99fc-e1a91779d19a' -d '{"console": 5721, "name": "test"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/914a6816-13eb-4b29-a79b-eb19c2b327da HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/nodes/bb7fb45b-8c96-4fdd-99fc-e1a91779d19a HTTP/1.1
 {
     "console": 5721,
     "name": "test"
@@ -24,7 +24,7 @@ X-ROUTE: /v2/compute/projects/{project_id}/virtualbox/nodes/{node_id}
     "linked_clone": false,
     "name": "test",
     "node_directory": null,
-    "node_id": "914a6816-13eb-4b29-a79b-eb19c2b327da",
+    "node_id": "bb7fb45b-8c96-4fdd-99fc-e1a91779d19a",
     "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 ac4784d3..d7576485 100644
--- a/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
+++ b/docs/api/examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:3080/v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e0719a9b-7863-46f7-ace1-479ff261f909' -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/41035467-4785-45a3-997f-4125c0f0955c' -d '{"console": 5722, "name": "test", "startup_script": "ip 192.168.1.1"}'
 
-PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/e0719a9b-7863-46f7-ace1-479ff261f909 HTTP/1.1
+PUT /v2/compute/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/nodes/41035467-4785-45a3-997f-4125c0f0955c HTTP/1.1
 {
     "console": 5722,
     "name": "test",
@@ -20,8 +20,8 @@ X-ROUTE: /v2/compute/projects/{project_id}/vpcs/nodes/{node_id}
     "console": 5722,
     "console_type": "telnet",
     "name": "test",
-    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmps5w9xq7p/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/e0719a9b-7863-46f7-ace1-479ff261f909",
-    "node_id": "e0719a9b-7863-46f7-ace1-479ff261f909",
+    "node_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpskaf5ewe/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/41035467-4785-45a3-997f-4125c0f0955c",
+    "node_id": "41035467-4785-45a3-997f-4125c0f0955c",
     "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 528577c0..a4aa1a9c 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/03ded74c-9066-4e4d-b2e2-4b835fce5631'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/c8e7d20f-adab-47e4-be7f-6bd1b3028009'
 
-DELETE /v2/projects/03ded74c-9066-4e4d-b2e2-4b835fce5631 HTTP/1.1
+DELETE /v2/projects/c8e7d20f-adab-47e4-be7f-6bd1b3028009 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
index 85af00d6..3a0981e4 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/70a58fbb-b8c9-44b4-89c1-a5fa72e9506c/drawings/1db2e2f6-3dd1-4831-9532-a60ab856294b'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/e4d9e39f-c6d7-4549-9a39-77b491a1d0c9/drawings/5e201fa7-093b-438a-813a-fb9c0ca7d1bc'
 
-DELETE /v2/projects/70a58fbb-b8c9-44b4-89c1-a5fa72e9506c/drawings/1db2e2f6-3dd1-4831-9532-a60ab856294b HTTP/1.1
+DELETE /v2/projects/e4d9e39f-c6d7-4549-9a39-77b491a1d0c9/drawings/5e201fa7-093b-438a-813a-fb9c0ca7d1bc HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt b/docs/api/examples/controller_delete_projectsprojectidlinkslinkid.txt
index b2a1c169..ac4b40f3 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/de115f02-96b9-4158-837c-1a73c47c96c7/links/669968e7-64ab-44d5-8a4f-d7caa3ac6de9'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/237d87b6-9912-4aff-9210-b46706b18caf/links/c1f96066-ff56-4c79-9a82-df5c53edcfd9'
 
-DELETE /v2/projects/de115f02-96b9-4158-837c-1a73c47c96c7/links/669968e7-64ab-44d5-8a4f-d7caa3ac6de9 HTTP/1.1
+DELETE /v2/projects/237d87b6-9912-4aff-9210-b46706b18caf/links/c1f96066-ff56-4c79-9a82-df5c53edcfd9 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt b/docs/api/examples/controller_delete_projectsprojectidnodesnodeid.txt
index f28d270f..38bfd102 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/0555e4fa-ea3b-4cfc-9ee7-f893afdc0529/nodes/930d8103-563f-4550-a43f-34a718883c6e'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/b33faa3d-e348-4de5-a266-30b3949d5872/nodes/cf34dae9-ff88-4ef4-a37f-e3954d07e351'
 
-DELETE /v2/projects/0555e4fa-ea3b-4cfc-9ee7-f893afdc0529/nodes/930d8103-563f-4550-a43f-34a718883c6e HTTP/1.1
+DELETE /v2/projects/b33faa3d-e348-4de5-a266-30b3949d5872/nodes/cf34dae9-ff88-4ef4-a37f-e3954d07e351 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt b/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
index 0154261e..0ec583d3 100644
--- a/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:3080/v2/projects/41922bc6-248e-49f1-bff4-a90a1ddcc6e8/snapshots/00f53403-6c95-4d73-9062-65ece9e4797a'
+curl -i -X DELETE 'http://localhost:3080/v2/projects/444b02bb-7499-40a7-860c-531554e3e7ab/snapshots/e8b20eee-6a23-4dfc-8cae-1f3ec3e7b880'
 
-DELETE /v2/projects/41922bc6-248e-49f1-bff4-a90a1ddcc6e8/snapshots/00f53403-6c95-4d73-9062-65ece9e4797a HTTP/1.1
+DELETE /v2/projects/444b02bb-7499-40a7-860c-531554e3e7ab/snapshots/e8b20eee-6a23-4dfc-8cae-1f3ec3e7b880 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_get_gns3vm.txt b/docs/api/examples/controller_get_gns3vm.txt
index bcfbd6fd..938ded7c 100644
--- a/docs/api/examples/controller_get_gns3vm.txt
+++ b/docs/api/examples/controller_get_gns3vm.txt
@@ -5,16 +5,16 @@ GET /v2/gns3vm HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 113
+CONTENT-LENGTH: 115
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
 X-ROUTE: /v2/gns3vm
 
 {
-    "auto_stop": true,
     "enable": false,
     "engine": "vmware",
     "headless": false,
-    "vmname": null
+    "vmname": null,
+    "when_exit": "stop"
 }
diff --git a/docs/api/examples/controller_get_gns3vmengines.txt b/docs/api/examples/controller_get_gns3vmengines.txt
index bc1b3644..a297415e 100644
--- a/docs/api/examples/controller_get_gns3vmengines.txt
+++ b/docs/api/examples/controller_get_gns3vmengines.txt
@@ -5,7 +5,7 @@ GET /v2/gns3vm/engines HTTP/1.1
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 366
+CONTENT-LENGTH: 1018
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -13,13 +13,24 @@ X-ROUTE: /v2/gns3vm/engines
 
 [
     {
-        "description": "VMware is the recommended choice for best performances.",
+        "description": "VMware is the recommended choice for best performances.<br>The GNS3 VM can be <a href=\"https://github.com/GNS3/gns3-gui/releases/download/v2.0.0dev1/GNS3.VM.VMware.Workstation.2.0.0dev1.zip\">downloaded here</a>.",
         "engine_id": "vmware",
-        "name": "VMware Fusion"
+        "name": "VMware Fusion",
+        "support_headless": true,
+        "support_when_exit": true
     },
     {
-        "description": "VirtualBox doesn't support nested virtualization, this means running Qemu based VM could be very slow.",
+        "description": "VirtualBox doesn't support nested virtualization, this means running Qemu based VM could be very slow.<br>The GNS3 VM can be <a href=\"https://github.com/GNS3/gns3-gui/releases/download/v2.0.0dev1/GNS3.VM.VirtualBox.2.0.0dev1.zip\">downloaded here</a>",
         "engine_id": "virtualbox",
-        "name": "VirtualBox"
+        "name": "VirtualBox",
+        "support_headless": true,
+        "support_when_exit": true
+    },
+    {
+        "description": "Use a remote GNS3 server as the GNS3 VM.",
+        "engine_id": "remote",
+        "name": "Remote",
+        "support_headless": false,
+        "support_when_exit": false
     }
 ]
diff --git a/docs/api/examples/controller_get_projects.txt b/docs/api/examples/controller_get_projects.txt
index 59a54f3f..007d305f 100644
--- a/docs/api/examples/controller_get_projects.txt
+++ b/docs/api/examples/controller_get_projects.txt
@@ -18,7 +18,7 @@ X-ROUTE: /v2/projects
         "auto_start": false,
         "filename": "test.gns3",
         "name": "test",
-        "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-311/test_list_projects1",
+        "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/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 59858bda..068053d2 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/daa8ed17-122d-4e73-a2be-c0473c14694d'
+curl -i -X GET 'http://localhost:3080/v2/projects/ad599422-7555-46f0-82aa-bc5cc232a84c'
 
-GET /v2/projects/daa8ed17-122d-4e73-a2be-c0473c14694d HTTP/1.1
+GET /v2/projects/ad599422-7555-46f0-82aa-bc5cc232a84c HTTP/1.1
 
 
 
@@ -17,7 +17,7 @@ X-ROUTE: /v2/projects/{project_id}
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpjy0a1u4u/projects/daa8ed17-122d-4e73-a2be-c0473c14694d",
-    "project_id": "daa8ed17-122d-4e73-a2be-c0473c14694d",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpm0i67nfc/projects/ad599422-7555-46f0-82aa-bc5cc232a84c",
+    "project_id": "ad599422-7555-46f0-82aa-bc5cc232a84c",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_get_projectsprojectiddrawings.txt b/docs/api/examples/controller_get_projectsprojectiddrawings.txt
index 74a0d685..396b451b 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/a309218f-8733-4b79-a1b0-b5029e1f4e98/drawings'
+curl -i -X GET 'http://localhost:3080/v2/projects/213aea2d-98f7-4d6b-a436-5f67458ad62d/drawings'
 
-GET /v2/projects/a309218f-8733-4b79-a1b0-b5029e1f4e98/drawings HTTP/1.1
+GET /v2/projects/213aea2d-98f7-4d6b-a436-5f67458ad62d/drawings HTTP/1.1
 
 
 
@@ -13,8 +13,8 @@ X-ROUTE: /v2/projects/{project_id}/drawings
 
 [
     {
-        "drawing_id": "dc2a42e7-1597-48e0-8d87-eb9d4b19e1f8",
-        "project_id": "a309218f-8733-4b79-a1b0-b5029e1f4e98",
+        "drawing_id": "397ff7c4-157e-4513-bf16-5cf857fd2433",
+        "project_id": "213aea2d-98f7-4d6b-a436-5f67458ad62d",
         "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 16bbe0d1..66fd6bd4 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/611178af-cb11-4444-a251-7b0ad49232c0/links'
+curl -i -X GET 'http://localhost:3080/v2/projects/7577e59a-7758-4c5a-841f-be976afd8a57/links'
 
-GET /v2/projects/611178af-cb11-4444-a251-7b0ad49232c0/links HTTP/1.1
+GET /v2/projects/7577e59a-7758-4c5a-841f-be976afd8a57/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": "5b0579f5-6ae2-4cc9-a212-bfb2e28cee58",
+        "link_id": "a5017183-450b-43ef-9f5b-7d9ef2f77670",
         "nodes": [
             {
                 "adapter_number": 0,
@@ -27,7 +27,7 @@ X-ROUTE: /v2/projects/{project_id}/links
                     "x": -10,
                     "y": -10
                 },
-                "node_id": "c2b9f58a-f3fc-47ac-b052-d4cc67ac6b46",
+                "node_id": "7ec55228-4f17-47ec-9afa-041114f5a95e",
                 "port_number": 3
             },
             {
@@ -39,10 +39,10 @@ X-ROUTE: /v2/projects/{project_id}/links
                     "x": -10,
                     "y": -10
                 },
-                "node_id": "d65154e2-1e56-4a37-90ba-946b5de8f698",
+                "node_id": "ea49b826-f3ac-4683-898d-7c9384cd44f1",
                 "port_number": 4
             }
         ],
-        "project_id": "611178af-cb11-4444-a251-7b0ad49232c0"
+        "project_id": "7577e59a-7758-4c5a-841f-be976afd8a57"
     }
 ]
diff --git a/docs/api/examples/controller_get_projectsprojectidnodes.txt b/docs/api/examples/controller_get_projectsprojectidnodes.txt
index b5546698..27f3bee6 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/fc32861d-501d-4298-82c4-f68376dc6068/nodes'
+curl -i -X GET 'http://localhost:3080/v2/projects/f7d44669-cb36-4ec0-bcee-57ef25dbb640/nodes'
 
-GET /v2/projects/fc32861d-501d-4298-82c4-f68376dc6068/nodes HTTP/1.1
+GET /v2/projects/f7d44669-cb36-4ec0-bcee-57ef25dbb640/nodes HTTP/1.1
 
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 811
+CONTENT-LENGTH: 1264
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -18,6 +18,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes
         "console": 2048,
         "console_host": "example.org",
         "console_type": null,
+        "first_port_name": null,
         "height": 59,
         "label": {
             "rotation": 0,
@@ -28,9 +29,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes
         },
         "name": "test",
         "node_directory": null,
-        "node_id": "e4ffbacc-ac60-4d99-8a13-1479837fd066",
+        "node_id": "cb86c0c4-5892-4178-a0ff-fda36032d578",
         "node_type": "vpcs",
-        "project_id": "fc32861d-501d-4298-82c4-f68376dc6068",
+        "port_name_format": "Ethernet{0}",
+        "port_segment_size": 0,
+        "ports": [
+            {
+                "adapter_number": 0,
+                "data_link_types": {
+                    "Ethernet": "DLT_EN10MB"
+                },
+                "link_type": "ethernet",
+                "name": "Ethernet0",
+                "port_number": 0,
+                "short_name": "e0/0"
+            }
+        ],
+        "project_id": "f7d44669-cb36-4ec0-bcee-57ef25dbb640",
         "properties": {
             "startup_script": "echo test"
         },
diff --git a/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt b/docs/api/examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
index ba186331..75584551 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/5ce65fd1-e708-4d72-a216-0ef5e0c7e127/nodes/729ad766-ee82-4664-bf63-daf9d58f9696/dynamips/auto_idlepc'
+curl -i -X GET 'http://localhost:3080/v2/projects/4dc27f12-ba3b-44a3-af9e-2965ac360d8b/nodes/8b807f66-d4b6-438a-987a-b7dd3c3eff7a/dynamips/auto_idlepc'
 
-GET /v2/projects/5ce65fd1-e708-4d72-a216-0ef5e0c7e127/nodes/729ad766-ee82-4664-bf63-daf9d58f9696/dynamips/auto_idlepc HTTP/1.1
+GET /v2/projects/4dc27f12-ba3b-44a3-af9e-2965ac360d8b/nodes/8b807f66-d4b6-438a-987a-b7dd3c3eff7a/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 9ec9882d..eb94278b 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/4f055831-d88f-4337-b41f-e05d6368f5b3/nodes/ebb91502-4baf-41df-b83b-7617b30a6211/dynamips/idlepc_proposals'
+curl -i -X GET 'http://localhost:3080/v2/projects/67874f29-b0c6-43bd-b884-089848010c10/nodes/7933f17b-6a9e-47c4-97ac-4e952e658dfa/dynamips/idlepc_proposals'
 
-GET /v2/projects/4f055831-d88f-4337-b41f-e05d6368f5b3/nodes/ebb91502-4baf-41df-b83b-7617b30a6211/dynamips/idlepc_proposals HTTP/1.1
+GET /v2/projects/67874f29-b0c6-43bd-b884-089848010c10/nodes/7933f17b-6a9e-47c4-97ac-4e952e658dfa/dynamips/idlepc_proposals HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_get_projectsprojectidsnapshots.txt b/docs/api/examples/controller_get_projectsprojectidsnapshots.txt
index f351d0bb..be506b92 100644
--- a/docs/api/examples/controller_get_projectsprojectidsnapshots.txt
+++ b/docs/api/examples/controller_get_projectsprojectidsnapshots.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:3080/v2/projects/444dfb21-bf9d-46ca-badb-e22095d42a01/snapshots'
+curl -i -X GET 'http://localhost:3080/v2/projects/a73b08ff-47f8-4ce8-9eb2-f59d5def53d0/snapshots'
 
-GET /v2/projects/444dfb21-bf9d-46ca-badb-e22095d42a01/snapshots HTTP/1.1
+GET /v2/projects/a73b08ff-47f8-4ce8-9eb2-f59d5def53d0/snapshots HTTP/1.1
 
 
 
@@ -13,9 +13,9 @@ X-ROUTE: /v2/projects/{project_id}/snapshots
 
 [
     {
-        "created_at": 1472479063,
+        "created_at": 1473859409,
         "name": "test",
-        "project_id": "444dfb21-bf9d-46ca-badb-e22095d42a01",
-        "snapshot_id": "f6e5b3e5-c34c-4aaf-a464-ca120a551c18"
+        "project_id": "a73b08ff-47f8-4ce8-9eb2-f59d5def53d0",
+        "snapshot_id": "5696b200-d0df-4c89-9813-ba76f58917ae"
     }
 ]
diff --git a/docs/api/examples/controller_post_projects.txt b/docs/api/examples/controller_post_projects.txt
index 3ebfc4d9..13871786 100644
--- a/docs/api/examples/controller_post_projects.txt
+++ b/docs/api/examples/controller_post_projects.txt
@@ -20,7 +20,7 @@ X-ROUTE: /v2/projects
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmppibcus6y/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpa6mgwv0u/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 dcae6023..16a76c20 100644
--- a/docs/api/examples/controller_post_projectsload.txt
+++ b/docs/api/examples/controller_post_projectsload.txt
@@ -19,7 +19,7 @@ X-ROUTE: /v2/projects/load
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwbctaekr/projects/67ae22fb-f6ec-4c61-a707-7d4d28cba4b2",
-    "project_id": "67ae22fb-f6ec-4c61-a707-7d4d28cba4b2",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9hlt1889/projects/6f7c9f59-9706-452a-9ca9-ab6833b8128d",
+    "project_id": "6f7c9f59-9706-452a-9ca9-ab6833b8128d",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidclose.txt b/docs/api/examples/controller_post_projectsprojectidclose.txt
index 76399e2e..e7913a02 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/d07650e7-0285-4be7-b820-af499454c87b/close' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/37f11940-60d6-4a49-824b-0c8fd8444e74/close' -d '{}'
 
-POST /v2/projects/d07650e7-0285-4be7-b820-af499454c87b/close HTTP/1.1
+POST /v2/projects/37f11940-60d6-4a49-824b-0c8fd8444e74/close HTTP/1.1
 {}
 
 
@@ -17,7 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/close
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpyb706ffj/projects/d07650e7-0285-4be7-b820-af499454c87b",
-    "project_id": "d07650e7-0285-4be7-b820-af499454c87b",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp1d654z13/projects/37f11940-60d6-4a49-824b-0c8fd8444e74",
+    "project_id": "37f11940-60d6-4a49-824b-0c8fd8444e74",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectiddrawings.txt b/docs/api/examples/controller_post_projectsprojectiddrawings.txt
index 1397dcc9..64fdeed3 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/c8570f34-847a-4155-9387-d0091d45cbab/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/4e21c010-3db6-4f22-bb37-81dce4e5d7fd/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/c8570f34-847a-4155-9387-d0091d45cbab/drawings HTTP/1.1
+POST /v2/projects/4e21c010-3db6-4f22-bb37-81dce4e5d7fd/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": "828b77b1-ab8b-4c2b-ae5e-65c89776885d",
-    "project_id": "c8570f34-847a-4155-9387-d0091d45cbab",
+    "drawing_id": "9c979443-867c-4169-98a2-50a55528d254",
+    "project_id": "4e21c010-3db6-4f22-bb37-81dce4e5d7fd",
     "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_projectsprojectidduplicate.txt b/docs/api/examples/controller_post_projectsprojectidduplicate.txt
index 3e765c50..644a1239 100644
--- a/docs/api/examples/controller_post_projectsprojectidduplicate.txt
+++ b/docs/api/examples/controller_post_projectsprojectidduplicate.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/d725bb97-c9e8-4fff-9ba8-2131dcf9a5c2/duplicate' -d '{"name": "hello"}'
+curl -i -X POST 'http://localhost:3080/v2/projects/0f9ef2ca-ac08-475a-b41e-0e5fe21f75ea/duplicate' -d '{"name": "hello"}'
 
-POST /v2/projects/d725bb97-c9e8-4fff-9ba8-2131dcf9a5c2/duplicate HTTP/1.1
+POST /v2/projects/0f9ef2ca-ac08-475a-b41e-0e5fe21f75ea/duplicate HTTP/1.1
 {
     "name": "hello"
 }
@@ -19,7 +19,7 @@ X-ROUTE: /v2/projects/{project_id}/duplicate
     "auto_start": false,
     "filename": "hello.gns3",
     "name": "hello",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvl8ealvy/projects/hello",
-    "project_id": "9817d197-924a-41c0-a61b-5ee8620bf959",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpy0j7sw_o/projects/hello",
+    "project_id": "e47d8cbb-496e-429c-b3c6-be70ded013f1",
     "status": "closed"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinks.txt b/docs/api/examples/controller_post_projectsprojectidlinks.txt
index 1a8cac5c..4887380c 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/e9c95008-ff25-4da1-9aac-6e31d88e258a/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "b7ae8bfc-d980-4be2-bc43-023561293d94", "port_number": 3}, {"adapter_number": 2, "node_id": "814eae63-4d8a-4c1a-84f4-09c6b50bedce", "port_number": 4}]}'
+curl -i -X POST 'http://localhost:3080/v2/projects/ad130b0e-f215-4e9a-8139-4976617ef8b2/links' -d '{"nodes": [{"adapter_number": 0, "label": {"text": "Text", "x": 42, "y": 0}, "node_id": "2d755c11-aa1f-412d-b5e3-6cbaee998928", "port_number": 3}, {"adapter_number": 2, "node_id": "8c7e73c0-918e-4442-9cb8-41f5d847a92b", "port_number": 4}]}'
 
-POST /v2/projects/e9c95008-ff25-4da1-9aac-6e31d88e258a/links HTTP/1.1
+POST /v2/projects/ad130b0e-f215-4e9a-8139-4976617ef8b2/links HTTP/1.1
 {
     "nodes": [
         {
@@ -10,12 +10,12 @@ POST /v2/projects/e9c95008-ff25-4da1-9aac-6e31d88e258a/links HTTP/1.1
                 "x": 42,
                 "y": 0
             },
-            "node_id": "b7ae8bfc-d980-4be2-bc43-023561293d94",
+            "node_id": "2d755c11-aa1f-412d-b5e3-6cbaee998928",
             "port_number": 3
         },
         {
             "adapter_number": 2,
-            "node_id": "814eae63-4d8a-4c1a-84f4-09c6b50bedce",
+            "node_id": "8c7e73c0-918e-4442-9cb8-41f5d847a92b",
             "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": "e3f9f2b2-bb47-4f57-948d-d7c4e92c0ff1",
+    "link_id": "c3a00a39-4520-4663-8628-8bea7fdb5825",
     "nodes": [
         {
             "adapter_number": 0,
@@ -42,7 +42,7 @@ X-ROUTE: /v2/projects/{project_id}/links
                 "x": 42,
                 "y": 0
             },
-            "node_id": "b7ae8bfc-d980-4be2-bc43-023561293d94",
+            "node_id": "2d755c11-aa1f-412d-b5e3-6cbaee998928",
             "port_number": 3
         },
         {
@@ -54,9 +54,9 @@ X-ROUTE: /v2/projects/{project_id}/links
                 "x": -10,
                 "y": -10
             },
-            "node_id": "814eae63-4d8a-4c1a-84f4-09c6b50bedce",
+            "node_id": "8c7e73c0-918e-4442-9cb8-41f5d847a92b",
             "port_number": 4
         }
     ],
-    "project_id": "e9c95008-ff25-4da1-9aac-6e31d88e258a"
+    "project_id": "ad130b0e-f215-4e9a-8139-4976617ef8b2"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
index 56753d27..d1b2d2bd 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/bd78d4c9-3445-4b64-9aad-480aee3de75a/links/50761c87-17db-49f6-9942-4925435076ea/start_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/20b23fbe-93ef-42cf-bfe9-9723803a3b55/links/52262649-be7c-4d42-823b-8cb3e8796220/start_capture' -d '{}'
 
-POST /v2/projects/bd78d4c9-3445-4b64-9aad-480aee3de75a/links/50761c87-17db-49f6-9942-4925435076ea/start_capture HTTP/1.1
+POST /v2/projects/20b23fbe-93ef-42cf-bfe9-9723803a3b55/links/52262649-be7c-4d42-823b-8cb3e8796220/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": "50761c87-17db-49f6-9942-4925435076ea",
+    "link_id": "52262649-be7c-4d42-823b-8cb3e8796220",
     "nodes": [],
-    "project_id": "bd78d4c9-3445-4b64-9aad-480aee3de75a"
+    "project_id": "20b23fbe-93ef-42cf-bfe9-9723803a3b55"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt b/docs/api/examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
index 46d9c885..d9f6c775 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/3d164322-ce7d-4634-a441-2ca9b00f5448/links/6b2ba8df-40ee-42c7-a1b7-c58274472ad0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/a01cdd0b-e4fa-46de-be52-eae27ce65e72/links/15212c71-b25d-4afd-bde1-9de061eb3b32/stop_capture' -d '{}'
 
-POST /v2/projects/3d164322-ce7d-4634-a441-2ca9b00f5448/links/6b2ba8df-40ee-42c7-a1b7-c58274472ad0/stop_capture HTTP/1.1
+POST /v2/projects/a01cdd0b-e4fa-46de-be52-eae27ce65e72/links/15212c71-b25d-4afd-bde1-9de061eb3b32/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": "6b2ba8df-40ee-42c7-a1b7-c58274472ad0",
+    "link_id": "15212c71-b25d-4afd-bde1-9de061eb3b32",
     "nodes": [],
-    "project_id": "3d164322-ce7d-4634-a441-2ca9b00f5448"
+    "project_id": "a01cdd0b-e4fa-46de-be52-eae27ce65e72"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidnodes.txt b/docs/api/examples/controller_post_projectsprojectidnodes.txt
index ffd91f66..65186ac9 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/baaa8614-7da6-4ad7-8d7e-6857babef38d/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/64d2f5f1-04d0-49b4-962a-69240377ea49/nodes' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
 
-POST /v2/projects/baaa8614-7da6-4ad7-8d7e-6857babef38d/nodes HTTP/1.1
+POST /v2/projects/64d2f5f1-04d0-49b4-962a-69240377ea49/nodes HTTP/1.1
 {
     "compute_id": "example.com",
     "name": "test",
@@ -12,7 +12,7 @@ POST /v2/projects/baaa8614-7da6-4ad7-8d7e-6857babef38d/nodes HTTP/1.1
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 691
+CONTENT-LENGTH: 1084
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -24,6 +24,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes
     "console": 2048,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -34,9 +35,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "f3f8f6b0-1e7a-469d-b5d8-bcb2c64b697c",
+    "node_id": "9815a844-baaa-4887-b827-e4da9224585e",
     "node_type": "vpcs",
-    "project_id": "baaa8614-7da6-4ad7-8d7e-6857babef38d",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "64d2f5f1-04d0-49b4-962a-69240377ea49",
     "properties": {
         "startup_script": "echo test"
     },
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
index a9c0fa5a..af6f971d 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidreload.txt
@@ -1,11 +1,11 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/920c3e57-5790-4e17-abfc-1c7633815720/nodes/33c1bcbb-08cd-47a9-9805-a9346e99c072/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/ae1c517c-76aa-4234-8a25-e840987b6a72/nodes/d74d9e77-f6df-4e15-8ed6-e89eca04f305/reload' -d '{}'
 
-POST /v2/projects/920c3e57-5790-4e17-abfc-1c7633815720/nodes/33c1bcbb-08cd-47a9-9805-a9346e99c072/reload HTTP/1.1
+POST /v2/projects/ae1c517c-76aa-4234-8a25-e840987b6a72/nodes/d74d9e77-f6df-4e15-8ed6-e89eca04f305/reload HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 648
+CONTENT-LENGTH: 1041
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -17,6 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/reload
     "console": null,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -27,9 +28,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/reload
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "33c1bcbb-08cd-47a9-9805-a9346e99c072",
+    "node_id": "d74d9e77-f6df-4e15-8ed6-e89eca04f305",
     "node_type": "vpcs",
-    "project_id": "920c3e57-5790-4e17-abfc-1c7633815720",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "ae1c517c-76aa-4234-8a25-e840987b6a72",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
index 820daa5e..eb585cbb 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstart.txt
@@ -1,11 +1,11 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/80697b93-98df-4e77-9eff-b7f874e7741a/nodes/3f9c7d6f-9f92-47bb-975d-74d76372dbee/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/b68fbf77-7840-4ca0-b79b-d5980bb058ce/nodes/625b8093-cc66-45f7-a2ae-e516902ced0a/start' -d '{}'
 
-POST /v2/projects/80697b93-98df-4e77-9eff-b7f874e7741a/nodes/3f9c7d6f-9f92-47bb-975d-74d76372dbee/start HTTP/1.1
+POST /v2/projects/b68fbf77-7840-4ca0-b79b-d5980bb058ce/nodes/625b8093-cc66-45f7-a2ae-e516902ced0a/start HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 648
+CONTENT-LENGTH: 1041
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -17,6 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/start
     "console": null,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -27,9 +28,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/start
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "3f9c7d6f-9f92-47bb-975d-74d76372dbee",
+    "node_id": "625b8093-cc66-45f7-a2ae-e516902ced0a",
     "node_type": "vpcs",
-    "project_id": "80697b93-98df-4e77-9eff-b7f874e7741a",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "b68fbf77-7840-4ca0-b79b-d5980bb058ce",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
index b0c6f6df..25b42ea5 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidstop.txt
@@ -1,11 +1,11 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/0701a222-9143-4c4a-b2e2-50737979501d/nodes/8f73b099-b4dd-442f-aca0-b6e18f3cf4b2/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/34d0e133-95e7-47c9-87a0-f1838d99394d/nodes/08036f93-2e2a-4975-883a-15f2ff438bdc/stop' -d '{}'
 
-POST /v2/projects/0701a222-9143-4c4a-b2e2-50737979501d/nodes/8f73b099-b4dd-442f-aca0-b6e18f3cf4b2/stop HTTP/1.1
+POST /v2/projects/34d0e133-95e7-47c9-87a0-f1838d99394d/nodes/08036f93-2e2a-4975-883a-15f2ff438bdc/stop HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 648
+CONTENT-LENGTH: 1041
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -17,6 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/stop
     "console": null,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -27,9 +28,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/stop
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "8f73b099-b4dd-442f-aca0-b6e18f3cf4b2",
+    "node_id": "08036f93-2e2a-4975-883a-15f2ff438bdc",
     "node_type": "vpcs",
-    "project_id": "0701a222-9143-4c4a-b2e2-50737979501d",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "34d0e133-95e7-47c9-87a0-f1838d99394d",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
index 6654ce33..1a879a0e 100644
--- a/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
+++ b/docs/api/examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
@@ -1,11 +1,11 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/9d844baf-a0b1-4351-82eb-a7eed82998b2/nodes/e505b27f-50ac-4e61-bbb3-55885b370b5a/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/55df4f36-8ded-401d-b545-ea33f11da494/nodes/e9caad3a-a9f1-4bd6-ade3-9bb1486135e9/suspend' -d '{}'
 
-POST /v2/projects/9d844baf-a0b1-4351-82eb-a7eed82998b2/nodes/e505b27f-50ac-4e61-bbb3-55885b370b5a/suspend HTTP/1.1
+POST /v2/projects/55df4f36-8ded-401d-b545-ea33f11da494/nodes/e9caad3a-a9f1-4bd6-ade3-9bb1486135e9/suspend HTTP/1.1
 {}
 
 
 HTTP/1.1 201
-CONTENT-LENGTH: 648
+CONTENT-LENGTH: 1041
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -17,6 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/suspend
     "console": null,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -27,9 +28,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}/suspend
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "e505b27f-50ac-4e61-bbb3-55885b370b5a",
+    "node_id": "e9caad3a-a9f1-4bd6-ade3-9bb1486135e9",
     "node_type": "vpcs",
-    "project_id": "9d844baf-a0b1-4351-82eb-a7eed82998b2",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "55df4f36-8ded-401d-b545-ea33f11da494",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesreload.txt b/docs/api/examples/controller_post_projectsprojectidnodesreload.txt
index 2b2631b7..f620deac 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/44ca89d3-0cdc-43b7-a36b-3a7f125a4599/nodes/reload' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/73512f66-9175-4c94-9da4-c5c0c0a43a97/nodes/reload' -d '{}'
 
-POST /v2/projects/44ca89d3-0cdc-43b7-a36b-3a7f125a4599/nodes/reload HTTP/1.1
+POST /v2/projects/73512f66-9175-4c94-9da4-c5c0c0a43a97/nodes/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstart.txt b/docs/api/examples/controller_post_projectsprojectidnodesstart.txt
index 4a89a15a..f7825f9a 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/7ec630d0-34f9-4471-b40c-f38fdcaa0ee0/nodes/start' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/df731015-9498-46ad-a926-e12462692167/nodes/start' -d '{}'
 
-POST /v2/projects/7ec630d0-34f9-4471-b40c-f38fdcaa0ee0/nodes/start HTTP/1.1
+POST /v2/projects/df731015-9498-46ad-a926-e12462692167/nodes/start HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodesstop.txt b/docs/api/examples/controller_post_projectsprojectidnodesstop.txt
index 67ae032b..eaa6bd4d 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/641ee787-d4a0-4c0c-a849-bb19a7258061/nodes/stop' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/c1eb365b-9696-40d1-9f24-14dfafeddcf8/nodes/stop' -d '{}'
 
-POST /v2/projects/641ee787-d4a0-4c0c-a849-bb19a7258061/nodes/stop HTTP/1.1
+POST /v2/projects/c1eb365b-9696-40d1-9f24-14dfafeddcf8/nodes/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt b/docs/api/examples/controller_post_projectsprojectidnodessuspend.txt
index c8db2202..9b7712ef 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/2c4001ec-3273-4730-ac50-47d3740135d4/nodes/suspend' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/946b2808-bd76-471a-a37a-e50682e60e4a/nodes/suspend' -d '{}'
 
-POST /v2/projects/2c4001ec-3273-4730-ac50-47d3740135d4/nodes/suspend HTTP/1.1
+POST /v2/projects/946b2808-bd76-471a-a37a-e50682e60e4a/nodes/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidopen.txt b/docs/api/examples/controller_post_projectsprojectidopen.txt
index cfdeca18..210aeff0 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/7e373b9a-3fd6-48e6-8b9a-0f390ec1d1aa/open' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/ae11fd75-0b87-4db0-b781-0122c5caf92e/open' -d '{}'
 
-POST /v2/projects/7e373b9a-3fd6-48e6-8b9a-0f390ec1d1aa/open HTTP/1.1
+POST /v2/projects/ae11fd75-0b87-4db0-b781-0122c5caf92e/open HTTP/1.1
 {}
 
 
@@ -17,7 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/open
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp4eptj2mn/projects/7e373b9a-3fd6-48e6-8b9a-0f390ec1d1aa",
-    "project_id": "7e373b9a-3fd6-48e6-8b9a-0f390ec1d1aa",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp0sj55_d_/projects/ae11fd75-0b87-4db0-b781-0122c5caf92e",
+    "project_id": "ae11fd75-0b87-4db0-b781-0122c5caf92e",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidsnapshots.txt b/docs/api/examples/controller_post_projectsprojectidsnapshots.txt
index 2cc066a3..21184506 100644
--- a/docs/api/examples/controller_post_projectsprojectidsnapshots.txt
+++ b/docs/api/examples/controller_post_projectsprojectidsnapshots.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/522bed66-ee06-4434-8be7-91081b782829/snapshots' -d '{"name": "snap1"}'
+curl -i -X POST 'http://localhost:3080/v2/projects/0b36822c-56a4-4957-8ed2-effdaf42fbb8/snapshots' -d '{"name": "snap1"}'
 
-POST /v2/projects/522bed66-ee06-4434-8be7-91081b782829/snapshots HTTP/1.1
+POST /v2/projects/0b36822c-56a4-4957-8ed2-effdaf42fbb8/snapshots HTTP/1.1
 {
     "name": "snap1"
 }
@@ -14,8 +14,8 @@ SERVER: Python/3.5 GNS3/2.0.0dev1
 X-ROUTE: /v2/projects/{project_id}/snapshots
 
 {
-    "created_at": 1472479063,
+    "created_at": 1473859410,
     "name": "snap1",
-    "project_id": "522bed66-ee06-4434-8be7-91081b782829",
-    "snapshot_id": "4e0de424-9aac-4697-b21b-2c8f7ba3021b"
+    "project_id": "0b36822c-56a4-4957-8ed2-effdaf42fbb8",
+    "snapshot_id": "411ff425-c0ad-4e0c-8411-8d43e4faa5aa"
 }
diff --git a/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt b/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
index d1c0810e..7483a2aa 100644
--- a/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
+++ b/docs/api/examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:3080/v2/projects/92ce89c8-33ca-4c38-8c07-b0843a512ace/snapshots/788b3176-266a-4f5b-ac17-924907c57fa9/restore' -d '{}'
+curl -i -X POST 'http://localhost:3080/v2/projects/c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0/snapshots/c3f5035d-bf37-4d1d-94c6-2ec676e90629/restore' -d '{}'
 
-POST /v2/projects/92ce89c8-33ca-4c38-8c07-b0843a512ace/snapshots/788b3176-266a-4f5b-ac17-924907c57fa9/restore HTTP/1.1
+POST /v2/projects/c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0/snapshots/c3f5035d-bf37-4d1d-94c6-2ec676e90629/restore HTTP/1.1
 {}
 
 
@@ -17,7 +17,7 @@ X-ROUTE: /v2/projects/{project_id}/snapshots/{snapshot_id}/restore
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpnx2hb84i/projects/92ce89c8-33ca-4c38-8c07-b0843a512ace",
-    "project_id": "92ce89c8-33ca-4c38-8c07-b0843a512ace",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp8q441wzy/projects/c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0",
+    "project_id": "c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_put_projectsprojectid.txt b/docs/api/examples/controller_put_projectsprojectid.txt
index 86b1f63e..046824c7 100644
--- a/docs/api/examples/controller_put_projectsprojectid.txt
+++ b/docs/api/examples/controller_put_projectsprojectid.txt
@@ -19,7 +19,7 @@ X-ROUTE: /v2/projects/{project_id}
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test2",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmuze6_r0/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvagfqk1t/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
     "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
     "status": "opened"
 }
diff --git a/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt b/docs/api/examples/controller_put_projectsprojectiddrawingsdrawingid.txt
index ce76a0f3..6e416520 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/1d3108a9-8f38-4bbf-9cfe-20a0b4d5e0c2/drawings/ad23dc90-7775-4537-b188-ab38c36ade9e' -d '{"x": 42}'
+curl -i -X PUT 'http://localhost:3080/v2/projects/709aacbf-aa1f-4b1b-a538-17f8294e98d1/drawings/28f0a4e0-fd69-4dda-b066-8fe5e2a43847' -d '{"x": 42}'
 
-PUT /v2/projects/1d3108a9-8f38-4bbf-9cfe-20a0b4d5e0c2/drawings/ad23dc90-7775-4537-b188-ab38c36ade9e HTTP/1.1
+PUT /v2/projects/709aacbf-aa1f-4b1b-a538-17f8294e98d1/drawings/28f0a4e0-fd69-4dda-b066-8fe5e2a43847 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": "ad23dc90-7775-4537-b188-ab38c36ade9e",
-    "project_id": "1d3108a9-8f38-4bbf-9cfe-20a0b4d5e0c2",
+    "drawing_id": "28f0a4e0-fd69-4dda-b066-8fe5e2a43847",
+    "project_id": "709aacbf-aa1f-4b1b-a538-17f8294e98d1",
     "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 a629a6ca..db2aee99 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/f46ee563-845f-4835-89c4-b0d924c8e4e8/nodes/8c1ee491-aed2-48b0-8cc1-0e9e3081ab8f' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
+curl -i -X PUT 'http://localhost:3080/v2/projects/46c9518a-9de2-43f7-91ed-55cb179fe562/nodes/fcc1c350-1079-4490-9597-f53bfed74dd1' -d '{"compute_id": "example.com", "name": "test", "node_type": "vpcs", "properties": {"startup_script": "echo test"}}'
 
-PUT /v2/projects/f46ee563-845f-4835-89c4-b0d924c8e4e8/nodes/8c1ee491-aed2-48b0-8cc1-0e9e3081ab8f HTTP/1.1
+PUT /v2/projects/46c9518a-9de2-43f7-91ed-55cb179fe562/nodes/fcc1c350-1079-4490-9597-f53bfed74dd1 HTTP/1.1
 {
     "compute_id": "example.com",
     "name": "test",
@@ -12,7 +12,7 @@ PUT /v2/projects/f46ee563-845f-4835-89c4-b0d924c8e4e8/nodes/8c1ee491-aed2-48b0-8
 
 
 HTTP/1.1 200
-CONTENT-LENGTH: 648
+CONTENT-LENGTH: 1041
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/2.0.0dev1
@@ -24,6 +24,7 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
     "console": 2048,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -34,9 +35,23 @@ X-ROUTE: /v2/projects/{project_id}/nodes/{node_id}
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "8c1ee491-aed2-48b0-8cc1-0e9e3081ab8f",
+    "node_id": "fcc1c350-1079-4490-9597-f53bfed74dd1",
     "node_type": "vpcs",
-    "project_id": "f46ee563-845f-4835-89c4-b0d924c8e4e8",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "46c9518a-9de2-43f7-91ed-55cb179fe562",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/notifications/compute.updated.json b/docs/api/notifications/compute.updated.json
index 71579eb8..75d786f7 100644
--- a/docs/api/notifications/compute.updated.json
+++ b/docs/api/notifications/compute.updated.json
@@ -1,27 +1,15 @@
 {
     "capabilities": {
-        "node_types": [
-            "cloud",
-            "nat",
-            "ethernet_hub",
-            "ethernet_switch",
-            "vpcs",
-            "virtualbox",
-            "dynamips",
-            "frame_relay_switch",
-            "atm_switch",
-            "qemu",
-            "vmware"
-        ],
-        "version": "2.0.0dev1"
+        "node_types": [],
+        "version": null
     },
-    "compute_id": "local",
-    "connected": true,
-    "cpu_usage_percent": 14.3,
+    "compute_id": "my_compute_id",
+    "connected": false,
+    "cpu_usage_percent": null,
     "host": "localhost",
-    "memory_usage_percent": 81.2,
-    "name": "atlantis",
-    "port": 3080,
-    "protocol": "http",
-    "user": null
+    "memory_usage_percent": null,
+    "name": "http://julien@localhost:84",
+    "port": 84,
+    "protocol": "https",
+    "user": "julien"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/drawing.created.json b/docs/api/notifications/drawing.created.json
index 23f18686..444ec648 100644
--- a/docs/api/notifications/drawing.created.json
+++ b/docs/api/notifications/drawing.created.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "dc2a42e7-1597-48e0-8d87-eb9d4b19e1f8",
-    "project_id": "a309218f-8733-4b79-a1b0-b5029e1f4e98",
+    "drawing_id": "397ff7c4-157e-4513-bf16-5cf857fd2433",
+    "project_id": "213aea2d-98f7-4d6b-a436-5f67458ad62d",
     "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 75991f28..2a9fd955 100644
--- a/docs/api/notifications/drawing.deleted.json
+++ b/docs/api/notifications/drawing.deleted.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "1db2e2f6-3dd1-4831-9532-a60ab856294b",
-    "project_id": "70a58fbb-b8c9-44b4-89c1-a5fa72e9506c",
+    "drawing_id": "5e201fa7-093b-438a-813a-fb9c0ca7d1bc",
+    "project_id": "e4d9e39f-c6d7-4549-9a39-77b491a1d0c9",
     "rotation": 0,
     "svg": "<svg></svg>",
     "x": 0,
diff --git a/docs/api/notifications/drawing.updated.json b/docs/api/notifications/drawing.updated.json
index a792158e..13f00d2d 100644
--- a/docs/api/notifications/drawing.updated.json
+++ b/docs/api/notifications/drawing.updated.json
@@ -1,6 +1,6 @@
 {
-    "drawing_id": "ad23dc90-7775-4537-b188-ab38c36ade9e",
-    "project_id": "1d3108a9-8f38-4bbf-9cfe-20a0b4d5e0c2",
+    "drawing_id": "28f0a4e0-fd69-4dda-b066-8fe5e2a43847",
+    "project_id": "709aacbf-aa1f-4b1b-a538-17f8294e98d1",
     "rotation": 0,
     "x": 42,
     "y": 20,
diff --git a/docs/api/notifications/link.created.json b/docs/api/notifications/link.created.json
index 1dbb4ad6..c435d146 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": "5b0579f5-6ae2-4cc9-a212-bfb2e28cee58",
+    "link_id": "a5017183-450b-43ef-9f5b-7d9ef2f77670",
     "nodes": [
         {
             "adapter_number": 0,
@@ -13,7 +13,7 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "c2b9f58a-f3fc-47ac-b052-d4cc67ac6b46",
+            "node_id": "7ec55228-4f17-47ec-9afa-041114f5a95e",
             "port_number": 3
         },
         {
@@ -25,9 +25,9 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "d65154e2-1e56-4a37-90ba-946b5de8f698",
+            "node_id": "ea49b826-f3ac-4683-898d-7c9384cd44f1",
             "port_number": 4
         }
     ],
-    "project_id": "611178af-cb11-4444-a251-7b0ad49232c0"
+    "project_id": "7577e59a-7758-4c5a-841f-be976afd8a57"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/link.deleted.json b/docs/api/notifications/link.deleted.json
index a9920d5d..da5de800 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": "669968e7-64ab-44d5-8a4f-d7caa3ac6de9",
+    "link_id": "c1f96066-ff56-4c79-9a82-df5c53edcfd9",
     "nodes": [],
-    "project_id": "de115f02-96b9-4158-837c-1a73c47c96c7"
+    "project_id": "237d87b6-9912-4aff-9210-b46706b18caf"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/link.updated.json b/docs/api/notifications/link.updated.json
index 48140a7e..c215fa7f 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": "d1a6c516-905c-42e0-b10e-af683afc6b5d",
+    "link_id": "53d6bd87-c993-48b5-929e-eb341e3e4ff0",
     "nodes": [
         {
             "adapter_number": 0,
@@ -11,7 +11,7 @@
                 "x": 64,
                 "y": 0
             },
-            "node_id": "6ab70fee-13cb-4297-9aa1-1b24a1aae726",
+            "node_id": "866a6df5-6a62-487e-a0da-1bd99c6190ff",
             "port_number": 3
         },
         {
@@ -23,9 +23,9 @@
                 "x": -10,
                 "y": -10
             },
-            "node_id": "41684742-d7b3-47e5-8619-5079ce0adfa1",
+            "node_id": "37b4c123-e5a5-4aae-9be6-d746ef8b3958",
             "port_number": 4
         }
     ],
-    "project_id": "bd022143-31d6-47d4-bf6f-0501b73f02f4"
+    "project_id": "2d1162b3-1094-4f73-9df0-c98d759fb88b"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/node.deleted.json b/docs/api/notifications/node.deleted.json
index 243d5fdd..e1f986f8 100644
--- a/docs/api/notifications/node.deleted.json
+++ b/docs/api/notifications/node.deleted.json
@@ -4,6 +4,7 @@
     "console": null,
     "console_host": "example.org",
     "console_type": null,
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
@@ -14,9 +15,23 @@
     },
     "name": "test",
     "node_directory": null,
-    "node_id": "930d8103-563f-4550-a43f-34a718883c6e",
+    "node_id": "cf34dae9-ff88-4ef4-a37f-e3954d07e351",
     "node_type": "vpcs",
-    "project_id": "0555e4fa-ea3b-4cfc-9ee7-f893afdc0529",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "b33faa3d-e348-4de5-a266-30b3949d5872",
     "properties": {},
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
diff --git a/docs/api/notifications/node.updated.json b/docs/api/notifications/node.updated.json
index 7bce2cbb..9d5da4d9 100644
--- a/docs/api/notifications/node.updated.json
+++ b/docs/api/notifications/node.updated.json
@@ -1,29 +1,45 @@
 {
-    "command_line": null,
-    "compute_id": "remote1",
-    "console": 2048,
-    "console_host": "example.org",
-    "console_type": null,
+    "command_line": "",
+    "compute_id": "local",
+    "console": 5987,
+    "console_host": "localhost",
+    "console_type": "telnet",
+    "first_port_name": null,
     "height": 59,
     "label": {
         "rotation": 0,
-        "style": "font-size: 10;font-familly: Verdana",
-        "text": "test",
-        "x": null,
-        "y": -40
+        "style": "font-family: TypeWriter;font-size: 10;font-weight: bold;fill: #000000;fill-opacity: 1.0;",
+        "text": "PC1",
+        "x": 18,
+        "y": -25
     },
-    "name": "test",
-    "node_directory": null,
-    "node_id": "e27aef3a-be31-439f-bce9-a936c359041a",
+    "name": "PC1",
+    "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-330/test_open0/project-files/vpcs/64ba8408-afbf-4b66-9cdd-1fd854427478",
+    "node_id": "64ba8408-afbf-4b66-9cdd-1fd854427478",
     "node_type": "vpcs",
-    "project_id": "8568421b-d86e-455c-adef-dfe861e23d8a",
+    "port_name_format": "Ethernet{0}",
+    "port_segment_size": 0,
+    "ports": [
+        {
+            "adapter_number": 0,
+            "data_link_types": {
+                "Ethernet": "DLT_EN10MB"
+            },
+            "link_type": "ethernet",
+            "name": "Ethernet0",
+            "port_number": 0,
+            "short_name": "e0/0"
+        }
+    ],
+    "project_id": "3c1be6f9-b4ba-4737-b209-63c47c23359f",
     "properties": {
-        "startup_config": "test.cfg"
+        "startup_script": "",
+        "startup_script_path": "startup.vpc"
     },
     "status": "stopped",
     "symbol": ":/symbols/computer.svg",
     "width": 65,
-    "x": 0,
-    "y": 0,
-    "z": 0
+    "x": -300,
+    "y": -118,
+    "z": 1
 }
\ No newline at end of file
diff --git a/docs/api/notifications/project.closed.json b/docs/api/notifications/project.closed.json
index 904cb229..21960091 100644
--- a/docs/api/notifications/project.closed.json
+++ b/docs/api/notifications/project.closed.json
@@ -4,7 +4,7 @@
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpy8xtppwg/projects/2e26e0e6-634c-409c-98d8-651b4160126d",
-    "project_id": "2e26e0e6-634c-409c-98d8-651b4160126d",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpy1hwdmxr/projects/1830ecc1-9a40-422d-9e15-ce407f7a1758",
+    "project_id": "1830ecc1-9a40-422d-9e15-ce407f7a1758",
     "status": "closed"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/project.updated.json b/docs/api/notifications/project.updated.json
index 95de41d2..db15d711 100644
--- a/docs/api/notifications/project.updated.json
+++ b/docs/api/notifications/project.updated.json
@@ -4,7 +4,7 @@
     "auto_start": false,
     "filename": "test.gns3",
     "name": "test2",
-    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpmuze6_r0/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
+    "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpvagfqk1t/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
     "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
     "status": "opened"
 }
\ No newline at end of file
diff --git a/docs/api/notifications/snapshot.restored.json b/docs/api/notifications/snapshot.restored.json
index 53a61970..b548e559 100644
--- a/docs/api/notifications/snapshot.restored.json
+++ b/docs/api/notifications/snapshot.restored.json
@@ -1,6 +1,6 @@
 {
-    "created_at": 1472479063,
+    "created_at": 1473859410,
     "name": "test",
-    "project_id": "92ce89c8-33ca-4c38-8c07-b0843a512ace",
-    "snapshot_id": "788b3176-266a-4f5b-ac17-924907c57fa9"
+    "project_id": "c587345b-5dbb-4a5d-bb8e-55fb01eb3cb0",
+    "snapshot_id": "c3f5035d-bf37-4d1d-94c6-2ec676e90629"
 }
\ No newline at end of file
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 291932f3..e7ec2c53 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 27677043..7748a7f3 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
@@ -29,8 +29,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 53e6013d..174091fe 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
index 688fe99e..d01d24ed 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
@@ -42,7 +42,7 @@ Body
     <tr><td>interfaces</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Cloud name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td></td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     </table>
 
 Output
@@ -54,7 +54,7 @@ Output
     <tr><td>interfaces</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Cloud name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
index 65105bb7..6d013e68 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
@@ -27,7 +27,7 @@ Output
     <tr><td>interfaces</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Cloud name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -80,7 +80,7 @@ Body
     <tr><td>interfaces</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Cloud name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -94,7 +94,7 @@ Output
     <tr><td>interfaces</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Cloud name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 60d181c6..9ceda591 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the cloud (always 0)
-- **port_number**: Port on the cloud
 - **project_id**: Project UUID
+- **port_number**: Port on the cloud
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the cloud (always 0)
-- **port_number**: Port on the cloud
 - **project_id**: Project UUID
+- **port_number**: Port on the cloud
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 34d08a55..2c49263e 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the cloud (always 0)
-- **port_number**: Port on the cloud
 - **project_id**: Project UUID
+- **port_number**: Port on the cloud
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 1e3922e9..9cf4577a 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the cloud (always 0)
-- **port_number**: Port on the cloud
 - **project_id**: Project UUID
+- **port_number**: Port on the cloud
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 3003c836..f8c38b36 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter where the nio should be added
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter where the nio should be added
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index f69c89b3..56ae3a52 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index a9260893..9b9afa51 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index dae3fc0e..62fd35fa 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter where the nio should be added
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
@@ -29,8 +29,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter from where the nio should be removed
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index d8d40a7e..52f3778a 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index c41d9044..4cc11da9 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst
index 45e85534..a18152b1 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst
@@ -41,7 +41,7 @@ Body
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Ethernet hub name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td></td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     </table>
 
 Output
@@ -52,7 +52,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet hub name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
index b47b6e7f..0d582397 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
@@ -26,7 +26,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet hub name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -72,7 +72,7 @@ Body
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet hub name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -85,7 +85,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet hub name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 80b4952c..ca7a6887 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the hub (always 0)
-- **port_number**: Port on the hub
 - **project_id**: Project UUID
+- **port_number**: Port on the hub
 
 Response status codes
 **********************
@@ -29,8 +29,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the hub (always 0)
-- **port_number**: Port on the hub
 - **project_id**: Project UUID
+- **port_number**: Port on the hub
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index fcc3fa95..825f67ed 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the hub (always 0)
-- **port_number**: Port on the hub
 - **project_id**: Project UUID
+- **port_number**: Port on the hub
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index b9f17504..3b85a13e 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the hub (always 0)
-- **port_number**: Port on the hub
 - **project_id**: Project UUID
+- **port_number**: Port on the hub
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
index 63dc039a..57433578 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
@@ -44,7 +44,7 @@ Body
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td>&#10004;</td>                     <td>string</td>                     <td>Ethernet switch name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td></td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     </table>
 
 Output
@@ -55,7 +55,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet switch name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
index d47bf391..23b6ac6d 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
@@ -26,7 +26,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet switch name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -75,7 +75,7 @@ Body
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet switch name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -88,7 +88,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Ethernet switch name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index b38890be..1e907c5a 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
@@ -29,8 +29,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 4250abea..376442a9 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 87f5cef2..fca913f3 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 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 731413ca..813e2cae 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
@@ -29,8 +29,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 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 f0404bec..cdc53e50 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 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 ef1a6709..e4ccc069 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the switch (always 0)
-- **port_number**: Port on the switch
 - **project_id**: Project UUID
+- **port_number**: Port on the switch
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index dfcb5b96..5db59dbe 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Network adapter where the nio is located
-- **port_number**: Port where the nio should be added
 - **project_id**: Project UUID
+- **port_number**: Port where the nio should be added
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Network adapter where the nio is located
-- **port_number**: Port from where the nio should be removed
 - **project_id**: Project UUID
+- **port_number**: Port from where the nio should be removed
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 0ae20630..4c67fe9a 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 92bd6dff..b118d82e 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst
index dc19b8e3..99cb0344 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst
@@ -25,7 +25,7 @@ Input
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Nat name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -38,7 +38,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Nat name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
index 4c0f4315..07f4ebd8 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
@@ -26,7 +26,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Nat name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -62,7 +62,7 @@ Input
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Nat name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
@@ -75,7 +75,7 @@ Output
     <tr>                 <th>Name</th>                 <th>Mandatory</th>                 <th>Type</th>                 <th>Description</th>                 </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Nat name</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
-    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
+    <tr><td>ports_mapping</td>                    <td> </td>                     <td>array</td>                     <td></td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: started, stopped, suspended</td>                     </tr>
     </table>
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 1b861bc3..a6baa3a8 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the nat (always 0)
-- **port_number**: Port on the nat
 - **project_id**: Project UUID
+- **port_number**: Port on the nat
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the nat (always 0)
-- **port_number**: Port on the nat
 - **project_id**: Project UUID
+- **port_number**: Port on the nat
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 06d55cf7..fa174f0b 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the nat (always 0)
-- **port_number**: Port on the nat
 - **project_id**: Project UUID
+- **port_number**: Port on the nat
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e9318f01..59d27ac2 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter on the nat (always 0)
-- **port_number**: Port on the nat
 - **project_id**: Project UUID
+- **port_number**: Port on the nat
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index efe7575c..069afaf8 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Network adapter where the nio is located
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Network adapter where the nio is located
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index e6bf7d58..dfdeb5c6 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e94a1add..5b032733 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 0ea4d152..400842a7 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter where the nio should be added
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter from where the nio should be removed
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index ca15da8d..256db4a6 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 060767e1..3af4cad0 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 04b5241c..ea1c3f0d 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter where the nio should be added
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
@@ -29,8 +29,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter from where the nio should be removed
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 8d0e16ec..4662bcd0 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 667a7841..bd72c0cb 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter (always 0)
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter (always 0)
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 8240cbfc..2a0c017a 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Network adapter where the nio is located
-- **port_number**: Port where the nio should be added
 - **project_id**: Project UUID
+- **port_number**: Port where the nio should be added
 
 Response status codes
 **********************
@@ -35,8 +35,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Network adapter where the nio is located
-- **port_number**: Port from where the nio should be removed
 - **project_id**: Project UUID
+- **port_number**: Port from where the nio should be removed
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 68264cf4..90d80187 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to start a packet capture
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index bdce4dcc..5f9d7554 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -11,8 +11,8 @@ Parameters
 **********
 - **node_id**: Node UUID
 - **adapter_number**: Adapter to stop a packet capture
-- **port_number**: Port on the adapter
 - **project_id**: Project UUID
+- **port_number**: Port on the adapter
 
 Response status codes
 **********************
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
new file mode 100644
index 00000000..430b8fab
--- /dev/null
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
@@ -0,0 +1,20 @@
+/v2/compute/projects/{project_id}/vpcs/nodes/{node_id}/suspend
+------------------------------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+POST /v2/compute/projects/**{project_id}**/vpcs/nodes/**{node_id}**/suspend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Suspend a VPCS instance (stop it)
+
+Parameters
+**********
+- **node_id**: Node UUID
+- **project_id**: Project UUID
+
+Response status codes
+**********************
+- **400**: Invalid request
+- **404**: Instance doesn't exist
+- **204**: Instance stopped
+
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..48426bdd 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
@@ -5,12 +5,12 @@
 
 GET /v2/projects/**{project_id}**/links/**{link_id}**/pcap
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Steam the pcap capture file
+Stream 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/projectsprojectidnodes.rst b/docs/api/v2/controller/node/projectsprojectidnodes.rst
index 31d1862c..52c78cd6 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodes.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodes.rst
@@ -27,12 +27,16 @@ Input
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
@@ -54,12 +58,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
index 86eaf3a8..3660ec9b 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
@@ -24,12 +24,16 @@ Input
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
@@ -51,12 +55,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
index 3af04749..19fcdbd1 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
@@ -29,12 +29,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
index 002d4620..426278bf 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
@@ -29,12 +29,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
index 7739b605..5fc60640 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
@@ -29,12 +29,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
index a17daacc..dff34191 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
@@ -29,12 +29,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesreload.rst
index 13109e7a..cc766c54 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesreload.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesreload.rst
@@ -28,12 +28,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesstart.rst
index 70a0670a..05a6d684 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesstart.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesstart.rst
@@ -28,12 +28,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesstop.rst
index 393b313f..52a283b2 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesstop.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesstop.rst
@@ -28,12 +28,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst
index ccb44300..486b2a29 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst
@@ -28,12 +28,16 @@ Output
     <tr><td>console</td>                    <td> </td>                     <td>['integer', 'null']</td>                     <td>Console TCP port</td>                     </tr>
     <tr><td>console_host</td>                    <td> </td>                     <td>string</td>                     <td>Console host</td>                     </tr>
     <tr><td>console_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: serial, vnc, telnet, null</td>                     </tr>
+    <tr><td>first_port_name</td>                    <td> </td>                     <td>['string', 'null']</td>                     <td>Name of the first port</td>                     </tr>
     <tr><td>height</td>                    <td> </td>                     <td>integer</td>                     <td>Height of the node (Read only)</td>                     </tr>
     <tr><td>label</td>                    <td> </td>                     <td>object</td>                     <td></td>                     </tr>
     <tr><td>name</td>                    <td> </td>                     <td>string</td>                     <td>Node name</td>                     </tr>
     <tr><td>node_directory</td>                    <td> </td>                     <td>['null', 'string']</td>                     <td>Working directory of the node. Read only</td>                     </tr>
     <tr><td>node_id</td>                    <td> </td>                     <td>string</td>                     <td>Node UUID</td>                     </tr>
     <tr><td>node_type</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: cloud, nat, ethernet_hub, ethernet_switch, frame_relay_switch, atm_switch, docker, dynamips, vpcs, virtualbox, vmware, iou, qemu</td>                     </tr>
+    <tr><td>port_name_format</td>                    <td> </td>                     <td>string</td>                     <td>Formating for port name {0} will be replace by port number</td>                     </tr>
+    <tr><td>port_segment_size</td>                    <td> </td>                     <td>integer</td>                     <td>Size of the port segment</td>                     </tr>
+    <tr><td>ports</td>                    <td> </td>                     <td>array</td>                     <td>List of node ports READ only</td>                     </tr>
     <tr><td>project_id</td>                    <td> </td>                     <td>string</td>                     <td>Project UUID</td>                     </tr>
     <tr><td>properties</td>                    <td> </td>                     <td>object</td>                     <td>Properties specific to an emulator</td>                     </tr>
     <tr><td>status</td>                    <td> </td>                     <td>enum</td>                     <td>Possible values: stopped, started, suspended</td>                     </tr>
diff --git a/docs/gns3_file.json b/docs/gns3_file.json
index 5066371c..9ebd3208 100644
--- a/docs/gns3_file.json
+++ b/docs/gns3_file.json
@@ -1,211 +1,133 @@
 {
+    "required": [
+        "project_id",
+        "type",
+        "revision",
+        "version",
+        "name",
+        "topology"
+    ],
+    "additionalProperties": false,
+    "description": "The topology",
     "type": "object",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "The topology",
     "properties": {
-        "version": {
-            "description": "Version of the GNS3 software which have update the file for the last time",
+        "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"
         },
-        "project_id": {
-            "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}$",
-            "description": "Project UUID",
-            "type": "string",
-            "minLength": 36,
-            "maxLength": 36
-        },
-        "auto_start": {
-            "description": "Start the topology when opened",
-            "type": "boolean"
-        },
         "topology": {
-            "description": "The topology content",
-            "type": "object",
+            "required": [
+                "nodes",
+                "links",
+                "drawings",
+                "computes"
+            ],
             "properties": {
                 "drawings": {
-                    "description": "Drawings elements",
-                    "type": "array",
                     "items": {
                         "$schema": "http://json-schema.org/draft-04/schema#",
-                        "description": "An drawing object",
-                        "type": "object",
                         "properties": {
                             "rotation": {
-                                "minimum": 0,
+                                "maximum": 360,
+                                "minimum": -359,
                                 "description": "Rotation of the element",
-                                "type": "integer",
-                                "maximum": 360
-                            },
-                            "y": {
-                                "description": "Y property",
-                                "type": "integer"
-                            },
-                            "z": {
-                                "description": "Z property",
                                 "type": "integer"
                             },
                             "drawing_id": {
+                                "maxLength": 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}$",
                                 "description": "Drawing UUID",
                                 "type": "string",
-                                "minLength": 36,
-                                "maxLength": 36
-                            },
-                            "x": {
-                                "description": "X property",
-                                "type": "integer"
+                                "minLength": 36
                             },
                             "project_id": {
+                                "maxLength": 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}$",
                                 "description": "Project UUID",
                                 "type": "string",
-                                "minLength": 36,
-                                "maxLength": 36
+                                "minLength": 36
+                            },
+                            "x": {
+                                "description": "X property",
+                                "type": "integer"
+                            },
+                            "z": {
+                                "description": "Z property",
+                                "type": "integer"
                             },
                             "svg": {
                                 "description": "SVG content of the drawing",
                                 "type": "string"
+                            },
+                            "y": {
+                                "description": "Y property",
+                                "type": "integer"
                             }
                         },
-                        "additionalProperties": false
-                    }
+                        "additionalProperties": false,
+                        "description": "An drawing object",
+                        "type": "object"
+                    },
+                    "description": "Drawings elements",
+                    "type": "array"
                 },
-                "links": {
-                    "description": "Link elements",
-                    "type": "array",
+                "computes": {
                     "items": {
+                        "required": [
+                            "compute_id",
+                            "protocol",
+                            "host",
+                            "port",
+                            "name"
+                        ],
+                        "additionalProperties": false,
+                        "description": "Request validation to a GNS3 compute object instance",
                         "type": "object",
                         "$schema": "http://json-schema.org/draft-04/schema#",
-                        "description": "A link object",
                         "properties": {
-                            "link_id": {
-                                "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}$",
-                                "description": "Link UUID",
-                                "type": "string",
-                                "minLength": 36,
-                                "maxLength": 36
+                            "name": {
+                                "description": "Server name",
+                                "type": "string"
                             },
-                            "capture_file_path": {
-                                "description": "Read only property. The full path of the capture file if capture is running",
+                            "cpu_usage_percent": {
+                                "maximum": 100,
+                                "description": "CPU usage of the compute. Read only",
                                 "type": [
-                                    "string",
+                                    "number",
                                     "null"
-                                ]
-                            },
-                            "project_id": {
-                                "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}$",
-                                "description": "Project UUID",
-                                "type": "string",
-                                "minLength": 36,
-                                "maxLength": 36
+                                ],
+                                "minimum": 0
                             },
-                            "nodes": {
-                                "description": "List of the VMS",
-                                "type": "array",
-                                "items": {
-                                    "properties": {
-                                        "node_id": {
-                                            "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}$",
-                                            "description": "Node UUID",
-                                            "type": "string",
-                                            "minLength": 36,
-                                            "maxLength": 36
-                                        },
-                                        "label": {
-                                            "properties": {
-                                                "style": {
-                                                    "description": "SVG style attribute",
-                                                    "type": "string"
-                                                },
-                                                "y": {
-                                                    "description": "Relative Y position of the label",
-                                                    "type": "integer"
-                                                },
-                                                "text": {
-                                                    "type": "string"
-                                                },
-                                                "rotation": {
-                                                    "description": "Rotation of the label",
-                                                    "type": "integer"
-                                                },
-                                                "x": {
-                                                    "description": "Relative X position of the label. If null center it",
-                                                    "type": [
-                                                        "integer",
-                                                        "null"
-                                                    ]
-                                                }
-                                            },
-                                            "type": "object",
-                                            "required": [
-                                                "text",
-                                                "x",
-                                                "y"
-                                            ],
-                                            "additionalProperties": false
-                                        },
-                                        "adapter_number": {
-                                            "description": "Adapter number",
-                                            "type": "integer"
-                                        },
-                                        "port_number": {
-                                            "description": "Port number",
-                                            "type": "integer"
-                                        }
-                                    },
-                                    "type": "object",
-                                    "required": [
-                                        "node_id",
-                                        "adapter_number",
-                                        "port_number"
-                                    ],
-                                    "additionalProperties": false
-                                }
+                            "connected": {
+                                "description": "Whether the controller is connected to the compute server or not",
+                                "type": "boolean"
                             },
-                            "capture_file_name": {
-                                "description": "Read only property. The name of the capture file if capture is running",
+                            "memory_usage_percent": {
+                                "maximum": 100,
+                                "description": "RAM usage of the compute. Read only",
                                 "type": [
-                                    "string",
+                                    "number",
                                     "null"
-                                ]
+                                ],
+                                "minimum": 0
                             },
-                            "capturing": {
-                                "description": "Read only property. True if a capture running on the link",
-                                "type": "boolean"
-                            }
-                        },
-                        "required": [
-                            "nodes"
-                        ],
-                        "additionalProperties": false
-                    }
-                },
-                "computes": {
-                    "description": "Computes servers",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "$schema": "http://json-schema.org/draft-04/schema#",
-                        "description": "Request validation to a GNS3 compute object instance",
-                        "properties": {
                             "capabilities": {
+                                "required": [
+                                    "version",
+                                    "node_types"
+                                ],
+                                "additionalProperties": false,
+                                "description": "Get what a server support",
                                 "type": "object",
                                 "$schema": "http://json-schema.org/draft-04/schema#",
-                                "description": "Get what a server support",
                                 "properties": {
                                     "node_types": {
                                         "items": {
-                                            "description": "Type of node",
                                             "enum": [
                                                 "cloud",
                                                 "nat",
@@ -220,7 +142,8 @@
                                                 "vmware",
                                                 "iou",
                                                 "qemu"
-                                            ]
+                                            ],
+                                            "description": "Type of node"
                                         },
                                         "type": "array"
                                     },
@@ -231,47 +154,16 @@
                                             "null"
                                         ]
                                     }
-                                },
-                                "required": [
-                                    "version",
-                                    "node_types"
-                                ],
-                                "additionalProperties": false
+                                }
                             },
-                            "port": {
-                                "description": "Server port",
-                                "type": "integer"
+                            "compute_id": {
+                                "description": "Server identifier",
+                                "type": "string"
                             },
                             "host": {
                                 "description": "Server host",
                                 "type": "string"
                             },
-                            "connected": {
-                                "description": "Whether the controller is connected to the compute server or not",
-                                "type": "boolean"
-                            },
-                            "memory_usage_percent": {
-                                "minimum": 0,
-                                "description": "RAM usage of the compute. Read only",
-                                "type": [
-                                    "number",
-                                    "null"
-                                ],
-                                "maximum": 100
-                            },
-                            "cpu_usage_percent": {
-                                "minimum": 0,
-                                "description": "CPU usage of the compute. Read only",
-                                "type": [
-                                    "number",
-                                    "null"
-                                ],
-                                "maximum": 100
-                            },
-                            "compute_id": {
-                                "description": "Server identifier",
-                                "type": "string"
-                            },
                             "user": {
                                 "description": "User for authentication",
                                 "type": [
@@ -280,125 +172,167 @@
                                 ]
                             },
                             "protocol": {
-                                "description": "Server protocol",
                                 "enum": [
                                     "http",
                                     "https"
-                                ]
+                                ],
+                                "description": "Server protocol"
                             },
-                            "name": {
-                                "description": "Server name",
-                                "type": "string"
+                            "port": {
+                                "description": "Server port",
+                                "type": "integer"
                             }
-                        },
-                        "required": [
-                            "compute_id",
-                            "protocol",
-                            "host",
-                            "port",
-                            "name"
-                        ],
-                        "additionalProperties": false
-                    }
+                        }
+                    },
+                    "description": "Computes servers",
+                    "type": "array"
                 },
-                "nodes": {
-                    "description": "Nodes elements",
-                    "type": "array",
+                "links": {
                     "items": {
+                        "required": [
+                            "nodes"
+                        ],
+                        "additionalProperties": false,
+                        "description": "A link object",
                         "type": "object",
                         "$schema": "http://json-schema.org/draft-04/schema#",
-                        "description": "A node object",
                         "properties": {
-                            "node_type": {
-                                "description": "Type of node",
-                                "enum": [
-                                    "cloud",
-                                    "nat",
-                                    "ethernet_hub",
-                                    "ethernet_switch",
-                                    "frame_relay_switch",
-                                    "atm_switch",
-                                    "docker",
-                                    "dynamips",
-                                    "vpcs",
-                                    "virtualbox",
-                                    "vmware",
-                                    "iou",
-                                    "qemu"
-                                ]
+                            "nodes": {
+                                "items": {
+                                    "required": [
+                                        "node_id",
+                                        "adapter_number",
+                                        "port_number"
+                                    ],
+                                    "properties": {
+                                        "node_id": {
+                                            "maxLength": 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}$",
+                                            "description": "Node UUID",
+                                            "type": "string",
+                                            "minLength": 36
+                                        },
+                                        "label": {
+                                            "required": [
+                                                "text",
+                                                "x",
+                                                "y"
+                                            ],
+                                            "properties": {
+                                                "rotation": {
+                                                    "maximum": 360,
+                                                    "minimum": -359,
+                                                    "description": "Rotation of the label",
+                                                    "type": "integer"
+                                                },
+                                                "style": {
+                                                    "description": "SVG style attribute",
+                                                    "type": "string"
+                                                },
+                                                "text": {
+                                                    "type": "string"
+                                                },
+                                                "y": {
+                                                    "description": "Relative Y position of the label",
+                                                    "type": "integer"
+                                                },
+                                                "x": {
+                                                    "description": "Relative X position of the label. If null center it",
+                                                    "type": [
+                                                        "integer",
+                                                        "null"
+                                                    ]
+                                                }
+                                            },
+                                            "additionalProperties": false,
+                                            "type": "object"
+                                        },
+                                        "adapter_number": {
+                                            "description": "Adapter number",
+                                            "type": "integer"
+                                        },
+                                        "port_number": {
+                                            "description": "Port number",
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "additionalProperties": false,
+                                    "type": "object"
+                                },
+                                "description": "List of the VMS",
+                                "type": "array"
                             },
-                            "status": {
-                                "description": "Status of the node",
-                                "enum": [
-                                    "stopped",
-                                    "started",
-                                    "suspended"
+                            "capture_file_path": {
+                                "description": "Read only property. The full path of the capture file if capture is running",
+                                "type": [
+                                    "string",
+                                    "null"
                                 ]
                             },
-                            "x": {
-                                "description": "X position of the node",
-                                "type": "integer"
-                            },
-                            "width": {
-                                "description": "Width of the node (Read only)",
-                                "type": "integer"
-                            },
-                            "node_id": {
+                            "project_id": {
+                                "maxLength": 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}$",
-                                "description": "Node UUID",
+                                "description": "Project UUID",
                                 "type": "string",
-                                "minLength": 36,
-                                "maxLength": 36
-                            },
-                            "properties": {
-                                "description": "Properties specific to an emulator",
-                                "type": "object"
+                                "minLength": 36
                             },
-                            "compute_id": {
-                                "description": "Compute identifier",
-                                "type": "string"
+                            "capturing": {
+                                "description": "Read only property. True if a capture running on the link",
+                                "type": "boolean"
                             },
-                            "y": {
-                                "description": "Y position of the node",
-                                "type": "integer"
+                            "link_id": {
+                                "maxLength": 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}$",
+                                "description": "Link UUID",
+                                "type": "string",
+                                "minLength": 36
                             },
-                            "node_directory": {
-                                "description": "Working directory of the node. Read only",
+                            "capture_file_name": {
+                                "description": "Read only property. The name of the capture file if capture is running",
                                 "type": [
-                                    "null",
-                                    "string"
+                                    "string",
+                                    "null"
                                 ]
-                            },
+                            }
+                        }
+                    },
+                    "description": "Link elements",
+                    "type": "array"
+                },
+                "nodes": {
+                    "items": {
+                        "additionalProperties": false,
+                        "description": "A node object",
+                        "type": "object",
+                        "$schema": "http://json-schema.org/draft-04/schema#",
+                        "properties": {
                             "name": {
                                 "description": "Node name",
                                 "type": "string",
                                 "minLength": 1
                             },
-                            "symbol": {
-                                "description": "Symbol of the node",
-                                "type": "string",
-                                "minLength": 1
-                            },
-                            "console_host": {
-                                "description": "Console host",
-                                "type": "string",
-                                "minLength": 1
-                            },
                             "label": {
+                                "required": [
+                                    "text",
+                                    "x",
+                                    "y"
+                                ],
                                 "properties": {
+                                    "rotation": {
+                                        "maximum": 360,
+                                        "minimum": -359,
+                                        "description": "Rotation of the label",
+                                        "type": "integer"
+                                    },
                                     "style": {
                                         "description": "SVG style attribute",
                                         "type": "string"
                                     },
-                                    "y": {
-                                        "description": "Relative Y position of the label",
-                                        "type": "integer"
-                                    },
                                     "text": {
                                         "type": "string"
                                     },
-                                    "rotation": {
-                                        "description": "Rotation of the label",
+                                    "y": {
+                                        "description": "Relative Y position of the label",
                                         "type": "integer"
                                     },
                                     "x": {
@@ -409,32 +343,26 @@
                                         ]
                                     }
                                 },
-                                "type": "object",
-                                "required": [
-                                    "text",
-                                    "x",
-                                    "y"
-                                ],
-                                "additionalProperties": false
+                                "additionalProperties": false,
+                                "type": "object"
                             },
-                            "console_type": {
-                                "description": "Console type",
-                                "enum": [
-                                    "serial",
-                                    "vnc",
-                                    "telnet",
-                                    null
-                                ]
+                            "height": {
+                                "description": "Height of the node (Read only)",
+                                "type": "integer"
                             },
                             "project_id": {
+                                "maxLength": 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}$",
                                 "description": "Project UUID",
                                 "type": "string",
-                                "minLength": 36,
-                                "maxLength": 36
+                                "minLength": 36
                             },
-                            "z": {
-                                "description": "Z position of the node",
+                            "compute_id": {
+                                "description": "Compute identifier",
+                                "type": "string"
+                            },
+                            "x": {
+                                "description": "X position of the node",
                                 "type": "integer"
                             },
                             "command_line": {
@@ -444,31 +372,167 @@
                                     "string"
                                 ]
                             },
-                            "height": {
-                                "description": "Height of the node (Read only)",
-                                "type": "integer"
+                            "console_host": {
+                                "description": "Console host",
+                                "type": "string",
+                                "minLength": 1
                             },
                             "console": {
+                                "maximum": 65535,
                                 "minimum": 1,
                                 "description": "Console TCP port",
                                 "type": [
                                     "integer",
                                     "null"
+                                ]
+                            },
+                            "symbol": {
+                                "description": "Symbol of the node",
+                                "type": "string",
+                                "minLength": 1
+                            },
+                            "node_directory": {
+                                "description": "Working directory of the node. Read only",
+                                "type": [
+                                    "null",
+                                    "string"
+                                ]
+                            },
+                            "port_name_format": {
+                                "description": "Formating for port name {0} will be replace by port number",
+                                "type": "string"
+                            },
+                            "first_port_name": {
+                                "description": "Name of the first port",
+                                "type": [
+                                    "string",
+                                    "null"
+                                ]
+                            },
+                            "node_type": {
+                                "enum": [
+                                    "cloud",
+                                    "nat",
+                                    "ethernet_hub",
+                                    "ethernet_switch",
+                                    "frame_relay_switch",
+                                    "atm_switch",
+                                    "docker",
+                                    "dynamips",
+                                    "vpcs",
+                                    "virtualbox",
+                                    "vmware",
+                                    "iou",
+                                    "qemu"
+                                ],
+                                "description": "Type of node"
+                            },
+                            "width": {
+                                "description": "Width of the node (Read only)",
+                                "type": "integer"
+                            },
+                            "ports": {
+                                "items": {
+                                    "properties": {
+                                        "name": {
+                                            "description": "Port name",
+                                            "type": "string"
+                                        },
+                                        "data_link_types": {
+                                            "properties": {},
+                                            "description": "Available PCAP type for capture",
+                                            "type": "object"
+                                        },
+                                        "link_type": {
+                                            "enum": [
+                                                "ethernet",
+                                                "serial"
+                                            ],
+                                            "description": "Type of link"
+                                        },
+                                        "short_name": {
+                                            "description": "Short version of port name",
+                                            "type": "string"
+                                        },
+                                        "port_number": {
+                                            "description": "Port slot",
+                                            "type": "integer"
+                                        },
+                                        "adapter_number": {
+                                            "description": "Adapter slot",
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "additionalProperties": false,
+                                    "description": "A node port",
+                                    "type": "object"
+                                },
+                                "description": "List of node ports READ only",
+                                "type": "array"
+                            },
+                            "port_segment_size": {
+                                "minimum": 0,
+                                "description": "Size of the port segment",
+                                "type": "integer"
+                            },
+                            "status": {
+                                "enum": [
+                                    "stopped",
+                                    "started",
+                                    "suspended"
                                 ],
-                                "maximum": 65535
+                                "description": "Status of the node"
+                            },
+                            "y": {
+                                "description": "Y position of the node",
+                                "type": "integer"
+                            },
+                            "properties": {
+                                "description": "Properties specific to an emulator",
+                                "type": "object"
+                            },
+                            "node_id": {
+                                "maxLength": 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}$",
+                                "description": "Node UUID",
+                                "type": "string",
+                                "minLength": 36
+                            },
+                            "z": {
+                                "description": "Z position of the node",
+                                "type": "integer"
+                            },
+                            "console_type": {
+                                "enum": [
+                                    "serial",
+                                    "vnc",
+                                    "telnet",
+                                    null
+                                ],
+                                "description": "Console type"
                             }
-                        },
-                        "additionalProperties": false
-                    }
+                        }
+                    },
+                    "description": "Nodes elements",
+                    "type": "array"
                 }
             },
-            "required": [
-                "nodes",
-                "links",
-                "drawings",
-                "computes"
+            "additionalProperties": false,
+            "description": "The topology content",
+            "type": "object"
+        },
+        "project_id": {
+            "maxLength": 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}$",
+            "description": "Project UUID",
+            "type": "string",
+            "minLength": 36
+        },
+        "type": {
+            "enum": [
+                "topology"
             ],
-            "additionalProperties": false
+            "description": "Type of file. It's always topology"
         },
         "auto_open": {
             "description": "Open the topology with GNS3",
@@ -478,18 +542,13 @@
             "description": "Close the topology when no client is connected",
             "type": "boolean"
         },
-        "name": {
-            "description": "Name of the project",
+        "version": {
+            "description": "Version of the GNS3 software which have update the file for the last time",
             "type": "string"
+        },
+        "auto_start": {
+            "description": "Start the topology when opened",
+            "type": "boolean"
         }
-    },
-    "required": [
-        "project_id",
-        "type",
-        "revision",
-        "version",
-        "name",
-        "topology"
-    ],
-    "additionalProperties": false
+    }
 }
\ No newline at end of file