ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-15 13:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Possibility to customize port names and adapter types for Qemu, VirtualBox, VMware and Docker. Fixes #2361.

Browse Source 
MAC addresses can customized for Qemu as well.
This commit is contained in:
grossmj
2018-04-02 22:27:12 +07:00
parent 509b171b06
commit 757c103c03
14 changed files with 162 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1696,10 +1696,17 @@ class QemuVM(BaseNode):
if adapter_number not in self._local_udp_tunnels:
self._local_udp_tunnels[adapter_number] = self._create_local_udp_tunnel()
nio = self._local_udp_tunnels[adapter_number][0]
custom_adapter = self._get_custom_adapter_settings(adapter_number)
adapter_type = custom_adapter.get("adapter_type", self._adapter_type)
custom_mac_address = custom_adapter.get("mac_address")
if custom_mac_address:
mac = int_to_macaddress(macaddress_to_int(custom_mac_address))
if self._legacy_networking:
# legacy QEMU networking syntax (-net)
if nio:
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, self._adapter_type)])
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, adapter_type)])
if isinstance(nio, NIOUDP):
if patched_qemu:
# use patched Qemu syntax
@ -1719,11 +1726,11 @@ class QemuVM(BaseNode):
elif isinstance(nio, NIOTAP):
network_options.extend(["-net", "tap,name=gns3-{},ifname={}".format(adapter_number, nio.tap_device)])
else:
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, self._adapter_type)])
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, adapter_type)])
else:
# newer QEMU networking syntax
device_string = "{},mac={}".format(self._adapter_type, mac)
device_string = "{},mac={}".format(adapter_type, mac)
bridge_id = math.floor(pci_device_id / 32)
if bridge_id > 0:
addr = pci_device_id % 32