Updates the examples to use the new build scripts (except Hula). (#74)

* Added Makefile and topology.jsons for all examples.

* use branch

* Updated MRI exercise (#73)

* Updated MRI exercise

* Updated basic_tunnel.p4 for changes to p4 lang

* updated other examples

P4D2_2017_Fall/exercises/mri/Makefile

@@ -0,0 +1 @@
+include ../../utils/Makefile

P4D2_2017_Fall/exercises/mri/README.md

@@ -31,7 +31,7 @@ switch in Mininet to test its behavior.
 
 1. In your shell, run:
    ```bash
-   ./run.sh
+   make
    ```
    This will:
    * compile `mri.p4`, and
@@ -46,7 +46,7 @@ switch in Mininet to test its behavior.
 2. We want to send a low rate traffic from `h1` to `h2` and a high
    rate iperf traffic from `h11` to `h22`.  The link between `s1` and
    `s2` is common between the flows and is a bottleneck because we
-   reduced its bandwidth to 512kbps in p4app.json.  Therefore, if we
+   reduced its bandwidth to 512kbps in topology.json.  Therefore, if we
    capture packets at `h2`, we should see high queue size for that
    link.
 
@@ -90,7 +90,7 @@ with parameters supplied by the control plane as part of the rule.
 
 In this exercise, the control plane logic has already been
 implemented.  As part of bringing up the Mininet instance, the
-`run.sh` script will install packet-processing rules in the tables of
+`make` script will install packet-processing rules in the tables of
 each switch. These are defined in the `sX-commands.txt` files, where
 `X` corresponds to the switch number.
 
@@ -204,11 +204,11 @@ got a packet
 
 There are several ways that problems might manifest:
 
-1. `mri.p4` fails to compile. In this case, `run.sh` will report the
+1. `mri.p4` fails to compile. In this case, `make` will report the
 error emitted from the compiler and stop.
 2. `mri.p4` compiles but does not support the control plane rules in
-the `sX-commands.txt` files that `run.sh` tries to install using the BMv2 CLI.
-In this case, `run.sh` will report these errors to `stderr`. Use these error
+the `sX-commands.txt` files that `make` tries to install using the BMv2 CLI.
+In this case, `make` will report these errors to `stderr`. Use these error
 messages to fix your `mri.p4` implementation.
 3. `mri.p4` compiles, and the control plane rules are installed, but
 the switch does not process packets in the desired way. The
@@ -220,16 +220,16 @@ packets on each interface. Use `tcpdump -r <filename> -xxx` to print
 the hexdump of the packets.
 4. `mri.p4` compiles and all rules are installed. Packets go through
 and the logs show that the queue length is always 0.  Then either
-reduce the link bandwidth in `p4app.json`.
+reduce the link bandwidth in `topology.json`.
 
 #### Cleaning up Mininet
 
-In the latter two cases above, `run.sh` may leave a Mininet instance
+In the latter two cases above, `make` may leave a Mininet instance
 running in the background.  Use the following command to clean up
 these instances:
 
 ```bash
-mn -c
+make stop
 ```
 
 ## Next Steps

P4D2_2017_Fall/exercises/mri/p4app.json

@@ -1,37 +0,0 @@
-{
-    "program": "mri.p4",
-    "language": "p4-16",
-    "targets": {
-      "multiswitch": {
-          "auto-control-plane": true,
-          "cli": true,
-          "pcap_dump": true,
-          "bmv2_log": true,
-          "links": [["h1", "s1"], ["h11", "s1"], ["s1", "s2", "0", 0.5], ["s1", "s3"], ["s3", "s2"], ["s2", "h2"], ["s2", "h22"], ["s3", "h3"]],
-          "hosts": {
-            "h1": {
-            },
-            "h2": {
-            },
-            "h3": {
-            },
-            "h11": {
-            },
-            "h22": {
-            }
-
-          },
-          "switches": {
-              "s1": {
-                  "entries": "s1-commands.txt"
-              },
-              "s2": {
-                  "entries": "s2-commands.txt"
-              },
-              "s3": {
-                  "entries": "s3-commands.txt"
-              }
-          }
-	    }
-    }
-}

P4D2_2017_Fall/exercises/mri/run.sh

@@ -1,5 +0,0 @@
-P4APPRUNNER=../../utils/p4apprunner.py
-mkdir -p build
-tar -czf build/p4app.tgz * --exclude='build'
-#cd build
-sudo python $P4APPRUNNER p4app.tgz --build-dir ./build

P4D2_2017_Fall/exercises/mri/s1-commands.txt

@@ -1,6 +1,6 @@
 table_set_default ipv4_lpm drop
 table_set_default swtrace add_swtrace 1
-table_add ipv4_lpm ipv4_forward 10.0.1.1/32  => 00:00:00:00:01:01 1
-table_add ipv4_lpm ipv4_forward 10.0.1.11/32 => 00:00:00:00:01:0b 2
+table_add ipv4_lpm ipv4_forward 10.0.1.1/32  => 00:00:00:00:01:01 2
+table_add ipv4_lpm ipv4_forward 10.0.1.11/32 => 00:00:00:00:01:0b 1
 table_add ipv4_lpm ipv4_forward 10.0.2.0/24 => 00:00:00:02:03:00 3
 table_add ipv4_lpm ipv4_forward 10.0.3.0/24 => 00:00:00:03:02:00 4

P4D2_2017_Fall/exercises/mri/s2-commands.txt

@@ -1,6 +1,6 @@
 table_set_default ipv4_lpm drop
 table_set_default swtrace add_swtrace 2
-table_add ipv4_lpm ipv4_forward 10.0.2.2/32  => 00:00:00:00:02:02 1
-table_add ipv4_lpm ipv4_forward 10.0.2.22/32 => 00:00:00:00:02:16 2
+table_add ipv4_lpm ipv4_forward 10.0.2.2/32  => 00:00:00:00:02:02 2
+table_add ipv4_lpm ipv4_forward 10.0.2.22/32 => 00:00:00:00:02:16 1
 table_add ipv4_lpm ipv4_forward 10.0.1.0/24 => 00:00:00:01:03:00 3
 table_add ipv4_lpm ipv4_forward 10.0.3.0/24 => 00:00:00:03:03:00 4

P4D2_2017_Fall/exercises/mri/topology.json

@@ -0,0 +1,18 @@
+{
+    "hosts": [
+        "h1",
+        "h2",
+        "h3",
+        "h11",
+        "h22"
+    ],
+    "switches": {
+        "s1": { "cli_input" : "s1-commands.txt" },
+        "s2": { "cli_input" : "s2-commands.txt" },
+        "s3": { "cli_input" : "s3-commands.txt" }
+    },
+    "links": [
+              ["h1", "s1"], ["h11", "s1"], ["s1", "s2", "0", 0.5], ["s1", "s3"],
+              ["s3", "s2"], ["s2", "h2"], ["s2", "h22"], ["s3", "h3"]
+    ]
+}