Merge branch '2.0' into 2.1

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"]

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": {

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": {

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": {

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": {

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": {