Merge branch 'master' into 2.0

gns3server/handlers/api/compute/vmware_handler.py

@@ -252,7 +252,7 @@ class VMwareHandler:
         vmware_manager = VMware.instance()
         vm = vmware_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
         nio_type = request.json["type"]
-        if nio_type not in ("nio_udp", "nio_vmnet", "nio_nat"):
+        if nio_type not in ("nio_udp", "nio_vmnet", "nio_nat", "nio_tap"):
             raise HTTPConflict(text="NIO of type {} is not supported".format(nio_type))
         nio = vmware_manager.create_nio(request.json)
         yield from vm.adapter_add_nio_binding(int(request.match_info["adapter_number"]), nio)