ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-16 06:18:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Relative path support of IOU, IOS and Qemu images.

Browse Source
This commit is contained in:
Jeremy
2015-03-11 15:04:11 -06:00
parent c41bec0516
commit aebcd9f08b
4 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/modules/dynamips/nodes/router.py
View File

@ -34,7 +34,6 @@ from ...base_vm import BaseVM
from ..dynamips_error import DynamipsError
from ..nios.nio_udp import NIOUDP
from gns3server.config import Config
from gns3server.utils.asyncio import wait_run_in_executor
@ -152,6 +151,12 @@ class Router(BaseVM):
"mac_addr": self._mac_addr,
"system_id": self._system_id}
# return the relative path if the IOS image is in the images_path directory
server_config = self.manager.config.get_section_config("Server")
relative_image = os.path.join(os.path.expanduser(server_config.get("images_path", "~/GNS3/images")), "IOS", self._image)
if os.path.exists(relative_image):
router_info["image"] = os.path.basename(self._image)
# add the slots
slot_number = 0
for slot in self._slots:
@ -422,7 +427,7 @@ class Router(BaseVM):
"""
if not os.path.isabs(image):
server_config = Config.instance().get_section_config("Server")
server_config = self.manager.config.get_section_config("Server")
image = os.path.join(os.path.expanduser(server_config.get("images_path", "~/GNS3/images")), "IOS", image)
if not os.path.isfile(image):