mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Merge branch 'master' into 1.5
This commit is contained in:
7 files changed
+57
-29
No files matched your search
@@ -55,7 +55,6 @@ class DynamipsHypervisor:
|
||||
self._working_dir = working_dir
|
||||
self._version = "N/A"
|
||||
self._timeout = timeout
|
||||
self._uuid = None
|
||||
self._reader = None
|
||||
self._writer = None
|
||||
self._io_lock = asyncio.Lock()
|
||||
@@ -99,8 +98,6 @@ class DynamipsHypervisor:
|
||||
except IndexError:
|
||||
self._version = "Unknown"
|
||||
|
||||
self._uuid = yield from self.send("hypervisor uuid")
|
||||
|
||||
# this forces to send the working dir to Dynamips
|
||||
yield from self.set_working_dir(self._working_dir)
|
||||
|
||||
@@ -174,16 +171,6 @@ class DynamipsHypervisor:
|
||||
|
||||
return self._working_dir
|
||||
|
||||
@property
|
||||
def uuid(self):
|
||||
"""
|
||||
Returns this hypervisor UUID.
|
||||
|
||||
:Returns: uuid string
|
||||
"""
|
||||
|
||||
return self._uuid
|
||||
|
||||
@property
|
||||
def devices(self):
|
||||
"""
|
||||
|
||||
Reference in new issue
Block a user