Improve suspend a link for Qemu and VirtualBox VMs.

A suspended link will be unplugged allowing the VMs to be notified
of the change.

gns3server/controller/link.py

@@ -124,7 +124,7 @@ class Link:
         self._streaming_pcap = None
         self._created = False
         self._link_type = "ethernet"
-        self._suspend = False
+        self._suspended = False
         self._filters = {}
 
     @property
@@ -146,7 +146,8 @@ class Link:
         Return the active filters.
         Filters are overridden if the link is suspended.
         """
-        if self._suspend:
+        if self._suspended:
+            # this is to allow all node types to support suspend link
             return {"frequency_drop": [-1]}
         return self._filters
 
@@ -178,8 +179,8 @@ class Link:
 
     @asyncio.coroutine
     def update_suspend(self, value):
-        if value != self._suspend:
-            self._suspend = value
+        if value != self._suspended:
+            self._suspended = value
             yield from self.update()
             self._project.controller.notification.emit("link.updated", self.__json__())
             self._project.dump()
@@ -452,7 +453,7 @@ class Link:
                 "nodes": res,
                 "link_id": self._id,
                 "filters": self._filters,
-                "suspend": self._suspend
+                "suspend": self._suspended
             }
         return {
             "nodes": res,
@@ -463,5 +464,5 @@ class Link:
             "capture_file_path": self.capture_file_path,
             "link_type": self._link_type,
             "filters": self._filters,
-            "suspend": self._suspend
+            "suspend": self._suspended
         }

gns3server/controller/udp_link.py

@@ -76,7 +76,8 @@ class UDPLink(Link):
             "rhost": node2_host,
             "rport": self._node2_port,
             "type": "nio_udp",
-            "filters": node1_filters
+            "filters": node1_filters,
+            "suspend": self._suspended
         })
         yield from node1.post("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number1, port_number=port_number1), data=self._link_data[0], timeout=120)
 
@@ -85,7 +86,8 @@ class UDPLink(Link):
             "rhost": node1_host,
             "rport": self._node1_port,
             "type": "nio_udp",
-            "filters": node2_filters
+            "filters": node2_filters,
+            "suspend": self._suspended
         })
         try:
             yield from node2.post("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number2, port_number=port_number2), data=self._link_data[1], timeout=120)
@@ -97,22 +99,34 @@ class UDPLink(Link):
 
     @asyncio.coroutine
     def update(self):
+        """
+        Update the link on the nodes
+        """
+
         if len(self._link_data) == 0:
             return
         node1 = self._nodes[0]["node"]
         node2 = self._nodes[1]["node"]
-        filter_node = self._get_filter_node()
 
-        if node1 == filter_node:
-            adapter_number1 = self._nodes[0]["adapter_number"]
-            port_number1 = self._nodes[0]["port_number"]
-            self._link_data[0]["filters"] = self.get_active_filters()
-            yield from node1.put("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number1, port_number=port_number1), data=self._link_data[0], timeout=120)
-        elif node2 == filter_node:
-            adapter_number2 = self._nodes[1]["adapter_number"]
-            port_number2 = self._nodes[1]["port_number"]
-            self._link_data[1]["filters"] = self.get_active_filters()
-            yield from node2.put("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number2, port_number=port_number2), data=self._link_data[1], timeout=221)
+        node1_filters = {}
+        node2_filters = {}
+        filter_node = self._get_filter_node()
+        if filter_node == node1:
+            node1_filters = self.get_active_filters()
+        elif filter_node == node2:
+            node2_filters = self.get_active_filters()
+
+        adapter_number1 = self._nodes[0]["adapter_number"]
+        port_number1 = self._nodes[0]["port_number"]
+        self._link_data[0]["filters"] = node1_filters
+        self._link_data[0]["suspend"] = self._suspended
+        yield from node1.put("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number1, port_number=port_number1), data=self._link_data[0], timeout=120)
+
+        adapter_number2 = self._nodes[1]["adapter_number"]
+        port_number2 = self._nodes[1]["port_number"]
+        self._link_data[1]["filters"] = node2_filters
+        self._link_data[1]["suspend"] = self._suspended
+        yield from node2.put("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number2, port_number=port_number2), data=self._link_data[1], timeout=221)
 
     @asyncio.coroutine
     def delete(self):