openflow.lua
diff --git a/onos-build-vm.py b/onos-build-vm.py
index 3bf023b..c099692 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -32,9 +32,6 @@
vm.sendline('sudo su - tutorial1')
vm.expect(prompt, timeout=20)
- vm.sendline('exit')
- vm.expect(prompt, timeout=20)
- return
vm.sendline( 'git clone https://gerrit.onosproject.org/onos-next/' )
vm.expect("Username for 'https://gerrit.onosproject.org':", timeout=30)
vm.sendline('vm')
@@ -57,7 +54,9 @@
vm.expect( prompt, timeout=20 )
vm.sendline( 'bash onos-setup.sh' )
vm.expect(prompt, timeout=1200)
-
+ vm.sendline('exit')
+ vm.expect(prompt, timeout=20)
+
def vmdk2size( vmdk ):
diff --git a/tutorial1-setup.sh b/tutorial1-setup.sh
index 45217a0..dd855dc 100644
--- a/tutorial1-setup.sh
+++ b/tutorial1-setup.sh
@@ -21,6 +21,12 @@
wget http://apache.osuosl.org/karaf/3.0.2/apache-karaf-3.0.2.zip
cd -
+# -------------- Setup Wireshark dissector ----
+
+wget -O openflow.lua "https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=openflow.lua"
+mkdir -p .wireshark/plugins
+mv openflow.lua .wireshark/plugins
+
# -------------- Setup Desktop ----------------
sudo apt-get install -y xorg lxde