arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-07-05 14:22:38 +00:00
Code Issues Releases Wiki Activity

VMware player linux support

Browse Source 
Fix #326
This commit is contained in:
Julien Duponchelle 2015-10-02 11:04:11 +02:00
parent 9737783eb6
commit d19b3f15ed
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gns3server/modules/vmware/__init__.py
View File

@ -171,7 +171,7 @@ class VMware(BaseManager):
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
return # FIXME: no version checking on Mac OS X return # FIXME: no version checking on Mac OS X
else: else:
vmware_path = shutil.which("vmware") vmware_path = self._get_linux_vmware_binary()
if vmware_path is None: if vmware_path is None:
raise VMwareError("VMware is not installed (vmware executable could not be found in $PATH)") raise VMwareError("VMware is not installed (vmware executable could not be found in $PATH)")
@ -438,7 +438,7 @@ class VMware(BaseManager):
with open(path, "w", encoding=encoding, errors="ignore") as f: with open(path, "w", encoding=encoding, errors="ignore") as f:
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
# write the shebang on the first line on Linux # write the shebang on the first line on Linux
vmware_path = shutil.which("vmware") vmware_path = self._get_linux_vmware_binary()
if vmware_path: if vmware_path:
f.write("#!{}\n".format(vmware_path)) f.write("#!{}\n".format(vmware_path))
for key, value in pairs.items(): for key, value in pairs.items():
@ -577,3 +577,12 @@ class VMware(BaseManager):
if not os.path.isdir(default_vm_path): if not os.path.isdir(default_vm_path):
raise VMwareError('Could not find the default VM directory: "{}"'.format(default_vm_path)) raise VMwareError('Could not find the default VM directory: "{}"'.format(default_vm_path))
return self._get_vms_from_directory(default_vm_path) return self._get_vms_from_directory(default_vm_path)
def _get_linux_vmware_binary(self):
"""
Return the path of the vmware binary on Linux or None
"""
path = shutil.which("vmware")
if path is None:
path = shutil.which("vmplayer")
return path