commit 89d5734045e35fe0998f5c372fb5116e4f763e20
author Dan Talayco <dtalayco@stanford.edu> Mon Jun 07 16:24:59 2010 -0700
committer Dan Talayco <dtalayco@stanford.edu> Mon Jun 07 16:24:59 2010 -0700
tree 32dfa4b2fe391f297d116472e996640466269849
parent 9f47f4d4dd1f73db0f2f45c53680f865f65116d6

Added flow expire/stats tests

Contributions from Google test engineers.  Basic tests for flow
expiration message generation and stats checking.  They also
added code for properly managing network prototype and wildcards
for TCP/UDP packets in parse.py.

src/python/oftest/parse.py

diff --git a/src/python/oftest/parse.py b/src/python/oftest/parse.py
index c8d9ad9..13dac43 100644
--- a/src/python/oftest/parse.py
+++ b/src/python/oftest/parse.py
@@ -302,6 +302,14 @@
         match.wildcards &= ~OFPFW_NW_TOS
 
     if tcp:
+        match.nw_proto = 6
+        match.wildcards &= ~OFPFW_NW_PROTO
+    elif not tcp and udp:
+        tcp = udp
+        match.nw_proto = 17
+        match.wildcards &= ~OFPFW_NW_PROTO
+
+    if tcp:
         match.tp_src = tcp.sport
         match.wildcards &= ~OFPFW_TP_SRC
         match.tp_dst = tcp.dport