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

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

Browse Source
This commit is contained in:
grossmj 2021-04-28 15:57:39 +09:30
commit d8968cbee8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/controller/topology.py
View File

@ -50,7 +50,7 @@ class DynamipsNodeValidation(DynamipsCreate):
name: Optional[str] = None name: Optional[str] = None
def _check_topology_schema(topo): def _check_topology_schema(topo, path):
try: try:
Topology.parse_obj(topo) Topology.parse_obj(topo)
@ -60,7 +60,7 @@ def _check_topology_schema(topo):
DynamipsNodeValidation.parse_obj(node.get("properties", {})) DynamipsNodeValidation.parse_obj(node.get("properties", {}))
except pydantic.ValidationError as e: except pydantic.ValidationError as e:
error = f"Invalid data in topology file: {e}" error = f"Invalid data in topology file {path}: {e}"
log.critical(error) log.critical(error)
raise ControllerError(error) raise ControllerError(error)
@ -117,7 +117,7 @@ def project_to_topology(project):
data["topology"]["computes"].append(compute) data["topology"]["computes"].append(compute)
elif isinstance(compute, dict): elif isinstance(compute, dict):
data["topology"]["computes"].append(compute) data["topology"]["computes"].append(compute)
_check_topology_schema(data) _check_topology_schema(data, project.path)
return data return data
@ -187,7 +187,7 @@ def load_topology(path):
topo["variables"] = [var for var in variables if var.get("name")] topo["variables"] = [var for var in variables if var.get("name")]
try: try:
_check_topology_schema(topo) _check_topology_schema(topo, path)
except ControllerError as e: except ControllerError as e:
log.error("Can't load the topology %s", path) log.error("Can't load the topology %s", path)
raise e raise e