Merge branch 'master' into unstable

gns3server/schemas/dynamips_vm.py

@@ -745,7 +745,6 @@ VM_CONFIGS_SCHEMA = {
         },
     },
     "additionalProperties": False,
-    "required": ["startup_config_content", "private_config_content"]
 }
 
 VMS_LIST_SCHEMA = {

gns3server/schemas/nio.py

@@ -78,6 +78,16 @@ NIO_SCHEMA = {
             "required": ["type", "ethernet_device"],
             "additionalProperties": False
         },
+        "NAT": {
+            "description": "NAT Network Input/Output",
+            "properties": {
+                "type": {
+                    "enum": ["nio_nat"]
+                },
+            },
+            "required": ["type"],
+            "additionalProperties": False
+        },
         "TAP": {
             "description": "TAP Network Input/Output",
             "properties": {
@@ -148,6 +158,7 @@ NIO_SCHEMA = {
         {"$ref": "#/definitions/UDP"},
         {"$ref": "#/definitions/Ethernet"},
         {"$ref": "#/definitions/LinuxEthernet"},
+        {"$ref": "#/definitions/NAT"},
         {"$ref": "#/definitions/TAP"},
         {"$ref": "#/definitions/UNIX"},
         {"$ref": "#/definitions/VDE"},