mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-09-01 15:54:03 +03:00
c62b9b0283
Markers now follow exactly the same apply pattern as packet filters: state lives in Link._markers, application goes through NIO (update() -> PUT /nio -> _ubridge_apply_markers). The former immediate-apply REST endpoints (/markers/start, /markers/stop on the compute side) and the per-node start_marker/stop_marker methods are removed — they were a legacy of the original capture-inspired design and have been superseded by the NIO flow. Changes: - controller/udp_link: start_marker/stop_marker/update_marker now set _markers state + call self.update() (mirrors update_filters). Removed _marker_capture_nodes runtime dict and its helpers. - controller/project: _create_link_from_topology_data restores _markers directly from persisted data (with BPF validation, like filter reload). No long calls start_marker during load. - compute: _ubridge_apply_markers swallows BPF compile errors (warn+skip), matching _ubridge_apply_filters behaviour so a single bad expression cannot break link creation / node restart. - Removed: /markers/start,stop endpoints (6 handlers across vpcs/qemu/docker route files), node start_marker/stop_marker methods (3 VM files), _ubridge_delete_marker_filter, _marker_capture_nodes, MarkerDelete schema. Net: ~280 lines of dead code removed; marker and packet filter now share a single, unified apply path via the NIO.
162 lines
3.9 KiB
Python
162 lines
3.9 KiB
Python
#
|
|
# Copyright (C) 2020 GNS3 Technologies Inc.
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
from pydantic import BaseModel, Field
|
|
from typing import List, Optional, Tuple
|
|
from enum import Enum
|
|
from uuid import UUID, uuid4
|
|
|
|
from .labels import Label
|
|
|
|
|
|
class LinkNode(BaseModel):
|
|
"""
|
|
Link node data.
|
|
"""
|
|
|
|
node_id: UUID
|
|
adapter_number: int
|
|
port_number: int
|
|
label: Optional[Label] = None
|
|
|
|
|
|
class LinkType(str, Enum):
|
|
"""
|
|
Link type.
|
|
"""
|
|
|
|
ethernet = "ethernet"
|
|
serial = "serial"
|
|
|
|
|
|
class LinkStyle(BaseModel):
|
|
|
|
color: Optional[str] = None
|
|
width: Optional[int] = None
|
|
type: Optional[int] = None
|
|
link_type: Optional[str] = None
|
|
bezier_curviness: Optional[int] = None
|
|
flowchart_roundness: Optional[int] = None
|
|
control_offset: Optional[Tuple[float, float]] = None
|
|
|
|
|
|
class LinkBase(BaseModel):
|
|
"""
|
|
Link data.
|
|
"""
|
|
|
|
nodes: Optional[List[LinkNode]] = Field(None, min_length=0, max_length=2)
|
|
suspend: Optional[bool] = None
|
|
link_style: Optional[LinkStyle] = None
|
|
filters: Optional[dict] = None
|
|
markers: Optional[dict] = Field(
|
|
None,
|
|
description="Traffic-insight markers on this link: name → {bpf, tag, enabled}"
|
|
)
|
|
show_filters_icon: Optional[bool] = Field(
|
|
True,
|
|
description="Show filters icon in Web UI"
|
|
)
|
|
|
|
|
|
class LinkCreate(LinkBase):
|
|
|
|
link_id: UUID = Field(default_factory=uuid4)
|
|
nodes: List[LinkNode] = Field(..., min_length=2, max_length=2)
|
|
|
|
|
|
class LinkUpdate(LinkBase):
|
|
|
|
pass
|
|
|
|
|
|
class Link(LinkBase):
|
|
|
|
link_id: UUID
|
|
project_id: Optional[UUID] = None
|
|
link_type: Optional[LinkType] = None
|
|
capturing: Optional[bool] = Field(
|
|
None,
|
|
description="Read only property. True if a capture running on the link"
|
|
)
|
|
capture_file_name: Optional[str] = Field(
|
|
None,
|
|
description="Read only property. The name of the capture file if a capture is running"
|
|
)
|
|
capture_file_path: Optional[str] = Field(
|
|
None,
|
|
description="Read only property. The full path of the capture file if a capture is running"
|
|
)
|
|
capture_compute_id: Optional[str] = Field(
|
|
None,
|
|
description="Read only property. The compute identifier where a capture is running"
|
|
)
|
|
wireshark: Optional[bool] = Field(
|
|
False,
|
|
description="Read only property. True if a Web Wireshark session is active on the link"
|
|
)
|
|
|
|
|
|
class UDPPortInfo(BaseModel):
|
|
"""
|
|
UDP port information.
|
|
"""
|
|
|
|
node_id: UUID
|
|
lport: int
|
|
rhost: str
|
|
rport: int
|
|
type: str
|
|
|
|
class EthernetPortInfo(BaseModel):
|
|
"""
|
|
Ethernet port information.
|
|
"""
|
|
|
|
node_id: UUID
|
|
interface: str
|
|
type: str
|
|
|
|
|
|
class LinkCapture(BaseModel):
|
|
"""
|
|
Link capture data.
|
|
"""
|
|
|
|
data_link_type: str = "DLT_EN10MB"
|
|
capture_file_name: Optional[str] = None
|
|
wireshark: bool = False
|
|
|
|
|
|
class MarkerCreate(BaseModel):
|
|
"""
|
|
Body for attaching a traffic-insight marker to a link.
|
|
|
|
``name`` is optional at the controller REST layer (auto-generated when
|
|
absent) but always set when the controller forwards to the compute.
|
|
"""
|
|
|
|
name: Optional[str] = None
|
|
bpf: str
|
|
tag: Optional[int] = None
|
|
link_id: Optional[str] = None
|
|
color: Optional[str] = Field(
|
|
None,
|
|
description="User-chosen hex color for this marker in the Web UI, e.g. '#ff5722'"
|
|
)
|
|
|
|
|