VOL-1257 - OpenOLT Driver Agent should support platforms-defined port topologies
Updated openolt driver initial activation sequence with BAL to query and
extract the topology information. This includes both number of ports as
well as the technology for each port. Presently, it is assumed that
all ports use same technology until the adapter resource manager supports
per-port technonologies. Updated hardcoded iterator extents to use
the dynamic results via NumPonIf_() and NumNniIf_(). Added construct
to allow vendors to specify their vendor/model name used in
DeviceInfo discovery.
Change-Id: I9050d78c3246d1be4e869ffdfb3a3f9314b9d959
diff --git a/src/utils.cc b/src/utils.cc
index 9610cdc..0ddff3f 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -17,10 +17,9 @@
#include "utils.h"
-// NOTE - This function is not thread-safe.
-const char* serial_number_to_str(bcmbal_serial_number* serial_number) {
+std::string serial_number_to_str(bcmbal_serial_number* serial_number) {
#define SERIAL_NUMBER_SIZE 12
- static char buff[SERIAL_NUMBER_SIZE+1];
+ char buff[SERIAL_NUMBER_SIZE+1];
sprintf(buff, "%c%c%c%c%1X%1X%1X%1X%1X%1X%1X%1X",
serial_number->vendor_id[0],
@@ -38,3 +37,20 @@
return buff;
}
+
+std::string vendor_specific_to_str(char const * const vendor_specific) {
+ char buff[SERIAL_NUMBER_SIZE+1];
+
+ sprintf(buff, "%1X%1X%1X%1X%1X%1X%1X%1X",
+ vendor_specific[0]>>4 & 0x0f,
+ vendor_specific[0] & 0x0f,
+ vendor_specific[1]>>4 & 0x0f,
+ vendor_specific[1] & 0x0f,
+ vendor_specific[2]>>4 & 0x0f,
+ vendor_specific[2] & 0x0f,
+ vendor_specific[3]>>4 & 0x0f,
+ vendor_specific[3] & 0x0f);
+
+ return buff;
+}
+