NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 01:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not require the local server param to open a .gns3 file. Fixes https://github.com/GNS3/gns3-gui/issues/2421 Ref #1460

Browse Source
This commit is contained in:
grossmj 2021-12-10 15:52:57 +10:30
parent 16fcf6141e
commit ab4d964d69
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/api/routes/controller/projects.py
View File

@ -204,12 +204,7 @@ async def load_project(path: str = Body(..., embed=True)) -> schemas.Project:
controller = Controller.instance() controller = Controller.instance()
dot_gns3_file = path dot_gns3_file = path
if Config.instance().settings.Server.local is False: project = await controller.load_project(dot_gns3_file)
log.error(f"Cannot load '{dot_gns3_file}' because the server has not been started with the '--local' parameter")
raise ControllerForbiddenError("Cannot load project when server is not local")
project = await controller.load_project(
dot_gns3_file,
)
return project.asdict() return project.asdict()

8
gns3server/controller/__init__.py
View File

@ -519,6 +519,9 @@ class Controller:
:param load: Load the topology :param load: Load the topology
""" """
if not os.path.exists(path):
raise ControllerError(f"'{path}' does not exist on the controller")
topo_data = load_topology(path) topo_data = load_topology(path)
topo_data.pop("topology") topo_data.pop("topology")
topo_data.pop("version") topo_data.pop("version")
@ -529,7 +532,10 @@ class Controller:
project = self._projects[topo_data["project_id"]] project = self._projects[topo_data["project_id"]]
else: else:
project = await self.add_project( project = await self.add_project(
path=os.path.dirname(path), status="closed", filename=os.path.basename(path), **topo_data path=os.path.dirname(path),
status="closed",
filename=os.path.basename(path),
**topo_data
) )
if load or project.auto_open: if load or project.auto_open:
await project.open() await project.open()

2
gns3server/schemas/controller/templates/qemu_templates.py
View File

@ -37,7 +37,7 @@ class QemuTemplate(TemplateBase):
default_name_format: Optional[str] = "{name}-{0}" default_name_format: Optional[str] = "{name}-{0}"
symbol: Optional[str] = ":/symbols/qemu_guest.svg" symbol: Optional[str] = ":/symbols/qemu_guest.svg"
qemu_path: Optional[str] = Field("", description="Qemu executable path") qemu_path: Optional[str] = Field("", description="Qemu executable path")
platform: Optional[QemuPlatform] = Field("i386", description="Platform to emulate") platform: Optional[QemuPlatform] = Field("x86_64", description="Platform to emulate")
linked_clone: Optional[bool] = Field(True, description="Whether the VM is a linked clone or not") linked_clone: Optional[bool] = Field(True, description="Whether the VM is a linked clone or not")
ram: Optional[int] = Field(256, description="Amount of RAM in MB") ram: Optional[int] = Field(256, description="Amount of RAM in MB")
cpus: Optional[int] = Field(1, ge=1, le=255, description="Number of vCPUs") cpus: Optional[int] = Field(1, ge=1, le=255, description="Number of vCPUs")