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

Dynamically configure network connections of running QEMU VMs (including new QEMU versions)

Browse Source
This commit is contained in:
Dmitry Shmygov 2015-01-03 05:04:52 +03:00
parent ccb4ccd612
commit 4eedc9c74c
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gns3server/modules/qemu/qemu_vm.py
View File

@ -993,15 +993,16 @@ class QemuVM(object):
# dynamically configure an UDP tunnel on the QEMU VM adapter # dynamically configure an UDP tunnel on the QEMU VM adapter
if nio and isinstance(nio, NIO_UDP): if nio and isinstance(nio, NIO_UDP):
if self._legacy_networking: if self._legacy_networking:
self._control_vm("host_net_remove {} dev.{}".format(adapter_id, adapter_id)) self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
self._control_vm("host_net_add udp vlan={},name=dev.{},sport={},dport={},daddr={}".format(adapter_id, self._control_vm("host_net_add udp vlan={},name=gns3-{},sport={},dport={},daddr={}".format(adapter_id,
adapter_id, adapter_id,
nio.lport, nio.lport,
nio.rport, nio.rport,
nio.rhost)) nio.rhost))
else: else:
self._control_vm("netdev_del gns3-{}".format(adapter_id)) self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
self._control_vm("netdev_add socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id, self._control_vm("host_net_add socket vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
adapter_id,
nio.rhost, nio.rhost,
nio.rport, nio.rport,
self._host, self._host,
@ -1030,12 +1031,8 @@ class QemuVM(object):
if self.is_running(): if self.is_running():
# dynamically disable the QEMU VM adapter # dynamically disable the QEMU VM adapter
if self._legacy_networking: self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
self._control_vm("host_net_remove {} dev.{}".format(adapter_id, adapter_id)) self._control_vm("host_net_add user vlan={},name=gns3-{}".format(adapter_id, adapter_id))
self._control_vm("host_net_add user vlan={},name=dev.{}".format(adapter_id, adapter_id))
else:
self._control_vm("netdev_del gns3-{}".format(adapter_id))
self._control_vm("netdev_add user,id=gns3-{}".format(adapter_id))
nio = adapter.get_nio(0) nio = adapter.get_nio(0)
adapter.remove_nio(0) adapter.remove_nio(0)
@ -1191,30 +1188,24 @@ class QemuVM(object):
for adapter in self._ethernet_adapters: for adapter in self._ethernet_adapters:
#TODO: let users specify a base mac address #TODO: let users specify a base mac address
mac = "00:00:ab:%02x:%02x:%02d" % (random.randint(0x00, 0xff), random.randint(0x00, 0xff), adapter_id) mac = "00:00:ab:%02x:%02x:%02d" % (random.randint(0x00, 0xff), random.randint(0x00, 0xff), adapter_id)
if self._legacy_networking:
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_id, mac, self._adapter_type)]) network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_id, mac, self._adapter_type)])
else:
network_options.extend(["-device", "{},mac={},netdev=gns3-{}".format(self._adapter_type, mac, adapter_id)])
nio = adapter.get_nio(0) nio = adapter.get_nio(0)
if nio and isinstance(nio, NIO_UDP): if nio and isinstance(nio, NIO_UDP):
if self._legacy_networking: if self._legacy_networking:
network_options.extend(["-net", "udp,vlan={},name=dev.{},sport={},dport={},daddr={}".format(adapter_id, network_options.extend(["-net", "udp,vlan={},name=gns3-{},sport={},dport={},daddr={}".format(adapter_id,
adapter_id, adapter_id,
nio.lport, nio.lport,
nio.rport, nio.rport,
nio.rhost)]) nio.rhost)])
else: else:
network_options.extend(["-netdev", "socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id, network_options.extend(["-net", "socket,vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
adapter_id,
nio.rhost, nio.rhost,
nio.rport, nio.rport,
self._host, self._host,
nio.lport)]) nio.lport)])
else: else:
if self._legacy_networking: network_options.extend(["-net", "user,vlan={},name=gns3-{}".format(adapter_id, adapter_id)])
network_options.extend(["-net", "user,vlan={},name=dev.{}".format(adapter_id, adapter_id)])
else:
network_options.extend(["-netdev", "user,id=gns3-{}".format(adapter_id)])
adapter_id += 1 adapter_id += 1
return network_options return network_options