5.0.2 [RIC-444] remove XML translation of the E2SM from the version
Change-Id: I3eed8e9f6e0cd5ea01815cfabb303c637d3e4088
Signed-off-by: aa7133@att.com <aa7133@att.com>
diff --git a/RIC-E2-TERMINATION/CMakeLists.txt b/RIC-E2-TERMINATION/CMakeLists.txt
index fbb9a12..95986fe 100644
--- a/RIC-E2-TERMINATION/CMakeLists.txt
+++ b/RIC-E2-TERMINATION/CMakeLists.txt
@@ -116,10 +116,11 @@
RIC-E2-TERMINATION/base64.cpp
RIC-E2-TERMINATION/ReadConfigFile.h
RIC-E2-TERMINATION/BuildRunName.h
- RIC-E2-TERMINATION/3rdparty/pugixml/src/pugiconfig.hpp
- RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.cpp
- RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.hpp
- RIC-E2-TERMINATION/BuildXml.h)
+ # RIC-E2-TERMINATION/3rdparty/pugixml/src/pugiconfig.hpp
+ # RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.cpp
+ # RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.hpp
+ # RIC-E2-TERMINATION/BuildXml.h
+ )
target_link_libraries(e2 libasn1ce2smcodec.a)
target_link_libraries(e2 librmr_si.a)
target_link_libraries(e2 libicui18n.a)
diff --git a/RIC-E2-TERMINATION/container-tag.yaml b/RIC-E2-TERMINATION/container-tag.yaml
index 6a6c6f6..0203031 100644
--- a/RIC-E2-TERMINATION/container-tag.yaml
+++ b/RIC-E2-TERMINATION/container-tag.yaml
@@ -1,3 +1,3 @@
# The Jenkins job requires a tag to build the Docker image.
# Global-JJB script assumes this file is in the repo root.
-tag: 5.0.1
+tag: 5.0.2
diff --git a/RIC-E2-TERMINATION/sctpThread.cpp b/RIC-E2-TERMINATION/sctpThread.cpp
index 94827f9..3ae156c 100644
--- a/RIC-E2-TERMINATION/sctpThread.cpp
+++ b/RIC-E2-TERMINATION/sctpThread.cpp
@@ -24,9 +24,9 @@
#include "sctpThread.h"
#include "BuildRunName.h"
-#include "3rdparty/oranE2SM/E2SM-gNB-NRT-RANfunction-Definition.h"
-#include "BuildXml.h"
-#include "pugixml/src/pugixml.hpp"
+//#include "3rdparty/oranE2SM/E2SM-gNB-NRT-RANfunction-Definition.h"
+//#include "BuildXml.h"
+//#include "pugixml/src/pugixml.hpp"
using namespace std;
//using namespace std::placeholders;
@@ -1276,19 +1276,18 @@
static void buildAndsendSetupRequest(ReportingMessages_t &message,
RmrMessagesBuffer_t &rmrMessageBuffer,
- E2AP_PDU_t *pdu,
+ E2AP_PDU_t *pdu/*,
string const &messageName,
string const &ieName,
vector<string> &functionsToAdd_v,
- vector<string> &functionsToModified_v) {
+ vector<string> &functionsToModified_v*/) {
auto logLevel = mdclog_level_get();
// now we can send the data to e2Mgr
asn_enc_rval_t er;
auto buffer_size = RECEIVE_SCTP_BUFFER_SIZE * 2;
- unsigned char *buffer;
+ unsigned char buffer[RECEIVE_SCTP_BUFFER_SIZE * 2];
while (true) {
- buffer = (unsigned char *)malloc(buffer_size);
er = asn_encode_to_buffer(nullptr, ATS_BASIC_XER, &asn_DEF_E2AP_PDU, pdu, buffer, buffer_size);
if (er.encoded == -1) {
mdclog_write(MDCLOG_ERR, "encoding of %s failed, %s", asn_DEF_E2AP_PDU.name, strerror(errno));
@@ -1299,7 +1298,7 @@
(int) buffer_size,
asn_DEF_E2AP_PDU.name, buffer_size);
buffer_size = er.encoded + 128;
- free(buffer);
+// free(buffer);
continue;
}
buffer[er.encoded] = '\0';
@@ -1307,24 +1306,29 @@
}
// encode to xml
- string res {};
- if (!functionsToAdd_v.empty() || !functionsToModified_v.empty()) {
- res = buildXmlData(messageName, ieName, functionsToAdd_v, functionsToModified_v, buffer, (size_t) er.encoded);
- }
+ string res((char *)buffer);
+ res.erase(std::remove(res.begin(), res.end(), '\n'), res.end());
+ res.erase(std::remove(res.begin(), res.end(), '\t'), res.end());
+ res.erase(std::remove(res.begin(), res.end(), ' '), res.end());
+
+// string res {};
+// if (!functionsToAdd_v.empty() || !functionsToModified_v.empty()) {
+// res = buildXmlData(messageName, ieName, functionsToAdd_v, functionsToModified_v, buffer, (size_t) er.encoded);
+// }
rmr_mbuf_t *rmrMsg;
- if (res.length() == 0) {
- rmrMsg = rmr_alloc_msg(rmrMessageBuffer.rmrCtx, buffer_size + 256);
- rmrMsg->len = snprintf((char *) rmrMsg->payload, RECEIVE_SCTP_BUFFER_SIZE * 2, "%s:%d|%s",
- message.peerInfo->sctpParams->myIP.c_str(),
- message.peerInfo->sctpParams->rmrPort,
- buffer);
- } else {
+// if (res.length() == 0) {
+// rmrMsg = rmr_alloc_msg(rmrMessageBuffer.rmrCtx, buffer_size + 256);
+// rmrMsg->len = snprintf((char *) rmrMsg->payload, RECEIVE_SCTP_BUFFER_SIZE * 2, "%s:%d|%s",
+// message.peerInfo->sctpParams->myIP.c_str(),
+// message.peerInfo->sctpParams->rmrPort,
+// buffer);
+// } else {
rmrMsg = rmr_alloc_msg(rmrMessageBuffer.rmrCtx, (int)res.length() + 256);
rmrMsg->len = snprintf((char *) rmrMsg->payload, res.length() + 256, "%s:%d|%s",
message.peerInfo->sctpParams->myIP.c_str(),
message.peerInfo->sctpParams->rmrPort,
res.c_str());
- }
+// }
if (logLevel >= MDCLOG_DEBUG) {
mdclog_write(MDCLOG_DEBUG, "Setup request of size %d :\n %s\n", rmrMsg->len, rmrMsg->payload);
@@ -1370,9 +1374,9 @@
if (rmrMsg != nullptr) {
rmr_free_msg(rmrMsg);
}
- free(buffer);
}
+#if 0
int RAN_Function_list_To_Vector(RANfunctions_List_t& list, vector <string> &runFunXML_v) {
auto index = 0;
runFunXML_v.clear();
@@ -1465,6 +1469,7 @@
return 0;
}
+#endif
void buildPrometheuslist(ConnectedCU_t *peerInfo, Family<Counter> *prometheusFamily) {
@@ -1549,8 +1554,7 @@
*/
int collectSetupRequestData(E2AP_PDU_t *pdu,
Sctp_Map_t *sctpMap,
- ReportingMessages_t &message,
- vector <string> &RANfunctionsAdded_v) {
+ ReportingMessages_t &message /*, vector <string> &RANfunctionsAdded_v*/) {
memset(message.peerInfo->enodbName, 0 , MAX_ENODB_NAME_SIZE);
for (auto i = 0; i < pdu->choice.initiatingMessage->value.choice.E2setupRequest.protocolIEs.list.count; i++) {
auto *ie = pdu->choice.initiatingMessage->value.choice.E2setupRequest.protocolIEs.list.array[i];
@@ -1566,7 +1570,7 @@
memcpy(message.message.enodbName, message.peerInfo->enodbName, strlen(message.peerInfo->enodbName));
sctpMap->setkey(message.message.enodbName, message.peerInfo);
}
- } else if (ie->id == ProtocolIE_ID_id_RANfunctionsAdded) {
+ } /*else if (ie->id == ProtocolIE_ID_id_RANfunctionsAdded) {
if (ie->value.present == E2setupRequestIEs__value_PR_RANfunctions_List) {
if (mdclog_level_get() >= MDCLOG_DEBUG) {
mdclog_write(MDCLOG_DEBUG, "Run function list have %d entries",
@@ -1576,12 +1580,12 @@
return -1;
}
}
- }
+ } */
}
- if (mdclog_level_get() >= MDCLOG_DEBUG) {
- mdclog_write(MDCLOG_DEBUG, "Run function vector have %ld entries",
- RANfunctionsAdded_v.size());
- }
+// if (mdclog_level_get() >= MDCLOG_DEBUG) {
+// mdclog_write(MDCLOG_DEBUG, "Run function vector have %ld entries",
+// RANfunctionsAdded_v.size());
+// }
return 0;
}
@@ -1641,11 +1645,11 @@
mdclog_write(MDCLOG_DEBUG, "Got E2setup");
}
- vector <string> RANfunctionsAdded_v;
- vector <string> RANfunctionsModified_v;
- RANfunctionsAdded_v.clear();
- RANfunctionsModified_v.clear();
- if (collectSetupRequestData(pdu, sctpMap, message, RANfunctionsAdded_v) != 0) {
+// vector <string> RANfunctionsAdded_v;
+// vector <string> RANfunctionsModified_v;
+// RANfunctionsAdded_v.clear();
+// RANfunctionsModified_v.clear();
+ if (collectSetupRequestData(pdu, sctpMap, message) != 0) {
break;
}
@@ -1656,21 +1660,21 @@
message.message.messageType = RIC_E2_SETUP_REQ;
message.peerInfo->counters[IN_INITI][MSG_COUNTER][ProcedureCode_id_E2setup - 1]->Increment();
message.peerInfo->counters[IN_INITI][BYTES_COUNTER][ProcedureCode_id_E2setup - 1]->Increment((double)rmrMessageBuffer.rcvMessage->len);
- buildAndsendSetupRequest(message, rmrMessageBuffer, pdu, messageName, ieName, RANfunctionsAdded_v, RANfunctionsModified_v);
+ buildAndsendSetupRequest(message, rmrMessageBuffer, pdu);
break;
}
case ProcedureCode_id_RICserviceUpdate: {
if (logLevel >= MDCLOG_DEBUG) {
mdclog_write(MDCLOG_DEBUG, "Got RICserviceUpdate %s", message.message.enodbName);
}
- vector <string> RANfunctionsAdded_v;
- vector <string> RANfunctionsModified_v;
- RANfunctionsAdded_v.clear();
- RANfunctionsModified_v.clear();
- if (collectServiceUpdate_RequestData(pdu, sctpMap, message,
- RANfunctionsAdded_v, RANfunctionsModified_v) != 0) {
- break;
- }
+// vector <string> RANfunctionsAdded_v;
+// vector <string> RANfunctionsModified_v;
+// RANfunctionsAdded_v.clear();
+// RANfunctionsModified_v.clear();
+// if (collectServiceUpdate_RequestData(pdu, sctpMap, message,
+// RANfunctionsAdded_v, RANfunctionsModified_v) != 0) {
+// break;
+// }
string messageName("RICserviceUpdate");
string ieName("RICserviceUpdateIEs");
@@ -1678,7 +1682,7 @@
message.peerInfo->counters[IN_INITI][MSG_COUNTER][ProcedureCode_id_RICserviceUpdate - 1]->Increment();
message.peerInfo->counters[IN_INITI][BYTES_COUNTER][ProcedureCode_id_RICserviceUpdate - 1]->Increment((double)rmrMessageBuffer.rcvMessage->len);
- buildAndsendSetupRequest(message, rmrMessageBuffer, pdu, messageName, ieName, RANfunctionsAdded_v, RANfunctionsModified_v);
+ buildAndsendSetupRequest(message, rmrMessageBuffer, pdu);
break;
}
case ProcedureCode_id_ErrorIndication: {