VOL-1489: Add uni port id as tunnel id needed for olt flows
When the olt is asked to setup pon resources on the
onu/uni's behalf it needs to know what onu and uni port it
is dealing with for a particular flow.
Typically with flow decomposer the ports on the child
device (uni) are not visible on the parent. But in the case
of olt based flows (at least with BAL?) the parent device
needs to know the uni ports so it can create
gems, alloc id, and queues needed.
This patch adds new openflow tunnel id containing the uni port
to the decomposed flows for use by the adapter.
Change-Id: I0ea701b457ab5cb5877b953f58364d6a7806a58f
diff --git a/rw_core/flow_decomposition/flow_decomposer_test.go b/rw_core/flow_decomposition/flow_decomposer_test.go
index e5c4bbd..fdc2b86 100644
--- a/rw_core/flow_decomposition/flow_decomposer_test.go
+++ b/rw_core/flow_decomposition/flow_decomposer_test.go
@@ -473,6 +473,7 @@
MatchFields: []*ofp.OfpOxmOfbField{
InPort(1),
VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 1),
+ TunnelId(uint64(1)),
EthType(0x888e),
},
Actions: []*ofp.OfpAction{
@@ -492,6 +493,7 @@
VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000),
VlanPcp(0),
Metadata_ofp(1),
+ TunnelId(uint64(1)),
},
Actions: []*ofp.OfpAction{
PopVlan(),
@@ -553,6 +555,7 @@
MatchFields: []*ofp.OfpOxmOfbField{
InPort(1),
VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 1),
+ TunnelId(uint64(1)),
EthType(0x0800),
Ipv4Dst(0xffffffff),
IpProto(17),
@@ -576,6 +579,7 @@
VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 4000),
VlanPcp(0),
Metadata_ofp(1),
+ TunnelId(uint64(1)),
},
Actions: []*ofp.OfpAction{
PopVlan(),
@@ -634,6 +638,7 @@
KV: fu.OfpFlowModArgs{"priority": 500},
MatchFields: []*ofp.OfpOxmOfbField{
InPort(2),
+ TunnelId(uint64(1)),
VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 0),
VlanPcp(0),
},
@@ -650,6 +655,7 @@
KV: fu.OfpFlowModArgs{"priority": 500},
MatchFields: []*ofp.OfpOxmOfbField{
InPort(1),
+ TunnelId(uint64(1)),
VlanVid(uint32(ofp.OfpVlanId_OFPVID_PRESENT) | 101),
VlanPcp(0),
},
@@ -710,6 +716,7 @@
MatchFields: []*ofp.OfpOxmOfbField{
InPort(2),
Metadata_ofp(1000),
+ TunnelId(uint64(1)),
VlanPcp(0),
},
Actions: []*ofp.OfpAction{