gns3-server 3.0.3__py3-none-any.whl → 3.0.5__py3-none-any.whl

gns3server/appliances/vyos.gns3a

@@ -30,6 +30,13 @@
         "on_close": "shutdown_signal"
     },
     "images": [
+        {
+            "filename": "vyos-1.4.1-kvm-amd64.qcow2",
+            "version": "1.4.1",
+            "md5sum": "5b8ebcd9905719d24405ed093afdd8ba",
+            "filesize": 513736704,
+            "download_url": "https://support.vyos.io/"
+        },
         {
             "filename": "vyos-1.4.0-kvm-amd64.qcow2",
             "version": "1.4.0",
@@ -109,6 +116,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1.4.1",
+            "images": {
+                "hda_disk_image": "vyos-1.4.1-kvm-amd64.qcow2"
+            }
+        },
         {
             "name": "1.4.0",
             "images": {

gns3server/compute/builtin/nodes/nat.py

@@ -37,7 +37,7 @@ class Nat(Cloud):
     def __init__(self, name, node_id, project, manager, ports=None):
 
         allowed_interfaces = Config.instance().settings.Server.allowed_interfaces
-        if allowed_interfaces:
+        if allowed_interfaces and isinstance(allowed_interfaces, str):
             allowed_interfaces = allowed_interfaces.split(',')
         if sys.platform.startswith("linux"):
             nat_interface = Config.instance().settings.Server.default_nat_interface

gns3server/compute/docker/__init__.py

@@ -175,11 +175,10 @@ class Docker(BaseManager):
         response = await self.http_query(method, path, data=data, params=params)
         body = await response.read()
         response.close()
-        if body and len(body):
-            if response.headers.get('CONTENT-TYPE') == 'application/json':
-                body = json.loads(body.decode("utf-8"))
-            else:
-                body = body.decode("utf-8")
+        if response.headers.get('CONTENT-TYPE') == 'application/json':
+            body = json.loads(body.decode("utf-8", errors="ignore"))
+        else:
+            body = body.decode("utf-8", errors="ignore")
         log.debug("Query Docker %s %s params=%s data=%s Response: %s", method, path, params, data, body)
         return body
 
@@ -267,12 +266,12 @@ class Docker(BaseManager):
             pass
 
         if progress_callback:
-            progress_callback(f"Pulling '{image}' from docker hub")
+            progress_callback(f"Pulling '{image}' from Docker repository")
         try:
             response = await self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None)
         except DockerError as e:
             raise DockerError(
-                f"Could not pull the '{image}' image from Docker Hub, "
+                f"Could not pull the '{image}' image from Docker repository, "
                 f"please check your Internet connection (original error: {e})"
             )
         # The pull api will stream status via an HTTP JSON stream
@@ -281,10 +280,10 @@ class Docker(BaseManager):
             try:
                 chunk = await response.content.read(CHUNK_SIZE)
             except aiohttp.ServerDisconnectedError:
-                log.error(f"Disconnected from server while pulling Docker image '{image}' from docker hub")
+                log.error(f"Disconnected from server while pulling Docker image '{image}' from Docker repository")
                 break
             except asyncio.TimeoutError:
-                log.error(f"Timeout while pulling Docker image '{image}' from docker hub")
+                log.error("Timeout while pulling Docker image '{}' from Docker repository".format(image))
                 break
             if not chunk:
                 break

gns3server/compute/docker/docker_vm.py

@@ -437,7 +437,7 @@ class DockerVM(BaseNode):
         try:
             image_infos = await self._get_image_information()
         except DockerHttp404Error:
-            log.info(f"Image '{self._image}' is missing, pulling it from Docker hub...")
+            log.info("Image '{}' is missing, pulling it from Docker repository...".format(self._image))
             await self.pull_image(self._image)
             image_infos = await self._get_image_information()
 
@@ -617,6 +617,7 @@ class DockerVM(BaseNode):
             await self._clean_servers()
 
             await self.manager.query("POST", f"containers/{self._cid}/start")
+            await asyncio.sleep(0.5)  # give the Docker container some time to start
             self._namespace = await self._get_namespace()
 
             await self._start_ubridge(require_privileged_access=True)

gns3server/compute/qemu/qemu_vm.py

@@ -32,6 +32,7 @@ import subprocess
 import time
 import json
 import shlex
+import psutil
 
 from gns3server.utils import parse_version
 from gns3server.utils.asyncio import subprocess_check_output, cancellable_wait_run_in_executor
@@ -265,17 +266,10 @@ class QemuVM(BaseNode):
             if qemu_bin == "qemu":
                 self._platform = "i386"
             else:
-                self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, re.IGNORECASE)
-
-        try:
-            QemuPlatform(self._platform.split(".")[0])
-        except ValueError:
+                self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, flags=re.IGNORECASE)
+        if self._platform.split(".")[0] not in list(QemuPlatform):
             raise QemuError(f"Platform {self._platform} is unknown")
