arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-27 16:31:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 1.5

Browse Source
This commit is contained in:
Julien Duponchelle 2016-02-16 19:07:17 +01:00
commit 9b1d513b03
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/iou/iou_vm.py
View File

@ -1191,7 +1191,7 @@ class IOUVM(BaseVM):
try: try:
startup_config_content, private_config_content = nvram_export(nvram_content) startup_config_content, private_config_content = nvram_export(nvram_content)
except ValueError as e: except ValueError as e:
log.warning("Could not export configs from nvram file".format(nvram_file, e)) log.warning("Could not export configs from nvram file {}: {}".format(nvram_file, e))
return None, None return None, None
return startup_config_content, private_config_content return startup_config_content, private_config_content

8
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -879,6 +879,14 @@ class VirtualBoxVM(BaseVM):
yield from self._control_vm("nicproperty{} dest={}".format(adapter_number + 1, nio.rhost)) yield from self._control_vm("nicproperty{} dest={}".format(adapter_number + 1, nio.rhost))
yield from self._control_vm("nicproperty{} dport={}".format(adapter_number + 1, nio.rport)) yield from self._control_vm("nicproperty{} dport={}".format(adapter_number + 1, nio.rport))
yield from self._control_vm("setlinkstate{} on".format(adapter_number + 1)) yield from self._control_vm("setlinkstate{} on".format(adapter_number + 1))
# check if the UDP tunnel has been correctly set
vm_info = yield from self._get_vm_info()
generic_driver_number = "generic{}".format(adapter_number + 1)
if generic_driver_number not in vm_info and vm_info[generic_driver_number] != "UDPTunnel":
log.warning("UDP tunnel has not been set on nic: {}".format(adapter_number + 1))
self.project.emit("log.warning", {"message": "UDP tunnel has not been set on nic: {}".format(adapter_number + 1)})
elif isinstance(nio, NIONAT): elif isinstance(nio, NIONAT):
yield from self._control_vm("nic{} nat".format(adapter_number + 1)) yield from self._control_vm("nic{} nat".format(adapter_number + 1))
yield from self._control_vm("setlinkstate{} on".format(adapter_number + 1)) yield from self._control_vm("setlinkstate{} on".format(adapter_number + 1))

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

@ -398,7 +398,7 @@ class VMware(BaseManager):
break break
if vmlist_entry is not None: if vmlist_entry is not None:
for name in inventory_pairs.keys(): for name in inventory_pairs.copy().keys():
if name.startswith(vmlist_entry): if name.startswith(vmlist_entry):
del inventory_pairs[name] del inventory_pairs[name]