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

Lock VMware by VM instead of globally

Browse Source 
Ref https://github.com/GNS3/gns3-gui/issues/1632
This commit is contained in:
Julien Duponchelle 2016-11-04 19:39:17 +01:00
parent 7255754fef
commit 0c87d8e1bd
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,6 @@ class VMware(BaseManager):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
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._host_type = None
@ -371,7 +370,6 @@ class VMware(BaseManager):
@asyncio.coroutine @asyncio.coroutine
def _execute(self, subcommand, args, timeout=120): def _execute(self, subcommand, args, timeout=120):
with (yield from self._execute_lock):
if self.host_type is None: if self.host_type is None:
yield from self.check_vmware_version() yield from self.check_vmware_version()
@ -413,7 +411,6 @@ class VMware(BaseManager):
:param required_version: required vmrun version number :param required_version: required vmrun version number
""" """
with (yield from self._execute_lock):
vmrun_path = self.vmrun_path vmrun_path = self.vmrun_path
if not vmrun_path: if not vmrun_path:
vmrun_path = self.find_vmrun() vmrun_path = self.find_vmrun()

4
gns3server/compute/vmware/vmware_vm.py
View File

@ -27,7 +27,7 @@ import tempfile
from gns3server.utils.telnet_server import TelnetServer from gns3server.utils.telnet_server import TelnetServer
from gns3server.utils.interfaces import interfaces from gns3server.utils.interfaces import interfaces
from gns3server.utils.asyncio import wait_for_file_creation, wait_for_named_pipe_creation from gns3server.utils.asyncio import wait_for_file_creation, wait_for_named_pipe_creation, locked_coroutine
from collections import OrderedDict from collections import OrderedDict
from .vmware_error import VMwareError from .vmware_error import VMwareError
from ..nios.nio_udp import NIOUDP from ..nios.nio_udp import NIOUDP
@ -99,7 +99,7 @@ class VMwareVM(BaseNode):
return self._vmnets return self._vmnets
@asyncio.coroutine @locked_coroutine
def _control_vm(self, subcommand, *additional_args): def _control_vm(self, subcommand, *additional_args):
args = [self._vmx_path] args = [self._vmx_path]