-        log.info(
-            'QEMU VM "{name}" [{id}] has set the QEMU path to {qemu_path}'.format(
-                name=self._name, id=self._id, qemu_path=qemu_path
-            )
-        )
+        log.info(f'QEMU VM "{self._name}" [{self._name}] has set the QEMU path to {qemu_path}')
 
     def _check_qemu_path(self, qemu_path):
 
@@ -1225,6 +1219,21 @@ class QemuVM(BaseNode):
         except OSError as e:
             raise QemuError(f"Could not start Telnet QEMU console {e}\n")
 
+    def _find_partition_for_path(self, path):
+        """
+        Finds the disk partition for a given path.
+        """
+
+        path = os.path.abspath(path)
+        partitions = psutil.disk_partitions()
+        # find the partition with the longest matching mount point
+        matching_partition = None
+        for partition in partitions:
+            if path.startswith(partition.mountpoint):
+                if matching_partition is None or len(partition.mountpoint) > len(matching_partition.mountpoint):
+                    matching_partition = partition
+        return matching_partition
+
     async def _termination_callback(self, returncode):
         """
         Called when the process has stopped.
@@ -1236,9 +1245,19 @@ class QemuVM(BaseNode):
             log.info("QEMU process has stopped, return code: %d", returncode)
             await self.stop()
             if returncode != 0:
+                qemu_stdout = self.read_stdout()
+                # additional permissions need to be configured for swtpm in AppArmor if the working dir
+                # is located on a different partition than the partition for the root directory
+                if "TPM result for CMD_INIT" in qemu_stdout:
+                    partition = self._find_partition_for_path(self.project.path)
+                    if partition and partition.mountpoint != "/":
+                        qemu_stdout += "\nTPM error: the project directory is not on the same partition as the root directory which can be a problem when using AppArmor.\n" \
+                                        "Please try to execute the following commands on the server:\n\n" \
+                                        "echo 'owner {}/** rwk,' | sudo tee /etc/apparmor.d/local/usr.bin.swtpm > /dev/null\n" \
+                                        "sudo service apparmor restart".format(os.path.dirname(self.project.path))
                 self.project.emit(
                     "log.error",
-                    {"message": f"QEMU process has stopped, return code: {returncode}\n{self.read_stdout()}"},
+                    {"message": f"QEMU process has stopped, return code: {returncode}\n{qemu_stdout}"},
                 )
 
     async def stop(self):
@@ -2287,19 +2306,42 @@ class QemuVM(BaseNode):
                 else:
                     raise QemuError(f"bios image '{self._bios_image}' is not accessible")
             options.extend(["-bios", self._bios_image.replace(",", ",,")])
+
         elif self._uefi:
-            # get the OVMF firmware from the images directory
-            ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd")
+
+            old_ovmf_vars_path = os.path.join(self.working_dir, "OVMF_VARS.fd")
+            if os.path.exists(old_ovmf_vars_path):
+                # the node has its own UEFI variables store already, we must also use the old UEFI firmware
+                ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd")
+            else:
+                system_ovmf_firmware_path = "/usr/share/OVMF/OVMF_CODE_4M.fd"
+                if os.path.exists(system_ovmf_firmware_path):
+                    ovmf_firmware_path = system_ovmf_firmware_path
+                else:
+                    # otherwise, get the UEFI firmware from the images directory
+                    ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE_4M.fd")
+
             log.info("Configuring UEFI boot mode using OVMF file: '{}'".format(ovmf_firmware_path))
             options.extend(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_firmware_path)])
 
+            # try to use the UEFI variables store from the system first
+            system_ovmf_vars_path = "/usr/share/OVMF/OVMF_VARS_4M.fd"
+            if os.path.exists(system_ovmf_vars_path):
+                ovmf_vars_path = system_ovmf_vars_path
+            else:
+                # otherwise, get the UEFI variables store from the images directory
+                ovmf_vars_path = self.manager.get_abs_image_path("OVMF_VARS_4M.fd")
+
             # the node should have its own copy of OVMF_VARS.fd (the UEFI variables store)
-            ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS.fd")
-            if not os.path.exists(ovmf_vars_node_path):
-                try:
-                    shutil.copyfile(self.manager.get_abs_image_path("OVMF_VARS.fd"), ovmf_vars_node_path)
-                except OSError as e:
-                    raise QemuError("Cannot copy OVMF_VARS.fd file to the node working directory: {}".format(e))
+            if os.path.exists(old_ovmf_vars_path):
+                ovmf_vars_node_path = old_ovmf_vars_path
+            else:
+                ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS_4M.fd")
+                if not os.path.exists(ovmf_vars_node_path):
+                    try:
+                        shutil.copyfile(ovmf_vars_path, ovmf_vars_node_path)
+                    except OSError as e:
+                        raise QemuError("Cannot copy OVMF_VARS_4M.fd file to the node working directory: {}".format(e))
             options.extend(["-drive", "if=pflash,format=raw,file={}".format(ovmf_vars_node_path)])
         return options
 
@@ -2396,16 +2438,13 @@ class QemuVM(BaseNode):
         )  # we do not want any user networking back-end if no adapter is connected.
 
         # Each 32 PCI device we need to add a PCI bridge with max 9 bridges
-        pci_devices = 4 + len(self._ethernet_adapters)  # 4 PCI devices are use by default by qemu
-        pci_bridges = math.floor(pci_devices / 32)
+        # Reserve 32 devices on root pci_bridge,
+        # since the number of devices used by templates may differ significantly
+        # and pci_bridges also consume IDs.
+        # Move network devices to their own bridge
+        pci_devices_reserved = 32
         pci_bridges_created = 0
-        if pci_bridges >= 1:
-            if self._qemu_version and parse_version(self._qemu_version) < parse_version("2.4.0"):
-                raise QemuError(
-                    "Qemu version 2.4 or later is required to run this VM with a large number of network adapters"
-                )
-
-        pci_device_id = 4 + pci_bridges  # Bridge consume PCI ports
+        pci_device_id = pci_devices_reserved
         for adapter_number, adapter in enumerate(self._ethernet_adapters):
             mac = int_to_macaddress(macaddress_to_int(self._mac_address) + adapter_number)
 
@@ -2596,6 +2635,8 @@ class QemuVM(BaseNode):
         """
 
         self._qemu_version = await self.manager.get_qemu_version(self.qemu_path)
