fix merge error
diff --git a/onos-build-vm.py b/onos-build-vm.py
index 16e6dd9..043fb93 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -9,7 +9,7 @@
# Add the Mininet build script directory to the path, so we can import it
#TODO do a better job finding Mininet
-path = os.path.join( '~', 'mininet', 'util', 'vm' )
+path = os.path.join( '/home', 'mininet', 'mininet','util', 'vm' )
path = os.path.expanduser( path )
if os.path.isdir( path ):
sys.path.append( path )
@@ -23,27 +23,18 @@
def installONOS( vm, prompt=Prompt ):
# start with sendline
#TODO consider resizing the HDD
-<<<<<<< Updated upstream
- url = 'https://gerrit.onlab.us/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/master;f=vm-setup.sh'
- vm.sendline( 'wget -O vm-setup.sh "%s" | bash' % url )
- vm.expect( prompt, timeout=20 )
- vm.sendline( 'bash vm-setup.sh' )
- # end with expect prompt
- vm.expect( prompt, timeout=1200 )
-=======
- url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial-1.6;f=vm-setup.sh'
+ url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial-1.1;f=vm-setup.sh'
vm.sendline( ' wget -O vm-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
vm.expect( prompt, timeout=20 )
vm.sendline( 'bash vm-setup.sh' )
vm.expect( prompt, timeout=3600 )
- url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial-1.6;f=onos-setup.sh'
+ url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial-1.1;f=onos-setup.sh'
vm.sendline( ' wget -O onos-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
vm.expect( prompt, timeout=20 )
vm.sendline( 'bash onos-setup.sh' )
vm.expect(prompt, timeout=3600)
->>>>>>> Stashed changes
def vmdk2size( vmdk ):
"Return virtual disk size (in bytes) of vmdk image"
@@ -51,7 +42,7 @@
assert 'disk image' in output
return os.stat( vmdk )[ ST_SIZE ]
-def buildONOS( image, out, flavor='raring64server', installMemory=1024, ovfMemory=2048 ):
+def buildONOS( image, out, flavor='trusty64server', installMemory=2048, ovfMemory=4096 ):
if not image:
# build VM from flavor
#build( flavor )
@@ -65,18 +56,18 @@
print osname, osid
ovf = generateOVF( name=ovfname, osname=osname, osid=osid,
- diskname=out+'.vmdk', disksize=size, mem=2048, cpus=4,
- vmname='ONOS-VM', vminfo='An ONOS VM' )
+ diskname=out+'.vmdk', disksize=size, mem=ovfMemory, cpus=2,
+ vmname='ONOS-Tutorial', vminfo='ONOS Tutorial VM' )
log( '* Generated OVF descriptor file', ovf )
if __name__ == '__main__':
- parser = argparse.ArgumentParser( description='ONOS VM build script' )
+ parser = argparse.ArgumentParser( description='Mininet Tutorial 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='raring64server',
- help='VM flavor to build (e.g. raring64server)' )
+ parser.add_argument( '-f', '--flavor', default='trusty64server',
+ help='VM flavor to build (e.g. trusty64server)' )
parser.add_argument( 'scripts', nargs='*',
- help='VM flavor(s) to build (e.g. raring64server)' )
+ help='VM flavor(s) to build (e.g. trusty64server)' )
parser.add_argument( '-z', '--zip', action='store_true',
help='archive .ovf and .vmdk into .zip file' )
parser.add_argument( '-o', '--out', required=True,