mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-09-01 23:55:15 +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.
111 lines
5.3 KiB
Python
111 lines
5.3 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/>.
|
|
|
|
# General schemas
|
|
from .config import ServerConfig
|
|
from .common import ErrorMessage
|
|
from .version import Version
|
|
|
|
# Controller schemas
|
|
from .controller.links import LinkCreate, LinkUpdate, Link, UDPPortInfo, EthernetPortInfo, LinkCapture, MarkerCreate
|
|
from .controller.computes import ComputeCreate, ComputeUpdate, ComputeVirtualBoxVM, ComputeVMwareVM, ComputeDockerImage, AutoIdlePC, Compute
|
|
from .controller.templates import TemplateCreate, TemplateUpdate, TemplateUsage, Template
|
|
from .controller.images import Image, ImageType
|
|
from .controller.appliances import ApplianceVersion, ApplianceVersionV8, Appliance
|
|
from .controller.drawings import Drawing
|
|
from .controller.gns3vm import GNS3VM
|
|
from .controller.nodes import NodeCreate, NodeUpdate, NodeDuplicate, NodeCapture, Node
|
|
from .controller.projects import ProjectCreate, ProjectUpdate, ProjectDuplicate, Project, ProjectFile, ProjectCompression, NodeFile
|
|
from .controller.users import UserCreate, UserUpdate, LoggedInUserUpdate, User, Credentials, UserGroupCreate, UserGroupUpdate, UserGroup
|
|
|
|
# Conditionally import AI-related schemas
|
|
try:
|
|
from .controller.llm_model_configs import (
|
|
LLMModelConfigData,
|
|
LLMModelConfigCreate,
|
|
LLMModelConfigUpdate,
|
|
LLMModelConfigResponse,
|
|
LLMModelConfigWithSource,
|
|
LLMModelConfigInheritedResponse,
|
|
LLMModelConfigListResponse
|
|
)
|
|
from .controller.chat import (
|
|
OpenAIToolCall,
|
|
ChatRequest,
|
|
ChatResponse,
|
|
OpenAIMessage,
|
|
ConversationHistory,
|
|
ChatSession,
|
|
RenameSession
|
|
)
|
|
except ImportError:
|
|
# AI schemas are not available (should not happen as they don't depend on external libs)
|
|
pass
|
|
|
|
from .controller.rbac import RoleCreate, RoleUpdate, Role, Privilege, ACECreate, ACEUpdate, ACE
|
|
from .controller.pools import Resource, ResourceCreate, ResourcePoolCreate, ResourcePoolUpdate, ResourcePool
|
|
from .controller.tokens import Token, ApiKeyCreate, RefreshTokenRequest
|
|
from .controller.snapshots import SnapshotCreate, Snapshot
|
|
from .controller.iou_license import IOULicense
|
|
from .controller.capabilities import Capabilities
|
|
|
|
# Controller template schemas
|
|
from .controller.templates.vpcs_templates import VPCSTemplate, VPCSTemplateUpdate
|
|
from .controller.templates.cloud_templates import CloudTemplate, CloudTemplateUpdate
|
|
from .controller.templates.iou_templates import IOUTemplate, IOUTemplateUpdate
|
|
from .controller.templates.docker_templates import DockerTemplate, DockerTemplateUpdate
|
|
from .controller.templates.ethernet_hub_templates import EthernetHubTemplate, EthernetHubTemplateUpdate
|
|
from .controller.templates.ethernet_switch_templates import EthernetSwitchTemplate, EthernetSwitchTemplateUpdate
|
|
from .controller.templates.virtualbox_templates import VirtualBoxTemplate, VirtualBoxTemplateUpdate
|
|
from .controller.templates.vmware_templates import VMwareTemplate, VMwareTemplateUpdate
|
|
from .controller.templates.qemu_templates import QemuTemplate, QemuTemplateUpdate
|
|
from .controller.templates.dynamips_templates import (
|
|
DynamipsTemplate,
|
|
C1700DynamipsTemplate,
|
|
C1700DynamipsTemplateUpdate,
|
|
C2600DynamipsTemplate,
|
|
C2600DynamipsTemplateUpdate,
|
|
C2691DynamipsTemplate,
|
|
C2691DynamipsTemplateUpdate,
|
|
C3600DynamipsTemplate,
|
|
C3600DynamipsTemplateUpdate,
|
|
C3725DynamipsTemplate,
|
|
C3725DynamipsTemplateUpdate,
|
|
C3745DynamipsTemplate,
|
|
C3745DynamipsTemplateUpdate,
|
|
C7200DynamipsTemplate,
|
|
C7200DynamipsTemplateUpdate
|
|
)
|
|
|
|
# Compute schemas
|
|
from .compute.nios import UDPNIO, TAPNIO, EthernetNIO
|
|
from .compute.atm_switch_nodes import ATMSwitchCreate, ATMSwitchUpdate, ATMSwitch
|
|
from .compute.cloud_nodes import CloudCreate, CloudUpdate, Cloud
|
|
from .compute.docker_nodes import DockerCreate, DockerUpdate, Docker
|
|
from .compute.dynamips_nodes import DynamipsCreate, DynamipsUpdate, Dynamips
|
|
from .compute.ethernet_hub_nodes import EthernetHubCreate, EthernetHubUpdate, EthernetHub
|
|
from .compute.ethernet_switch_nodes import EthernetSwitchCreate, EthernetSwitchUpdate, EthernetSwitch
|
|
from .compute.frame_relay_switch_nodes import FrameRelaySwitchCreate, FrameRelaySwitchUpdate, FrameRelaySwitch
|
|
from .compute.qemu_nodes import QemuCreate, QemuUpdate, Qemu
|
|
from .compute.iou_nodes import IOUCreate, IOUUpdate, IOUStart, IOU
|
|
from .compute.nat_nodes import NATCreate, NATUpdate, NAT
|
|
from .compute.vpcs_nodes import VPCSCreate, VPCSUpdate, VPCS
|
|
from .compute.vmware_nodes import VMwareCreate, VMwareUpdate, VMware
|
|
from .compute.virtualbox_nodes import VirtualBoxCreate, VirtualBoxUpdate, VirtualBox
|
|
|
|
# Schemas for both controller and compute
|
|
from .qemu_disk_image import QemuDiskImageFormat, QemuDiskImageCreate, QemuDiskImageUpdate
|