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

Do not trust client for the type of VMware host

Browse Source 
Ref https://github.com/GNS3/gns3-gui/issues/1579
This commit is contained in:
Julien Duponchelle 2016-10-19 11:40:16 +02:00
parent 7d35d1a34f
commit 8adc010ba0
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/compute/vmware/__init__.py
View File

@ -50,6 +50,7 @@ class VMware(BaseManager):
self._execute_lock = asyncio.Lock() self._execute_lock = asyncio.Lock()
self._vmware_inventory_lock = asyncio.Lock() self._vmware_inventory_lock = asyncio.Lock()
self._vmrun_path = None self._vmrun_path = None
self._host_type = None
self._vmnets = [] self._vmnets = []
self._vmnet_start_range = 2 self._vmnet_start_range = 2
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
@ -160,6 +161,7 @@ class VMware(BaseManager):
yield from self.check_vmrun_version(minimum_required_version="1.14.0") yield from self.check_vmrun_version(minimum_required_version="1.14.0")
elif player_version >= 12: elif player_version >= 12:
yield from self.check_vmrun_version(minimum_required_version="1.15.0") yield from self.check_vmrun_version(minimum_required_version="1.15.0")
self._host_type = "player"
@asyncio.coroutine @asyncio.coroutine
def _check_vmware_workstation_requirements(self, ws_version): def _check_vmware_workstation_requirements(self, ws_version):
@ -182,6 +184,7 @@ class VMware(BaseManager):
yield from self.check_vmrun_version(minimum_required_version="1.14.0") yield from self.check_vmrun_version(minimum_required_version="1.14.0")
elif ws_version >= 12: elif ws_version >= 12:
yield from self.check_vmrun_version(minimum_required_version="1.15.0") yield from self.check_vmrun_version(minimum_required_version="1.15.0")
self._host_type = "ws"
@asyncio.coroutine @asyncio.coroutine
def check_vmware_version(self): def check_vmware_version(self):
@ -206,6 +209,7 @@ class VMware(BaseManager):
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
if not os.path.isdir("/Applications/VMware Fusion.app"): if not os.path.isdir("/Applications/VMware Fusion.app"):
raise VMwareError("VMware Fusion is not installed in the standard location /Applications/VMware Fusion.app") raise VMwareError("VMware Fusion is not installed in the standard location /Applications/VMware Fusion.app")
self._host_type = "fusion"
return # FIXME: no version checking on Mac OS X but we support all versions of fusion return # FIXME: no version checking on Mac OS X but we support all versions of fusion
vmware_path = VMware._get_linux_vmware_binary() vmware_path = VMware._get_linux_vmware_binary()
@ -350,11 +354,7 @@ class VMware(BaseManager):
:returns: host type (string) :returns: host type (string)
""" """
if sys.platform.startswith("darwin"): return self._host_type
host_type = "fusion"
else:
host_type = self.config.get_section_config("VMware").get("host_type", "ws")
return host_type
@asyncio.coroutine @asyncio.coroutine
def execute(self, subcommand, args, timeout=120, host_type=None): def execute(self, subcommand, args, timeout=120, host_type=None):