gns3-server 3.0.4__tar.gz → 3.0.5__tar.gz

{gns3_server-3.0.4 → gns3_server-3.0.5}/CHANGELOG

@@ -1,5 +1,44 @@
 # Change Log
 
+## 3.0.5 14/05/2025
+
+* Bundle web-ui v3.0.5
+* Sync appliances
+* Use Ubuntu 24.04 LTS in Dockerfile. Ref #2523
+* Fix tests and require Qemu version >= 2.4
+* Fix adding pci_bridges to qemu vms
+* Resolve deprecation warnings of regex library
+* Remove OVMF_CODE_4M.secboot.fd and associated code
+* Add edk2-stable202502 UEFI firmwares and try to first use firmwares from the ovmf package if installed. Fixes #2494
+* Prettify TPM error message
+* Fix bug in qemu_stdout message
+* Try to detect swtpm and AppArmor issue. Ref https://github.com/GNS3/gns3-gui/issues/3725
+* Fix Docker logs decoding. Ref #2522
+* Add delay after starting a Docker container and adding connections in uBridge. Ref #2522
+* Fix TypeError when reading Docker container logs. Ref #2522
+* Allow an image to be uploaded to the controller again even if it is already in the database
+* Fix controller not reporting an error if invalid options are passed to Qemu command line. Fixes #2517
+* Replace "Docker hub" by "Docker repository" because it is possible to use different repositories
+* Fix unable to add NAT cloud after configuring “allowed_interfaces” in configuration file. Fixes #2508
+* Fix interface information API endpoint for Cloud/NAT devices
+* Upgrade Jinja2 to v3.1.6. Fixes #2515
+* Fix packet capture for links connected to a cloud node. Fixes #2513
+* fix: check if remote-install.sh is being run as root
+
+## 2.2.54 21/04/2025
+
+* Bundle web-ui v2.2.54
+* Add new method to find the IP address of a VBox GNS3 VM + allow NAT Network
+* Add edk2-stable202502 UEFI firmwares and try to first use firmwares from the ovmf package if installed. Fixes #2494
+* Try to detect swtpm and AppArmor issue. Ref https://github.com/GNS3/gns3-gui/issues/3725
+* Fix Docker logs decoding. Ref #2522
+* Add delay after starting a Docker container and adding connections in uBridge. Ref #2522
+* Fix TypeError when reading Docker container logs. Ref #2522
+* Replace "Docker hub" by "Docker repository" because it is possible to use different repositories
+* Upgrade dependencies
+* Improvements for remote-install.sh
+
+
 ## 3.0.4 25/02/2025
 
 * Require minimum 8 characters for passwords

gns3_server-3.0.5/PKG-INFO

