",
- "console_type": null,
- "first_port_name": null,
- "height": 59,
- "label": {
- "rotation": 0,
- "style": "font-size: 10;font-familly: Verdana",
- "text": "test",
- "x": null,
- "y": -40
- },
- "name": "test",
- "node_directory": null,
- "node_id": "193fec66-6bf5-4a7c-85a3-952952a4e956",
- "node_type": "vpcs",
- "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": "47cfbe19-809c-4e83-b3f4-2e11edbb04cc",
- "properties": {},
- "status": "stopped",
- "symbol": ":/symbols/computer.svg",
- "width": 65,
- "x": 0,
- "y": 0,
- "z": 0
-}
diff --git a/docs/api/notifications/compute.created.json b/docs/api/notifications/compute.created.json
deleted file mode 100644
index 48759ae3..00000000
--- a/docs/api/notifications/compute.created.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "capabilities": {
- "node_types": [],
- "version": null
- },
- "compute_id": "my_compute",
- "connected": false,
- "cpu_usage_percent": null,
- "host": "localhost",
- "memory_usage_percent": null,
- "name": "http://julien@localhost:84",
- "port": 84,
- "protocol": "http",
- "user": "julien"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/compute.deleted.json b/docs/api/notifications/compute.deleted.json
deleted file mode 100644
index 2c489ad4..00000000
--- a/docs/api/notifications/compute.deleted.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "capabilities": {
- "node_types": [],
- "version": null
- },
- "compute_id": "my_compute_id",
- "connected": false,
- "cpu_usage_percent": null,
- "host": "localhost",
- "memory_usage_percent": null,
- "name": "http://julien@localhost:84",
- "port": 84,
- "protocol": "http",
- "user": "julien"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/compute.updated.json b/docs/api/notifications/compute.updated.json
deleted file mode 100644
index 75d786f7..00000000
--- a/docs/api/notifications/compute.updated.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "capabilities": {
- "node_types": [],
- "version": null
- },
- "compute_id": "my_compute_id",
- "connected": false,
- "cpu_usage_percent": null,
- "host": "localhost",
- "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
deleted file mode 100644
index dca468f8..00000000
--- a/docs/api/notifications/drawing.created.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "drawing_id": "f0d4d443-3a0e-4319-897b-b58d87668092",
- "project_id": "b46d5053-9683-4b4b-ae08-d67fdd8016a3",
- "rotation": 0,
- "svg": "",
- "x": 10,
- "y": 20,
- "z": 0
-}
\ No newline at end of file
diff --git a/docs/api/notifications/drawing.deleted.json b/docs/api/notifications/drawing.deleted.json
deleted file mode 100644
index 77015b15..00000000
--- a/docs/api/notifications/drawing.deleted.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "drawing_id": "59f70a89-21a8-4e7f-a3d4-a9c559c73f58",
- "project_id": "dae36643-b4b9-489d-b4c1-0d6bf8c6a079",
- "rotation": 0,
- "svg": "",
- "x": 0,
- "y": 0,
- "z": 0
-}
\ No newline at end of file
diff --git a/docs/api/notifications/drawing.updated.json b/docs/api/notifications/drawing.updated.json
deleted file mode 100644
index edac7590..00000000
--- a/docs/api/notifications/drawing.updated.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "drawing_id": "7c43091b-742f-4f8f-b6d8-b9025ac4d627",
- "project_id": "7e9159b4-b024-4beb-adc2-b62bbe350870",
- "rotation": 0,
- "x": 42,
- "y": 20,
- "z": 0
-}
\ No newline at end of file
diff --git a/docs/api/notifications/ignore.json b/docs/api/notifications/ignore.json
deleted file mode 100644
index 9bf8f5c3..00000000
--- a/docs/api/notifications/ignore.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "project_id": 42
-}
\ No newline at end of file
diff --git a/docs/api/notifications/link.created.json b/docs/api/notifications/link.created.json
deleted file mode 100644
index bc5cb9b4..00000000
--- a/docs/api/notifications/link.created.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "capture_file_name": null,
- "capture_file_path": null,
- "capturing": false,
- "link_id": "398c9cb0-724e-4d56-a9b5-2b33831c8c39",
- "link_type": "ethernet",
- "nodes": [
- {
- "adapter_number": 0,
- "label": {
- "rotation": 0,
- "style": "font-size: 10; font-style: Verdana",
- "text": "0/3",
- "x": -10,
- "y": -10
- },
- "node_id": "f931da2a-abe7-4e8b-8b40-385fa091cb4d",
- "port_number": 3
- },
- {
- "adapter_number": 2,
- "label": {
- "rotation": 0,
- "style": "font-size: 10; font-style: Verdana",
- "text": "2/4",
- "x": -10,
- "y": -10
- },
- "node_id": "3fcc232f-a6df-422c-800a-39ca356661d5",
- "port_number": 4
- }
- ],
- "project_id": "ca14de30-087a-4994-bb54-b2b00e18d1ef"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/link.deleted.json b/docs/api/notifications/link.deleted.json
deleted file mode 100644
index 70678a54..00000000
--- a/docs/api/notifications/link.deleted.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "capture_file_name": null,
- "capture_file_path": null,
- "capturing": false,
- "link_id": "8975791d-acea-404c-9c4f-afc9cb74f08c",
- "link_type": "ethernet",
- "nodes": [],
- "project_id": "90d544c0-ecc1-43c4-9daf-f349a7fbc647"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/link.updated.json b/docs/api/notifications/link.updated.json
deleted file mode 100644
index 0da41ad6..00000000
--- a/docs/api/notifications/link.updated.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "capture_file_name": null,
- "capture_file_path": null,
- "capturing": false,
- "link_id": "65559a20-c765-457c-a5a8-d7d888a463b4",
- "link_type": "ethernet",
- "nodes": [
- {
- "adapter_number": 0,
- "label": {
- "text": "Hello",
- "x": 64,
- "y": 0
- },
- "node_id": "a6d134f5-be5e-4c5b-aabc-cfa27082e8ce",
- "port_number": 3
- },
- {
- "adapter_number": 2,
- "label": {
- "rotation": 0,
- "style": "font-size: 10; font-style: Verdana",
- "text": "2/4",
- "x": -10,
- "y": -10
- },
- "node_id": "dd3133ce-2a62-4f2e-9304-8d5fb3e5a972",
- "port_number": 4
- }
- ],
- "project_id": "a278f1ce-4fd4-4161-ab9c-db7e6cc8ad1c"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/log.error.json b/docs/api/notifications/log.error.json
deleted file mode 100644
index aaf314d7..00000000
--- a/docs/api/notifications/log.error.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "message": "Permission denied on /tmp"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/log.info.json b/docs/api/notifications/log.info.json
deleted file mode 100644
index f77299a5..00000000
--- a/docs/api/notifications/log.info.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "message": "Image uploaded"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/log.warning.json b/docs/api/notifications/log.warning.json
deleted file mode 100644
index 5d630354..00000000
--- a/docs/api/notifications/log.warning.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "message": "Warning ASA 8 is not officialy supported by GNS3"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/node.created.json b/docs/api/notifications/node.created.json
deleted file mode 100644
index e24038fa..00000000
--- a/docs/api/notifications/node.created.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "a": "b"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/node.updated.json b/docs/api/notifications/node.updated.json
deleted file mode 100644
index fcb8b6ea..00000000
--- a/docs/api/notifications/node.updated.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "command_line": "",
- "compute_id": "local",
- "console": 5002,
- "console_host": "localhost",
- "console_type": "telnet",
- "first_port_name": null,
- "height": 59,
- "label": {
- "rotation": 0,
- "style": "font-family: TypeWriter;font-size: 10;font-weight: bold;fill: #000000;fill-opacity: 1.0;",
- "text": "PC2",
- "x": 18,
- "y": -25
- },
- "name": "PC2",
- "node_directory": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-105/test_open0/project-files/vpcs/748bcd89-624a-40eb-a8d3-1d2e85c99b51",
- "node_id": "748bcd89-624a-40eb-a8d3-1d2e85c99b51",
- "node_type": "vpcs",
- "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_script": "",
- "startup_script_path": "startup.vpc"
- },
- "status": "stopped",
- "symbol": ":/symbols/computer.svg",
- "width": 65,
- "x": -71,
- "y": -98,
- "z": 1
-}
\ No newline at end of file
diff --git a/docs/api/notifications/ping.json b/docs/api/notifications/ping.json
deleted file mode 100644
index 4df2d436..00000000
--- a/docs/api/notifications/ping.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "compute_id": 12
-}
\ No newline at end of file
diff --git a/docs/api/notifications/project.closed.json b/docs/api/notifications/project.closed.json
deleted file mode 100644
index f9d8122a..00000000
--- a/docs/api/notifications/project.closed.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "auto_close": true,
- "auto_open": false,
- "auto_start": false,
- "filename": "test.gns3",
- "name": "test",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3li3k94u/projects/d5adb1de-f412-4b25-8626-5c4c51e18dda",
- "project_id": "d5adb1de-f412-4b25-8626-5c4c51e18dda",
- "scene_height": 1000,
- "scene_width": 2000,
- "status": "closed"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/project.updated.json b/docs/api/notifications/project.updated.json
deleted file mode 100644
index b00fd398..00000000
--- a/docs/api/notifications/project.updated.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "auto_close": true,
- "auto_open": false,
- "auto_start": false,
- "filename": "test.gns3",
- "name": "test2",
- "path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpqs4mvhu8/projects/10010203-0405-0607-0809-0a0b0c0d0e0f",
- "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f",
- "scene_height": 1000,
- "scene_width": 2000,
- "status": "opened"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/settings.updated.json b/docs/api/notifications/settings.updated.json
deleted file mode 100644
index 69fbf10a..00000000
--- a/docs/api/notifications/settings.updated.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "test": true
-}
\ No newline at end of file
diff --git a/docs/api/notifications/snapshot.restored.json b/docs/api/notifications/snapshot.restored.json
deleted file mode 100644
index 6a28f3bb..00000000
--- a/docs/api/notifications/snapshot.restored.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "created_at": 1478193604,
- "name": "test",
- "project_id": "8ebb5d97-6716-4b68-bbac-db60e91afcd5",
- "snapshot_id": "c11d2478-3e60-4708-9ac7-4a90532e62c4"
-}
\ No newline at end of file
diff --git a/docs/api/notifications/test.json b/docs/api/notifications/test.json
deleted file mode 100644
index 9e26dfee..00000000
--- a/docs/api/notifications/test.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ 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 f48f895f..16feb6f9 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmrelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on an ATM switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodes.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodes.rst
index 901f086f..02ff16fd 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodes.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
index 740fc5be..b9f44b22 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an ATM switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -38,8 +38,8 @@ Update an ATM switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -81,12 +81,12 @@ Delete an ATM switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index ad356b8e..cfda08c3 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,15 +9,15 @@ Add a NIO to an ATM switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
@@ -27,14 +27,14 @@ Remove a NIO from an ATM switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 6f1e5fe5..57ad186f 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on an ATM switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
index 121048b4..e52cccb8 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start an ATM switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
index 97de81c8..a7a9d18b 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop an ATM switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
index d893d4d8..5dfe016d 100644
--- a/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/atm_switch/projectsprojectidatmswitchnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend an ATM Relay switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/capabilities/capabilities.rst b/docs/api/v2/compute/capabilities/capabilities.rst
index 7c6f7fcc..d0685663 100644
--- a/docs/api/v2/compute/capabilities/capabilities.rst
+++ b/docs/api/v2/compute/capabilities/capabilities.rst
@@ -22,9 +22,3 @@ Output
version | ✔ | ['string', 'null'] | Version number |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_capabilities.txt
-
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
index 0fac182f..c9a5338e 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -54,15 +54,10 @@ Output
Name | Mandatory | Type | Description |
interfaces | | array | |
name | | string | Cloud name |
+ node_directory | | string | Path to the VM working directory |
node_id | | string | Node UUID |
ports_mapping | | array | |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidcloudnodes.txt
-
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
index f045cd13..ec97be6e 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a cloud instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -26,18 +26,13 @@ Output
Name | Mandatory | Type | Description |
interfaces | | array | |
name | | string | Cloud name |
+ node_directory | | string | Path to the VM working directory |
node_id | | string | Node UUID |
ports_mapping | | array | |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectidcloudnodesnodeid.txt
-
PUT /v2/compute/projects/**{project_id}**/cloud/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -45,8 +40,8 @@ Update a cloud instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -80,6 +75,7 @@ Body
Name | Mandatory | Type | Description |
interfaces | | array | |
name | | string | Cloud name |
+ node_directory | | string | Path to the VM working directory |
node_id | | string | Node UUID |
ports_mapping | | array | |
project_id | | string | Project UUID |
@@ -94,18 +90,13 @@ Output
Name | Mandatory | Type | Description |
interfaces | | array | |
name | | string | Cloud name |
+ node_directory | | string | Path to the VM working directory |
node_id | | string | Node UUID |
ports_mapping | | array | |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectidcloudnodesnodeid.txt
-
DELETE /v2/compute/projects/**{project_id}**/cloud/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -113,18 +104,12 @@ Delete a cloud instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidcloudnodesnodeid.txt
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 355ad180..693ea808 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a cloud instance
Parameters
**********
-- **adapter_number**: Adapter on the cloud (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the cloud (always 0)
- **port_number**: Port on the cloud
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/cloud/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a cloud instance
Parameters
**********
-- **adapter_number**: Adapter on the cloud (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the cloud (always 0)
- **port_number**: Port on the cloud
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 296939b2..869e3ff4 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a cloud instance
Parameters
**********
-- **adapter_number**: Adapter on the cloud (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the cloud (always 0)
- **port_number**: Port on the cloud
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index cc5656ec..e4059ca5 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a cloud instance
Parameters
**********
-- **adapter_number**: Adapter on the cloud (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the cloud (always 0)
- **port_number**: Port on the cloud
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
index 7332ec76..c57ec5e6 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start a cloud
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
index 6a1070a7..90168769 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop a cloud
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
index 28c5de49..2452d545 100644
--- a/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/cloud/projectsprojectidcloudnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend a cloud
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodes.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodes.rst
index d80ac2e2..74fbb78c 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodes.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
index 0828a3c9..4de9efa8 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeid.rst
@@ -9,14 +9,14 @@ Delete a Docker container
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
PUT /v2/compute/projects/**{project_id}**/docker/nodes/**{node_id}**
@@ -25,8 +25,8 @@ Update a Docker instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -83,9 +83,3 @@ Output
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectiddockernodesnodeid.txt
-
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 5e67e473..9728e7c2 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a Docker container
Parameters
**********
-- **adapter_number**: Adapter where the nio should be added
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/docker/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a Docker container
Parameters
**********
-- **adapter_number**: Adapter where the nio should be added
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 91eddb80..b224ea50 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a Docker container instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter
Response status codes
@@ -28,12 +28,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
-
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 0306dbce..4cc91dd6 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,21 +9,15 @@ Stop a packet capture on a Docker container instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
- **409**: Container not started
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectiddockernodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
-
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
index 62ea8357..89a92fa4 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidpause.rst
@@ -9,12 +9,12 @@ Pause a Docker container
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance paused
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance paused
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
index 12b5d9e1..8f6e006b 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidreload.rst
@@ -9,12 +9,12 @@ Restart a Docker container
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance restarted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance restarted
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
index 073462cb..0f0a3cc6 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start a Docker container
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
index 88ca6b9a..65e9d5d4 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop a Docker container
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
index 327ed120..37e97c15 100644
--- a/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
+++ b/docs/api/v2/compute/docker/projectsprojectiddockernodesnodeidunpause.rst
@@ -9,12 +9,12 @@ Unpause a Docker container
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance unpaused
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance unpaused
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst
index 3aa37114..20ef3a94 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -94,7 +94,7 @@ Output
midplane | | enum | Possible values: std, vxr |
mmap | | boolean | MMAP feature |
name | ✔ | string | Dynamips VM instance name |
- node_directory | | string | |
+ node_directory | | string | Path to the vm working directory |
node_id | ✔ | string | Node UUID |
npe | | enum | Possible values: npe-100, npe-150, npe-175, npe-200, npe-225, npe-300, npe-400, npe-g2 |
nvram | | integer | Amount of NVRAM in KB |
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
index 4a111b55..72cd15e5 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -44,7 +44,7 @@ Output
midplane | | enum | Possible values: std, vxr |
mmap | | boolean | MMAP feature |
name | ✔ | string | Dynamips VM instance name |
- node_directory | | string | |
+ node_directory | | string | Path to the vm working directory |
node_id | ✔ | string | Node UUID |
npe | | enum | Possible values: npe-100, npe-150, npe-175, npe-200, npe-225, npe-300, npe-400, npe-g2 |
nvram | | integer | Amount of NVRAM in KB |
@@ -79,8 +79,8 @@ Update a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -165,7 +165,7 @@ Output
midplane | | enum | Possible values: std, vxr |
mmap | | boolean | MMAP feature |
name | ✔ | string | Dynamips VM instance name |
- node_directory | | string | |
+ node_directory | | string | Path to the vm working directory |
node_id | ✔ | string | Node UUID |
npe | | enum | Possible values: npe-100, npe-150, npe-175, npe-200, npe-225, npe-300, npe-400, npe-g2 |
nvram | | integer | Amount of NVRAM in KB |
@@ -200,12 +200,12 @@ Delete a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index b9316d8a..1f309347 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,15 +9,15 @@ Add a NIO to a Dynamips VM instance
Parameters
**********
-- **adapter_number**: Adapter where the nio should be added
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
@@ -27,14 +27,14 @@ Remove a NIO from a Dynamips VM instance
Parameters
**********
-- **adapter_number**: Adapter from where the nio should be removed
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter from where the nio should be removed
- **port_number**: Port on the adapter
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index ab4fc798..11b2aa3f 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a Dynamips VM instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 5f3c3b21..f305598c 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a Dynamips VM instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
index 81a775f4..8e8d4f54 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidautoidlepc.rst
@@ -9,8 +9,8 @@ Retrieve the idlepc proposals
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
index 53d61343..c5cde1de 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeididlepcproposals.rst
@@ -9,8 +9,8 @@ Retrieve the idlepc proposals
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
index 9ae98a06..d313251a 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidreload.rst
@@ -9,12 +9,12 @@ Reload a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
index d45ede09..15887578 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidresume.rst
@@ -9,12 +9,12 @@ Resume a suspended Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance resumed
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance resumed
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
index de898325..9df36fba 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
index c9b01c50..304f905a 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
index 075f3df6..33412332 100644
--- a/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/dynamips_vm/projectsprojectiddynamipsnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend a Dynamips VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst
index a18152b1..aa8b28d9 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
index 0d582397..8976581c 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an Ethernet hub instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -38,8 +38,8 @@ Update an Ethernet hub instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -97,12 +97,12 @@ Delete an Ethernet hub instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 42753e96..7d2b087b 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,15 +9,15 @@ Add a NIO to an Ethernet hub instance
Parameters
**********
-- **adapter_number**: Adapter on the hub (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the hub (always 0)
- **port_number**: Port on the hub
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
@@ -27,14 +27,14 @@ Remove a NIO from an Ethernet hub instance
Parameters
**********
-- **adapter_number**: Adapter on the hub (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the hub (always 0)
- **port_number**: Port on the hub
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 95c4c6f2..a24e1577 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on an Ethernet hub instance
Parameters
**********
-- **adapter_number**: Adapter on the hub (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the hub (always 0)
- **port_number**: Port on the hub
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 23843300..650b46db 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on an Ethernet hub instance
Parameters
**********
-- **adapter_number**: Adapter on the hub (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the hub (always 0)
- **port_number**: Port on the hub
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
index 275d9a62..7b20e5c3 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start an Ethernet hub
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
index 7a98a5dc..7940753a 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop an Ethernet hub
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
index 1ee67e63..e5195707 100644
--- a/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/ethernet_hub/projectsprojectidethernethubnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend an Ethernet hub
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
index 57433578..9dec4975 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
index 23b6ac6d..a5d5f977 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get an Ethernet switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -38,8 +38,8 @@ Update an Ethernet switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -100,12 +100,12 @@ Delete an Ethernet switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index da1b31c1..8c2eaa7e 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,15 +9,15 @@ Add a NIO to an Ethernet switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
@@ -27,14 +27,14 @@ Remove a NIO from an Ethernet switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 32758189..62938b61 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on an Ethernet switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 6fd29062..f9c6275c 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on an Ethernet switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
index a3d3d51d..58d551a1 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start an Ethernet switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
index a5b5e5ec..4531d526 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop an Ethernet switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
index 89755223..ca2173a9 100644
--- a/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend an Ethernet switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodes.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodes.rst
index 49c5b291..e393dc10 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodes.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
index 245dce77..63d110fe 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Frame Relay switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -38,8 +38,8 @@ Update a Frame Relay switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -81,12 +81,12 @@ Delete a Frame Relay switch instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 9fc39361..8a17eba7 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,15 +9,15 @@ Add a NIO to a Frame Relay switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
@@ -27,14 +27,14 @@ Remove a NIO from a Frame Relay switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 57b81e48..92ea49c0 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a Frame Relay switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index cfafdb6e..ef36dc08 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a Frame Relay switch instance
Parameters
**********
-- **adapter_number**: Adapter on the switch (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the switch (always 0)
- **port_number**: Port on the switch
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
index 89a7a3c9..bd3716e0 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start a Frame Relay switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
index 9d6e3273..0b37be95 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop a Frame Relay switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
index aae9bc87..5e48c4a6 100644
--- a/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/frame_relay_switch/projectsprojectidframerelayswitchnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend a Frame Relay switch
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/iou/iouimages.rst b/docs/api/v2/compute/iou/iouimages.rst
index 95456098..f2b0d7ab 100644
--- a/docs/api/v2/compute/iou/iouimages.rst
+++ b/docs/api/v2/compute/iou/iouimages.rst
@@ -11,9 +11,3 @@ Response status codes
**********************
- **200**: List of IOU images
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_iouimages.txt
-
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodes.rst b/docs/api/v2/compute/iou/projectsprojectidiounodes.rst
index 8c837d6a..6bfcc865 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodes.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -71,9 +71,3 @@ Output
use_default_iou_values | | ['boolean', 'null'] | Use default IOU values |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodes.txt
-
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
index 0c3f693b..b7b93742 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeid.rst
@@ -9,8 +9,8 @@ Get an IOU instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -47,12 +47,6 @@ Output
use_default_iou_values | | ['boolean', 'null'] | Use default IOU values |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectidiounodesnodeid.txt
-
PUT /v2/compute/projects/**{project_id}**/iou/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,8 +54,8 @@ Update an IOU instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -128,12 +122,6 @@ Output
use_default_iou_values | | ['boolean', 'null'] | Use default IOU values |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectidiounodesnodeid.txt
-
DELETE /v2/compute/projects/**{project_id}**/iou/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -141,18 +129,12 @@ Delete an IOU instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidiounodesnodeid.txt
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index e3e33d25..6f58909e 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a IOU instance
Parameters
**********
-- **adapter_number**: Network adapter where the nio is located
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port where the nio should be added
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/iou/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a IOU instance
Parameters
**********
-- **adapter_number**: Network adapter where the nio is located
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port from where the nio should be removed
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index b6a16dd7..12670a6c 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on an IOU VM instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter
Response status codes
@@ -28,12 +28,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstartcapture.txt
-
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 3ffdd795..2ea2fc51 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,21 +9,15 @@ Stop a packet capture on an IOU VM instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
- **409**: VM not started
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodesnodeidadaptersadapternumberdportsportnumberdstopcapture.txt
-
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
index 86ada843..7f6d6262 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidreload.rst
@@ -9,18 +9,12 @@ Reload an IOU instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodesnodeidreload.txt
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
index 70eab247..c8eda9d1 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start an IOU instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -56,9 +56,3 @@ Output
use_default_iou_values | | ['boolean', 'null'] | Use default IOU values |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodesnodeidstart.txt
-
diff --git a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
index e1df8aa9..d9348673 100644
--- a/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
+++ b/docs/api/v2/compute/iou/projectsprojectidiounodesnodeidstop.rst
@@ -9,18 +9,12 @@ Stop an IOU instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidiounodesnodeidstop.txt
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst
index 99cb0344..4d64ab54 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -43,9 +43,3 @@ Output
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidnatnodes.txt
-
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
index 07f4ebd8..fbaff64d 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a nat instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -31,12 +31,6 @@ Output
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectidnatnodesnodeid.txt
-
PUT /v2/compute/projects/**{project_id}**/nat/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -44,8 +38,8 @@ Update a nat instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -80,12 +74,6 @@ Output
status | | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectidnatnodesnodeid.txt
-
DELETE /v2/compute/projects/**{project_id}**/nat/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,18 +81,12 @@ Delete a nat instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidnatnodesnodeid.txt
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 2044fce5..4563f285 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a nat instance
Parameters
**********
-- **adapter_number**: Adapter on the nat (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the nat (always 0)
- **port_number**: Port on the nat
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/nat/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a nat instance
Parameters
**********
-- **adapter_number**: Adapter on the nat (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the nat (always 0)
- **port_number**: Port on the nat
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index c4bd9bf8..ca03814b 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a nat instance
Parameters
**********
-- **adapter_number**: Adapter on the nat (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the nat (always 0)
- **port_number**: Port on the nat
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index e11b5e12..588f1425 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a nat instance
Parameters
**********
-- **adapter_number**: Adapter on the nat (always 0)
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter on the nat (always 0)
- **port_number**: Port on the nat
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst
index b35197f7..ca31ef98 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start a nat
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst
index 837e5d6d..42f722f2 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop a nat
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst
index cf78d8d8..9d8e1433 100644
--- a/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/nat/projectsprojectidnatnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend a nat
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/network/networkinterfaces.rst b/docs/api/v2/compute/network/networkinterfaces.rst
index 66f40f0d..61d1ed3d 100644
--- a/docs/api/v2/compute/network/networkinterfaces.rst
+++ b/docs/api/v2/compute/network/networkinterfaces.rst
@@ -11,9 +11,3 @@ Response status codes
**********************
- **200**: OK
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_networkinterfaces.txt
-
diff --git a/docs/api/v2/compute/network/projectsprojectidportsudp.rst b/docs/api/v2/compute/network/projectsprojectidportsudp.rst
index ca5f9b03..0c6f0090 100644
--- a/docs/api/v2/compute/network/projectsprojectidportsudp.rst
+++ b/docs/api/v2/compute/network/projectsprojectidportsudp.rst
@@ -16,9 +16,3 @@ Response status codes
- **201**: UDP port allocated
- **404**: The project doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidportsudp.txt
-
diff --git a/docs/api/v2/compute/project/projects.rst b/docs/api/v2/compute/project/projects.rst
index 3599488c..36379831 100644
--- a/docs/api/v2/compute/project/projects.rst
+++ b/docs/api/v2/compute/project/projects.rst
@@ -11,12 +11,6 @@ Response status codes
**********************
- **200**: Project list
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projects.txt
-
POST /v2/compute/projects
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,7 +29,7 @@ Input
Name | Mandatory | Type | Description |
auto_close | | boolean | Project auto close |
- name | | ['string', 'null'] | Project name |
+ name | ✔ | ['string', 'null'] | Project name |
path | | ['string', 'null'] | Project directory |
project_id | | ['string', 'null'] | Project UUID |
scene_height | | integer | Height of the drawing area |
@@ -60,9 +54,3 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projects.txt
-
diff --git a/docs/api/v2/compute/project/projectsprojectid.rst b/docs/api/v2/compute/project/projectsprojectid.rst
index 534c11a9..606c1c78 100644
--- a/docs/api/v2/compute/project/projectsprojectid.rst
+++ b/docs/api/v2/compute/project/projectsprojectid.rst
@@ -34,12 +34,6 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectid.txt
-
DELETE /v2/compute/projects/**{project_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -51,12 +45,6 @@ Parameters
Response status codes
**********************
-- **404**: The project doesn't exist
- **204**: Changes have been written on disk
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectid.txt
+- **404**: The project doesn't exist
diff --git a/docs/api/v2/compute/project/projectsprojectidclose.rst b/docs/api/v2/compute/project/projectsprojectidclose.rst
index 45c77199..c651d88d 100644
--- a/docs/api/v2/compute/project/projectsprojectidclose.rst
+++ b/docs/api/v2/compute/project/projectsprojectidclose.rst
@@ -13,12 +13,6 @@ Parameters
Response status codes
**********************
-- **404**: The project doesn't exist
- **204**: Project closed
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidclose.txt
+- **404**: The project doesn't exist
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
index c028493d..b6b1b2f2 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -26,6 +26,8 @@ Input
acpi_shutdown | | ['boolean', 'null'] | ACPI shutdown support |
adapter_type | | ['string', 'null'] | QEMU adapter type |
adapters | | ['integer', 'null'] | Number of adapters |
+ bios_image | | string | QEMU bios image path |
+ bios_image_md5sum | | ['string', 'null'] | QEMU bios image checksum |
boot_priority | | enum | Possible values: c, d, n, cn, cd |
cdrom_image | | string | QEMU cdrom image path |
cdrom_image_md5sum | | ['string', 'null'] | QEMU cdrom image checksum |
@@ -72,6 +74,8 @@ Output
acpi_shutdown | ✔ | boolean | ACPI shutdown support |
adapter_type | ✔ | string | QEMU adapter type |
adapters | ✔ | integer | Number of adapters |
+ bios_image | ✔ | string | QEMU bios image path |
+ bios_image_md5sum | ✔ | ['string', 'null'] | QEMU bios image checksum |
boot_priority | ✔ | enum | Possible values: c, d, n, cn, cd |
cdrom_image | ✔ | string | QEMU cdrom image path |
cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
@@ -100,7 +104,7 @@ Output
legacy_networking | ✔ | boolean | Use QEMU legagy networking commands (-net syntax) |
mac_address | ✔ | string | QEMU MAC address |
name | ✔ | string | QEMU VM instance name |
- node_directory | ✔ | string | |
+ node_directory | ✔ | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
options | ✔ | string | Additional QEMU options |
platform | ✔ | enum | Possible values: aarch64, alpha, arm, cris, i386, lm32, m68k, microblaze, microblazeel, mips, mips64, mips64el, mipsel, moxie, or32, ppc, ppc64, ppcemb, s390x, sh4, sh4eb, sparc, sparc64, tricore, unicore32, x86_64, xtensa, xtensaeb |
@@ -112,9 +116,3 @@ Output
usage | ✔ | string | How to use the QEMU VM |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodes.txt
-
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
index afa11ec4..bc82ed07 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
@@ -9,8 +9,8 @@ Get a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -27,6 +27,8 @@ Output
acpi_shutdown | ✔ | boolean | ACPI shutdown support |
adapter_type | ✔ | string | QEMU adapter type |
adapters | ✔ | integer | Number of adapters |
+ bios_image | ✔ | string | QEMU bios image path |
+ bios_image_md5sum | ✔ | ['string', 'null'] | QEMU bios image checksum |
boot_priority | ✔ | enum | Possible values: c, d, n, cn, cd |
cdrom_image | ✔ | string | QEMU cdrom image path |
cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
@@ -55,7 +57,7 @@ Output
legacy_networking | ✔ | boolean | Use QEMU legagy networking commands (-net syntax) |
mac_address | ✔ | string | QEMU MAC address |
name | ✔ | string | QEMU VM instance name |
- node_directory | ✔ | string | |
+ node_directory | ✔ | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
options | ✔ | string | Additional QEMU options |
platform | ✔ | enum | Possible values: aarch64, alpha, arm, cris, i386, lm32, m68k, microblaze, microblazeel, mips, mips64, mips64el, mipsel, moxie, or32, ppc, ppc64, ppcemb, s390x, sh4, sh4eb, sparc, sparc64, tricore, unicore32, x86_64, xtensa, xtensaeb |
@@ -67,12 +69,6 @@ Output
usage | ✔ | string | How to use the QEMU VM |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectidqemunodesnodeid.txt
-
PUT /v2/compute/projects/**{project_id}**/qemu/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -80,8 +76,8 @@ Update a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -99,6 +95,8 @@ Input
acpi_shutdown | | ['boolean', 'null'] | ACPI shutdown support |
adapter_type | | ['string', 'null'] | QEMU adapter type |
adapters | | ['integer', 'null'] | Number of adapters |
+ bios_image | | string | QEMU bios image path |
+ bios_image_md5sum | | ['string', 'null'] | QEMU bios image checksum |
boot_priority | | enum | Possible values: c, d, n, cn, cd |
cdrom_image | | string | QEMU cdrom image path |
cdrom_image_md5sum | | ['string', 'null'] | QEMU cdrom image checksum |
@@ -144,6 +142,8 @@ Output
acpi_shutdown | ✔ | boolean | ACPI shutdown support |
adapter_type | ✔ | string | QEMU adapter type |
adapters | ✔ | integer | Number of adapters |
+ bios_image | ✔ | string | QEMU bios image path |
+ bios_image_md5sum | ✔ | ['string', 'null'] | QEMU bios image checksum |
boot_priority | ✔ | enum | Possible values: c, d, n, cn, cd |
cdrom_image | ✔ | string | QEMU cdrom image path |
cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
@@ -172,7 +172,7 @@ Output
legacy_networking | ✔ | boolean | Use QEMU legagy networking commands (-net syntax) |
mac_address | ✔ | string | QEMU MAC address |
name | ✔ | string | QEMU VM instance name |
- node_directory | ✔ | string | |
+ node_directory | ✔ | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
options | ✔ | string | Additional QEMU options |
platform | ✔ | enum | Possible values: aarch64, alpha, arm, cris, i386, lm32, m68k, microblaze, microblazeel, mips, mips64, mips64el, mipsel, moxie, or32, ppc, ppc64, ppcemb, s390x, sh4, sh4eb, sparc, sparc64, tricore, unicore32, x86_64, xtensa, xtensaeb |
@@ -184,12 +184,6 @@ Output
usage | ✔ | string | How to use the QEMU VM |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectidqemunodesnodeid.txt
-
DELETE /v2/compute/projects/**{project_id}**/qemu/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -197,18 +191,12 @@ Delete a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidqemunodesnodeid.txt
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index d20f387f..c83d8fa3 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a Qemu VM instance
Parameters
**********
-- **adapter_number**: Network adapter where the nio is located
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/qemu/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a Qemu VM instance
Parameters
**********
-- **adapter_number**: Network adapter where the nio is located
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 0c1636b3..51c724e7 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a Qemu VM instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index aa2a9dd5..f29195ad 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a Qemu VM instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
index dff97a96..8bee2ec1 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidreload.rst
@@ -9,18 +9,12 @@ Reload a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodesnodeidreload.txt
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
index b19656e5..938c5ad0 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidresume.rst
@@ -9,18 +9,12 @@ Resume a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance resumed
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance resumed
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodesnodeidresume.txt
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
index 1cf2ac05..4b59d12c 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
@@ -9,8 +9,8 @@ Start a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -27,6 +27,8 @@ Output
acpi_shutdown | ✔ | boolean | ACPI shutdown support |
adapter_type | ✔ | string | QEMU adapter type |
adapters | ✔ | integer | Number of adapters |
+ bios_image | ✔ | string | QEMU bios image path |
+ bios_image_md5sum | ✔ | ['string', 'null'] | QEMU bios image checksum |
boot_priority | ✔ | enum | Possible values: c, d, n, cn, cd |
cdrom_image | ✔ | string | QEMU cdrom image path |
cdrom_image_md5sum | ✔ | ['string', 'null'] | QEMU cdrom image checksum |
@@ -55,7 +57,7 @@ Output
legacy_networking | ✔ | boolean | Use QEMU legagy networking commands (-net syntax) |
mac_address | ✔ | string | QEMU MAC address |
name | ✔ | string | QEMU VM instance name |
- node_directory | ✔ | string | |
+ node_directory | ✔ | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
options | ✔ | string | Additional QEMU options |
platform | ✔ | enum | Possible values: aarch64, alpha, arm, cris, i386, lm32, m68k, microblaze, microblazeel, mips, mips64, mips64el, mipsel, moxie, or32, ppc, ppc64, ppcemb, s390x, sh4, sh4eb, sparc, sparc64, tricore, unicore32, x86_64, xtensa, xtensaeb |
@@ -67,9 +69,3 @@ Output
usage | ✔ | string | How to use the QEMU VM |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodesnodeidstart.txt
-
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
index bcd612d6..90b6447e 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstop.rst
@@ -9,18 +9,12 @@ Stop a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodesnodeidstop.txt
diff --git a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
index 306e3189..f41b998b 100644
--- a/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidsuspend.rst
@@ -9,18 +9,12 @@ Suspend a Qemu VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidqemunodesnodeidsuspend.txt
diff --git a/docs/api/v2/compute/qemu/qemubinaries.rst b/docs/api/v2/compute/qemu/qemubinaries.rst
index f1a4173b..572aa802 100644
--- a/docs/api/v2/compute/qemu/qemubinaries.rst
+++ b/docs/api/v2/compute/qemu/qemubinaries.rst
@@ -22,9 +22,3 @@ Input
archs | | array | Architectures to filter binaries with |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_qemubinaries.txt
-
diff --git a/docs/api/v2/compute/qemu/qemucapabilities.rst b/docs/api/v2/compute/qemu/qemucapabilities.rst
index eeb70e2f..f1a5b841 100644
--- a/docs/api/v2/compute/qemu/qemucapabilities.rst
+++ b/docs/api/v2/compute/qemu/qemucapabilities.rst
@@ -20,9 +20,3 @@ Output
kvm | | array | Architectures that KVM is enabled for |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_qemucapabilities.txt
-
diff --git a/docs/api/v2/compute/qemu/qemuimg.rst b/docs/api/v2/compute/qemu/qemuimg.rst
index b64f4d8d..efa21555 100644
--- a/docs/api/v2/compute/qemu/qemuimg.rst
+++ b/docs/api/v2/compute/qemu/qemuimg.rst
@@ -31,9 +31,3 @@ Input
zeroed_grain | | enum | Possible values: on, off |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_qemuimg.txt
-
diff --git a/docs/api/v2/compute/version.rst b/docs/api/v2/compute/server.rst
similarity index 77%
rename from docs/api/v2/compute/version.rst
rename to docs/api/v2/compute/server.rst
index 70939776..d6b9081f 100644
--- a/docs/api/v2/compute/version.rst
+++ b/docs/api/v2/compute/server.rst
@@ -1,8 +1,8 @@
-Version
+Server
-----------------------------
.. toctree::
:glob:
:maxdepth: 2
- version/*
+ server/*
diff --git a/docs/api/v2/compute/server/debug.rst b/docs/api/v2/compute/server/debug.rst
new file mode 100644
index 00000000..1e04dd1a
--- /dev/null
+++ b/docs/api/v2/compute/server/debug.rst
@@ -0,0 +1,13 @@
+/v2/compute/debug
+------------------------------------------------------------------------------------------------------------------------------------------
+
+.. contents::
+
+GET /v2/compute/debug
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Return debug informations about the compute
+
+Response status codes
+**********************
+- **201**: Writed
+
diff --git a/docs/api/v2/compute/version/version.rst b/docs/api/v2/compute/server/version.rst
similarity index 91%
rename from docs/api/v2/compute/version/version.rst
rename to docs/api/v2/compute/server/version.rst
index b4947701..d58dc956 100644
--- a/docs/api/v2/compute/version/version.rst
+++ b/docs/api/v2/compute/server/version.rst
@@ -21,9 +21,3 @@ Output
version | ✔ | string | Version number |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_version.txt
-
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodes.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodes.rst
index d9705ed1..710eed0c 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodes.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -27,6 +27,7 @@ Input
adapter_type | | string | VirtualBox adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | ✔ | string | VirtualBox VM instance name |
@@ -46,10 +47,11 @@ Output
adapter_type | | string | VirtualBox adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VirtualBox VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the VM working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
ram | | integer | Amount of RAM |
@@ -58,9 +60,3 @@ Output
vmname | | string | VirtualBox VM name (in VirtualBox itself) |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodes.txt
-
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
index 9654d420..461089b6 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -28,10 +28,11 @@ Output
adapter_type | | string | VirtualBox adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VirtualBox VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the VM working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
ram | | integer | Amount of RAM |
@@ -40,12 +41,6 @@ Output
vmname | | string | VirtualBox VM name (in VirtualBox itself) |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectidvirtualboxnodesnodeid.txt
-
PUT /v2/compute/projects/**{project_id}**/virtualbox/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -53,8 +48,8 @@ Update a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -73,10 +68,11 @@ Input
adapter_type | | string | VirtualBox adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VirtualBox VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the VM working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
ram | | integer | Amount of RAM |
@@ -95,10 +91,11 @@ Output
adapter_type | | string | VirtualBox adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VirtualBox VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the VM working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
ram | | integer | Amount of RAM |
@@ -107,12 +104,6 @@ Output
vmname | | string | VirtualBox VM name (in VirtualBox itself) |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectidvirtualboxnodesnodeid.txt
-
DELETE /v2/compute/projects/**{project_id}**/virtualbox/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -120,12 +111,12 @@ Delete a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index 566baef5..2bfdd646 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a VirtualBox VM instance
Parameters
**********
-- **adapter_number**: Adapter where the nio should be added
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/virtualbox/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a VirtualBox VM instance
Parameters
**********
-- **adapter_number**: Adapter from where the nio should be removed
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter from where the nio should be removed
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 99be64ae..d22d2127 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a VirtualBox VM instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index aac05aaa..10093905 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a VirtualBox VM instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
index ba593e10..58a62435 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidreload.rst
@@ -9,18 +9,12 @@ Reload a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodesnodeidreload.txt
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
index 50e1bba3..2e4f8523 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidresume.rst
@@ -9,18 +9,12 @@ Resume a suspended VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance resumed
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance resumed
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodesnodeidresume.txt
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
index 62ead042..506d8663 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstart.rst
@@ -9,18 +9,12 @@ Start a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodesnodeidstart.txt
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
index 202424dc..6050655a 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidstop.rst
@@ -9,18 +9,12 @@ Stop a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodesnodeidstop.txt
diff --git a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
index e1dad875..dc24b777 100644
--- a/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/virtualbox/projectsprojectidvirtualboxnodesnodeidsuspend.rst
@@ -9,18 +9,12 @@ Suspend a VirtualBox VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvirtualboxnodesnodeidsuspend.txt
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodes.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodes.rst
index 05479c37..8d648e4f 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodes.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -27,6 +27,7 @@ Input
adapter_type | | string | VMware adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | ✔ | boolean | Whether the VM is a linked clone or not |
name | ✔ | string | VMware VM instance name |
@@ -45,10 +46,11 @@ Output
adapter_type | | string | VMware adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VMware VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the node working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
index 8d2e88e0..d2dca26c 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -28,10 +28,11 @@ Output
adapter_type | | string | VMware adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VMware VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the node working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
@@ -46,8 +47,8 @@ Update a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -66,10 +67,11 @@ Input
adapter_type | | string | VMware adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VMware VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the node working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
@@ -87,10 +89,11 @@ Output
adapter_type | | string | VMware adapter type |
adapters | | integer | Number of adapters |
console | | integer | Console TCP port |
+ console_type | | enum | Possible values: telnet |
headless | | boolean | Headless mode |
linked_clone | | boolean | Whether the VM is a linked clone or not |
name | | string | VMware VM instance name |
- node_directory | | ['string', 'null'] | |
+ node_directory | | ['string', 'null'] | Path to the node working directory |
node_id | | string | Node UUID |
project_id | | string | Project UUID |
status | | enum | Possible values: started, stopped, suspended |
@@ -105,12 +108,12 @@ Delete a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index f51a2bf2..cfd84f4c 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,15 +9,15 @@ Add a NIO to a VMware VM instance
Parameters
**********
-- **adapter_number**: Adapter where the nio should be added
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter where the nio should be added
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
@@ -27,14 +27,14 @@ Remove a NIO from a VMware VM instance
Parameters
**********
-- **adapter_number**: Adapter from where the nio should be removed
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter from where the nio should be removed
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index b25c9c0c..d6b37ace 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a VMware VM instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index b168f138..732cf328 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a VMware VM instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter (always 0)
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
index 16913e56..d3672687 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidinterfacesvmnet.rst
@@ -9,8 +9,8 @@ Allocate a VMware VMnet interface on the server
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
index d63d89d9..24f890cb 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidreload.rst
@@ -9,12 +9,12 @@ Reload a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
index 84d21d6c..9167c921 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidresume.rst
@@ -9,12 +9,12 @@ Resume a suspended VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance resumed
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance resumed
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
index 3240f8da..15f4853a 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstart.rst
@@ -9,12 +9,12 @@ Start a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
index a260c0c8..1242ad89 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidstop.rst
@@ -9,12 +9,12 @@ Stop a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
index b2306c74..5b7478f7 100644
--- a/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/vmware/projectsprojectidvmwarenodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend a VMware VM instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodes.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodes.rst
index dab04e62..d0fb80de 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodes.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
- **409**: Conflict
Input
@@ -41,7 +41,7 @@ Output
console | ✔ | integer | Console TCP port |
console_type | ✔ | enum | Possible values: telnet |
name | ✔ | string | VPCS VM name |
- node_directory | | string | |
+ node_directory | | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
project_id | ✔ | string | Project UUID |
startup_script | | ['string', 'null'] | Content of the VPCS startup script |
@@ -49,9 +49,3 @@ Output
status | ✔ | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvpcsnodes.txt
-
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
index 641002f8..330e3490 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeid.rst
@@ -9,8 +9,8 @@ Get a VPCS instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -28,7 +28,7 @@ Output
console | ✔ | integer | Console TCP port |
console_type | ✔ | enum | Possible values: telnet |
name | ✔ | string | VPCS VM name |
- node_directory | | string | |
+ node_directory | | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
project_id | ✔ | string | Project UUID |
startup_script | | ['string', 'null'] | Content of the VPCS startup script |
@@ -36,12 +36,6 @@ Output
status | ✔ | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_get_projectsprojectidvpcsnodesnodeid.txt
-
PUT /v2/compute/projects/**{project_id}**/vpcs/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -49,8 +43,8 @@ Update a VPCS instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
@@ -82,7 +76,7 @@ Output
console | ✔ | integer | Console TCP port |
console_type | ✔ | enum | Possible values: telnet |
name | ✔ | string | VPCS VM name |
- node_directory | | string | |
+ node_directory | | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
project_id | ✔ | string | Project UUID |
startup_script | | ['string', 'null'] | Content of the VPCS startup script |
@@ -90,12 +84,6 @@ Output
status | ✔ | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_put_projectsprojectidvpcsnodesnodeid.txt
-
DELETE /v2/compute/projects/**{project_id}**/vpcs/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -103,18 +91,12 @@ Delete a VPCS instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidvpcsnodesnodeid.txt
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
index f42dd571..62e23572 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.rst
@@ -9,23 +9,17 @@ Add a NIO to a VPCS instance
Parameters
**********
-- **adapter_number**: Network adapter where the nio is located
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port where the nio should be added
Response status codes
**********************
-- **400**: Invalid request
- **201**: NIO created
+- **400**: Invalid request
- **404**: Instance doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
-
DELETE /v2/compute/projects/**{project_id}**/vpcs/nodes/**{node_id}**/adapters/**{adapter_number:\d+}**/ports/**{port_number:\d+}**/nio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,20 +27,14 @@ Remove a NIO from a VPCS instance
Parameters
**********
-- **adapter_number**: Network adapter where the nio is located
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Network adapter where the nio is located
- **port_number**: Port from where the nio should be removed
Response status codes
**********************
+- **204**: NIO deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: NIO deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_delete_projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdnio.txt
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
index 5abe77d9..4091ed70 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstartcapture.rst
@@ -9,9 +9,9 @@ Start a packet capture on a VPCS instance
Parameters
**********
-- **adapter_number**: Adapter to start a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to start a packet capture
- **port_number**: Port on the adapter
Response status codes
@@ -27,6 +27,6 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | ✔ | string | Capture file name |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
index 055ce0c4..3ecc986e 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidadaptersadapternumberdportsportnumberdstopcapture.rst
@@ -9,14 +9,14 @@ Stop a packet capture on a VPCS instance
Parameters
**********
-- **adapter_number**: Adapter to stop a packet capture
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
+- **adapter_number**: Adapter to stop a packet capture
- **port_number**: Port on the adapter
Response status codes
**********************
+- **204**: Capture stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Capture stopped
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
index e3cc4ec9..0f721c01 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidreload.rst
@@ -9,18 +9,12 @@ Reload a VPCS instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvpcsnodesnodeidreload.txt
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
index 6f438a4f..7a579b26 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstart.rst
@@ -9,14 +9,14 @@ Start a VPCS instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
Output
*******
@@ -28,7 +28,7 @@ Output
console | ✔ | integer | Console TCP port |
console_type | ✔ | enum | Possible values: telnet |
name | ✔ | string | VPCS VM name |
- node_directory | | string | |
+ node_directory | | string | Path to the VM working directory |
node_id | ✔ | string | Node UUID |
project_id | ✔ | string | Project UUID |
startup_script | | ['string', 'null'] | Content of the VPCS startup script |
@@ -36,9 +36,3 @@ Output
status | ✔ | enum | Possible values: started, stopped, suspended |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvpcsnodesnodeidstart.txt
-
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
index 280dbca1..1f1fff3c 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidstop.rst
@@ -9,18 +9,12 @@ Stop a VPCS instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/compute_post_projectsprojectidvpcsnodesnodeidstop.txt
diff --git a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
index 430b8fab..32abd416 100644
--- a/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
+++ b/docs/api/v2/compute/vpcs/projectsprojectidvpcsnodesnodeidsuspend.rst
@@ -9,12 +9,12 @@ Suspend a VPCS instance (stop it)
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
diff --git a/docs/api/v2/controller/compute/sid.rst b/docs/api/v2/controller/compute/sid.rst
index aab5eb2f..25bcc968 100644
--- a/docs/api/v2/controller/compute/sid.rst
+++ b/docs/api/v2/controller/compute/sid.rst
@@ -84,7 +84,7 @@ Parameters
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
diff --git a/docs/api/v2/controller/drawing/projectsprojectiddrawings.rst b/docs/api/v2/controller/drawing/projectsprojectiddrawings.rst
index 85658213..972354dc 100644
--- a/docs/api/v2/controller/drawing/projectsprojectiddrawings.rst
+++ b/docs/api/v2/controller/drawing/projectsprojectiddrawings.rst
@@ -15,12 +15,6 @@ Response status codes
**********************
- **200**: List of drawings returned
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectiddrawings.txt
-
POST /v2/projects/**{project_id}**/drawings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -32,8 +26,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Drawing created
+- **400**: Invalid request
Input
*******
@@ -65,9 +59,3 @@ Output
z | | integer | Z property |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectiddrawings.txt
-
diff --git a/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst b/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst
index 956f0a76..6f16c063 100644
--- a/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst
+++ b/docs/api/v2/controller/drawing/projectsprojectiddrawingsdrawingid.rst
@@ -9,13 +9,13 @@ Create a new drawing instance
Parameters
**********
-- **drawing_id**: Drawing UUID
- **project_id**: Project UUID
+- **drawing_id**: Drawing UUID
Response status codes
**********************
-- **400**: Invalid request
- **201**: Drawing updated
+- **400**: Invalid request
Input
*******
@@ -47,12 +47,6 @@ Output
z | | integer | Z property |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_put_projectsprojectiddrawingsdrawingid.txt
-
DELETE /v2/projects/**{project_id}**/drawings/**{drawing_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,17 +54,11 @@ Delete a drawing instance
Parameters
**********
-- **drawing_id**: Drawing UUID
- **project_id**: Project UUID
+- **drawing_id**: Drawing UUID
Response status codes
**********************
-- **400**: Invalid request
- **204**: Drawing deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_delete_projectsprojectiddrawingsdrawingid.txt
+- **400**: Invalid request
diff --git a/docs/api/v2/controller/gns3_vm/gns3vm.rst b/docs/api/v2/controller/gns3_vm/gns3vm.rst
index 423ff461..e6acb4e4 100644
--- a/docs/api/v2/controller/gns3_vm/gns3vm.rst
+++ b/docs/api/v2/controller/gns3_vm/gns3vm.rst
@@ -11,12 +11,6 @@ Response status codes
**********************
- **200**: GNS3 VM settings returned
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_gns3vm.txt
-
PUT /v2/gns3vm
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -26,9 +20,3 @@ Response status codes
**********************
- **201**: GNS3 VM updated
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_put_gns3vm.txt
-
diff --git a/docs/api/v2/controller/gns3_vm/gns3vmengines.rst b/docs/api/v2/controller/gns3_vm/gns3vmengines.rst
index 1c9f5c29..6ee79e12 100644
--- a/docs/api/v2/controller/gns3_vm/gns3vmengines.rst
+++ b/docs/api/v2/controller/gns3_vm/gns3vmengines.rst
@@ -11,9 +11,3 @@ Response status codes
**********************
- **200**: OK
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_gns3vmengines.txt
-
diff --git a/docs/api/v2/controller/gns3_vm/gns3vmenginesenginevms.rst b/docs/api/v2/controller/gns3_vm/gns3vmenginesenginevms.rst
index 4b5cc690..b6158597 100644
--- a/docs/api/v2/controller/gns3_vm/gns3vmenginesenginevms.rst
+++ b/docs/api/v2/controller/gns3_vm/gns3vmenginesenginevms.rst
@@ -16,9 +16,3 @@ Response status codes
- **200**: Success
- **400**: Invalid request
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_gns3vmenginesenginevms.txt
-
diff --git a/docs/api/v2/controller/link/projectsprojectidlinks.rst b/docs/api/v2/controller/link/projectsprojectidlinks.rst
index f24e9b6d..1c8c739e 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinks.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinks.rst
@@ -15,12 +15,6 @@ Response status codes
**********************
- **200**: List of links returned
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectidlinks.txt
-
POST /v2/projects/**{project_id}**/links
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -32,8 +26,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Link created
+- **400**: Invalid request
Input
*******
@@ -65,9 +59,3 @@ Output
project_id | | string | Project UUID |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidlinks.txt
-
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
index 5acf4a66..65716bea 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
@@ -9,13 +9,13 @@ Update a link instance
Parameters
**********
-- **link_id**: Link UUID
- **project_id**: Project UUID
+- **link_id**: Link UUID
Response status codes
**********************
-- **400**: Invalid request
- **201**: Link updated
+- **400**: Invalid request
Input
*******
@@ -54,17 +54,11 @@ Delete a link instance
Parameters
**********
-- **link_id**: Link UUID
- **project_id**: Project UUID
+- **link_id**: Link UUID
Response status codes
**********************
-- **400**: Invalid request
- **204**: Link deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_delete_projectsprojectidlinkslinkid.txt
+- **400**: Invalid request
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
index 99a050aa..48426bdd 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidpcap.rst
@@ -9,8 +9,8 @@ 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 4ba786c0..37a0e4f5 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
@@ -9,13 +9,13 @@ 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
**********************
-- **400**: Invalid request
- **201**: Capture started
+- **400**: Invalid request
Input
*******
@@ -24,7 +24,7 @@ Input
Name | Mandatory | Type | Description |
capture_file_name | | string | Read only property. The name of the capture file if capture is running |
- data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC |
+ data_link_type | | enum | Possible values: DLT_ATM_RFC1483, DLT_EN10MB, DLT_FRELAY, DLT_C_HDLC, DLT_PPP_SERIAL |
Output
@@ -42,9 +42,3 @@ Output
project_id | | string | Project UUID |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidlinkslinkidstartcapture.txt
-
diff --git a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst
index 53c97524..ec1f0ccd 100644
--- a/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst
+++ b/docs/api/v2/controller/link/projectsprojectidlinkslinkidstopcapture.rst
@@ -9,17 +9,11 @@ Stop capture on a link instance
Parameters
**********
-- **link_id**: Link UUID
- **project_id**: Project UUID
+- **link_id**: Link UUID
Response status codes
**********************
-- **400**: Invalid request
- **201**: Capture stopped
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidlinkslinkidstopcapture.txt
+- **400**: Invalid request
diff --git a/docs/api/v2/controller/node/projectsprojectidnodes.rst b/docs/api/v2/controller/node/projectsprojectidnodes.rst
index ca45fd1e..d2177317 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodes.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodes.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **400**: Invalid request
- **201**: Instance created
+- **400**: Invalid request
Input
*******
@@ -78,12 +78,6 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodes.txt
-
GET /v2/projects/**{project_id}**/nodes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -97,9 +91,3 @@ Response status codes
**********************
- **200**: List of nodes returned
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectidnodes.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
index 1772e6ce..3258a098 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeid.rst
@@ -44,12 +44,6 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectidnodesnodeid.txt
-
PUT /v2/projects/**{project_id}**/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -123,12 +117,6 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_put_projectsprojectidnodesnodeid.txt
-
DELETE /v2/projects/**{project_id}**/nodes/**{node_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -136,18 +124,12 @@ Delete a node instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance deleted
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance deleted
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_delete_projectsprojectidnodesnodeid.txt
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
index cc04c2e5..83e3b94c 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsautoidlepc.rst
@@ -9,18 +9,12 @@ Compute the IDLE PC for a Dynamips node
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectidnodesnodeiddynamipsautoidlepc.txt
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
index e5e05092..8affe5a1 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeiddynamipsidlepcproposals.rst
@@ -9,18 +9,12 @@ Compute a list of potential idle PC for a node
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectidnodesnodeiddynamipsidlepcproposals.txt
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst
index 54e26c0c..3fc4bbaf 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidfilespath.rst
@@ -9,14 +9,14 @@ Get a file in the node directory
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
POST /v2/projects/**{project_id}**/nodes/**{node_id}**/files/**{path:.+}**
@@ -25,12 +25,12 @@ Write a file in the node directory
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
index 4efd1928..994a8c2d 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidreload.rst
@@ -9,14 +9,14 @@ Reload a node instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance reloaded
Output
*******
@@ -49,9 +49,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesnodeidreload.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
index cc6cc8a1..afdf56e8 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstart.rst
@@ -9,14 +9,14 @@ Start a node instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance started
Output
*******
@@ -49,9 +49,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesnodeidstart.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
index a97de38f..7eba9826 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidstop.rst
@@ -9,14 +9,14 @@ Stop a node instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance stopped
Output
*******
@@ -49,9 +49,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesnodeidstop.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
index ae0ee25c..dcf6474d 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesnodeidsuspend.rst
@@ -9,14 +9,14 @@ Suspend a node instance
Parameters
**********
-- **node_id**: Node UUID
- **project_id**: Project UUID
+- **node_id**: Node UUID
Response status codes
**********************
+- **204**: Instance suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: Instance suspended
Output
*******
@@ -49,9 +49,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesnodeidsuspend.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesreload.rst b/docs/api/v2/controller/node/projectsprojectidnodesreload.rst
index c3952c6e..66719c66 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesreload.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesreload.rst
@@ -13,9 +13,9 @@ Parameters
Response status codes
**********************
+- **204**: All nodes successfully reloaded
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: All nodes successfully reloaded
Output
*******
@@ -48,9 +48,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesreload.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesstart.rst b/docs/api/v2/controller/node/projectsprojectidnodesstart.rst
index f14f95e2..6ec39708 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesstart.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesstart.rst
@@ -13,9 +13,9 @@ Parameters
Response status codes
**********************
+- **204**: All nodes successfully started
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: All nodes successfully started
Output
*******
@@ -48,9 +48,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesstart.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodesstop.rst b/docs/api/v2/controller/node/projectsprojectidnodesstop.rst
index 7de57fbf..94a3c5f1 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodesstop.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodesstop.rst
@@ -13,9 +13,9 @@ Parameters
Response status codes
**********************
+- **204**: All nodes successfully stopped
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: All nodes successfully stopped
Output
*******
@@ -48,9 +48,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodesstop.txt
-
diff --git a/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst b/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst
index bb8112c4..595b4740 100644
--- a/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst
+++ b/docs/api/v2/controller/node/projectsprojectidnodessuspend.rst
@@ -13,9 +13,9 @@ Parameters
Response status codes
**********************
+- **204**: All nodes successfully suspended
- **400**: Invalid request
- **404**: Instance doesn't exist
-- **204**: All nodes successfully suspended
Output
*******
@@ -48,9 +48,3 @@ Output
z | | integer | Z position of the node |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidnodessuspend.txt
-
diff --git a/docs/api/v2/controller/project/projects.rst b/docs/api/v2/controller/project/projects.rst
index de09074c..cfc45158 100644
--- a/docs/api/v2/controller/project/projects.rst
+++ b/docs/api/v2/controller/project/projects.rst
@@ -19,7 +19,7 @@ Input
Name | Mandatory | Type | Description |
auto_close | | boolean | Project auto close |
- name | | ['string', 'null'] | Project name |
+ name | ✔ | ['string', 'null'] | Project name |
path | | ['string', 'null'] | Project directory |
project_id | | ['string', 'null'] | Project UUID |
scene_height | | integer | Height of the drawing area |
@@ -44,12 +44,6 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projects.txt
-
GET /v2/projects
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -59,9 +53,3 @@ Response status codes
**********************
- **200**: List of projects
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projects.txt
-
diff --git a/docs/api/v2/controller/project/projectsload.rst b/docs/api/v2/controller/project/projectsload.rst
index e59bc766..8f018a42 100644
--- a/docs/api/v2/controller/project/projectsload.rst
+++ b/docs/api/v2/controller/project/projectsload.rst
@@ -43,9 +43,3 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsload.txt
-
diff --git a/docs/api/v2/controller/project/projectsprojectid.rst b/docs/api/v2/controller/project/projectsprojectid.rst
index 074bf368..3a257af0 100644
--- a/docs/api/v2/controller/project/projectsprojectid.rst
+++ b/docs/api/v2/controller/project/projectsprojectid.rst
@@ -16,12 +16,6 @@ Response status codes
- **200**: Project information returned
- **404**: The project doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectid.txt
-
PUT /v2/projects/**{project_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -66,12 +60,6 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_put_projectsprojectid.txt
-
DELETE /v2/projects/**{project_id}**
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -83,12 +71,6 @@ Parameters
Response status codes
**********************
-- **404**: The project doesn't exist
- **204**: Changes have been written on disk
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_delete_projectsprojectid.txt
+- **404**: The project doesn't exist
diff --git a/docs/api/v2/controller/project/projectsprojectidclose.rst b/docs/api/v2/controller/project/projectsprojectidclose.rst
index 49ec81a6..72c36ddb 100644
--- a/docs/api/v2/controller/project/projectsprojectidclose.rst
+++ b/docs/api/v2/controller/project/projectsprojectidclose.rst
@@ -13,8 +13,8 @@ Parameters
Response status codes
**********************
-- **404**: The project doesn't exist
- **204**: The project has been closed
+- **404**: The project doesn't exist
Output
*******
@@ -34,9 +34,3 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidclose.txt
-
diff --git a/docs/api/v2/controller/project/projectsprojectidduplicate.rst b/docs/api/v2/controller/project/projectsprojectidduplicate.rst
index 39c607a9..17a0611a 100644
--- a/docs/api/v2/controller/project/projectsprojectidduplicate.rst
+++ b/docs/api/v2/controller/project/projectsprojectidduplicate.rst
@@ -24,7 +24,7 @@ Input
Name | Mandatory | Type | Description |
auto_close | | boolean | Project auto close |
- name | | ['string', 'null'] | Project name |
+ name | ✔ | ['string', 'null'] | Project name |
path | | ['string', 'null'] | Project directory |
project_id | | ['string', 'null'] | Project UUID |
scene_height | | integer | Height of the drawing area |
@@ -49,9 +49,3 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidduplicate.txt
-
diff --git a/docs/api/v2/controller/project/projectsprojectidopen.rst b/docs/api/v2/controller/project/projectsprojectidopen.rst
index 02c3e627..9af3191a 100644
--- a/docs/api/v2/controller/project/projectsprojectidopen.rst
+++ b/docs/api/v2/controller/project/projectsprojectidopen.rst
@@ -34,9 +34,3 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidopen.txt
-
diff --git a/docs/api/v2/controller/server/debug.rst b/docs/api/v2/controller/server/debug.rst
index cac05a97..9cc6bb13 100644
--- a/docs/api/v2/controller/server/debug.rst
+++ b/docs/api/v2/controller/server/debug.rst
@@ -5,7 +5,7 @@
POST /v2/debug
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Dump debug informations to disk (debug directory in config directory)
+Dump debug informations to disk (debug directory in config directory). Work only for local server
Response status codes
**********************
diff --git a/docs/api/v2/controller/server/settings.rst b/docs/api/v2/controller/server/settings.rst
index ff3cac61..8d9d6f63 100644
--- a/docs/api/v2/controller/server/settings.rst
+++ b/docs/api/v2/controller/server/settings.rst
@@ -11,12 +11,6 @@ Response status codes
**********************
- **200**: OK
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_settings.txt
-
POST /v2/settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -26,9 +20,3 @@ Response status codes
**********************
- **201**: Writed
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_settings.txt
-
diff --git a/docs/api/v2/controller/server/shutdown.rst b/docs/api/v2/controller/server/shutdown.rst
index 27d95fed..8a1849d1 100644
--- a/docs/api/v2/controller/server/shutdown.rst
+++ b/docs/api/v2/controller/server/shutdown.rst
@@ -12,9 +12,3 @@ Response status codes
- **201**: Server is shutting down
- **403**: Server shutdown refused
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_shutdown.txt
-
diff --git a/docs/api/v2/controller/server/version.rst b/docs/api/v2/controller/server/version.rst
index 70c5f5db..b43d4d0b 100644
--- a/docs/api/v2/controller/server/version.rst
+++ b/docs/api/v2/controller/server/version.rst
@@ -21,12 +21,6 @@ Output
version | ✔ | string | Version number |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_version.txt
-
POST /v2/version
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -57,9 +51,3 @@ Output
version | ✔ | string | Version number |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_version.txt
-
diff --git a/docs/api/v2/controller/snapshot/projectsprojectidsnapshots.rst b/docs/api/v2/controller/snapshot/projectsprojectidsnapshots.rst
index c37b5788..4c537bbe 100644
--- a/docs/api/v2/controller/snapshot/projectsprojectidsnapshots.rst
+++ b/docs/api/v2/controller/snapshot/projectsprojectidsnapshots.rst
@@ -37,12 +37,6 @@ Output
snapshot_id | ✔ | string | Snapshot UUID |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidsnapshots.txt
-
GET /v2/projects/**{project_id}**/snapshots
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -57,9 +51,3 @@ Response status codes
- **200**: Snasphot list returned
- **404**: The project doesn't exist
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_projectsprojectidsnapshots.txt
-
diff --git a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst
index f949f4a8..3540c7bd 100644
--- a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst
+++ b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst
@@ -14,12 +14,6 @@ Parameters
Response status codes
**********************
-- **404**: The project or snapshot doesn't exist
- **204**: Changes have been written on disk
-
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_delete_projectsprojectidsnapshotssnapshotid.txt
+- **404**: The project or snapshot doesn't exist
diff --git a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst
index 7c55a564..e8885eb2 100644
--- a/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst
+++ b/docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst
@@ -35,9 +35,3 @@ Output
status | | enum | Possible values: opened, closed |
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_post_projectsprojectidsnapshotssnapshotidrestore.txt
-
diff --git a/docs/api/v2/controller/symbol/symbols.rst b/docs/api/v2/controller/symbol/symbols.rst
index d6ed5aa6..a58a8b66 100644
--- a/docs/api/v2/controller/symbol/symbols.rst
+++ b/docs/api/v2/controller/symbol/symbols.rst
@@ -11,9 +11,3 @@ Response status codes
**********************
- **200**: Symbols list returned
-Sample session
-***************
-
-
-.. literalinclude:: ../../../examples/controller_get_symbols.txt
-
diff --git a/docs/gns3_file.json b/docs/gns3_file.json
index bc2aeea6..768fe434 100644
--- a/docs/gns3_file.json
+++ b/docs/gns3_file.json
@@ -1,570 +1,570 @@
{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "description": "The topology",
+ "type": "object",
"properties": {
+ "project_id": {
+ "description": "Project UUID",
+ "type": "string",
+ "minLength": 36,
+ "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}$"
+ },
+ "type": {
+ "description": "Type of file. It's always topology",
+ "enum": [
+ "topology"
+ ]
+ },
"auto_start": {
- "type": "boolean",
- "description": "Start the topology when opened"
+ "description": "Start the topology when opened",
+ "type": "boolean"
+ },
+ "auto_close": {
+ "description": "Close the topology when no client is connected",
+ "type": "boolean"
},
"auto_open": {
- "type": "boolean",
- "description": "Open the topology with GNS3"
+ "description": "Open the topology with GNS3",
+ "type": "boolean"
+ },
+ "revision": {
+ "description": "Version of the .gns3 specification.",
+ "type": "integer"
+ },
+ "version": {
+ "description": "Version of the GNS3 software which have update the file for the last time",
+ "type": "string"
+ },
+ "name": {
+ "type": "string",
+ "description": "Name of the project"
+ },
+ "scene_height": {
+ "type": "integer",
+ "description": "Height of the drawing area"
+ },
+ "scene_width": {
+ "type": "integer",
+ "description": "Width of the drawing area"
},
"topology": {
+ "description": "The topology content",
+ "type": "object",
"properties": {
- "drawings": {
+ "computes": {
+ "description": "Computes servers",
+ "type": "array",
"items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "description": "Request validation to a GNS3 compute object instance",
+ "type": "object",
"properties": {
- "rotation": {
- "maximum": 360,
- "type": "integer",
- "description": "Rotation of the element",
- "minimum": -359
- },
- "z": {
- "type": "integer",
- "description": "Z property"
- },
- "drawing_id": {
- "minLength": 36,
- "type": "string",
- "description": "Drawing UUID",
- "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}$"
- },
- "y": {
- "type": "integer",
- "description": "Y property"
- },
- "x": {
- "type": "integer",
- "description": "X property"
+ "compute_id": {
+ "description": "Server identifier",
+ "type": "string"
},
- "project_id": {
- "minLength": 36,
- "type": "string",
- "description": "Project UUID",
- "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}$"
+ "name": {
+ "description": "Server name",
+ "type": "string"
},
- "svg": {
- "type": "string",
- "description": "SVG content of the drawing"
- }
- },
- "additionalProperties": false,
- "type": "object",
- "description": "An drawing object",
- "$schema": "http://json-schema.org/draft-04/schema#"
- },
- "type": "array",
- "description": "Drawings elements"
- },
- "nodes": {
- "items": {
- "properties": {
- "properties": {
- "type": "object",
- "description": "Properties specific to an emulator"
+ "protocol": {
+ "description": "Server protocol",
+ "enum": [
+ "http",
+ "https"
+ ]
},
- "command_line": {
- "type": [
- "null",
- "string"
- ],
- "description": "Command line use to start the node"
+ "host": {
+ "description": "Server host",
+ "type": "string"
},
- "z": {
- "type": "integer",
- "description": "Z position of the node"
+ "port": {
+ "description": "Server port",
+ "type": "integer"
},
- "first_port_name": {
+ "user": {
+ "description": "User for authentication",
"type": [
"string",
"null"
- ],
- "description": "Name of the first port"
+ ]
},
- "console_host": {
- "minLength": 1,
- "type": "string",
- "description": "Console host. Warning if the host is 0.0.0.0 or :: (listen on all interfaces) you need to use the same address you use to connect to the controller."
+ "connected": {
+ "description": "Whether the controller is connected to the compute server or not",
+ "type": "boolean"
},
- "console": {
- "maximum": 65535,
+ "cpu_usage_percent": {
+ "description": "CPU usage of the compute. Read only",
"type": [
- "integer",
+ "number",
"null"
],
- "description": "Console TCP port",
- "minimum": 1
- },
- "status": {
- "enum": [
- "stopped",
- "started",
- "suspended"
- ],
- "description": "Status of the node"
- },
- "project_id": {
- "minLength": 36,
- "type": "string",
- "description": "Project UUID",
- "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}$"
- },
- "port_segment_size": {
- "type": "integer",
- "description": "Size of the port segment",
+ "maximum": 100,
"minimum": 0
},
- "port_name_format": {
- "type": "string",
- "description": "Formating for port name {0} will be replace by port number"
- },
- "height": {
- "type": "integer",
- "description": "Height of the node (Read only)"
- },
- "width": {
- "type": "integer",
- "description": "Width of the node (Read only)"
- },
- "symbol": {
- "minLength": 1,
+ "memory_usage_percent": {
+ "description": "RAM usage of the compute. Read only",
"type": [
- "string",
+ "number",
"null"
],
- "description": "Symbol of the node"
+ "maximum": 100,
+ "minimum": 0
},
- "label": {
+ "capabilities": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "description": "Get what a server support",
+ "type": "object",
+ "required": [
+ "version",
+ "node_types"
+ ],
"properties": {
- "text": {
- "type": "string"
- },
- "rotation": {
- "maximum": 360,
- "type": "integer",
- "description": "Rotation of the label",
- "minimum": -359
- },
- "y": {
- "type": "integer",
- "description": "Relative Y position of the label"
- },
- "x": {
+ "version": {
+ "description": "Version number",
"type": [
- "integer",
+ "string",
"null"
- ],
- "description": "Relative X position of the label. If null center it"
+ ]
},
- "style": {
- "type": "string",
- "description": "SVG style attribute"
- }
- },
- "additionalProperties": false,
- "type": "object",
- "required": [
- "text",
- "x",
- "y"
- ]
- },
- "compute_id": {
- "type": "string",
- "description": "Compute identifier"
- },
- "console_type": {
- "enum": [
- "vnc",
- "telnet",
- "http",
- null
- ],
- "description": "Console type"
- },
- "ports": {
- "items": {
- "properties": {
- "adapter_number": {
- "type": "integer",
- "description": "Adapter slot"
- },
- "link_type": {
+ "node_types": {
+ "type": "array",
+ "items": {
+ "description": "Type of node",
"enum": [
- "ethernet",
- "serial"
- ],
- "description": "Type of link"
- },
- "port_number": {
- "type": "integer",
- "description": "Port slot"
- },
- "data_link_types": {
- "properties": {},
- "type": "object",
- "description": "Available PCAP type for capture"
- },
- "name": {
- "type": "string",
- "description": "Port name"
+ "cloud",
+ "nat",
+ "ethernet_hub",
+ "ethernet_switch",
+ "frame_relay_switch",
+ "atm_switch",
+ "docker",
+ "dynamips",
+ "vpcs",
+ "virtualbox",
+ "vmware",
+ "iou",
+ "qemu"
+ ]
},
- "short_name": {
- "type": "string",
- "description": "Short version of port name"
- }
+ "description": "Node type supported by the compute"
},
- "additionalProperties": false,
- "type": "object",
- "description": "A node port"
+ "platform": {
+ "type": "string",
+ "description": "Platform where the compute is running"
+ }
},
- "type": "array",
- "description": "List of node ports READ only"
- },
- "name": {
- "minLength": 1,
+ "additionalProperties": false
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "compute_id",
+ "protocol",
+ "host",
+ "port",
+ "name"
+ ]
+ }
+ },
+ "drawings": {
+ "description": "Drawings elements",
+ "type": "array",
+ "items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "description": "An drawing object",
+ "type": "object",
+ "properties": {
+ "drawing_id": {
+ "description": "Drawing UUID",
"type": "string",
- "description": "Node name"
+ "minLength": 36,
+ "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}$"
},
- "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"
+ "project_id": {
+ "description": "Project UUID",
+ "type": "string",
+ "minLength": 36,
+ "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}$"
},
- "node_directory": {
- "type": [
- "null",
- "string"
- ],
- "description": "Working directory of the node. Read only"
+ "x": {
+ "description": "X property",
+ "type": "integer"
},
"y": {
- "type": "integer",
- "description": "Y position of the node"
+ "description": "Y property",
+ "type": "integer"
},
- "x": {
+ "z": {
+ "description": "Z property",
+ "type": "integer"
+ },
+ "rotation": {
+ "description": "Rotation of the element",
"type": "integer",
- "description": "X position of the node"
+ "minimum": -359,
+ "maximum": 360
},
- "node_id": {
- "minLength": 36,
- "type": "string",
- "description": "Node UUID",
- "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}$"
+ "svg": {
+ "description": "SVG content of the drawing",
+ "type": "string"
}
},
- "type": "object",
- "description": "A node object",
- "additionalProperties": false,
- "$schema": "http://json-schema.org/draft-04/schema#"
- },
- "type": "array",
- "description": "Nodes elements"
+ "additionalProperties": false
+ }
},
"links": {
+ "description": "Link elements",
+ "type": "array",
"items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "description": "A link object",
+ "type": "object",
"properties": {
- "link_type": {
- "enum": [
- "ethernet",
- "serial"
- ],
- "description": "Type of link"
- },
"link_id": {
- "minLength": 36,
- "type": "string",
"description": "Link UUID",
+ "type": "string",
+ "minLength": 36,
"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}$"
},
- "capturing": {
- "type": "boolean",
- "description": "Read only property. True if a capture running on the link"
- },
- "capture_file_path": {
- "type": [
- "string",
- "null"
- ],
- "description": "Read only property. The full path of the capture file if capture is running"
- },
- "capture_file_name": {
- "type": [
- "string",
- "null"
- ],
- "description": "Read only property. The name of the capture file if capture is running"
- },
"project_id": {
- "minLength": 36,
- "type": "string",
"description": "Project UUID",
+ "type": "string",
+ "minLength": 36,
"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}$"
},
"nodes": {
+ "description": "List of the VMS",
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
+ "node_id": {
+ "description": "Node UUID",
+ "type": "string",
+ "minLength": 36,
+ "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}$"
+ },
"adapter_number": {
- "type": "integer",
- "description": "Adapter number"
+ "description": "Adapter number",
+ "type": "integer"
+ },
+ "port_number": {
+ "description": "Port number",
+ "type": "integer"
},
"label": {
+ "type": "object",
"properties": {
"text": {
"type": "string"
},
- "rotation": {
- "maximum": 360,
- "type": "integer",
- "description": "Rotation of the label",
- "minimum": -359
- },
- "y": {
- "type": "integer",
- "description": "Relative Y position of the label"
+ "style": {
+ "description": "SVG style attribute",
+ "type": "string"
},
"x": {
+ "description": "Relative X position of the label. If null center it",
"type": [
"integer",
"null"
- ],
- "description": "Relative X position of the label. If null center it"
+ ]
},
- "style": {
- "type": "string",
- "description": "SVG style attribute"
+ "y": {
+ "description": "Relative Y position of the label",
+ "type": "integer"
+ },
+ "rotation": {
+ "description": "Rotation of the label",
+ "type": "integer",
+ "minimum": -359,
+ "maximum": 360
}
},
- "additionalProperties": false,
- "type": "object",
"required": [
"text",
"x",
"y"
- ]
- },
- "node_id": {
- "minLength": 36,
- "type": "string",
- "description": "Node UUID",
- "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}$"
- },
- "port_number": {
- "type": "integer",
- "description": "Port number"
+ ],
+ "additionalProperties": false
}
},
- "additionalProperties": false,
- "type": "object",
"required": [
"node_id",
"adapter_number",
"port_number"
- ]
- },
- "type": "array",
- "description": "List of the VMS"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "capturing": {
+ "description": "Read only property. True if a capture running on the link",
+ "type": "boolean"
+ },
+ "capture_file_name": {
+ "description": "Read only property. The name of the capture file if capture is running",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "capture_file_path": {
+ "description": "Read only property. The full path of the capture file if capture is running",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "link_type": {
+ "description": "Type of link",
+ "enum": [
+ "ethernet",
+ "serial"
+ ]
}
},
- "type": "object",
- "description": "A link object",
- "additionalProperties": false,
"required": [
"nodes"
],
- "$schema": "http://json-schema.org/draft-04/schema#"
- },
- "type": "array",
- "description": "Link elements"
+ "additionalProperties": false
+ }
},
- "computes": {
+ "nodes": {
+ "description": "Nodes elements",
+ "type": "array",
"items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "description": "A node object",
+ "type": "object",
"properties": {
- "port": {
- "type": "integer",
- "description": "Server port"
+ "compute_id": {
+ "description": "Compute identifier",
+ "type": "string"
},
- "user": {
+ "project_id": {
+ "description": "Project UUID",
+ "type": "string",
+ "minLength": 36,
+ "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}$"
+ },
+ "node_id": {
+ "description": "Node UUID",
+ "type": "string",
+ "minLength": 36,
+ "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}$"
+ },
+ "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"
+ ]
+ },
+ "node_directory": {
+ "description": "Working directory of the node. Read only",
"type": [
- "string",
- "null"
- ],
- "description": "User for authentication"
+ "null",
+ "string"
+ ]
},
- "memory_usage_percent": {
- "maximum": 100,
+ "command_line": {
+ "description": "Command line use to start the node",
"type": [
- "number",
+ "null",
+ "string"
+ ]
+ },
+ "name": {
+ "description": "Node name",
+ "type": "string",
+ "minLength": 1
+ },
+ "console": {
+ "description": "Console TCP port",
+ "minimum": 1,
+ "maximum": 65535,
+ "type": [
+ "integer",
"null"
- ],
- "description": "RAM usage of the compute. Read only",
- "minimum": 0
+ ]
},
- "protocol": {
+ "console_host": {
+ "description": "Console host. Warning if the host is 0.0.0.0 or :: (listen on all interfaces) you need to use the same address you use to connect to the controller.",
+ "type": "string",
+ "minLength": 1
+ },
+ "console_type": {
+ "description": "Console type",
"enum": [
+ "vnc",
+ "telnet",
"http",
- "https"
- ],
- "description": "Server protocol"
+ null
+ ]
},
- "compute_id": {
- "type": "string",
- "description": "Server identifier"
+ "properties": {
+ "description": "Properties specific to an emulator",
+ "type": "object"
},
- "capabilities": {
+ "status": {
+ "description": "Status of the node",
+ "enum": [
+ "stopped",
+ "started",
+ "suspended"
+ ]
+ },
+ "label": {
+ "type": "object",
"properties": {
- "node_types": {
- "items": {
- "enum": [
- "cloud",
- "nat",
- "ethernet_hub",
- "ethernet_switch",
- "frame_relay_switch",
- "atm_switch",
- "docker",
- "dynamips",
- "vpcs",
- "virtualbox",
- "vmware",
- "iou",
- "qemu"
- ],
- "description": "Type of node"
- },
- "type": "array",
- "description": "Node type supported by the compute"
+ "text": {
+ "type": "string"
},
- "platform": {
- "type": "string",
- "description": "Platform where the compute is running"
+ "style": {
+ "description": "SVG style attribute",
+ "type": "string"
},
- "version": {
+ "x": {
+ "description": "Relative X position of the label. If null center it",
"type": [
- "string",
+ "integer",
"null"
- ],
- "description": "Version number"
+ ]
+ },
+ "y": {
+ "description": "Relative Y position of the label",
+ "type": "integer"
+ },
+ "rotation": {
+ "description": "Rotation of the label",
+ "type": "integer",
+ "minimum": -359,
+ "maximum": 360
}
},
- "type": "object",
- "description": "Get what a server support",
- "additionalProperties": false,
"required": [
- "version",
- "node_types"
+ "text",
+ "x",
+ "y"
],
- "$schema": "http://json-schema.org/draft-04/schema#"
- },
- "host": {
- "type": "string",
- "description": "Server host"
- },
- "name": {
- "type": "string",
- "description": "Server name"
+ "additionalProperties": false
},
- "cpu_usage_percent": {
- "maximum": 100,
+ "symbol": {
+ "description": "Symbol of the node",
"type": [
- "number",
+ "string",
"null"
],
- "description": "CPU usage of the compute. Read only",
+ "minLength": 1
+ },
+ "width": {
+ "description": "Width of the node (Read only)",
+ "type": "integer"
+ },
+ "height": {
+ "description": "Height of the node (Read only)",
+ "type": "integer"
+ },
+ "x": {
+ "description": "X position of the node",
+ "type": "integer"
+ },
+ "y": {
+ "description": "Y position of the node",
+ "type": "integer"
+ },
+ "z": {
+ "description": "Z position of the node",
+ "type": "integer"
+ },
+ "port_name_format": {
+ "description": "Formating for port name {0} will be replace by port number",
+ "type": "string"
+ },
+ "port_segment_size": {
+ "description": "Size of the port segment",
+ "type": "integer",
"minimum": 0
},
- "connected": {
- "type": "boolean",
- "description": "Whether the controller is connected to the compute server or not"
+ "first_port_name": {
+ "description": "Name of the first port",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "ports": {
+ "description": "List of node ports READ only",
+ "type": "array",
+ "items": {
+ "type": "object",
+ "description": "A node port",
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "Port name"
+ },
+ "short_name": {
+ "type": "string",
+ "description": "Short version of port name"
+ },
+ "adapter_number": {
+ "type": "integer",
+ "description": "Adapter slot"
+ },
+ "port_number": {
+ "type": "integer",
+ "description": "Port slot"
+ },
+ "link_type": {
+ "description": "Type of link",
+ "enum": [
+ "ethernet",
+ "serial"
+ ]
+ },
+ "data_link_types": {
+ "type": "object",
+ "description": "Available PCAP type for capture",
+ "properties": {}
+ }
+ },
+ "additionalProperties": false
+ }
}
},
- "type": "object",
- "description": "Request validation to a GNS3 compute object instance",
- "additionalProperties": false,
- "required": [
- "compute_id",
- "protocol",
- "host",
- "port",
- "name"
- ],
- "$schema": "http://json-schema.org/draft-04/schema#"
- },
- "type": "array",
- "description": "Computes servers"
+ "additionalProperties": false
+ }
}
},
- "additionalProperties": false,
- "type": "object",
- "description": "The topology content",
"required": [
"nodes",
"links",
"drawings",
"computes"
- ]
- },
- "type": {
- "enum": [
- "topology"
],
- "description": "Type of file. It's always topology"
- },
- "revision": {
- "type": "integer",
- "description": "Version of the .gns3 specification."
- },
- "auto_close": {
- "type": "boolean",
- "description": "Close the topology when no client is connected"
- },
- "scene_height": {
- "type": "integer",
- "description": "Height of the drawing area"
- },
- "scene_width": {
- "type": "integer",
- "description": "Width of the drawing area"
- },
- "name": {
- "type": "string",
- "description": "Name of the project"
- },
- "project_id": {
- "minLength": 36,
- "type": "string",
- "description": "Project UUID",
- "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}$"
- },
- "version": {
- "type": "string",
- "description": "Version of the GNS3 software which have update the file for the last time"
+ "additionalProperties": false
}
},
- "type": "object",
- "description": "The topology",
- "additionalProperties": false,
"required": [
"project_id",
"type",
@@ -573,5 +573,5 @@
"name",
"topology"
],
- "$schema": "http://json-schema.org/draft-04/schema#"
+ "additionalProperties": false
}
\ No newline at end of file
diff --git a/gns3server/compute/base_node.py b/gns3server/compute/base_node.py
index 1f8cdc18..b728401b 100644
--- a/gns3server/compute/base_node.py
+++ b/gns3server/compute/base_node.py
@@ -533,7 +533,7 @@ class BaseNode:
server_config = self._manager.config.get_section_config("Server")
server_host = server_config.get("host")
- if not self._ubridge_hypervisor:
+ if not self.ubridge:
self._ubridge_hypervisor = Hypervisor(self._project, self.ubridge_path, self.working_dir, server_host)
log.info("Starting new uBridge hypervisor {}:{}".format(self._ubridge_hypervisor.host, self._ubridge_hypervisor.port))
yield from self._ubridge_hypervisor.start()
diff --git a/gns3server/compute/builtin/nodes/cloud.py b/gns3server/compute/builtin/nodes/cloud.py
index 0f3262e2..630905df 100644
--- a/gns3server/compute/builtin/nodes/cloud.py
+++ b/gns3server/compute/builtin/nodes/cloud.py
@@ -81,7 +81,9 @@ class Cloud(BaseNode):
"project_id": self.project.id,
"ports_mapping": self._ports_mapping,
"interfaces": host_interfaces,
- "status": self.status}
+ "status": self.status,
+ "node_directory": self.working_dir
+ }
@property
def ports_mapping(self):
diff --git a/gns3server/compute/qemu/qemu_vm.py b/gns3server/compute/qemu/qemu_vm.py
index bfe2f2bf..31688319 100644
--- a/gns3server/compute/qemu/qemu_vm.py
+++ b/gns3server/compute/qemu/qemu_vm.py
@@ -935,6 +935,7 @@ class QemuVM(BaseNode):
except OSError as e:
raise QemuError("Could not start QEMU console {}\n".format(e))
+ @asyncio.coroutine
def _termination_callback(self, returncode):
"""
Called when the process has stopped.
@@ -944,9 +945,7 @@ class QemuVM(BaseNode):
if self.started:
log.info("QEMU process has stopped, return code: %d", returncode)
- self.status = "stopped"
- self._hw_virtualization = False
- self._process = None
+ yield from self.stop()
# A return code of 1 seem fine on Windows
if returncode != 0 and (returncode != 1 or not sys.platform.startswith("win")):
self.project.emit("log.error", {"message": "QEMU process has stopped, return code: {}\n{}".format(returncode, self.read_stdout())})
diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py
index 837ef19f..345e0fbe 100644
--- a/gns3server/controller/__init__.py
+++ b/gns3server/controller/__init__.py
@@ -275,6 +275,7 @@ class Controller:
@settings.setter
def settings(self, val):
self._settings = val
+ self.save()
self.notification.emit("settings.updated", val)
@asyncio.coroutine
diff --git a/gns3server/controller/project.py b/gns3server/controller/project.py
index da884f31..c6caa7bf 100644
--- a/gns3server/controller/project.py
+++ b/gns3server/controller/project.py
@@ -293,7 +293,7 @@ class Project:
name = base_name.format(number, id=number, name="Node")
except KeyError as e:
raise aiohttp.web.HTTPConflict(text="{" + e.args[0] + "} is not a valid replacement string in the node name")
- except ValueError as e:
+ except (ValueError, IndexError) as e:
raise aiohttp.web.HTTPConflict(text="{} is not a valid replacement string in the node name".format(base_name))
if name not in self._allocated_node_names:
self._allocated_node_names.add(name)
diff --git a/gns3server/controller/topology.py b/gns3server/controller/topology.py
index 875aaa52..bdb1a318 100644
--- a/gns3server/controller/topology.py
+++ b/gns3server/controller/topology.py
@@ -142,7 +142,11 @@ def load_topology(path):
if topo["revision"] < 8:
topo = _convert_2_0_0(topo, path)
- _check_topology_schema(topo)
+ try:
+ _check_topology_schema(topo)
+ except aiohttp.web.HTTPConflict as e:
+ log.error("Can't load the topology %s", path)
+ raise e
if changed:
with open(path, "w+", encoding="utf-8") as f:
diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py
index 7302207b..d5e350a5 100644
--- a/gns3server/crash_report.py
+++ b/gns3server/crash_report.py
@@ -54,7 +54,7 @@ class CrashReport:
Report crash to a third party service
"""
- DSN = "sync+https://83564b27a6f6475488a3eb74c78f1760:ed5ac7c6d3f7428d960a84da98450b69@sentry.io/38482"
+ DSN = "sync+https://5b834577b69a4b77b112f020412237b5:b648d289253740daad5c08a939ceffd7@sentry.io/38482"
if hasattr(sys, "frozen"):
cacert = get_resource("cacert.pem")
if cacert is not None and os.path.isfile(cacert):
diff --git a/gns3server/schemas/cloud.py b/gns3server/schemas/cloud.py
index f5c23508..a67d8d35 100644
--- a/gns3server/schemas/cloud.py
+++ b/gns3server/schemas/cloud.py
@@ -75,7 +75,7 @@ CLOUD_CREATE_SCHEMA = {
{"$ref": "#/definitions/HostInterfaces"}
]},
]
- },
+ }
},
"additionalProperties": False,
"required": ["name"]
@@ -123,6 +123,10 @@ CLOUD_OBJECT_SCHEMA = {
]},
]
},
+ "node_directory": {
+ "description": "Path to the VM working directory",
+ "type": "string"
+ },
"status": {
"description": "Node status",
"enum": ["started", "stopped", "suspended"]
diff --git a/gns3server/schemas/dynamips_vm.py b/gns3server/schemas/dynamips_vm.py
index 0a2bcc71..f1a66ba5 100644
--- a/gns3server/schemas/dynamips_vm.py
+++ b/gns3server/schemas/dynamips_vm.py
@@ -487,7 +487,7 @@ VM_OBJECT_SCHEMA = {
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"node_directory": {
- "decription": "Path to the vm working directory",
+ "description": "Path to the vm working directory",
"type": "string"
},
"project_id": {
diff --git a/gns3server/schemas/qemu.py b/gns3server/schemas/qemu.py
index aa16d594..fee56de5 100644
--- a/gns3server/schemas/qemu.py
+++ b/gns3server/schemas/qemu.py
@@ -503,7 +503,7 @@ QEMU_OBJECT_SCHEMA = {
"enum": ["c", "d", "n", "cn", "cd"]
},
"node_directory": {
- "decription": "Path to the VM working directory",
+ "description": "Path to the VM working directory",
"type": "string"
},
"ram": {
diff --git a/gns3server/schemas/virtualbox.py b/gns3server/schemas/virtualbox.py
index 5b2661b6..769d373f 100644
--- a/gns3server/schemas/virtualbox.py
+++ b/gns3server/schemas/virtualbox.py
@@ -124,7 +124,7 @@ VBOX_OBJECT_SCHEMA = {
"enum": ["started", "stopped", "suspended"]
},
"node_directory": {
- "decription": "Path to the VM working directory",
+ "description": "Path to the VM working directory",
"type": ["string", "null"]
},
"headless": {
diff --git a/gns3server/schemas/vmware.py b/gns3server/schemas/vmware.py
index efd2cd8b..72a009fe 100644
--- a/gns3server/schemas/vmware.py
+++ b/gns3server/schemas/vmware.py
@@ -103,7 +103,7 @@ VMWARE_OBJECT_SCHEMA = {
"enum": ["started", "stopped", "suspended"]
},
"node_directory": {
- "decription": "Path to the node working directory",
+ "description": "Path to the node working directory",
"type": ["string", "null"]
},
"project_id": {
diff --git a/gns3server/schemas/vpcs.py b/gns3server/schemas/vpcs.py
index f36351a8..adbd2043 100644
--- a/gns3server/schemas/vpcs.py
+++ b/gns3server/schemas/vpcs.py
@@ -97,7 +97,7 @@ VPCS_OBJECT_SCHEMA = {
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"node_directory": {
- "decription": "Path to the VM working directory",
+ "description": "Path to the VM working directory",
"type": "string"
},
"status": {
diff --git a/scripts/documentation.sh b/scripts/documentation.sh
index 012794fe..38464e30 100755
--- a/scripts/documentation.sh
+++ b/scripts/documentation.sh
@@ -30,6 +30,7 @@ mkdir -p docs/api/examples
py.test -v tests
+export PYTHONPATH=.
python3 gns3server/web/documentation.py
cd docs
make html
diff --git a/tests/compute/builtin/nodes/test_cloud.py b/tests/compute/builtin/nodes/test_cloud.py
index 52687c97..43fee80d 100644
--- a/tests/compute/builtin/nodes/test_cloud.py
+++ b/tests/compute/builtin/nodes/test_cloud.py
@@ -29,21 +29,29 @@ def nio():
return NIOUDP(4242, "127.0.0.1", 4343)
-def test_json_with_ports(on_gns3vm, project):
+@pytest.fixture
+def manager():
+ m = MagicMock()
+ m.module_name = "builtins"
+ return m
+
+
+def test_json_with_ports(on_gns3vm, project, manager):
ports = [
{
"interface": "virbr0",
"name": "virbr0",
"port_number": 0,
- "type": "ethernet"
+ "type": "ethernet",
}
]
- cloud = Cloud("cloud1", str(uuid.uuid4()), project, MagicMock(), ports=ports)
+ cloud = Cloud("cloud1", str(uuid.uuid4()), project, manager, ports=ports)
assert cloud.__json__() == {
"name": "cloud1",
"node_id": cloud.id,
"project_id": project.id,
"status": "stopped",
+ "node_directory": cloud.working_dir,
"ports_mapping": [
{
"interface": "virbr0",
@@ -60,16 +68,17 @@ def test_json_with_ports(on_gns3vm, project):
}
-def test_json_without_ports(on_gns3vm, project):
+def test_json_without_ports(on_gns3vm, project, manager):
"""
If no interface is provide the cloud is prefill with non special interfaces
"""
- cloud = Cloud("cloud1", str(uuid.uuid4()), project, MagicMock(), ports=None)
+ cloud = Cloud("cloud1", str(uuid.uuid4()), project, manager, ports=None)
assert cloud.__json__() == {
"name": "cloud1",
"node_id": cloud.id,
"project_id": project.id,
"status": "stopped",
+ "node_directory": cloud.working_dir,
"ports_mapping": [
{
"interface": "eth0",
diff --git a/tests/compute/qemu/test_qemu_vm.py b/tests/compute/qemu/test_qemu_vm.py
index 854f47e4..55040bc5 100644
--- a/tests/compute/qemu/test_qemu_vm.py
+++ b/tests/compute/qemu/test_qemu_vm.py
@@ -144,7 +144,7 @@ def test_termination_callback(vm, async_run):
vm.status = "started"
with NotificationManager.instance().queue() as queue:
- vm._termination_callback(0)
+ async_run(vm._termination_callback(0))
assert vm.status == "stopped"
async_run(queue.get(0)) # Ping
@@ -163,10 +163,10 @@ def test_termination_callback_error(vm, tmpdir, async_run):
vm._stdout_file = str(tmpdir / "qemu.log")
with NotificationManager.instance().queue() as queue:
- vm._termination_callback(1)
+ async_run(vm._termination_callback(1))
assert vm.status == "stopped"
- async_run(queue.get(0)) # Ping
+ async_run(queue.get(0)) # Ping
(action, event, kwargs) = queue.get_nowait()
assert action == "node.updated"
diff --git a/tests/handlers/api/compute/test_server.py b/tests/handlers/api/compute/test_server.py
index 67c878ef..e39c2913 100644
--- a/tests/handlers/api/compute/test_server.py
+++ b/tests/handlers/api/compute/test_server.py
@@ -35,5 +35,5 @@ def test_version_output(http_compute):
def test_debug_output(http_compute):
- response = http_compute.get('/debug', example=True)
+ response = http_compute.get('/debug')
assert response.status == 200