VOL-1941: Use protobufs from the voltha-protos repo, not a copy
- Use protobufs from the voltha-protos repo, not a copy
- Provided option to specify the openolt proto version via make option
- Removed duplicate README.md
Change-Id: Id67714c8119521f8358aaa9245268c47b7e843cf
diff --git a/agent/src/core.cc b/agent/src/core.cc
index 9c27296..c1a381a 100644
--- a/agent/src/core.cc
+++ b/agent/src/core.cc
@@ -1629,11 +1629,14 @@
return Status::OK;
}
-Status UplinkPacketOut_(uint32_t intf_id, const std::string pkt, bcmolt_flow_id flow_id) {
+Status UplinkPacketOut_(uint32_t intf_id, const std::string pkt) {
bcmolt_flow_key key = {}; /* declare key */
bcmolt_bin_str buffer = {};
bcmolt_flow_send_eth_packet oper; /* declare main API struct */
+ // TODO: flow_id is currently not passed in UplinkPacket message from voltha.
+ bcmolt_flow_id flow_id = 0;
+
//validate flow_id and find flow_id/flow type: upstream/ingress type: PON/egress type: NNI
if (get_flow_status(flow_id, BCMOLT_FLOW_TYPE_UPSTREAM, FLOW_TYPE) == BCMOLT_FLOW_TYPE_UPSTREAM && \
get_flow_status(flow_id, BCMOLT_FLOW_TYPE_UPSTREAM, INGRESS_INTF_TYPE) == BCMOLT_FLOW_INTERFACE_TYPE_PON && \
@@ -1651,8 +1654,9 @@
}
}
}
- else
+ else {
return grpc::Status(grpc::StatusCode::NOT_FOUND, "no flow id found");
+ }
}
key.flow_type = BCMOLT_FLOW_TYPE_UPSTREAM; /* send from uplink direction */
@@ -1664,16 +1668,16 @@
buffer.arr = (uint8_t *)malloc((buffer.len)*sizeof(uint8_t));
memcpy(buffer.arr, (uint8_t *)pkt.data(), buffer.len);
if (buffer.arr == NULL) {
- OPENOLT_LOG(ERROR, openolt_log_id, "allocate pakcet buffer failed\n");
- return bcm_to_grpc_err(BCM_ERR_PARM, "allocate pakcet buffer failed");
+ OPENOLT_LOG(ERROR, openolt_log_id, "allocate packet buffer failed\n");
+ return bcm_to_grpc_err(BCM_ERR_PARM, "allocate packet buffer failed");
}
BCMOLT_FIELD_SET(&oper.data, flow_send_eth_packet_data, buffer, buffer);
bcmos_errno err = bcmolt_oper_submit(dev_id, &oper.hdr);
if (err) {
- OPENOLT_LOG(ERROR, openolt_log_id, "Error sending packets to port %d, flow_id %d, err %d\n", intf_id, key.flow_id, err);
+ OPENOLT_LOG(ERROR, openolt_log_id, "Error sending packets via nni port %d, flow_id %d err %d\n", intf_id, key.flow_id, err);
} else {
- OPENOLT_LOG(INFO, openolt_log_id, "sent packets to port %d in upstream direction (flow_id %d)\n", intf_id, key.flow_id);
+ OPENOLT_LOG(INFO, openolt_log_id, "sent packets to port %d in upstream direction, flow_id %d \n", intf_id, key.flow_id);
}
return Status::OK;
diff --git a/agent/src/indications.cc b/agent/src/indications.cc
index dc75317..6852e30 100644
--- a/agent/src/indications.cc
+++ b/agent/src/indications.cc
@@ -718,7 +718,6 @@
activation_fail_ind->set_intf_id(key->pon_ni);
activation_fail_ind->set_onu_id(key->onu_id);
- activation_fail_ind->set_fail_reason(data->fail_reason);
alarm_ind->set_allocated_onu_activation_fail_ind(activation_fail_ind);
ind.set_allocated_alarm_ind(alarm_ind);
diff --git a/agent/src/indications.h b/agent/src/indications.h
index c2f0724..f762e72 100644
--- a/agent/src/indications.h
+++ b/agent/src/indications.h
@@ -19,7 +19,7 @@
#define OPENOLT_INDICATIONS_H_
#include <grpc++/grpc++.h>
-#include <openolt.grpc.pb.h>
+#include <voltha_protos/openolt.grpc.pb.h>
#include "Queue.h"
extern "C" {
diff --git a/agent/src/stats_collection.cc b/agent/src/stats_collection.cc
index 2d535cf..62213c2 100644
--- a/agent/src/stats_collection.cc
+++ b/agent/src/stats_collection.cc
@@ -19,7 +19,6 @@
#include <unistd.h>
-#include <openolt.grpc.pb.h>
#include "indications.h"
#include "core.h"
#include "translation.h"
diff --git a/agent/src/stats_collection.h b/agent/src/stats_collection.h
index ab9f174..8e1c00f 100644
--- a/agent/src/stats_collection.h
+++ b/agent/src/stats_collection.h
@@ -18,7 +18,7 @@
#ifndef OPENOLT_STATS_COLLECTION_H_
#define OPENOLT_STATS_COLLECTION_H_
-#include <openolt.grpc.pb.h>
+#include <voltha_protos/openolt.grpc.pb.h>
extern "C"
{