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

Add 'mininet' prefix to output files

Browse Source
This commit is contained in:
Bob Lantz
2013-09-11 12:00:17 -07:00
committed by Brian O'Connor
parent e02cdc0c54
commit 9e725cb28a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+5 -4
View File
@@ -502,7 +502,7 @@ def convert( cow, basename ):
# Warning: XML file cannot begin with a newline! # Warning: XML file cannot begin with a newline!
OVFTemplate = """<?xml version="1.0"?> OVFTemplate = """<?xml version="1.0"?>
<Envelope ovf:version="1.0" xml:lang="en-US" <Envelope ovf:version="1.0" xml:lang="en-US"
xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
@@ -623,7 +623,8 @@ def build( flavor='raring32server' ):
log( '* Logging to', abspath( LogFile.name ) ) log( '* Logging to', abspath( LogFile.name ) )
log( '* Created working directory', dir ) log( '* Created working directory', dir )
image, kernel, initrd = findBaseImage( flavor ) image, kernel, initrd = findBaseImage( flavor )
volume = flavor + '.qcow2' basename = 'mininet-' + flavor
volume = basename + '.qcow2'
run( 'qemu-img create -f qcow2 -b %s %s' % ( image, volume ) ) run( 'qemu-img create -f qcow2 -b %s %s' % ( image, volume ) )
log( '* VM image for', flavor, 'created as', volume ) log( '* VM image for', flavor, 'created as', volume )
if LogToConsole: if LogToConsole:
@@ -634,12 +635,12 @@ def build( flavor='raring32server' ):
vm = boot( volume, kernel, initrd, logfile ) vm = boot( volume, kernel, initrd, logfile )
interact( vm ) interact( vm )
size = qcow2size( volume ) size = qcow2size( volume )
vmdk = convert( volume, basename=flavor ) vmdk = convert( volume, basename=basename )
if not SaveQCOW2: if not SaveQCOW2:
log( '* Removing qcow2 volume', volume ) log( '* Removing qcow2 volume', volume )
os.remove( volume ) os.remove( volume )
log( '* Converted VM image stored as', abspath( vmdk ) ) log( '* Converted VM image stored as', abspath( vmdk ) )
ovf = generateOVF( diskname=vmdk, disksize=size, name=flavor, mem=1024 ) ovf = generateOVF( diskname=vmdk, disksize=size, name=basename )
log( '* Generated OVF descriptor file', ovf ) log( '* Generated OVF descriptor file', ovf )
end = time() end = time()
elapsed = end - start elapsed = end - start