Merge branch '3.1' into 3.1

This commit is contained in:
Jeremy Grossmann authored and GitHub committed 2026-10-19 18:11:29 +02:00
commit 68b5e89bfa
51 files changed
+3155 -183

No files matched your search

+50
View File
@@ -187,3 +187,53 @@ async def test_list_images(tmpdir, config):
"path": "qemu_image.qcow2",
}
]
@pytest.mark.asyncio
@pytest.mark.parametrize("subdirectory", [None, "installers/linux"])
async def test_iso_upload_and_discovery(tmp_path, config, subdirectory):
from unittest.mock import AsyncMock
from gns3server.utils.images import discover_images, inspect_image_file, write_image
config.settings.Server.images_path = str(tmp_path)
config.settings.Server.additional_images_paths = []
# ISO 9660 primary volume descriptor; no raw-image fallback is needed.
content = b"\0" * (16 * 2048) + b"\x01CD001\x01" + b"\0" * 2041
async def stream():
# Exercise a descriptor split across upload chunks.
for offset in range(0, len(content), 13):
yield content[offset : offset + 13]
repo = AsyncMock()
repo.get_image_by_checksum.return_value = None
repo.save_verified_image.side_effect = lambda image: image
result = await write_image(
"installer.ISO", str(tmp_path / "installer.ISO"), stream(), repo, subdirectory=subdirectory
)
expected = tmp_path / "QEMU" / (subdirectory or "") / "installer.ISO"
assert result["path"] == str(expected)
assert result["image_type"] == "qemu"
assert expected.read_bytes() == content
assert inspect_image_file(expected)["checksum"] == result["checksum"]
assert [image["path"] for image in await discover_images("qemu")] == [str(expected)]
def test_iso_extension_alone_is_not_a_valid_image():
from gns3server.utils.images import InvalidImageError, check_valid_image_header
with pytest.raises(InvalidImageError):
check_valid_image_header("fake.iso", b"not an ISO image")
@pytest.mark.parametrize("images_root", ["images", "QEMU/images"])
def test_image_reference_uses_configured_root(tmp_path, config, images_root):
from gns3server.db.models.images import Image
root = tmp_path / images_root
config.settings.Server.images_path = str(root)
image = Image(image_type="qemu", path=str(root / "QEMU/installers/linux.iso"))
assert image.reference == "installers/linux.iso"
image.path = str(tmp_path / "extra/QEMU/linux.iso")
assert image.reference == image.path
+71
View File
@@ -0,0 +1,71 @@
#
# Copyright (C) 2026 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/>.
#
"""
Cross-compute VXLAN link identity: the derived VNI and device name.
"""
import uuid
from gns3server.utils.vxlan import VXLAN_NAME_PREFIX, VXLAN_VNI_MAX, VXLAN_VNI_MIN, derive_vni, vxlan_device_name
def test_derive_vni_is_deterministic_and_bounded():
link_id = str(uuid.uuid4())
vni = derive_vni(link_id)
assert derive_vni(link_id) == vni
assert VXLAN_VNI_MIN <= vni <= VXLAN_VNI_MAX
def test_derive_vni_salt_moves_the_value():
link_id = str(uuid.uuid4())
values = {derive_vni(link_id, salt) for salt in range(16)}
# Every salt lands in range; a bumped salt is a fresh point of the space
# (a collision here would defeat the retry, and 16 draws out of ~16.8M
# values collapsing is a hash failure, not bad luck).
assert all(VXLAN_VNI_MIN <= v <= VXLAN_VNI_MAX for v in values)
assert len(values) == 16
def test_derive_vni_avoids_low_well_known_vnis():
# Flannel starts at 1, Docker overlay networks at 256: derived links
# must never land in the low range whatever the link id.
for _ in range(200):
assert derive_vni(str(uuid.uuid4()), uuid.uuid4().int) >= VXLAN_VNI_MIN
def test_vxlan_device_name_deterministic_and_within_ifnamsiz():
link_id = str(uuid.uuid4())
node_id = str(uuid.uuid4())
name = vxlan_device_name(link_id, node_id)
assert name == vxlan_device_name(link_id, node_id)
assert name.startswith(VXLAN_NAME_PREFIX)
# IFNAMSIZ (16) includes the NUL terminator: the kernel accepts 15 chars.
assert len(name) <= 15
def test_vxlan_device_name_unique_per_endpoint_and_link():
link1 = str(uuid.uuid4())
link2 = str(uuid.uuid4())
node1 = str(uuid.uuid4())
node2 = str(uuid.uuid4())
names = {
vxlan_device_name(link1, node1),
vxlan_device_name(link1, node2),
vxlan_device_name(link2, node1),
}
assert len(names) == 3