fixing double tagging
diff --git a/olt.py b/olt.py
index 115b6df..9d1cad4 100644
--- a/olt.py
+++ b/olt.py
@@ -961,6 +961,7 @@
verify_no_packet(self, upstreamDoubleTaggedPkt, olt_port)
def installDoubleTaggingRule(self, s_vlan_id, c_vlan_id):
+ # upstream flow rule
match = ofp.match()
match.oxm_list.append(ofp.oxm.in_port(onu_port))
match.oxm_list.append(ofp.oxm.vlan_vid(value=ofp.OFPVID_PRESENT))
@@ -983,23 +984,6 @@
do_barrier(self.controller)
verify_no_errors(self.controller)
- # push inner vlan (c-vlan) for upstream
- request = ofp.message.flow_add(
- table_id=test_param_get("table", 0),
- cookie=43,
- match=match,
- instructions=[
- ofp.instruction.apply_actions(
- actions=[
- ofp.action.set_field(ofp.oxm.vlan_vid(ofp.OFPVID_PRESENT | c_vlan_id))]),
- ofp.instruction.goto_table(1)],
- buffer_id=ofp.OFP_NO_BUFFER,
- priority=1000)
-
- self.controller.message_send(request)
- do_barrier(self.controller)
- verify_no_errors(self.controller)
-
# push outer vlan (s-vlan) for upstream
match = ofp.match()
match.oxm_list.append(ofp.oxm.in_port(onu_port))
@@ -1008,7 +992,7 @@
request = ofp.message.flow_add(
table_id=test_param_get("table", 1),
- cookie=44,
+ cookie=43,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -1032,7 +1016,7 @@
match.oxm_list.append(ofp.oxm.vlan_pcp(0))
request = ofp.message.flow_add(
table_id=test_param_get("table", 0),
- cookie=45,
+ cookie=44,
match=match,
instructions=[
ofp.instruction.apply_actions(