mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Suspend link
This commit is contained in:
7 files changed
+162
-9
No files matched your search
@@ -122,6 +122,7 @@ class Link:
|
||||
self._streaming_pcap = None
|
||||
self._created = False
|
||||
self._link_type = "ethernet"
|
||||
self._suspend = False
|
||||
self._filters = {}
|
||||
|
||||
@property
|
||||
@@ -131,6 +132,15 @@ class Link:
|
||||
"""
|
||||
return self._filters
|
||||
|
||||
def get_active_filters(self):
|
||||
"""
|
||||
Return the active filters.
|
||||
If the node is suspend the filters will be override
|
||||
"""
|
||||
if self._suspend:
|
||||
return {"frequency_drop": [-1]}
|
||||
return self._filters
|
||||
|
||||
@asyncio.coroutine
|
||||
def update_filters(self, filters):
|
||||
"""
|
||||
@@ -155,6 +165,12 @@ class Link:
|
||||
if self._created:
|
||||
yield from self.update()
|
||||
|
||||
@asyncio.coroutine
|
||||
def update_suspend(self, value):
|
||||
if value != self._suspend:
|
||||
self._suspend = value
|
||||
yield from self.update()
|
||||
|
||||
@property
|
||||
def created(self):
|
||||
"""
|
||||
@@ -401,7 +417,8 @@ class Link:
|
||||
return {
|
||||
"nodes": res,
|
||||
"link_id": self._id,
|
||||
"filters": self._filters
|
||||
"filters": self._filters,
|
||||
"suspend": self._suspend
|
||||
}
|
||||
return {
|
||||
"nodes": res,
|
||||
@@ -411,5 +428,6 @@ class Link:
|
||||
"capture_file_name": self._capture_file_name,
|
||||
"capture_file_path": self.capture_file_path,
|
||||
"link_type": self._link_type,
|
||||
"filters": self._filters
|
||||
"filters": self._filters,
|
||||
"suspend": self._suspend
|
||||
}
|
||||
@@ -66,9 +66,9 @@ class UDPLink(Link):
|
||||
node2_filters = {}
|
||||
filter_node = self._get_filter_node()
|
||||
if filter_node == node1:
|
||||
node1_filters = self._filters
|
||||
node1_filters = self.get_active_filters()
|
||||
elif filter_node == node2:
|
||||
node2_filters = self._filters
|
||||
node2_filters = self.get_active_filters()
|
||||
|
||||
# Create the tunnel on both side
|
||||
self._link_data.append({
|
||||
@@ -106,12 +106,12 @@ class UDPLink(Link):
|
||||
if node1 == filter_node:
|
||||
adapter_number1 = self._nodes[0]["adapter_number"]
|
||||
port_number1 = self._nodes[0]["port_number"]
|
||||
self._link_data[0]["filters"] = self._filters
|
||||
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._filters
|
||||
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)
|
||||
|
||||
@asyncio.coroutine
|
||||
|
||||
@@ -62,7 +62,10 @@ class LinkHandler:
|
||||
|
||||
project = yield from Controller.instance().get_loaded_project(request.match_info["project_id"])
|
||||
link = yield from project.add_link()
|
||||
yield from link.update_filters(request.json.get("filters", {}))
|
||||
if "filters" in request.json:
|
||||
yield from link.update_filters(request.json["filters"])
|
||||
if "suspend" in request.json:
|
||||
yield from link.update_suspend(request.json["suspend"])
|
||||
try:
|
||||
for node in request.json["nodes"]:
|
||||
yield from link.add_node(project.get_node(node["node_id"]),
|
||||
@@ -110,7 +113,10 @@ class LinkHandler:
|
||||
|
||||
project = yield from Controller.instance().get_loaded_project(request.match_info["project_id"])
|
||||
link = project.get_link(request.match_info["link_id"])
|
||||
yield from link.update_filters(request.json.get("filters", {}))
|
||||
if "filters" in request.json:
|
||||
yield from link.update_filters(request.json["filters"])
|
||||
if "suspend" in request.json:
|
||||
yield from link.update_suspend(request.json["suspend"])
|
||||
if "nodes" in request.json:
|
||||
yield from link.update_nodes(request.json["nodes"])
|
||||
response.set_status(201)
|
||||
|
||||
@@ -64,6 +64,10 @@ LINK_OBJECT_SCHEMA = {
|
||||
"additionalProperties": False
|
||||
}
|
||||
},
|
||||
"suspend": {
|
||||
"type": "boolean",
|
||||
"description": "Link has been turned off"
|
||||
},
|
||||
"filters": FILTER_OBJECT_SCHEMA,
|
||||
"capturing": {
|
||||
"description": "Read only property. True if a capture running on the link",
|
||||
|
||||
Reference in new issue
Block a user