Fixes Qemu networking.

gns3server/handlers/api/qemu_handler.py

@@ -236,7 +236,7 @@ class QEMUHandler:
             "project_id": "UUID for the project",
             "vm_id": "UUID for the instance",
             "adapter_number": "Network adapter where the nio is located",
-            "port_number": "Port where the nio should be added"
+            "port_number": "Port on the adapter (always 0)"
         },
         status_codes={
             201: "NIO created",
@@ -251,7 +251,7 @@ class QEMUHandler:
         qemu_manager = Qemu.instance()
         vm = qemu_manager.get_vm(request.match_info["vm_id"], project_id=request.match_info["project_id"])
         nio = qemu_manager.create_nio(vm.qemu_path, request.json)
-        yield from vm.adapter_add_nio_binding(int(request.match_info["adapter_number"]), int(request.match_info["port_number"]), nio)
+        yield from vm.adapter_add_nio_binding(int(request.match_info["adapter_number"]), nio)
         response.set_status(201)
         response.json(nio)
 
@@ -262,7 +262,7 @@ class QEMUHandler:
             "project_id": "UUID for the project",
             "vm_id": "UUID for the instance",
             "adapter_number": "Network adapter where the nio is located",
-            "port_number": "Port from where the nio should be removed"
+            "port_number": "Port on the adapter (always 0)"
         },
         status_codes={
             204: "NIO deleted",
@@ -274,7 +274,7 @@ class QEMUHandler:
 
         qemu_manager = Qemu.instance()
         vm = qemu_manager.get_vm(request.match_info["vm_id"], project_id=request.match_info["project_id"])
-        yield from vm.adapter_remove_nio_binding(int(request.match_info["adapter_number"]), int(request.match_info["port_number"]))
+        yield from vm.adapter_remove_nio_binding(int(request.match_info["adapter_number"]))
         response.set_status(204)
 
     @classmethod

gns3server/handlers/api/virtualbox_handler.py

@@ -290,7 +290,7 @@ class VirtualBoxHandler:
             "project_id": "UUID for the project",
             "vm_id": "UUID for the instance",
             "adapter_number": "Adapter from where the nio should be removed",
-            "port_number": "Port on the adapter (always)"
+            "port_number": "Port on the adapter (always 0)"
         },
         status_codes={
             204: "NIO deleted",

gns3server/modules/qemu/qemu_vm.py

@@ -598,6 +598,7 @@ class QemuVM(BaseVM):
         if self.is_running() and self._monitor:
             log.debug("Execute QEMU monitor command: {}".format(command))
             try:
+                log.info("Connecting to Qemu monitor on {}:{}".format(self._monitor_host, self._monitor))
                 reader, writer = yield from asyncio.open_connection(self._monitor_host, self._monitor)
             except OSError as e:
                 log.warn("Could not connect to QEMU monitor: {}".format(e))
@@ -682,13 +683,12 @@ class QemuVM(BaseVM):
             log.info("QEMU VM is not paused to be resumed, current status is {}".format(vm_status))
 
     @asyncio.coroutine
-    def adapter_add_nio_binding(self, adapter_id, port_id, nio):
+    def adapter_add_nio_binding(self, adapter_id, nio):
         """
         Adds a port NIO binding.
 
         :param adapter_id: adapter ID
-        :param port_id: port ID
-        :param nio: NIO instance to add to the slot/port
+        :param nio: NIO instance to add to the adapter
         """
 
         try:
@@ -708,13 +708,16 @@ class QemuVM(BaseVM):
                                                                                                                           nio.rport,
                                                                                                                           nio.rhost))
                 else:
-                    yield from self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
-                    yield from self._control_vm("host_net_add socket vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
-                                                                                                                            adapter_id,
-                                                                                                                            nio.rhost,
-                                                                                                                            nio.rport,
-                                                                                                                            self._host,
-                                                                                                                            nio.lport))
+                    # FIXME: does it work? very undocumented feature...
+                    # Apparently there is a bug in Qemu...
+                    # netdev_add [user|tap|socket|hubport|netmap],id=str[,prop=value][,...] -- add host network device
+                    # netdev_del id -- remove host network device
+                    yield from self._control_vm("netdev_del gns3-{}".format(adapter_id))
+                    yield from self._control_vm("netdev_add socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
+                                                                                                                nio.rhost,
+                                                                                                                nio.rport,
+                                                                                                                self._host,
+                                                                                                                nio.lport))
 
         adapter.add_nio(0, nio)
         log.info("QEMU VM {name} [id={id}]: {nio} added to adapter {adapter_id}".format(name=self._name,
@@ -723,12 +726,11 @@ class QemuVM(BaseVM):
                                                                                         adapter_id=adapter_id))
 
     @asyncio.coroutine
-    def adapter_remove_nio_binding(self, adapter_id, port_id):
+    def adapter_remove_nio_binding(self, adapter_id):
         """
         Removes a port NIO binding.
 
         :param adapter_id: adapter ID
-        :param port_id: port ID
 
         :returns: NIO instance
         """
@@ -745,6 +747,8 @@ class QemuVM(BaseVM):
             yield from self._control_vm("host_net_add user vlan={},name=gns3-{}".format(adapter_id, adapter_id))
 
         nio = adapter.get_nio(0)
+        if isinstance(nio, NIOUDP):
+            self.manager.port_manager.release_udp_port(nio.lport)
         adapter.remove_nio(0)
         log.info("QEMU VM {name} [id={id}]: {nio} removed from adapter {adapter_id}".format(name=self._name,
                                                                                             id=self._id,