commit 1cdf6ce6e94189ea37f6e78d5b58400cab85a988
author Girish Gowdru <ggowdru@radisys.com> Mon Aug 27 02:43:02 2018 -0700
committer Shad Ansari <shad@opennetworking.org> Fri Aug 31 19:15:09 2018 +0000
tree 61dce1e49d4447ada02c4ff8499e4bc6e5ee82ad
parent 135ce81662571bc6447eb03f8bb633e8a20a5c51

VOL-948: Make gemport and alloc_id configurable from openolt adapter

Change-Id: I9e515cd744934f5a6501ad48ee845912de11c16e

common/core.h

diff --git a/common/core.h b/common/core.h
index be32f00..81b79ad 100644
--- a/common/core.h
+++ b/common/core.h
@@ -30,11 +30,13 @@
 
 Status Enable_(int argc, char *argv[]);
 Status ActivateOnu_(uint32_t intf_id, uint32_t onu_id,
-    const char *vendor_id, const char *vendor_specific, uint32_t pir);
+    const char *vendor_id, const char *vendor_specific, uint32_t pir,
+    uint32_t agg_port_id, uint32_t alloc_id);
 Status DeactivateOnu_(uint32_t intf_id, uint32_t onu_id,
     const char *vendor_id, const char *vendor_specific);
 Status DeleteOnu_(uint32_t intf_id, uint32_t onu_id,
-    const char *vendor_id, const char *vendor_specific);
+    const char *vendor_id, const char *vendor_specific,
+    uint32_t agg_port_id, uint32_t alloc_id);
 Status EnablePonIf_(uint32_t intf_id);
 Status DisablePonIf_(uint32_t intf_id);
 Status EnableUplinkIf_(uint32_t intf_id);
@@ -45,7 +47,7 @@
 Status FlowAdd_(uint32_t onu_id,
                 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,
+                uint32_t gemport_id, uint32_t alloc_id, uint32_t priority,
                 const ::openolt::Classifier& classifier,
                 const ::openolt::Action& action);
 Status FlowRemove_(uint32_t flow_id, const std::string flow_type);

common/server.cc

diff --git a/common/server.cc b/common/server.cc
index e1759cb..027c24b 100644
--- a/common/server.cc
+++ b/common/server.cc
@@ -68,7 +68,8 @@
             request->onu_id(),
             ((request->serial_number()).vendor_id()).c_str(),
             ((request->serial_number()).vendor_specific()).c_str(),
-            request->pir());
+            request->pir(), request->agg_port_id(),
+            request->sched_id());
     }
 
     Status DeactivateOnu(
@@ -90,7 +91,8 @@
             request->intf_id(),
             request->onu_id(),
             ((request->serial_number()).vendor_id()).c_str(),
-            ((request->serial_number()).vendor_specific()).c_str());
+            ((request->serial_number()).vendor_specific()).c_str(),
+            request->agg_port_id(), request->sched_id());
     }
 
     Status OmciMsgOut(
@@ -133,6 +135,7 @@
             request->access_intf_id(),
             request->network_intf_id(),
             request->gemport_id(),
+            request->alloc_id(),
             request->priority(),
             request->classifier(),
             request->action());