@@ -0,0 +1,202 @@
+Metadata-Version: 2.4
+Name: gns3-server
+Version: 3.0.5
+Summary: GNS3 graphical interface for the GNS3 server.
+Author-email: Jeremy Grossmann <developers@gns3.com>
+Project-URL: Homepage, http://gns3.com
+Project-URL: Repository, http://github.com/GNS3/gns3-server
+Project-URL: Bug tracker, http://github.com/GNS3/gns3-server/issues
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Framework :: FastAPI
+Classifier: Intended Audience :: Information Technology
+Classifier: Topic :: System :: Networking
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Natural Language :: English
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: uvicorn==0.34.2
+Requires-Dist: pydantic==2.11.4
+Requires-Dist: fastapi==0.115.12
+Requires-Dist: python-multipart==0.0.20
+Requires-Dist: websockets==15.0.1
+Requires-Dist: aiohttp<3.12,>=3.11.16
+Requires-Dist: async-timeout==5.0.1; python_version < "3.11"
+Requires-Dist: aiofiles<25.0,>=24.1.0
+Requires-Dist: Jinja2<3.2,>=3.1.6
+Requires-Dist: sentry-sdk<2.27,>=2.26.1
+Requires-Dist: psutil>=7.0.0
+Requires-Dist: async-timeout<5.1,>=5.0.1
+Requires-Dist: distro>=1.9.0
+Requires-Dist: py-cpuinfo<10.0,>=9.0.0
+Requires-Dist: greenlet==3.2.0
+Requires-Dist: sqlalchemy==2.0.40
+Requires-Dist: aiosqlite==0.21.0
+Requires-Dist: alembic==1.15.2
+Requires-Dist: bcrypt==4.3.0
+Requires-Dist: joserfc==1.0.4
+Requires-Dist: email-validator==2.2.0
+Requires-Dist: watchdog==6.0.0
+Requires-Dist: zstandard==0.23.0
+Requires-Dist: platformdirs<3,>=2.4.0
+Requires-Dist: importlib-resources>=1.3; python_version <= "3.9"
+Requires-Dist: truststore>=0.10.1; python_version >= "3.10"
+Provides-Extra: dev
+Requires-Dist: pytest==8.3.4; extra == "dev"
+Requires-Dist: flake8==7.1.1; extra == "dev"
+Requires-Dist: pytest-timeout==2.3.1; extra == "dev"
+Requires-Dist: pytest-asyncio==0.25.2; extra == "dev"
+Requires-Dist: requests==2.32.3; extra == "dev"
+Requires-Dist: httpx==0.28.1; extra == "dev"
+Requires-Dist: httpx_ws==0.7.1; extra == "dev"
+Dynamic: license-file
+
+# GNS3 server repository
+
+[![Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![GitHub Actions tests](https://github.com/GNS3/gns3-server/workflows/testing/badge.svg?branch=3.0)](https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting+branch%3A3.0)
+[![Latest PyPi version](https://img.shields.io/pypi/v/gns3-server.svg)](https://pypi.python.org/pypi/gns3-server)
+[![Snyk scanning](https://snyk.io/test/github/GNS3/gns3-server/badge.svg)](https://snyk.io/test/github/GNS3/gns3-server)
+
+The GNS3 server manages emulators and other virtualization software such as Dynamips, Qemu/KVM, Docker, VPCS, VirtualBox and VMware Workstation.
+Clients like the [GNS3 GUI](https://github.com/GNS3/gns3-gui/) and the [GNS3 Web UI](https://github.com/GNS3/gns3-web-ui/) control the server using a HTTP REST API.
+
+## Installation
+
+These instructions are for using GNS3, please see below for development.
+
+### Windows & macOS
+
+Please use our [Windows installer or DMG package](https://gns3.com/software/download) to install the stable build along with the GNS3 VM.
+Note that as of GNS3 version above 3.0, you must run the server using the GNS3 VM or on a Linux system (remote, cloud or virtual machine).
+
+### Linux
+
+#### Ubuntu based distributions
+
+We build and test packages for actively supported Ubuntu versions.
+Other distros based on Ubuntu, like Mint, should also be supported.
+
+Packages can be installed from our Personal Package Archives (PPA) repository:
+
+```shell
+sudo apt update
+sudo apt install software-properties-common
+sudo add-apt-repository ppa:gns3/ppa
+sudo apt update                                
+sudo apt install gns3-gui gns3-server
+```
+
+#### Other Linux distributions
+
+GNS3 is often packaged for other distributions by third-parties:
+
+* [Gentoo](https://packages.gentoo.org/package/net-misc/gns3-server)
+* [Alpine](https://pkgs.alpinelinux.org/package/v3.10/community/x86_64/gns3-server)
+* [NixOS](https://search.nixos.org/packages?channel=21.11&from=0&size=50&sort=relevance&type=packages&query=gns3-server)
+
+#### PyPi
+
+You may use PyPi in case no package is provided, or you would like to do a manual installation:
+
+* https://pypi.org/project/gns3-server/
+* https://pypi.org/project/gns3-gui/
+
+```shell
+python3 -m pip install gns3-gui
+python3 -m pip install gns3-server
+```
+
+The downside of this method is you will have to manually install all dependencies (see below).
+
+Please see our [documentation](https://docs.gns3.com/docs/getting-started/installation/linux) for more details.
+
+### Software dependencies
+
+In addition to Python dependencies, other software may be required, recommended or optional.
+
+* [uBridge](https://github.com/GNS3/ubridge/) is required, it interconnects the nodes.
+* [Dynamips](https://github.com/GNS3/dynamips/) is required for running IOS routers (using real IOS images) as well as the internal switches and hubs.
+* [VPCS](https://github.com/GNS3/vpcs/) is recommended, it is a builtin node simulating a very simple computer to perform connectivity tests using ping, traceroute etc.
+* Qemu is strongly recommended as most node types are based on Qemu, for example Cisco IOSv and Arista vEOS.
+* libvirt is recommended as it's needed for the NAT cloud.
+* Docker is optional, some nodes are based on Docker.
+* mtools is recommended to support data transfer to/from QEMU VMs using virtual disks.
+* i386-libraries of libc and libcrypto are optional, they are only needed to run IOU based nodes.
+
+Note that Docker needs the script program (`bsdutils` or `util-linux` package), when running a Docker VM and a static busybox during installation (python3 setup.py install / pip3 install / package creation).
+
+## Development
+
+### Setting up
+
+These commands will install the server as well as all Python dependencies:
+
+```shell
+git clone https://github.com/GNS3/gns3-server
+cd gns3-server
+git checkout 3.0
+python3 -m venv venv-gns3server
+source venv-gns3server/bin/activate
+python3 -m pip install .
+python3 -m gns3server
+```
+
+You will have to manually install other software dependencies (see above), for Dynamips, VPCS and uBridge the easiest is to install from our PPA.
+
+### Docker container
+
+Alternatively, you can run the GNS3 server in a container
+
+```shell
+bash scripts/docker_dev_server.sh
+```
+
+#### use Docker Compose
+
+``` {.bash}
+docker compose up -d
+```
+
+### Running tests
+
+First, install the development dependencies:
+
+```shell
+python3 -m pip install -r dev-requirements.txt
+```
+
+Then run the tests using pytest:
+
+```shell
+python3 -m pytest -vv tests/
+```
+
+### API documentation
+
+The API documentation can be accessed when running the server locally:
+
+* On `http://IP:PORT/docs` to see with Swagger UI (i.e. `http://localhost:3080/docs`)
+* On `http://IP:PORT/redoc` to see with ReDoc (i.e. `http://localhost:3080/redoc`)
+
+The documentation can also be viewed [online](http://apiv3.gns3.net) however it may not be the most up-to-date version since it needs manually synchronization with the current code. Also, you cannot use this to interact with a GNS3 server.
+
+### Branches
+
+#### master
+
+master is the next stable release, you can test it in your day-to -day activities.
+Bug fixes or small improvements pull requests go here.
+
+3.x development brand for the next major release.
+
+**Never** use this branch for production. Pull requests for major new features go here.

{gns3_server-3.0.4 → gns3_server-3.0.5}/README.md

@@ -99,6 +99,12 @@ Alternatively, you can run the GNS3 server in a container
 bash scripts/docker_dev_server.sh
 ```
 
+#### use Docker Compose
+
+``` {.bash}
+docker compose up -d
+```
+
 ### Running tests
 
 First, install the development dependencies:

gns3_server-3.0.5/gns3_server.egg-info/PKG-INFO

@@ -0,0 +1,202 @@
+Metadata-Version: 2.4
+Name: gns3-server
+Version: 3.0.5
+Summary: GNS3 graphical interface for the GNS3 server.
+Author-email: Jeremy Grossmann <developers@gns3.com>
+Project-URL: Homepage, http://gns3.com
+Project-URL: Repository, http://github.com/GNS3/gns3-server
+Project-URL: Bug tracker, http://github.com/GNS3/gns3-server/issues
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Framework :: FastAPI
+Classifier: Intended Audience :: Information Technology
+Classifier: Topic :: System :: Networking
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Natural Language :: English
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: uvicorn==0.34.2
+Requires-Dist: pydantic==2.11.4
+Requires-Dist: fastapi==0.115.12
+Requires-Dist: python-multipart==0.0.20
+Requires-Dist: websockets==15.0.1
+Requires-Dist: aiohttp<3.12,>=3.11.16
+Requires-Dist: async-timeout==5.0.1; python_version < "3.11"
+Requires-Dist: aiofiles<25.0,>=24.1.0
+Requires-Dist: Jinja2<3.2,>=3.1.6
+Requires-Dist: sentry-sdk<2.27,>=2.26.1
+Requires-Dist: psutil>=7.0.0
+Requires-Dist: async-timeout<5.1,>=5.0.1
+Requires-Dist: distro>=1.9.0
+Requires-Dist: py-cpuinfo<10.0,>=9.0.0
+Requires-Dist: greenlet==3.2.0
+Requires-Dist: sqlalchemy==2.0.40
+Requires-Dist: aiosqlite==0.21.0
+Requires-Dist: alembic==1.15.2
+Requires-Dist: bcrypt==4.3.0
+Requires-Dist: joserfc==1.0.4
+Requires-Dist: email-validator==2.2.0
+Requires-Dist: watchdog==6.0.0
+Requires-Dist: zstandard==0.23.0
+Requires-Dist: platformdirs<3,>=2.4.0
+Requires-Dist: importlib-resources>=1.3; python_version <= "3.9"
+Requires-Dist: truststore>=0.10.1; python_version >= "3.10"
+Provides-Extra: dev
+Requires-Dist: pytest==8.3.4; extra == "dev"
+Requires-Dist: flake8==7.1.1; extra == "dev"
+Requires-Dist: pytest-timeout==2.3.1; extra == "dev"
+Requires-Dist: pytest-asyncio==0.25.2; extra == "dev"
+Requires-Dist: requests==2.32.3; extra == "dev"
+Requires-Dist: httpx==0.28.1; extra == "dev"
+Requires-Dist: httpx_ws==0.7.1; extra == "dev"
+Dynamic: license-file
+
+# GNS3 server repository
+
+[![Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![GitHub Actions tests](https://github.com/GNS3/gns3-server/workflows/testing/badge.svg?branch=3.0)](https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting+branch%3A3.0)
+[![Latest PyPi version](https://img.shields.io/pypi/v/gns3-server.svg)](https://pypi.python.org/pypi/gns3-server)
+[![Snyk scanning](https://snyk.io/test/github/GNS3/gns3-server/badge.svg)](https://snyk.io/test/github/GNS3/gns3-server)
+
+The GNS3 server manages emulators and other virtualization software such as Dynamips, Qemu/KVM, Docker, VPCS, VirtualBox and VMware Workstation.
+Clients like the [GNS3 GUI](https://github.com/GNS3/gns3-gui/) and the [GNS3 Web UI](https://github.com/GNS3/gns3-web-ui/) control the server using a HTTP REST API.
+
+## Installation
+
+These instructions are for using GNS3, please see below for development.
+
+### Windows & macOS
+
+Please use our [Windows installer or DMG package](https://gns3.com/software/download) to install the stable build along with the GNS3 VM.
+Note that as of GNS3 version above 3.0, you must run the server using the GNS3 VM or on a Linux system (remote, cloud or virtual machine).
+
+### Linux
+
+#### Ubuntu based distributions
+
+We build and test packages for actively supported Ubuntu versions.
+Other distros based on Ubuntu, like Mint, should also be supported.
+
+Packages can be installed from our Personal Package Archives (PPA) repository:
+
+```shell
+sudo apt update
+sudo apt install software-properties-common
+sudo add-apt-repository ppa:gns3/ppa
+sudo apt update                                
+sudo apt install gns3-gui gns3-server
+```
+
+#### Other Linux distributions
+
+GNS3 is often packaged for other distributions by third-parties:
+
+* [Gentoo](https://packages.gentoo.org/package/net-misc/gns3-server)
+* [Alpine](https://pkgs.alpinelinux.org/package/v3.10/community/x86_64/gns3-server)
+* [NixOS](https://search.nixos.org/packages?channel=21.11&from=0&size=50&sort=relevance&type=packages&query=gns3-server)
+
+#### PyPi
+
+You may use PyPi in case no package is provided, or you would like to do a manual installation:
+
+* https://pypi.org/project/gns3-server/
+* https://pypi.org/project/gns3-gui/
+
+```shell
+python3 -m pip install gns3-gui
+python3 -m pip install gns3-server
+```
+
+The downside of this method is you will have to manually install all dependencies (see below).
+
+Please see our [documentation](https://docs.gns3.com/docs/getting-started/installation/linux) for more details.
+
+### Software dependencies
+
+In addition to Python dependencies, other software may be required, recommended or optional.
+
+* [uBridge](https://github.com/GNS3/ubridge/) is required, it interconnects the nodes.
+* [Dynamips](https://github.com/GNS3/dynamips/) is required for running IOS routers (using real IOS images) as well as the internal switches and hubs.
+* [VPCS](https://github.com/GNS3/vpcs/) is recommended, it is a builtin node simulating a very simple computer to perform connectivity tests using ping, traceroute etc.
+* Qemu is strongly recommended as most node types are based on Qemu, for example Cisco IOSv and Arista vEOS.
+* libvirt is recommended as it's needed for the NAT cloud.
+* Docker is optional, some nodes are based on Docker.
+* mtools is recommended to support data transfer to/from QEMU VMs using virtual disks.
+* i386-libraries of libc and libcrypto are optional, they are only needed to run IOU based nodes.
+
+Note that Docker needs the script program (`bsdutils` or `util-linux` package), when running a Docker VM and a static busybox during installation (python3 setup.py install / pip3 install / package creation).
+
+## Development
+
+### Setting up
+
+These commands will install the server as well as all Python dependencies:
+
+```shell
+git clone https://github.com/GNS3/gns3-server
+cd gns3-server
+git checkout 3.0
+python3 -m venv venv-gns3server
+source venv-gns3server/bin/activate
+python3 -m pip install .
+python3 -m gns3server
+```
+
+You will have to manually install other software dependencies (see above), for Dynamips, VPCS and uBridge the easiest is to install from our PPA.
+
+### Docker container
+
+Alternatively, you can run the GNS3 server in a container
+
+```shell
+bash scripts/docker_dev_server.sh
+```
+
+#### use Docker Compose
+
+``` {.bash}
+docker compose up -d
+```
+
+### Running tests
+
+First, install the development dependencies:
+
+```shell
+python3 -m pip install -r dev-requirements.txt
+```
+
+Then run the tests using pytest:
+
+```shell
+python3 -m pytest -vv tests/
+```
+
+### API documentation
+
+The API documentation can be accessed when running the server locally:
+
+* On `http://IP:PORT/docs` to see with Swagger UI (i.e. `http://localhost:3080/docs`)
+* On `http://IP:PORT/redoc` to see with ReDoc (i.e. `http://localhost:3080/redoc`)
+
+The documentation can also be viewed [online](http://apiv3.gns3.net) however it may not be the most up-to-date version since it needs manually synchronization with the current code. Also, you cannot use this to interact with a GNS3 server.
+
+### Branches
+
+#### master
+
+master is the next stable release, you can test it in your day-to -day activities.
+Bug fixes or small improvements pull requests go here.
+
+3.x development brand for the next major release.
+
+**Never** use this branch for production. Pull requests for major new features go here.

{gns3_server-3.0.4 → gns3_server-3.0.5}/gns3_server.egg-info/SOURCES.txt

@@ -82,6 +82,7 @@ gns3server/appliances/arista-veos.gns3a
 gns3server/appliances/aruba-arubaoscx.gns3a
 gns3server/appliances/aruba-vgw.gns3a
 gns3server/appliances/aruba-vmc.gns3a
+gns3server/appliances/asterfusion-vAsterNOS-campus.gns3a
 gns3server/appliances/asterfusion-vAsterNOS.gns3a
 gns3server/appliances/asterisk.gns3a
 gns3server/appliances/bigswitch-bigcloud-fabric.gns3a
@@ -181,6 +182,7 @@ gns3server/appliances/ipfire.gns3a
 gns3server/appliances/ipterm.gns3a
 gns3server/appliances/ipxe.gns3a
 gns3server/appliances/juniper-junos-space.gns3a
+gns3server/appliances/juniper-vJunos-router.gns3a
 gns3server/appliances/juniper-vmx-legacy.gns3a
 gns3server/appliances/juniper-vmx-vcp.gns3a
 gns3server/appliances/juniper-vmx-vfp.gns3a
@@ -217,6 +219,7 @@ gns3server/appliances/mininet.gns3a
 gns3server/appliances/net_toolbox.gns3a
 gns3server/appliances/netapp-ontapsim.gns3a
 gns3server/appliances/netem.gns3a
+gns3server/appliances/nethsecurity.gns3a
 gns3server/appliances/network_automation.gns3a
 gns3server/appliances/nixos.gns3a
 gns3server/appliances/nokia-vsim.gns3a
@@ -517,7 +520,9 @@ gns3server/db_migrations/versions/7ceeddd9c9a8_init.py
 gns3server/db_migrations/versions/9a5292aa4389_add_mac_address_field_in_docker_.py
 gns3server/disks/OVMF.fd
 gns3server/disks/OVMF_CODE.fd
+gns3server/disks/OVMF_CODE_4M.fd
 gns3server/disks/OVMF_VARS.fd
+gns3server/disks/OVMF_VARS_4M.fd
 gns3server/disks/empty100G.qcow2
 gns3server/disks/empty10G.qcow2
 gns3server/disks/empty150G.qcow2
@@ -626,7 +631,7 @@ gns3server/static/web-ui/NotoSans-Regular.e6139cb1663a1c57.ttf
 gns3server/static/web-ui/ReleaseNotes.txt
 gns3server/static/web-ui/favicon.ico
 gns3server/static/web-ui/index.html
-gns3server/static/web-ui/main.87178dd64c9c79ba.js
+gns3server/static/web-ui/main.fd9d76d279fa7d5e.js
 gns3server/static/web-ui/polyfills.319c79dd175e50d0.js
 gns3server/static/web-ui/roboto-latin-100.539f0a96b40596f7.woff2
 gns3server/static/web-ui/roboto-latin-100.5ba994dac3e79ea8.woff

{gns3_server-3.0.4 → gns3_server-3.0.5}/gns3_server.egg-info/requires.txt

@@ -1,21 +1,22 @@
-uvicorn==0.34.0
-pydantic==2.10.6
-fastapi==0.115.8
+uvicorn==0.34.2
+pydantic==2.11.4
+fastapi==0.115.12
 python-multipart==0.0.20
-websockets==15.0
-aiohttp<3.12,>=3.11.13
+websockets==15.0.1
+aiohttp<3.12,>=3.11.16
 aiofiles<25.0,>=24.1.0
-Jinja2<3.2,>=3.1.5
-sentry-sdk<2.23,>=2.22
+Jinja2<3.2,>=3.1.6
+sentry-sdk<2.27,>=2.26.1
 psutil>=7.0.0
+async-timeout<5.1,>=5.0.1
 distro>=1.9.0
 py-cpuinfo<10.0,>=9.0.0
-greenlet==3.1.1
-sqlalchemy==2.0.38
+greenlet==3.2.0
+sqlalchemy==2.0.40
 aiosqlite==0.21.0
-alembic==1.14.1
-bcrypt==4.2.1
-joserfc==1.0.3
+alembic==1.15.2
+bcrypt==4.3.0
+joserfc==1.0.4
 email-validator==2.2.0
 watchdog==6.0.0
 zstandard==0.23.0

{gns3_server-3.0.4 → gns3_server-3.0.5}/gns3server/api/routes/compute/cloud_nodes.py

@@ -232,7 +232,7 @@ async def stop_cloud_capture(
     await node.stop_capture(port_number)
 
 
-@router.get("/{node_id}/adapters/{adapter_number}/ports/{port_number}/pcap")
+@router.get("/{node_id}/adapters/{adapter_number}/ports/{port_number}/capture/stream")
 async def stream_pcap_file(
         *,
         adapter_number: int = Path(..., ge=0, le=0),

{gns3_server-3.0.4 → gns3_server-3.0.5}/gns3server/api/routes/controller/images.py

@@ -148,11 +148,6 @@ async def upload_image(
     if os.path.commonprefix([base_images_directory, full_path]) != base_images_directory:
         raise ControllerForbiddenError(f"Cannot write image, '{image_path}' is forbidden")
 
-    image = await images_repo.get_image(image_path)
-    if image:
-        log.warning(f"Image '{image_path}' already exists")
-        return image
-
     try:
         allow_raw_image = Config.instance().settings.Server.allow_raw_images
         image = await write_image(image_path, full_path, request.stream(), images_repo, allow_raw_image=allow_raw_image)

{gns3_server-3.0.4 → gns3_server-3.0.5}/gns3server/api/routes/controller/links.py

@@ -24,7 +24,7 @@ import aiohttp
 from fastapi import APIRouter, Depends, Request, status
 from fastapi.responses import StreamingResponse
 from fastapi.encoders import jsonable_encoder
-from typing import List
+from typing import List, Union
 from uuid import UUID
 
 from gns3server.controller import Controller
@@ -285,3 +285,54 @@ async def stream_pcap(request: Request, link: Link = Depends(dep_link)) -> Strea
             raise ControllerError(f"Client error received when receiving pcap stream from compute: {e}")
 
     return StreamingResponse(compute_pcap_stream(), media_type="application/vnd.tcpdump.pcap")
+
+
+@router.get(
+    "/{link_id}/iface",
+    response_model=Union[schemas.UDPPortInfo, schemas.EthernetPortInfo],
+    dependencies=[Depends(has_privilege("Link.Audit"))]
+)
+async def get_iface(link: Link = Depends(dep_link)) -> Union[schemas.UDPPortInfo, schemas.EthernetPortInfo]:
+    """
+    Return iface info for links to Cloud or NAT devices.
+
+    Required privilege: Link.Audit
+    """
+
+    ifaces_info = {}
+    for node_data in link._nodes:
+        node = node_data["node"]
+        if node.node_type not in ("cloud", "nat"):
+            continue
+
+        port_number = node_data["port_number"]
+        compute = node.compute
+        project_id = link.project.id
+        response = await compute.get(f"/projects/{project_id}/{node.node_type}/nodes/{node.id}")
+        if "ports_mapping" not in response.json:
+            continue
+        ports_mapping = response.json["ports_mapping"]
+        
+        for port in ports_mapping:
+            port_num = port.get("port_number")
+
+            if port_num and int(port_num) == int(port_number):
+                port_type = port.get("type", "")
+                if "udp" in port_type.lower():
+                    ifaces_info = {
+                        "node_id": node.id,
+                        "type": f"{port_type}",
+                        "lport": port["lport"],
+                        "rhost": port["rhost"],
+                        "rport": port["rport"]
+                    }
+                else:
+                    ifaces_info = {
+                        "node_id": node.id,
+                        "type": f"{port_type}",
+                        "interface": port["interface"],
+                    }
+    
+    if not ifaces_info:
+        raise ControllerError("Link not connected to Cloud/NAT")
+    return ifaces_info