mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-19 12:45:19 +02:00
Merge 2.1 into 2.2 branch
This commit is contained in:
1 parent
2a5f3221b9
commit
658aa4bae9
69 files changed
+846
-448
No files matched your search
@@ -510,7 +510,9 @@ def test_load_appliances(controller):
|
||||
"Qemu": {
|
||||
"vms": [
|
||||
{
|
||||
"name": "Test"
|
||||
"name": "Test",
|
||||
"node_type": "qemu",
|
||||
"category": "router"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -538,6 +540,52 @@ def test_load_appliances(controller):
|
||||
assert cloud_uuid == appliance.id
|
||||
|
||||
|
||||
def test_load_appliances_deprecated_features_default_symbol(controller):
|
||||
controller._settings = {
|
||||
"Qemu": {
|
||||
"vms": [
|
||||
{
|
||||
"name": "Test",
|
||||
"node_type": "qemu",
|
||||
"category": "router",
|
||||
"default_symbol": ":/symbols/iosv_virl.normal.svg",
|
||||
"hover_symbol": ":/symbols/iosv_virl.selected.svg",
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
controller.load_appliances()
|
||||
appliances = dict([(a.name, a) for a in controller.appliances.values()])
|
||||
|
||||
assert appliances["Test"].__json__()["symbol"] == ":/symbols/computer.svg"
|
||||
assert "default_symbol" not in appliances["Test"].data.keys()
|
||||
assert "hover_symbol" not in appliances["Test"].data.keys()
|
||||
|
||||
|
||||
def test_load_appliances_deprecated_features_default_symbol_with_symbol(controller):
|
||||
controller._settings = {
|
||||
"Qemu": {
|
||||
"vms": [
|
||||
{
|
||||
"name": "Test",
|
||||
"node_type": "qemu",
|
||||
"category": "router",
|
||||
"default_symbol": ":/symbols/iosv_virl.normal.svg",
|
||||
"hover_symbol": ":/symbols/iosv_virl.selected.svg",
|
||||
"symbol": ":/symbols/my-symbol.svg"
|
||||
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
controller.load_appliances()
|
||||
appliances = dict([(a.name, a) for a in controller.appliances.values()])
|
||||
|
||||
assert appliances["Test"].__json__()["symbol"] == ":/symbols/my-symbol.svg"
|
||||
assert "default_symbol" not in appliances["Test"].data.keys()
|
||||
assert "hover_symbol" not in appliances["Test"].data.keys()
|
||||
|
||||
|
||||
def test_autoidlepc(controller, async_run):
|
||||
controller._computes["local"] = AsyncioMagicMock()
|
||||
node_mock = AsyncioMagicMock()
|
||||
|
||||
Reference in new issue
Block a user