+        if self._qemu_version and parse_version(self._qemu_version) < parse_version("2.4.0"):
+            raise QemuError("Qemu version 2.4 or later is required to run Qemu VMs")
         vm_name = self._name.replace(",", ",,")
         project_path = self.project.path.replace(",", ",,")
         additional_options = self._options.strip()

gns3server/compute/vmware/vmware_vm.py

@@ -352,6 +352,7 @@ class VMwareVM(BaseNode):
         vnet = self._get_vnet(adapter_number)
         await self._ubridge_send(f"bridge create {vnet}")
         vmnet_interface = os.path.basename(self._vmx_pairs[vnet])
+        block_host_traffic = self.manager.config.settings.VMware.block_host_traffic
 
         if sys.platform.startswith("darwin"):
             if parse_version(platform.mac_ver()[0]) >= parse_version("11.0.0"):
@@ -360,13 +361,11 @@ class VMwareVM(BaseNode):
                 vmnet_interface = self.manager.find_bridge_interface(vmnet_interface)
                 if not vmnet_interface:
                     raise VMwareError(f"Could not find bridge interface linked with {vmnet_interface}")
-                block_host_traffic = self.manager.config.get_section_config("VMware").getboolean("block_host_traffic", False)
                 await self._add_ubridge_ethernet_connection(vnet, vmnet_interface, block_host_traffic)
             else:
                 # special case on macOS, we cannot bind VMnet interfaces using the libpcap
                 await self._ubridge_send('bridge add_nio_fusion_vmnet {name} "{interface}"'.format(name=vnet, interface=vmnet_interface))
         else:
-            block_host_traffic = self.manager.config.VMware.block_host_traffic
             await self._add_ubridge_ethernet_connection(vnet, vmnet_interface, block_host_traffic)
 
         if isinstance(nio, NIOUDP):

gns3server/controller/__init__.py

@@ -74,6 +74,7 @@ class Controller:
 
         log.info("Controller is starting")
         await self._install_base_configs()
+        await self._install_custom_symbols()
         installed_disks = await self._install_builtin_disks()
         if installed_disks:
             await update_disk_checksums(installed_disks)
@@ -371,6 +372,19 @@ class Controller:
         except OSError as e:
             log.error(f"Could not install disk files to {dst_path}: {e}")
 
+    async def _install_custom_symbols(self):
+        """
+        At startup we copy custom symbols to the user location to allow
+        them to use with appliances
+        """
+
+        dst_path = self.symbols.symbols_path()
+        log.info(f"Installing custom symbols in '{dst_path}'")
+        try:
+            return await Controller.install_resource_files(dst_path, "custom_symbols", upgrade_resources=False)
+        except OSError as e:
+            log.error(f"Could not install custom symbols to {dst_path}: {e}")
+
     def images_path(self):
         """
         Get the image storage directory

gns3server/controller/compute.py

@@ -458,10 +458,11 @@ class Compute:
                             # FIXME: slow down number of compute events
                             self._controller.notification.controller_emit("compute.updated", self.asdict())
                         else:
-                            if action == "log.error":
-                                log.error(event.pop("message"))
                             await self._controller.notification.dispatch(
-                                action, event, project_id=project_id, compute_id=self.id
+                                action,
+                                event,
+                                project_id=project_id,
+                                compute_id=self.id
                             )
                     else:
                         if response.type == aiohttp.WSMsgType.CLOSE:

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -249,6 +249,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                     return True
         return False
 
+
     async def list(self):
         """
         List all VirtualBox VMs
