mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-06 15:21:13 +02:00
Merge branch 'GNS3:3.0' into 3.0
This commit is contained in:
8 files changed
+30
-18
No files matched your search
@@ -86,8 +86,8 @@ class TestIOUNodesRoutes:
|
||||
assert response.json()["project_id"] == compute_project.id
|
||||
assert response.json()["serial_adapters"] == 2
|
||||
assert response.json()["ethernet_adapters"] == 2
|
||||
assert response.json()["ram"] == 256
|
||||
assert response.json()["nvram"] == 128
|
||||
assert response.json()["ram"] == 1024
|
||||
assert response.json()["nvram"] == 256
|
||||
assert response.json()["l1_keepalives"] is False
|
||||
|
||||
|
||||
@@ -190,8 +190,8 @@ class TestIOUNodesRoutes:
|
||||
assert response.json()["project_id"] == compute_project.id
|
||||
assert response.json()["serial_adapters"] == 2
|
||||
assert response.json()["ethernet_adapters"] == 2
|
||||
assert response.json()["ram"] == 256
|
||||
assert response.json()["nvram"] == 128
|
||||
assert response.json()["ram"] == 1024
|
||||
assert response.json()["nvram"] == 256
|
||||
assert response.json()["l1_keepalives"] is False
|
||||
|
||||
|
||||
|
||||
@@ -718,14 +718,14 @@ class TestIOUTemplate:
|
||||
"default_name_format": "IOU{0}",
|
||||
"ethernet_adapters": 2,
|
||||
"name": "IOU template",
|
||||
"nvram": 128,
|
||||
"nvram": 256,
|
||||
"path": image_path,
|
||||
"private_config": "",
|
||||
"ram": 256,
|
||||
"ram": 1024,
|
||||
"serial_adapters": 2,
|
||||
"startup_config": "iou_l3_base_startup-config.txt",
|
||||
"symbol": unittest.mock.ANY,
|
||||
"use_default_iou_values": True,
|
||||
"use_default_iou_values": False,
|
||||
"l1_keepalives": False}
|
||||
|
||||
for item, value in expected_response.items():
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in new issue
Block a user