refactor
diff --git a/onos-build-vm.py b/onos-build-vm.py
index 4c20e98..e54041d 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -31,15 +31,13 @@
vm.sendline( 'bash vm-setup-lxc.sh' )
vm.expect( prompt, timeout=3600 )
- """
- vm.sendline('sudo su - tutorial1')
+
+ vm.sendline('sudo su - mininet')
vm.expect(prompt, timeout=20)
- vm.sendline( 'git clone https://gerrit.onosproject.org/onos' )
- vm.expect( prompt, timeout=30 )
- vm.sendline( 'cd onos && git checkout %s && cd -' % onos_version )
-
-
- vm.expect( prompt, timeout=1200 )
+ #vm.sendline( 'git clone https://gerrit.onosproject.org/onos' )
+ #vm.expect( prompt, timeout=30 )
+ #vm.sendline( 'cd onos && git checkout %s && cd -' % onos_version )
+ #vm.expect( prompt, timeout=1200 )
vm.sendline('ssh 127.0.0.1')
@@ -50,14 +48,14 @@
vm.expect( prompt, timeout=1200 )
- url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos-setup.sh'
- vm.sendline( ' wget -O onos-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
+ url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos-setup-lxc.sh'
+ vm.sendline( ' wget -O onos-setup-lxc.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.sendline( 'bash onos-setup-lxc.sh' )
vm.expect(prompt, timeout=3600)
vm.sendline('exit')
vm.expect(prompt, timeout=20)
- """
+
def vmdk2size( vmdk ):