Updated receive.py & Calc tutorial (#284)

* Updated receive.py

* Updated calc tutorial

* Relocated calc tutorial

exercises/calc/Makefile

@@ -0,0 +1,5 @@
+BMV2_SWITCH_EXE = simple_switch_grpc
+#NO_P4 = true
+#P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
+
+include ../../utils/Makefile

exercises/calc/calc.p4

@@ -175,7 +175,7 @@ control MyIngress(inout headers hdr,
     }
 
     action operation_drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     table calculate {

exercises/calc/calc.py

@@ -65,7 +65,7 @@ def main():
 
     p = make_seq(num_parser, make_seq(op_parser,num_parser))
     s = ''
-    iface = 'h1-eth0'
+    iface = 'eth0'
 
     while True:
         s = str(raw_input('> '))

exercises/calc/s1-runtime.json

@@ -1,6 +1,6 @@
 {
   "target": "bmv2",
-  "p4info": "build/calc.p4info",
+  "p4info": "build/calc.p4.p4info.txt",
   "bmv2_json": "build/calc.json",
   "table_entries": [ ]
 }

exercises/calc/solution/calc.p4

@@ -180,7 +180,7 @@ control MyIngress(inout headers hdr,
     }
 
     action operation_drop() {
-        mark_to_drop();
+        mark_to_drop(standard_metadata);
     }
     
     table calculate {

exercises/calc/topology.json

@@ -0,0 +1,12 @@
+{
+    "hosts": {
+        "h1": {"ip": "10.0.1.1/24", "mac": "08:00:00:00:01:01"},
+        "h2": {"ip": "10.0.1.2/24", "mac": "08:00:00:00:01:02"}
+    },
+    "switches": {
+        "s1": { "runtime_json" : "s1-runtime.json" }
+    },
+    "links": [
+        ["h1", "s1-p1"], ["h2", "s1-p2"]
+    ]
+}

exercises/ecn/receive.py

@@ -27,7 +27,7 @@ def handle_pkt(pkt):
 
 
 def main():
-    iface = 'h2-eth0'
+    iface = 'eth0'
     print "sniffing on %s" % iface
     sys.stdout.flush()
     sniff(filter="udp and port 4321", iface = iface,

exercises/mri/receive.py

@@ -47,7 +47,7 @@ def handle_pkt(pkt):
 
 
 def main():
-    iface = 'h2-eth0'
+    iface = 'eth0'
     print "sniffing on %s" % iface
     sys.stdout.flush()
     sniff(filter="udp and port 4321", iface = iface,

exercises/other/calc/Makefile

@@ -1,5 +0,0 @@
-BMV2_SWITCH_EXE = simple_switch_grpc
-NO_P4 = true
-P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text
-
-include ../../utils/Makefile

exercises/other/calc/topology.json

@@ -1,12 +0,0 @@
-{
-    "hosts": [
-        "h1",
-        "h2"
-    ],
-    "switches": {
-        "s1": { "runtime_json" : "s1-runtime.json" }
-    },
-    "links": [
-        ["h1", "s1"], ["h2", "s1"]
-    ]
-}