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

Merge branch '1.5' into 2.0

Browse Source 
Conflicts:
	gns3server/version.py
This commit is contained in:
grossmj
2016-05-29 19:52:15 -06:00
parent 59f22cd346 ea7754f1c8
commit c1aad550fa
5 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import subprocess
import shlex
import asyncio
import socket
import random
import gns3server
from gns3server.utils import parse_version
@ -493,9 +494,9 @@ class QemuVM(BaseNode):
"""
if not mac_address:
self._mac_address = "00:00:ab:%s:%s:00" % (self.id[-4:-2], self.id[-2:])
self._mac_address = "12:34:%02x:%02x:%02x:00" % (random.randint(0, 255), random.randint(0, 255), random.randint(0, 255))
else:
self._mac_address = mac_address
self._mac_address = mac_address[:8] + ":%02x:%02x:00" % (random.randint(0, 255), random.randint(0, 255))
log.info('QEMU VM "{name}" [{id}]: MAC address changed to {mac_addr}'.format(name=self._name,
id=self._id,