Updating tutorial assets to work with 1.13.1
Change-Id: Icfa6c0b9a35e869b68a7c1ff394144a3ba0256c4
diff --git a/tools/tutorials/vm/createCluster b/tools/tutorials/vm/createCluster
index 4f3c8f3..392be70 100755
--- a/tools/tutorials/vm/createCluster
+++ b/tools/tutorials/vm/createCluster
@@ -1,11 +1,8 @@
#!/bin/bash
-# -----------------------------------------------------------------------------
-# Creates the ONOS cluster using 3 docker container instances.
-# -----------------------------------------------------------------------------
export PATH="$PATH:bin:onos/bin"
# Creates ONOS cluster using ONOS docker images
-ONOS_IMAGE=onosproject/onos:1.12.0
+ONOS_IMAGE=onosproject/onos:1.13.1
SSH_KEY=$(cut -d\ -f2 ~/.ssh/id_rsa.pub)
for i in {1..3}; do
@@ -21,8 +18,8 @@
for i in {1..3}; do
echo "Waiting for onos-$i startup..."
ip=$(docker container inspect onos-$i | grep \"IPAddress | cut -d: -f2 | sort -u | tr -d '", ')
- for t in {1..30}; do
- curl --fail -sS http://$ip:8181/onos/v1/cluster --user onos:rocks 1>/dev/null 2>&1 && break;
+ for t in {1..60}; do
+ curl --fail -sS http://$ip:8181/onos/v1/applications --user onos:rocks 1>/dev/null 2>&1 && break;
sleep 1;
done
onos $ip summary >/dev/null 2>&1
@@ -37,6 +34,6 @@
waitForStart
echo "Activating OpenFlow and ProxyARP applications..."
-onos $OC1 app activate openflow proxyarp
+onos $OC1 app activate org.onosproject.openflow proxyarp layout
onos $OC1
diff --git a/tools/tutorials/vm/destroyCluster b/tools/tutorials/vm/destroyCluster
index 9bc3a74..1ef04e2 100755
--- a/tools/tutorials/vm/destroyCluster
+++ b/tools/tutorials/vm/destroyCluster
@@ -1,10 +1,6 @@
#!/bin/bash
-# -----------------------------------------------------------------------------
-# Destroys the ONOS cluster by stopping the 3 docker containers.
-# -----------------------------------------------------------------------------
-# Creates ONOS cluster using ONOS docker images
-ONOS_IMAGE=onosproject/onos:1.12.0
+# Destroys ONOS cluster running as ONOS docker images
SSH_KEY=$(cut -d\ -f2 ~/.ssh/id_rsa.pub)
for i in {1..3}; do
diff --git a/tools/tutorials/vm/exportVM b/tools/tutorials/vm/exportVM
index 48420c9..792627c 100755
--- a/tools/tutorials/vm/exportVM
+++ b/tools/tutorials/vm/exportVM
@@ -3,7 +3,7 @@
# Exports the ONOS Tutorial VM into an OVA file for publishing.
# -----------------------------------------------------------------------------
-export VER=1.12.0
+export VER=1.13.1
export OVA=/tmp/onos-tutorial-$VER.ova
rm -f $OVA
vboxmanage export "ONOS Tutorial" --output $OVA --manifest \
diff --git a/tools/tutorials/vm/prepForExport b/tools/tutorials/vm/prepForExport
index fb944a7..4c5286c 100755
--- a/tools/tutorials/vm/prepForExport
+++ b/tools/tutorials/vm/prepForExport
@@ -1,7 +1,4 @@
#!/bin/bash
-# -----------------------------------------------------------------------------
-# Prepars the ONOS Tutorial VM for export; run from the VM.
-# -----------------------------------------------------------------------------
sudo chattr +i ~/.config/xfce4/desktop/icons*
destroyCluster
sudo mn -c
diff --git a/tools/tutorials/vm/uploadToS3 b/tools/tutorials/vm/uploadToS3
index 3a0e2cb..9e60e9a 100755
--- a/tools/tutorials/vm/uploadToS3
+++ b/tools/tutorials/vm/uploadToS3
@@ -2,6 +2,6 @@
# -----------------------------------------------------------------------------
# Publishes the ONOS Tutorial OVA file.
# -----------------------------------------------------------------------------
-export VER=1.12.0
+export VER=1.13.1
export OVA=/tmp/onos-tutorial-$VER.ova
uploadToS3.py $OVA --secret $AWS_SECRET_ACCESS_KEY --key $AWS_ACCESS_KEY_ID --bucket onos --dest vm/