X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fo1%2Fves%2FSliceMeasurementEvent.cpp;h=efbba0e0616945b9b9b0d944137e9e991cd38c4d;hb=0c4403cc2355cc38d01c6645b1dad36dd4c1daa7;hp=53fc4f5a005b70cd93076f976f9988218c0d8ea5;hpb=03343a6a545fb0f5bd36fb309a5dee153831c54f;p=o-du%2Fl2.git diff --git a/src/o1/ves/SliceMeasurementEvent.cpp b/src/o1/ves/SliceMeasurementEvent.cpp index 53fc4f5a0..efbba0e06 100644 --- a/src/o1/ves/SliceMeasurementEvent.cpp +++ b/src/o1/ves/SliceMeasurementEvent.cpp @@ -23,8 +23,8 @@ #include "JsonHelper.hpp" #include "PmInterface.h" -#define MEASUREMENT_INTERVAL 60 -#define MEASUREMENT_FIELDS_VERSION 4.0 +#define MEASUREMENT_INTERVAL 60.0 +#define MEASUREMENT_FIELDS_VERSION "4.0" /* Constructor*/ SliceMeasurementEvent::SliceMeasurementEvent() @@ -87,9 +87,8 @@ bool SliceMeasurementEvent::prepareEventFields(const Message* msg) for (size_t i{0}; i < sliceList.size(); i++) { cJSON *Slice = JsonHelper::createNode(); - char networkId[12]; - sprintf(networkId,"%d%x\n", sliceList[i].networkSliceIdentifier.sst,sliceList[i].networkSliceIdentifier.sd); - //O1_LOG("sliceList[i].networkSliceIdentifier %s",networkId); + char networkSliceId[7] = {0}; + sprintf(networkSliceId,"%06X", sliceList[i].networkSliceIdentifier.sd); if(Slice == 0) { ret = false; @@ -114,7 +113,7 @@ bool SliceMeasurementEvent::prepareEventFields(const Message* msg) } else if (JsonHelper::addNodeToObject(Slice, \ "networkSliceIdentifier", \ - networkId) == 0) + networkSliceId) == 0) { ret = false; }