Cloud schema and remove use_ubridge for VMware VM.

This commit is contained in:
grossmj committed 2016-05-28 21:46:48 -06:00
1 parent df654b40ff
commit 39a3f2fae2
6 files changed
+306 -74

No files matched your search

+1 -26
View File
@@ -71,7 +71,7 @@ class VMwareVM(BaseNode):
self._adapters = 0
self._ethernet_adapters = {}
self._adapter_type = "e1000"
self._use_ubridge = True
self._use_ubridge = True # TODO: clean this (old ubridge code)
self._use_any_adapter = False
if not os.path.exists(vmx_path):
@@ -89,7 +89,6 @@ class VMwareVM(BaseNode):
"enable_remote_console": self.enable_remote_console,
"adapters": self._adapters,
"adapter_type": self.adapter_type,
"use_ubridge": self.use_ubridge,
"use_any_adapter": self.use_any_adapter,
"status": self.status,
"node_directory": self.working_dir}
@@ -740,30 +739,6 @@ class VMwareVM(BaseNode):
id=self.id,
adapter_type=adapter_type))
@property
def use_ubridge(self):
"""
Returns either GNS3 can use uBridge for network connections.
:returns: boolean
"""
return self._use_ubridge
@use_ubridge.setter
def use_ubridge(self, use_ubridge):
"""
Allows GNS3 to use uBridge for network connections.
:param use_ubridge: boolean
"""
if use_ubridge:
log.info("VMware VM '{name}' [{id}] will use uBridge for network connections".format(name=self.name, id=self.id))
else:
log.info("VMware VM '{name}' [{id}] will not use uBridge for network connections".format(name=self.name, id=self.id))
self._use_ubridge = use_ubridge
@property
def use_any_adapter(self):
"""