cookies
diff --git a/olt.py b/olt.py
index 9d1cad4..d2856b5 100644
--- a/olt.py
+++ b/olt.py
@@ -919,11 +919,12 @@
def runTest(self):
logging.info("Running cycling vlan test")
delete_all_flows(self.controller)
+ self.cookie = 42
self.vlan_pairs = []
- for stag in xrange(1, 4000, 100):
- for ctag in xrange(1, 4000, 100):
+ for stag in xrange(2, 4000, 100):
+ for ctag in xrange(2, 4000, 100):
self.installDoubleTaggingRule(stag, ctag)
self.vlan_pairs.append((stag, ctag))
time.sleep(1)
@@ -966,11 +967,12 @@
match.oxm_list.append(ofp.oxm.in_port(onu_port))
match.oxm_list.append(ofp.oxm.vlan_vid(value=ofp.OFPVID_PRESENT))
match.oxm_list.append(ofp.oxm.vlan_pcp(value=0))
+ self.cookie += 1
# push inner vlan (c-vlan) for upstream
request = ofp.message.flow_add(
table_id=test_param_get("table", 0),
- cookie=42,
+ cookie=self.cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -989,10 +991,11 @@
match.oxm_list.append(ofp.oxm.in_port(onu_port))
match.oxm_list.append(ofp.oxm.vlan_vid(ofp.OFPVID_PRESENT | c_vlan_id))
match.oxm_list.append(ofp.oxm.vlan_pcp(0))
+ self.cookie += 1
request = ofp.message.flow_add(
table_id=test_param_get("table", 1),
- cookie=43,
+ cookie=self.cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -1008,6 +1011,7 @@
self.controller.message_send(request)
do_barrier(self.controller)
verify_no_errors(self.controller)
+ self.cookie += 1
# strip outer vlan (s-vlan) for downstream
match = ofp.match()
@@ -1016,7 +1020,7 @@
match.oxm_list.append(ofp.oxm.vlan_pcp(0))
request = ofp.message.flow_add(
table_id=test_param_get("table", 0),
- cookie=44,
+ cookie=self.cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -1034,10 +1038,11 @@
match.oxm_list.append(ofp.oxm.in_port(olt_port))
match.oxm_list.append(ofp.oxm.vlan_vid(ofp.OFPVID_PRESENT | c_vlan_id))
match.oxm_list.append(ofp.oxm.vlan_pcp(0))
+ self.cookie += 1
request = ofp.message.flow_add(
table_id=test_param_get("table", 1),
- cookie=45,
+ cookie=self.cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(