VOL-2114: No need for vid 4000 controller flows
Change-Id: I054eef570c9e2978d05ab5403de7177cdb591295
diff --git a/rw_core/flowdecomposition/flow_decomposer.go b/rw_core/flowdecomposition/flow_decomposer.go
index 16754b9..76794e3 100644
--- a/rw_core/flowdecomposition/flow_decomposer.go
+++ b/rw_core/flowdecomposition/flow_decomposer.go
@@ -149,7 +149,7 @@
// Trap flow for UNI port
log.Debug("trap-uni")
- //inPortNo is 0 for wildcard input case, do not include upstream port for 4000 flow in input
+ //inPortNo is 0 for wildcard input case, do not include upstream port for controller bound flow in input
var inPorts []uint32
if inPortNo == 0 {
inPorts = agent.GetWildcardInputPorts(egressHop.Egress) // exclude egress_hop.egress_port.port_no
@@ -165,8 +165,6 @@
fu.TunnelId(uint64(inputPort)),
},
Actions: []*ofp.OfpAction{
- fu.PushVlan(0x8100),
- fu.SetField(fu.VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000)),
fu.Output(egressHop.Egress),
},
}
diff --git a/rw_core/flowdecomposition/flow_decomposer_test.go b/rw_core/flowdecomposition/flow_decomposer_test.go
index 3517f43..002c3a2 100644
--- a/rw_core/flowdecomposition/flow_decomposer_test.go
+++ b/rw_core/flowdecomposition/flow_decomposer_test.go
@@ -513,8 +513,6 @@
fu.EthType(0x888e),
},
Actions: []*ofp.OfpAction{
- fu.PushVlan(0x8100),
- fu.SetField(fu.VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000)),
fu.Output(uint32(ofp.OfpPortNo_OFPP_CONTROLLER)),
},
}
@@ -580,8 +578,6 @@
fu.EthType(0x888e),
},
Actions: []*ofp.OfpAction{
- fu.PushVlan(0x8100),
- fu.SetField(fu.VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000)),
fu.Output(uint32(ofp.OfpPortNo_OFPP_CONTROLLER)),
},
}
@@ -645,8 +641,6 @@
fu.EthType(0x888e),
},
Actions: []*ofp.OfpAction{
- fu.PushVlan(0x8100),
- fu.SetField(fu.VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000)),
fu.Output(uint32(ofp.OfpPortNo_OFPP_CONTROLLER)),
},
}
@@ -716,8 +710,6 @@
fu.UdpDst(67),
},
Actions: []*ofp.OfpAction{
- fu.PushVlan(0x8100),
- fu.SetField(fu.VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000)),
fu.Output(uint32(ofp.OfpPortNo_OFPP_CONTROLLER)),
},
}