@@ -269,8 +270,8 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
 
         # get a NAT interface number
         nat_interface_number = await self._look_for_interface("nat")
-        if nat_interface_number < 0:
-            raise GNS3VMError(f'VM "{self.vmname}" must have a NAT interface configured in order to start')
+        if nat_interface_number < 0 and await self._look_for_interface("natnetwork") < 0:
+            raise GNS3VMError(f'VM "{self.vmname}" must have a NAT interface or NAT Network configured in order to start')
 
         if sys.platform.startswith("darwin") and parse_version(self._system_properties["API version"]) >= parse_version("7_0"):
             # VirtualBox 7.0+ on macOS requires a host-only network interface
@@ -339,42 +340,68 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         elif vm_state == "paused":
             args = [self._vmname, "resume"]
             await self._execute("controlvm", args)
-        ip_address = "127.0.0.1"
-        try:
-            # get a random port on localhost
-            with socket.socket() as s:
-                s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-                s.bind((ip_address, 0))
-                api_port = s.getsockname()[1]
-        except OSError as e:
-            raise GNS3VMError(f"Error while getting random port: {e}")
-
-        if await self._check_vbox_port_forwarding():
-            # delete the GNS3VM NAT port forwarding rule if it exists
-            log.info(f"Removing GNS3VM NAT port forwarding rule from interface {nat_interface_number}")
-            await self._execute("controlvm", [self._vmname, f"natpf{nat_interface_number}", "delete", "GNS3VM"])
-
-        # add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to the port in the VM
-        log.info(f"Adding GNS3VM NAT port forwarding rule with port {api_port} to interface {nat_interface_number}")
-        await self._execute(
-            "controlvm",
-            [self._vmname, f"natpf{nat_interface_number}", f"GNS3VM,tcp,{ip_address},{api_port},,{self.port}"],
-        )
 
-        self.ip_address = await self._get_ip(interface_number, api_port)
-        log.info("GNS3 VM has been started with IP {}".format(self.ip_address))
+        log.info("Retrieving IP address from GNS3 VM...")
+        ip = await self._get_ip_from_guest_property()
+        if ip:
+            self.ip_address = ip
+        else:
+            # if we can't get the IP address from the guest property, we try to get it from the GNS3 server (a NAT interface is required)
+            if nat_interface_number < 0:
+                raise GNS3VMError("Could not find guest IP address for {}".format(self.vmname))
+            log.warning("Could not find IP address from guest property, trying to get it from GNS3 server")
+            ip_address = "127.0.0.1"
+            try:
+                # get a random port on localhost
+                with socket.socket() as s:
+                    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+                    s.bind((ip_address, 0))
+                    api_port = s.getsockname()[1]
+            except OSError as e:
+                raise GNS3VMError("Error while getting random port: {}".format(e))
+
+            if await self._check_vbox_port_forwarding():
+                # delete the GNS3VM NAT port forwarding rule if it exists
+                log.info("Removing GNS3VM NAT port forwarding rule from interface {}".format(nat_interface_number))
+                await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "delete", "GNS3VM"])
+
+            # add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to the port in the VM
+            log.info("Adding GNS3VM NAT port forwarding rule with port {} to interface {}".format(api_port, nat_interface_number))
+            await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number),
+                                                   "GNS3VM,tcp,{},{},,{}".format(ip_address, api_port, self.port)])
+
+            self.ip_address = await self._get_ip_from_server(interface_number, api_port)
+
+        log.info("GNS3 VM has been started with IP '{}'".format(self.ip_address))
         self.running = True
 
-    async def _get_ip(self, hostonly_interface_number, api_port):
+    async def _get_ip_from_guest_property(self):
+        """
+        Get the IP from VirtualBox by retrieving the guest property (Guest Additions must be installed).
+        """
+
+        remaining_try = 180  # try for 3 minutes
+        while remaining_try > 0:
+            result = await self._execute("guestproperty", ["get", self._vmname, "/VirtualBox/GuestInfo/Net/0/V4/IP"])
+            for info in result.splitlines():
+                if ':' in info:
+                    name, value = info.split(':', 1)
+                    if name == "Value":
+                        return value.strip()
+            remaining_try -= 1
+            await asyncio.sleep(1)
+        return None
+
+    async def _get_ip_from_server(self, hostonly_interface_number, api_port):
         """
-        Get the IP from VirtualBox.
+        Get the IP from VirtualBox by sending a request to the GNS3 server.
 
         Due to VirtualBox limitation the only way is to send request each
         second to a GNS3 endpoint in order to get the list of the interfaces and
         their IP and after that match it with VirtualBox host only.
         """
 
