commit e2f0de8d04e154e873eda726247ec7f8b5fe277c
author Pavlin Radoslavov <pavlin@onlab.us> Tue Mar 12 01:39:30 2013 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Mar 12 01:39:30 2013 -0700
tree f9cfb9f469a87cce8fe94d845cd66eb5c43e3963
parent f13923ae7f06204984496563abb3aed6d6464804

Complete the work toward Issue #215 and Issue #216:

 * Added back-end support for matching conditions and actions for flows.
 * Fixed a bug in setting the inPort matching condition.

NOTE: to match IP Source or Destination address, we must
add "matchEthernetFrameType 2048" to the set of matching conditions. E.g:

web/add_flow.py 1 FOOBAR 00:00:00:00:00:00:00:01 0 00:00:00:00:00:00:00:02 0 matchDstMac 00:11:22:33:44:55 matchDstIPv4Net 10.0.0.0/8 matchEthernetFrameType 2048

web/add_flow.py

diff --git a/web/add_flow.py b/web/add_flow.py
index 30de975..d8788ee 100755
--- a/web/add_flow.py
+++ b/web/add_flow.py
@@ -92,11 +92,11 @@
   usage_msg = usage_msg + "        matchDstMac <destination MAC address>\n"
   usage_msg = usage_msg + "        matchSrcIPv4Net <source IPv4 network address>\n"
   usage_msg = usage_msg + "        matchDstIPv4Net <destination IPv4 network address>\n"
+  usage_msg = usage_msg + "        matchEthernetFrameType <Ethernet frame type>\n"
 
   usage_msg = usage_msg + "    Match Conditions (not implemented yet):\n"
   usage_msg = usage_msg + "        matchVlanId <VLAN ID>\n"
   usage_msg = usage_msg + "        matchVlanPriority <VLAN priority>\n"
-  usage_msg = usage_msg + "        matchEthernetFrametype <Ethernet frame type>\n"
   usage_msg = usage_msg + "        matchIpToS <IP ToS (DSCP field, 6 bits)>\n"
   usage_msg = usage_msg + "        matchIpProto <IP protocol>\n"
   usage_msg = usage_msg + "        matchSrcTcpUdpPort <source TCP/UDP port>\n"

web/get_flow.py

diff --git a/web/get_flow.py b/web/get_flow.py
index 99e4f3a..eaf50d3 100755
--- a/web/get_flow.py
+++ b/web/get_flow.py
@@ -44,14 +44,12 @@
   print "FlowPath: (flowId = %s installerId = %s src = %s/%s dst = %s/%s)" % (flowId, installerId, srcSwitch, srcPort, dstSwitch, dstPort)
 
   for f in parsedResult['dataPath']['flowEntries']:
-    inPort = f['inPort']['value']
-    outPort = f['outPort']['value']
     dpid = f['dpid']['value']
     userState = f['flowEntryUserState']
     switchState = f['flowEntrySwitchState']
     match = f['flowEntryMatch'];
     actions = f['flowEntryActions']
-    print "  FlowEntry: (%s, %s, %s, %s, %s)" % (inPort, dpid, outPort, userState, switchState)
+    print "  FlowEntry: (%s, %s, %s)" % (dpid, userState, switchState)
 
     #
     # Print the match conditions