VOL-1023 - Supporting multiple UNI per ONU
To support multiple UNIs on a given ONU, OpenOLT Driver is updated to support
an abstract opaque cookie that is registered with all controller-bound trap
flows. This cookie is supplied back to adapter during all packet indications.
OpenOLT adapter will use this cookie to track the OF logical port that should
be used to reflect the origin of packet to OF controller.
For outbound packets from controller, the system needs to inject frames
directly onto a GEM port rather than towards "any GEM" associated with the ONU.
This is necessary to send to various UNIs on one ONU. This is achieved by
registering the OF logical port number with the flow and gemport(s) associated
with the port. The OF Out packet will include the logical port number and
hence can be tracked back to a registered GEM for that UNI.
Change-Id: I1085a4b44d12b9402a431c41083e3a5cdb4764b9
diff --git a/agent/sim/core.h b/agent/sim/core.h
index 7db554b..c11eecf 100644
--- a/agent/sim/core.h
+++ b/agent/sim/core.h
@@ -37,14 +37,13 @@
Status EnableUplinkIf_(uint32_t intf_id);
Status DisableUplinkIf_(uint32_t intf_id);
Status OmciMsgOut_(uint32_t intf_id, uint32_t onu_id, const std::string pkt);
-Status OnuPacketOut_(uint32_t intf_id, uint32_t onu_id, const std::string pkt);
+Status OnuPacketOut_(uint32_t intf_id, uint32_t onu_id, uint64_t cookie, const std::string pkt);
Status UplinkPacketOut_(uint32_t intf_id, const std::string pkt);
-Status FlowAdd_(uint32_t onu_id,
+Status FlowAdd_(int32_t access_intf_id, int32_t onu_id, int32_t uni_id, uint32_t port_no,
uint32_t flow_id, const std::string flow_type,
- uint32_t access_intf_id, uint32_t network_intf_id,
- uint32_t gemport_id, uint32_t priority,
- const ::openolt::Classifier& classifier,
- const ::openolt::Action& action);
+ int32_t alloc_id, int32_t network_intf_id,
+ int32_t gemport_id, const ::openolt::Classifier& classifier,
+ const ::openolt::Action& action, int32_t priority_value, uint64_t cookie);
Status Disable_();
Status Reenable_();