-        remaining_try = 300
+        remaining_try = 180  # try for 3 minutes
         while remaining_try > 0:
             try:
                 async with HTTPClient.get(f"http://127.0.0.1:{api_port}/v3/compute/network/interfaces") as resp:

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://2c96fa0280f82c48108f122b87cd902c@o19455.ingest.us.sentry.io/38482"
+    DSN = "https://61bb46252cabeebd49ee1e09fb8ba72e@o19455.ingest.us.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/custom_symbols/6wind.svg

@@ -0,0 +1 @@
+<svg id="f6fe4215-7336-420b-bd07-06692844737a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 67.6 65.59"><title>vrouter-logo-generic</title><circle cx="34" cy="32.75" r="19.09" style="fill:#3d4859;opacity:0.8999999761581421;isolation:isolate"/><circle cx="34.04" cy="32.79" r="11.18" style="fill:#5e7ce2;opacity:0.8999999761581421;isolation:isolate"/><path d="M44.61,7.88l20.74-5.6c1.22-.33,2,.41,1.7,1.65L62.21,24.86c-.47,2-3.1,3.65-4.17,2.62l-4.92-4.76-7.84,8.13c-1.07,1.11-2.48,1.49-3.15.85l-3.62-3.49c-.66-.64-.33-2.07.73-3.18l7.84-8.13-4.93-4.76C41.07,11.1,42.62,8.42,44.61,7.88Z" transform="translate(-1.16 -2.2)" style="fill:#0aaded;opacity:0.8999999761581421;isolation:isolate"/><path d="M26.06,62.11,5.32,67.72c-1.21.33-2-.42-1.7-1.65L8.47,45.14c.44-2,3.08-3.65,4.15-2.62l4.93,4.76,7.84-8.13c1.07-1.11,2.49-1.49,3.15-.85l3.63,3.49c.67.64.33,2.07-.72,3.18L23.61,53.1l4.91,4.76C29.6,58.9,28.05,61.58,26.06,62.11Z" transform="translate(-1.16 -2.2)" style="fill:#5e7ce2;opacity:0.8999999761581421;isolation:isolate"/><path d="M25.29,8.71l5.6,20.75c.33,1.21-.41,2-1.64,1.69L8.31,26.31c-2-.47-3.65-3.1-2.61-4.17l4.75-4.91L2.32,9.38C1.21,8.31.83,6.9,1.47,6.24L5,2.6c.64-.66,2.07-.33,3.18.73l8.13,7.86L21,6.25C22.07,5.17,24.75,6.72,25.29,8.71Z" transform="translate(-1.16 -2.2)" style="fill:#5e7ce2;opacity:0.8999999761581421;isolation:isolate"/><path d="M44.64,61.15,39,40.4c-.33-1.21.42-2,1.65-1.7l20.93,4.84c2,.46,3.65,3.09,2.62,4.16l-4.76,4.94,8.13,7.84c1.11,1.06,1.49,2.48.85,3.14L65,67.24c-.64.67-2.07.34-3.18-.72l-8.13-7.84L48.9,63.61C47.85,64.69,45.17,63.14,44.64,61.15Z" transform="translate(-1.16 -2.2)" style="fill:#0aaded;opacity:0.8999999761581421;isolation:isolate"/></svg>

