Merge remote-tracking branch 'origin/2.2' into 3.0

# Conflicts:
#	gns3server/schemas/iou_template.py
#	tests/handlers/api/compute/test_iou.py
#	tests/handlers/api/controller/test_template.py
This commit is contained in:
grossmj 2026-03-12 14:11:05 +08:00
commit 27ce1a4e25
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
2 changed files with 4 additions and 4 deletions

View File

@ -97,11 +97,11 @@ class IOUVM(BaseNode):
self._serial_adapters = []
self.ethernet_adapters = 2 # one adapter = 4 interfaces
self.serial_adapters = 2 # one adapter = 4 interfaces
self._use_default_iou_values = True # for RAM & NVRAM values
self._nvram = 128 # Kilobytes
self._use_default_iou_values = False # for RAM & NVRAM values
self._nvram = 256 # Kilobytes
self._startup_config = ""
self._private_config = ""
self._ram = 256 # Megabytes
self._ram = 1024 # Megabytes
self._application_id = application_id
self._l1_keepalives = False # used to overcome the always-up Ethernet interfaces (not supported by all IOSes).

View File

@ -264,7 +264,7 @@ def test_create_netmap_config(vm):
@pytest.mark.asyncio
async def test_build_command(vm):
assert await vm._build_command() == [vm.path, str(vm.application_id)]
assert await vm._build_command() == [vm.path, "-n", "256", "-m", "1024", str(vm.application_id)]
def test_get_startup_config(vm):