arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 03:08:14 +00:00
Code Issues Releases Wiki Activity

Fix bug with custom adapters and categories for Docker VM. Fixes https://github.com/GNS3/gns3-gui/issues/2613

Browse Source
This commit is contained in:
grossmj 2018-11-17 21:50:00 +07:00
parent aa4593c993
commit 74e1463015
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/node.py
View File

@ -636,7 +636,7 @@ class Node:
break break
port_name = "eth{}".format(adapter_number) port_name = "eth{}".format(adapter_number)
port_name = custom_adapter_settings.get("port_name", port_name) port_name = custom_adapter_settings.get("port_name", port_name)
self._ports.append(PortFactory(port_name, 0, adapter_number, 0, "ethernet", short_name="eth{}".format(adapter_number))) self._ports.append(PortFactory(port_name, 0, adapter_number, 0, "ethernet", short_name=port_name))
elif self._node_type in ("ethernet_switch", "ethernet_hub"): elif self._node_type in ("ethernet_switch", "ethernet_hub"):
# Basic node we don't want to have adapter number # Basic node we don't want to have adapter number
port_number = 0 port_number = 0

4
gns3server/schemas/docker.py
View File

@ -102,7 +102,7 @@ DOCKER_CREATE_SCHEMA = {
"maxLength": 64, "maxLength": 64,
"pattern": "^[a-f0-9]+$" "pattern": "^[a-f0-9]+$"
}, },
"custom_adapters": CUSTOM_ADAPTERS_ARRAY_SCHEMA # not used at this time "custom_adapters": CUSTOM_ADAPTERS_ARRAY_SCHEMA
}, },
"additionalProperties": False, "additionalProperties": False,
"required": ["name", "image"] "required": ["name", "image"]
@ -206,7 +206,7 @@ DOCKER_OBJECT_SCHEMA = {
"description": "VM status Read only", "description": "VM status Read only",
"enum": ["started", "stopped", "suspended"] "enum": ["started", "stopped", "suspended"]
}, },
"custom_adapters": CUSTOM_ADAPTERS_ARRAY_SCHEMA # not used at this time "custom_adapters": CUSTOM_ADAPTERS_ARRAY_SCHEMA
}, },
"additionalProperties": False, "additionalProperties": False,
} }

4
gns3server/schemas/docker_appliance.py
View File

@ -17,6 +17,7 @@
import copy import copy
from .appliance import BASE_APPLIANCE_PROPERTIES from .appliance import BASE_APPLIANCE_PROPERTIES
from .custom_adapters import CUSTOM_ADAPTERS_ARRAY_SCHEMA
DOCKER_APPLIANCE_PROPERTIES = { DOCKER_APPLIANCE_PROPERTIES = {
@ -75,7 +76,8 @@ DOCKER_APPLIANCE_PROPERTIES = {
"description": "Docker extra hosts (added to /etc/hosts)", "description": "Docker extra hosts (added to /etc/hosts)",
"type": "string", "type": "string",
"default": "", "default": "",
} },
"custom_adapters": CUSTOM_ADAPTERS_ARRAY_SCHEMA
} }
DOCKER_APPLIANCE_PROPERTIES.update(copy.deepcopy(BASE_APPLIANCE_PROPERTIES)) DOCKER_APPLIANCE_PROPERTIES.update(copy.deepcopy(BASE_APPLIANCE_PROPERTIES))

3
tests/handlers/api/controller/test_appliance.py
View File

@ -636,7 +636,8 @@ def test_docker_appliance_create(http_controller):
"image": "gns3/endhost:latest", "image": "gns3/endhost:latest",
"name": "Docker appliance", "name": "Docker appliance",
"start_command": "", "start_command": "",
"symbol": ":/symbols/docker_guest.svg"} "symbol": ":/symbols/docker_guest.svg",
"custom_adapters": []}
for item, value in expected_response.items(): for item, value in expected_response.items():
assert response.json.get(item) == value assert response.json.get(item) == value