gns3server/custom_symbols/alpine-virt-qemu.svg

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg height="59.253815" id="Andysvg" version="1.0" width="65.414536" x="0.00000000" y="0.00000000" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com">
+  <defs id="defs3">
+    <linearGradient id="linearGradient891" x1="92.437965" x2="27.674332" y1="-3.9104078" y2="91.076988" gradientTransform="matrix(0.8184166,0,0,0.530237,-9.8827678,-14.589608)" gradientUnits="userSpaceOnUse">
+      <stop id="stop889" offset="0" style="stop-color:#626262;stop-opacity:1.0000000;"/>
+      <stop id="stop890" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient905" x1="-77.726181" x2="95.64444" y1="208.43991" y2="11.699047" gradientTransform="matrix(0.7314635,0,0,0.5932693,-9.8827694,-14.589616)" gradientUnits="userSpaceOnUse">
+      <stop id="stop889" offset="0" style="stop-color:#626262;stop-opacity:1.0000000;"/>
+      <stop id="stop890" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient cx="60.004654" cy="56.485935" id="radialGradient1132" r="68.589226" gradientTransform="matrix(0.8184166,0,0,0.530237,-9.8827678,-14.589608)" gradientUnits="userSpaceOnUse">
+      <stop id="stop1134" offset="0" style="stop-color:#8bb7df;stop-opacity:1.0000000;"/>
+      <stop id="stop1136" offset="0.7621" style="stop-color:#2a6092;stop-opacity:1.0000000;"/>
+      <stop id="stop1135" offset="1" style="stop-color:#375e82;stop-opacity:1.0000000;"/>
+    </radialGradient>
+    <linearGradient id="linearGradient1140" x1="45.685757" x2="41.96706" y1="110.4447" y2="232.24953" gradientTransform="matrix(1.2743811,0,0,0.3405213,-9.8827694,-14.589616)" gradientUnits="userSpaceOnUse">
+      <stop id="stop889" offset="0" style="stop-color:#626262;stop-opacity:1.0000000;"/>
+      <stop id="stop890" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient1144" x1="31.449743" x2="31.617281" y1="203.49899" y2="251.21892" gradientTransform="matrix(1.4044089,0,0,0.3089952,-9.8827694,-14.589616)" gradientUnits="userSpaceOnUse">
+      <stop id="stop893" offset="0" style="stop-color:#ffffff;stop-opacity:0.00000000;"/>
+      <stop id="stop894" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient1146" x1="39.810947" x2="17.87653" y1="90.197021" y2="113.71949" gradientTransform="matrix(0.8811179,0,0,0.4925045,-9.8827694,-14.589616)" gradientUnits="userSpaceOnUse">
+      <stop id="stop893" offset="0" style="stop-color:#ffffff;stop-opacity:0.00000000;"/>
+      <stop id="stop894" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient1156" x1="25.220816" x2="25.220816" y1="178.48862" y2="234.26866" gradientTransform="matrix(1.6156202,0,0,0.2685999,-9.8827678,-14.589608)" gradientUnits="userSpaceOnUse">
+      <stop id="stop889" offset="0" style="stop-color:#626262;stop-opacity:1.0000000;"/>
+      <stop id="stop890" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient1157" x1="51.46093" x2="-16.224497" y1="269.85831" y2="176.28694" gradientTransform="matrix(1.6156202,0,0,0.2685999,-9.8827678,-14.589608)" gradientUnits="userSpaceOnUse">
+      <stop id="stop889" offset="0" style="stop-color:#626262;stop-opacity:1.0000000;"/>
+      <stop id="stop890" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+  </defs>
+  <rect height="5.4088969" id="rect1155" style="fill: url(#linearGradient1156); fill-opacity: 1; fill-rule: evenodd; stroke: url(#linearGradient1157); stroke-width: 0.953444pt;" width="38.405891" x="12.350429" y="36.575089"/>
+  <path d="M 0.19287398,54.885213 C -0.67386281,56.46268 1.5579198,59.253939 3.3933636,59.253939 L 62.069027,59.253939 C 63.628857,59.253939 65.976201,57.281205 65.269522,55.925378 L 58.655165,43.235277 C 58.145696,42.257819 57.005954,41.779036 55.881408,41.779036 L 8.9408812,41.779036 C 8.0135624,41.779036 7.0317541,42.438291 6.5938539,43.235277 L 0.19287398,54.885213 z " id="path1139" style="fill: url(#linearGradient1140); fill-opacity: 1; fill-rule: evenodd; stroke-width: 1.44735pt;"/>
+  <rect height="39.110481" id="rect1137" rx="3.6272225" ry="3.536587" style="fill: url(#linearGradient905); fill-opacity: 1; fill-rule: evenodd; stroke-width: 1.62827;" width="48.220726" x="7.4732022" y="-0.010164791"/>
+  <rect height="24.74659" id="rect1131" style="fill: url(#radialGradient1132); fill-opacity: 1; fill-rule: evenodd; stroke: url(#linearGradient891); stroke-width: 0.965037pt;" width="38.813015" x="12.390426" y="6.027596"/>
+  <path d="M 8.5906358,19.782157 L 8.3772707,34.032521 C 8.3432557,36.304242 9.6712558,37.75887 12.004493,37.777143 L 38.568566,37.985175 L 41.128957,32.160207 L 11.471076,31.952177 L 11.257713,19.678141 L 8.5906358,19.782157 z " id="path1145" style="fill: url(#linearGradient1146); fill-opacity: 1; fill-rule: evenodd; stroke-width: 1pt;"/>
+  <path d="M 2.7205883,54.675124 C 2.1113822,55.866786 2.9089235,57.975349 4.9701318,57.975349 L 60.179981,57.975349 C 61.276346,57.975349 62.926231,56.48511 62.429524,55.460899 L 57.78047,45.874547 C 57.422369,45.136152 56.621274,44.774474 55.830865,44.774474 L 8.8693353,44.774468 C 8.2175462,44.774468 7.5274604,45.272486 7.2196723,45.874547 L 2.7205883,54.675124 z " id="path1143" style="fill: url(#linearGradient1144); fill-opacity: 1; fill-rule: evenodd; stroke-width: 1pt;"/>
+  <rect x="12.664" y="6.294" width="38.092" height="24.48" style="fill: rgb(255, 255, 255);"/>
+  <path d="M 28.718 20.949 L 28.718 18.69 L 27.09 20.318 C 27.266 20.44 27.431 20.541 27.587 20.622 C 27.741 20.704 27.887 20.768 28.023 20.815 C 28.159 20.864 28.284 20.896 28.399 20.918 C 28.516 20.939 28.622 20.948 28.718 20.949 M 37.035 20.762 C 37.038 20.764 37.054 20.778 37.082 20.796 C 37.113 20.815 37.155 20.839 37.212 20.862 C 37.269 20.886 37.339 20.91 37.426 20.927 C 37.512 20.945 37.613 20.956 37.728 20.956 C 37.825 20.956 37.931 20.948 38.048 20.927 C 38.164 20.907 38.292 20.875 38.429 20.826 C 38.566 20.779 38.713 20.716 38.871 20.633 C 39.029 20.551 39.196 20.449 39.374 20.325 L 38.14 19.116 L 34.048 15.009 L 32.253 16.805 L 29.832 14.307 L 23.753 20.317 C 23.931 20.442 24.098 20.542 24.256 20.624 C 24.413 20.707 24.561 20.771 24.697 20.818 C 24.835 20.866 24.961 20.899 25.078 20.919 C 25.195 20.939 25.301 20.948 25.398 20.948 C 25.513 20.948 25.614 20.936 25.7 20.919 C 25.785 20.901 25.856 20.878 25.914 20.855 C 25.97 20.831 26.013 20.806 26.043 20.788 C 26.072 20.769 26.088 20.755 26.091 20.753 L 28.835 18.009 L 29.816 17.068 L 32.534 19.786 L 33.483 20.762 C 33.485 20.764 33.501 20.778 33.53 20.796 C 33.56 20.815 33.602 20.839 33.66 20.862 C 33.716 20.886 33.788 20.91 33.873 20.927 C 33.959 20.945 34.06 20.956 34.176 20.956 C 34.273 20.956 34.379 20.948 34.496 20.927 C 34.613 20.907 34.74 20.875 34.877 20.826 C 35.014 20.779 35.161 20.716 35.319 20.633 C 35.476 20.551 35.644 20.449 35.823 20.325 L 33.642 18.19 L 34.047 17.785 L 35.934 19.672 L 37.035 20.762 M 37.011 9.382 L 42.371 18.668 L 37.011 27.955 L 26.288 27.955 L 20.926 18.668 L 26.288 9.382 L 37.011 9.382 Z" style="fill: rgb(13, 89, 127); fill-opacity: 1; fill-rule: nonzero; stroke: none;" id="path58" bx:origin="0 0"/>
+</svg>

