Tutorial VM pointers and corrections for ONOS-P4 tutorial exercise 1
Change-Id: Ia8872a1d5b8c2962a63dbfa7825ed0d6994b8a4e
diff --git a/apps/p4-tutorial/README.md b/apps/p4-tutorial/README.md
index 87d62da..1aa4f9b 100644
--- a/apps/p4-tutorial/README.md
+++ b/apps/p4-tutorial/README.md
@@ -7,7 +7,30 @@
[brigade-p4@onosproject.org](mailto:brigade-p4@onosproject.org) or check the
[mailing list archives](https://groups.google.com/a/onosproject.org/forum/#!forum/brigade-p4).
-## mytunnel.p4
+## Tutorial VM
+
+To complete the exercises, you will need to download and run the following VM
+(in .ova format):
+
+<http://onlab.vicci.org/onos/onos-p4-tutorial.ova>
+
+To run the VM you can use any modern virtualization system, although we
+recommend using VirtualBox. To download VirtualBox and import the VM use the
+following links:
+
+* <https://www.virtualbox.org/wiki/Downloads>
+* <https://docs.oracle.com/cd/E26217_01/E26796/html/qs-import-vm.html>
+
+For more information on the content of the VM, and minimum system requirements,
+[click here](/tools/dev/p4vm/README.md).
+
+### VM credentials
+
+The VM comes with one user with sudo privileges named `sdn` with password `rocks`.
+
+## Overview
+
+### mytunnel.p4
These exercises are based on a simple P4 program called
[mytunnel.p4](./pipeconf/src/main/resources/mytunnel.p4) designed for this
@@ -32,7 +55,7 @@
* What happens if a matching entry is not found in table `t_l2_fwd`? What's the
next table applied to the packet?
-## MyTunnel Pipeconf
+### MyTunnel Pipeconf
The `mytunnel.p4` program is provided to ONOS as part of a "pipeconf", along
with the Java implementations of some ONOS driver behaviors necessary to
@@ -62,7 +85,7 @@
implementation works by reading the value of two P4 counters defined in
`mytunnel.p4`, `tx_port_counter` and `rx_port_counter`.
-## MyTunnel App
+### MyTunnel App
This application is used to provide connectivity between each pair of hosts via
the MyTunnel protocol. The implementation can be found
diff --git a/apps/p4-tutorial/exercise-1.md b/apps/p4-tutorial/exercise-1.md
index 56858bb..a340f55 100644
--- a/apps/p4-tutorial/exercise-1.md
+++ b/apps/p4-tutorial/exercise-1.md
@@ -207,7 +207,7 @@
```
deviceId=device:bmv2:1, flowRuleCount=3
- ADDED, bytes=798, packets=19, table=0, priority=40000, selector=[ETH_TYPE:arp], treatment=[immediate=[OUTPUT:CONTROLLER], clearDeferred]
+ ADDED, bytes=0, packets=0, table=0, priority=40000, selector=[ETH_TYPE:arp], treatment=[immediate=[OUTPUT:CONTROLLER], clearDeferred]
ADDED, bytes=0, packets=0, table=0, priority=40000, selector=[ETH_TYPE:bddp], treatment=[immediate=[OUTPUT:CONTROLLER], clearDeferred]
ADDED, bytes=0, packets=0, table=0, priority=40000, selector=[ETH_TYPE:lldp], treatment=[immediate=[OUTPUT:CONTROLLER], clearDeferred]
```
@@ -271,8 +271,8 @@
the action `c_ingress.send_to_cpu`.
**Important:** The BMv2 CLI is a powerful tool to debug the state of a
- *BMv2 switch. Type `help` to show a list of possible commands. This CLI
- *provides also auto-completion when pressing the `tab` key.
+ BMv2 switch. Type `help` to show a list of possible commands. This CLI
+ provides also auto-completion when pressing the `tab` key.
4. It is finally time to **test connectivity between the hosts** of our Mininet
network.
@@ -313,7 +313,7 @@
5. Congratulations, you completed the first exercise of the ONOS+P4 tutorial!
- To kill ONOS, press `ctrl-d` in the ONOS log terminal window. To kill
+ To kill ONOS, press `ctrl-c` in the ONOS log terminal window. To kill
Mininet, press `ctrl-d` in the Mininet CLI or type `exit`.
## Bonus exercise