lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #536 from jonohart/buildcpu

Browse Source 
Add parameter for number of CPU cores to use in VM builds
This commit is contained in:
lantz
2015-11-23 15:40:46 -08:00
parent 2791333c70 86af067e42
commit af0215fb9f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+8 -4
View File
@@ -435,12 +435,13 @@ def installUbuntu( iso, image, logfilename='install.log', memory=1024 ):
log( '* Ubuntu installation completed in %.2f seconds' % elapsed ) log( '* Ubuntu installation completed in %.2f seconds' % elapsed )
def boot( cow, kernel, initrd, logfile, memory=1024 ): def boot( cow, kernel, initrd, logfile, memory=1024, cpuCores=1 ):
"""Boot qemu/kvm with a COW disk and local/user data store """Boot qemu/kvm with a COW disk and local/user data store
cow: COW disk path cow: COW disk path
kernel: kernel path kernel: kernel path
logfile: log file for pexpect object logfile: log file for pexpect object
memory: memory size in MB memory: memory size in MB
cpuCores: number of CPU cores to use
returns: pexpect object to qemu process""" returns: pexpect object to qemu process"""
# pexpect might not be installed until after depend() is called # pexpect might not be installed until after depend() is called
global pexpect global pexpect
@@ -469,6 +470,8 @@ def boot( cow, kernel, initrd, logfile, memory=1024 ):
'-append "root=/dev/vda1 init=/sbin/init console=ttyS0" ' ] '-append "root=/dev/vda1 init=/sbin/init console=ttyS0" ' ]
if Forward: if Forward:
cmd += sum( [ [ '-redir', f ] for f in Forward ], [] ) cmd += sum( [ [ '-redir', f ] for f in Forward ], [] )
if cpuCores > 1:
cmd += [ '-smp cores=%s' % cpuCores ]
cmd = ' '.join( cmd ) cmd = ' '.join( cmd )
log( '* BOOTING VM FROM', cow ) log( '* BOOTING VM FROM', cow )
log( cmd ) log( cmd )
@@ -881,14 +884,15 @@ def getMininetVersion( vm ):
return version return version
def bootAndRun( image, prompt=Prompt, memory=1024, outputFile=None, def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None,
runFunction=None, **runArgs ): runFunction=None, **runArgs ):
"""Boot and test VM """Boot and test VM
tests: list of tests to run tests: list of tests to run
pre: command line to run in VM before tests pre: command line to run in VM before tests
post: command line to run in VM after tests post: command line to run in VM after tests
prompt: shell prompt (default '$ ') prompt: shell prompt (default '$ ')
memory: VM memory size in MB""" memory: VM memory size in MB
cpuCores: number of CPU cores to use"""
bootTestStart = time() bootTestStart = time()
basename = path.basename( image ) basename = path.basename( image )
image = abspath( image ) image = abspath( image )
@@ -906,7 +910,7 @@ def bootAndRun( image, prompt=Prompt, memory=1024, outputFile=None,
suffix='.testlog', delete=False ) suffix='.testlog', delete=False )
log( '* Logging VM output to', logfile.name ) log( '* Logging VM output to', logfile.name )
vm = boot( cow=cow, kernel=kernel, initrd=initrd, logfile=logfile, vm = boot( cow=cow, kernel=kernel, initrd=initrd, logfile=logfile,
memory=memory ) memory=memory, cpuCores=cpuCores )
login( vm ) login( vm )
log( '* Waiting for prompt after login' ) log( '* Waiting for prompt after login' )
vm.expect( prompt ) vm.expect( prompt )