gns3server/custom_symbols/arista_bybaro.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg id="svg1998" width="51.358818" height="47.630692" version="1.0" xmlns="http://www.w3.org/2000/svg">
+  <defs id="defs2001">
+    <marker orient="auto" refY="0" refX="0" id="Arrow2Lstart" style="overflow:visible">
+      <path id="path11918" style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="matrix(1.1,0,0,1.1,1.1,0)"/>
+    </marker>
+    <marker orient="auto" refY="0" refX="0" id="Arrow1Send" style="overflow:visible">
+      <path id="path11921" d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z " style="fill-rule:evenodd;stroke:black;stroke-width:1pt;marker-start:none" transform="matrix(-0.2,0,0,-0.2,-1.2,0)"/>
+    </marker>
+    <marker orient="auto" refY="0" refX="0" id="Arrow1Lstart" style="overflow:visible">
+      <path id="path11936" d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z " style="fill-rule:evenodd;stroke:black;stroke-width:1pt;marker-start:none" transform="matrix(0.8,0,0,0.8,10,0)"/>
+    </marker>
+    <linearGradient id="linearGradient9199" gradientUnits="userSpaceOnUse" gradientTransform="matrix(24.666332,1.3331909e-2,-1.2883406e-2,23.708747,-8.6563136,-4.6316275)" x1="2.1178279" y1="0.30649999" x2="-0.4954865" y2="0.30649999">
+      <stop style="stop-opacity: 1; stop-color: rgb(239, 239, 239);" offset="0" id="stop8333"/>
+      <stop style="stop-opacity: 1; stop-color: rgb(255, 255, 255);" offset="1" id="stop8335"/>
+    </linearGradient>
+  </defs>
+  <path id="path11907" d="M 1.8402723,44.565612 L 1.8402723,47.615693 L 44.293781,47.615693 L 44.293781,44.565612 L 1.8402723,44.565612" style="fill:#000000;fill-opacity:0.39215686;stroke:none;stroke-width:0.001"/>
+  <path id="path11020" d="M 44.370594,6.1851672 L 51.194316,1.0980117 L 51.358819,41.344844 L 44.266438,47.63069 L 44.370594,6.1851672" style="fill:#000000;fill-opacity:0.39215686;stroke:none;stroke-width:0.001"/>
+  <path id="path2037" d="M 0.062500355,5.0439492 L 0.062500355,46.326915 L 44.31814,46.326915 L 44.31814,5.0439492 L 0.062500355,5.0439492" style="fill-opacity: 1; stroke: none; stroke-width: 0.001; fill: rgb(239, 239, 239);"/>
+  <path id="path2041" d="M -0.028418806,5.1647552 L 5.5982489,0.11782966 L 50.022311,0.14184042 L 44.346312,5.1887393 L -0.028418806,5.1647552" style="fill:url(#linearGradient9199);fill-opacity:1;stroke:none;stroke-width:0.001"/>
+  <path id="path2045" d="M 44.228586,5.0887264 L 49.976169,0.12831483 L 49.976169,41.348635 L 44.228586,46.309047 L 44.228586,5.0887264" style="fill-opacity: 1; stroke: none; stroke-width: 0.001; fill: rgb(223, 223, 223);"/>
+  <path class="st0" d="M 40.254 38.435 L 24.509 13.686 C 23.584 12.049 20.925 12.049 19.901 13.789 L 4.254 38.435 L 9.369 38.435 L 14.073 30.969 L 24.099 30.969 L 26.753 26.67 L 16.731 26.67 L 22.255 18.082 L 35.039 38.435 L 40.254 38.435 Z" style="fill: rgb(24, 61, 100);"/>
+</svg>

