Parameterized VM name and info
diff --git a/onos-build-base.py b/onos-build-base.py
index 2510d24..fc12e45 100755
--- a/onos-build-base.py
+++ b/onos-build-base.py
@@ -36,10 +36,8 @@
assert 'disk image' in output
return os.stat( vmdk )[ ST_SIZE ]
-def buildBaseVm( image, out, scriptFileName, flavor='utopic64server', installMemory=4096, ovfMemory=4096 ):
- if not image:
- log( '* Error: no image specified' )
- sys.exit( 1 )
+def buildOnosVm( image, out, scriptFileName, vmname='ONOS', vminfo='ONOS VM',
+ flavor='utopic64server', installMemory=4096, ovfMemory=4096 ):
bootAndRun( image, runFunction=install, scriptFileName=scriptFileName, memory=installMemory, outputFile=out )
@@ -50,11 +48,11 @@
ovf = generateOVF( name=ovfname, osname=osname, osid=osid,
diskname=out+'.vmdk', disksize=size, mem=ovfMemory, cpus=2,
- vmname='ONOS-Base', vminfo='ONOS Base VM' )
+ vmname=vmname, vminfo=vminfo )
log( '* Generated OVF descriptor file', ovf )
if __name__ == '__main__':
- parser = argparse.ArgumentParser( description='ONOS Base VM build script' )
+ parser = argparse.ArgumentParser( description='ONOS VM build script' )
parser.add_argument( '-i', '--image', metavar='image', required=True,
help='Build from an existing VM image' )
parser.add_argument( '-f', '--flavor', default='trusty64server', required=True,
@@ -67,11 +65,15 @@
help='output file for test image (vmdk)' )
parser.add_argument( '-s', '--script', required=True,
help='Install script filename' )
+ parser.add_argument( '--vmname', default='ONOS',
+ help='Name of the generated VM image')
+ parser.add_argument( '--vminfo', default='ONOS VM',
+ help='Short description of the VM')
args = parser.parse_args()
print args
- buildBaseVm( args.image, args.out, args.script, flavor=args.flavor)
+ buildOnosVm( args.image, args.out, args.script, vmname=args.vmname, vminfo=args.vminfo, flavor=args.flavor)
if args.zip:
log( '* Generating .zip file' )