commit 488fbc52b4986db4d69f881209391f2321393af2
author Dan Talayco <dan.talayco@bigswitch.com> Mon Apr 09 16:30:41 2012 -0700
committer Dan Talayco <dan.talayco@bigswitch.com> Mon Apr 09 16:30:41 2012 -0700
tree 0ddc9ef75d481da96ee61c9e43ffa8435189ad0d
parent a6fbd673bc693c86337ac21ddf3684364e1196a0

From eswierk 6927ce7fa40cc770749d6495828002971eee1a77

    Fix SingleWildcard and AllExceptOneWildcard tests to exercise only valid
    combinations of wildcard and exact match fields (e.g. if nw_proto is
    wildcarded, also wildcard l4_src and l4_dst fields), to accommodate
    switches that are picky about such things

tests/flow_stats.py

diff --git a/tests/flow_stats.py b/tests/flow_stats.py
index 38560bc..4d43672 100644
--- a/tests/flow_stats.py
+++ b/tests/flow_stats.py
@@ -30,15 +30,17 @@
 
 # TODO: ovs has problems with VLAN id?
 WILDCARD_VALUES = [ofp.OFPFW_IN_PORT,
-                   # ofp.OFPFW_DL_VLAN,
+                   # (ofp.OFPFW_DL_VLAN | ofp.OFPFW_DL_VLAN_PCP),
                    ofp.OFPFW_DL_SRC,
                    ofp.OFPFW_DL_DST,
-                   ofp.OFPFW_DL_TYPE,
-                   ofp.OFPFW_NW_PROTO,
+                   (ofp.OFPFW_DL_TYPE | ofp.OFPFW_NW_SRC_ALL |
+                    ofp.OFPFW_NW_DST_ALL | ofp.OFPFW_NW_TOS | ofp.OFPFW_NW_PROTO |
+                    ofp.OFPFW_TP_SRC | ofp.OFPFW_TP_DST),
+                   (ofp.OFPFW_NW_PROTO | ofp.OFPFW_TP_SRC | ofp.OFPFW_TP_DST),
                    ofp.OFPFW_TP_SRC,
                    ofp.OFPFW_TP_DST,
-                   0x3F << ofp.OFPFW_NW_SRC_SHIFT,
-                   0x3F << ofp.OFPFW_NW_DST_SHIFT,
+                   ofp.OFPFW_NW_SRC_MASK,
+                   ofp.OFPFW_NW_DST_MASK,
                    ofp.OFPFW_DL_VLAN_PCP,
                    ofp.OFPFW_NW_TOS]