gns3server/custom_symbols/asterfusion-vAsterNOS.svg

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="_图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 44.52">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+      }
+
+      .cls-2 {
+        clip-path: url(#clippath);
+      }
+
+      .cls-3 {
+        fill: #fff;
+      }
+
+      .cls-4 {
+        fill: #abbbed;
+      }
+
+      .cls-5 {
+        fill: #96aae9;
+      }
+
+      .cls-6 {
+        fill: #7989bb;
+      }
+    </style>
+    <clipPath id="clippath">
+      <rect class="cls-1" x=".1" y="8.18" width="64.89" height="27.34"/>
+    </clipPath>
+  </defs>
+  <rect x="1.34" y="23.21" width="49.53" height="13.54"/>
+  <polygon points="50.88 23.21 50.88 36.75 66 23.21 66 9.64 50.88 23.21"/>
+  <rect class="cls-1" x=".1" y="8.18" width="64.89" height="27.34"/>
+  <rect class="cls-1" x=".1" y="8.18" width="64.89" height="27.34"/>
+  <rect class="cls-5" x=".22" y="21.87" width="49.53" height="13.54"/>
+  <polygon class="cls-4" points="15.34 8.3 .22 21.87 49.75 21.87 64.87 8.3 15.34 8.3"/>
+  <polygon class="cls-6" points="49.75 21.87 49.75 35.4 64.87 21.87 64.87 8.3 49.75 21.87"/>
+  <polygon class="cls-3" points="33.17 12.87 25.08 14.56 31.96 17.27 40.04 15.58 33.17 12.87"/>
+  <polygon class="cls-3" points="24.77 15.66 28.21 17.02 14.88 19.81 16.6 20.49 9.1 19.98 9.73 17.78 11.45 18.46 24.77 15.66"/>
+  <polygon class="cls-3" points="36.9 13.12 40.33 14.48 53.69 11.68 55.41 12.35 56 10.15 48.54 9.64 50.26 10.32 36.9 13.12"/>
+  <polygon class="cls-3" points="35.71 17.52 39.75 16.68 44.9 18.71 46.92 18.29 46.33 20.49 38.83 19.98 40.86 19.56 35.71 17.52"/>
+  <polygon class="cls-3" points="25.39 13.46 29.44 12.61 24.28 10.58 26.29 10.15 18.83 9.64 18.2 11.85 20.24 11.42 25.39 13.46"/>
+  <g class="cls-2">
+    <path class="cls-3" d="m25.84,29.93c0-.2-.07-.35-.21-.46-.14-.11-.39-.22-.74-.34s-.64-.23-.86-.34c-.73-.36-1.09-.85-1.09-1.47,0-.31.09-.58.27-.82.18-.24.44-.42.77-.56s.7-.2,1.12-.2.77.07,1.09.21c.32.15.57.35.74.62.18.26.26.57.26.91h-1.35c0-.23-.07-.41-.21-.53-.14-.13-.33-.19-.57-.19s-.43.05-.57.16c-.14.1-.21.24-.21.41,0,.15.08.27.23.39.16.12.42.24.81.36.39.12.71.26.95.4.61.35.91.83.91,1.45,0,.49-.18.88-.56,1.15-.37.28-.88.42-1.52.42-.46,0-.87-.08-1.24-.25s-.65-.39-.83-.67c-.19-.28-.28-.61-.28-.98h1.35c0,.3.08.52.23.67.16.14.41.21.76.21.22,0,.4-.05.53-.15.13-.1.2-.23.2-.41"/>
+  </g>
+</svg>