Merge branch 'master' of github.com:/floodlight/oftest
diff --git a/tests/pktact.py b/tests/pktact.py
index ecd438e..ee60e96 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -802,9 +802,11 @@
Verify flow_expiration message is correct when command option is set
"""
def runTest(self):
+ vid = test_param_get(self.config, 'vid', default=TEST_VID_DEFAULT)
for wc in WILDCARD_VALUES:
if wc & ofp.OFPFW_DL_VLAN:
- dl_vlan = 0
+ # Set nonzero VLAN id to avoid sending priority-tagged packet
+ dl_vlan = vid
else:
dl_vlan = -1
flow_match_test(self, pa_port_map, wildcards=wc,
@@ -832,10 +834,12 @@
Verify flow_expiration message is correct when command option is set
"""
def runTest(self):
+ vid = test_param_get(self.config, 'vid', default=TEST_VID_DEFAULT)
for wc in WILDCARD_VALUES:
all_exp_one_wildcard = ofp.OFPFW_ALL ^ wc
if all_exp_one_wildcard & ofp.OFPFW_DL_VLAN:
- dl_vlan = 0
+ # Set nonzero VLAN id to avoid sending priority-tagged packet
+ dl_vlan = vid
else:
dl_vlan = -1
flow_match_test(self, pa_port_map, wildcards=all_exp_one_wildcard,