ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-14 05:18:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PEP 8 Enforcer.

Browse Source
This commit is contained in:
Julien Duponchelle
2015-01-20 22:13:58 +01:00
parent 649d4e5143
commit 0eaa7be86a
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gns3server/old_modules/qemu/qemu_vm.py
View File

@ -1003,7 +1003,7 @@ class QemuVM(object):
nio.rport,
nio.rhost))
else:
#FIXME: does it work? very undocumented feature...
# FIXME: does it work? very undocumented feature...
self._control_vm("netdev_del gns3-{}".format(adapter_id))
self._control_vm("netdev_add socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
nio.rhost,
@ -1038,7 +1038,7 @@ class QemuVM(object):
self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
self._control_vm("host_net_add user vlan={},name=gns3-{}".format(adapter_id, adapter_id))
else:
#FIXME: does it work? very undocumented feature...
# FIXME: does it work? very undocumented feature...
self._control_vm("netdev_del gns3-{}".format(adapter_id))
self._control_vm("netdev_add user,id=gns3-{}".format(adapter_id))
@ -1210,20 +1210,11 @@ class QemuVM(object):
nio.rport,
nio.rhost)])
else:
<<<<<<< HEAD:gns3server/old_modules/qemu/qemu_vm.py
network_options.extend(["-net", "socket,vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
adapter_id,
nio.rhost,
nio.rport,
self._host,
nio.lport)])
=======
network_options.extend(["-netdev", "socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
nio.rhost,
nio.rport,
self._host,
nio.lport)])
>>>>>>> master:gns3server/modules/qemu/qemu_vm.py
else:
if self._legacy_networking:
network_options.extend(["-net", "user,vlan={},name=gns3-{}".format(adapter_id, adapter_id)])