commit 3f17dbba1772f56640b0b9fe87b1d2a338d02d9a
author Rich Lane <rlane@bigswitch.com> Fri Jul 19 13:51:37 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Mon Aug 05 16:38:35 2013 -0700
tree cfd86b7018aacf969308c318f62bb6747e8884fb
parent b7dc3e25d8e4c18d54251f8fe2646c1edb7c6ef1

packet_to_flow_match: use OFPVID_PRESENT

The spec requires OFPVID_PRESENT (the CFI bit) to be included in the vlan_vid
value if matching on a vlan id.

src/python/oftest/parse.py

diff --git a/src/python/oftest/parse.py b/src/python/oftest/parse.py
index 8c98c91..7963c0c 100644
--- a/src/python/oftest/parse.py
+++ b/src/python/oftest/parse.py
@@ -196,7 +196,7 @@
         if type(layer.payload) == scapy.Dot1Q:
             layer = layer.payload
             match.oxm_list.append(ofp.oxm.eth_type(layer.type))
-            match.oxm_list.append(ofp.oxm.vlan_vid(layer.vlan))
+            match.oxm_list.append(ofp.oxm.vlan_vid(ofp.OFPVID_PRESENT|layer.vlan))
             match.oxm_list.append(ofp.oxm.vlan_pcp(layer.prio))
         else:
             match.oxm_list.append(ofp.oxm.eth_type(layer.type))