Demoting logs and removing duplicate #define

Commented out an abort(); used for debugging.
An incoming merge request will properly handle
the issue of multiple CQIs.

nfapi/oai_integration/nfapi_pnf.c

@@ -999,7 +999,6 @@ nfapi_pnf_p7_subframe_buffer_t dummy_subframe;
 
 int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi_start_request_t *req) {
   printf("[PNF] Received NFAPI_START_REQ phy_id:%d\n", req->header.phy_id);
-  nfapi_set_trace_level(NFAPI_TRACE_INFO);
   pnf_info *pnf = (pnf_info *)(config->user_data);
   phy_info *phy_info = pnf->phys;
   nfapi_pnf_p7_config_t *p7_config = nfapi_pnf_p7_config_create();

nfapi/oai_integration/nfapi_vnf.c

@@ -733,7 +733,7 @@ static void analyze_cqi_pdus_for_duplicates(nfapi_cqi_indication_t *ind)
       {
         LOG_E(MAC, "Problem, two cqis received from a single UE for rnti %x\n",
               rnti_i);
-        abort();
+        //abort(); This will be fixed in merge request which handles multiple CQIs.
       }
     }
   }
@@ -1181,7 +1181,7 @@ int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req) {
             {
                 uint16_t dl_rnti = dl_config_req->dl_config_request_body.dl_config_pdu_list[i].dlsch_pdu.dlsch_pdu_rel8.rnti;
                 uint16_t numPDUs = dl_config_req->dl_config_request_body.number_pdu;
-                LOG_A(MAC, "(OAI eNB) Sending dl_config_req at VNF during Frame: %d and Subframe: %d,"
+                LOG_I(MAC, "(OAI eNB) Sending dl_config_req at VNF during Frame: %d and Subframe: %d,"
                            " with a RNTI value of: %x and with number of PDUs: %u\n",
                       NFAPI_SFNSF2SFN(dl_config_req->sfn_sf),NFAPI_SFNSF2SF(dl_config_req->sfn_sf), dl_rnti, numPDUs);
             }

nfapi/open-nFAPI/common/src/debug.c

@@ -37,7 +37,7 @@ void nfapi_trace_dbg(nfapi_trace_level_t level, const char *format, ...);
 // initialize the trace function to 0
 void (*nfapi_trace_g)(nfapi_trace_level_t level, const char* format, ...) = &nfapi_trace_dbg;
 
-nfapi_trace_level_t nfapi_trace_level_g = NFAPI_TRACE_INFO;
+nfapi_trace_level_t nfapi_trace_level_g = NFAPI_TRACE_ERROR;
 //nfapi_trace_level_t nfapi_trace_level_g = NFAPI_TRACE_WARN;
 
 void nfapi_set_trace_level(nfapi_trace_level_t new_level)
@@ -47,6 +47,8 @@ void nfapi_set_trace_level(nfapi_trace_level_t new_level)
 
 void nfapi_trace_dbg(nfapi_trace_level_t level, const char *format, ...)
 {
+        if (level < nfapi_trace_level_g)
+                return;
 	char trace_buff[MAX_MSG_LENGTH + TRACE_HEADER_LENGTH];
 	uint32_t num_chars;
 	va_list p_args;

nfapi/open-nFAPI/pnf/inc/pnf_p7.h

@@ -25,7 +25,7 @@
 
 #include "nfapi_pnf_interface.h"
 
-#define NFAPI_MAX_PACKED_MESSAGE_SIZE 4096
+#define NFAPI_MAX_PACKED_MESSAGE_SIZE 8192
 
 typedef struct {
 	uint16_t dl_conf_ontime;

nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h

@@ -19,16 +19,14 @@
 
 #include "nfapi_interface.h"
 #include "nfapi_nr_interface_scf.h"
-
+#include "nfapi/open-nFAPI/pnf/inc/pnf_p7.h"
 #include "debug.h"
-
 #include "netinet/in.h"
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-#define NFAPI_MAX_PACKED_MESSAGE_SIZE 8192
 
 /*! The nfapi VNF phy configuration information
  */

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -1989,7 +1989,7 @@ static int get_cqi_from_mcs(void)
       int mcs = get_mcs_from_sinr(sf_rnti_mcs[sf].sinr);
       CHECK_INDEX(mcs_to_cqi, mcs);
       int cqi = mcs_to_cqi[mcs];
-      LOG_A(MAC, "SINR: %f -> MCS: %d -> CQI: %d\n", sf_rnti_mcs[sf].sinr, mcs, cqi);
+      LOG_I(MAC, "SINR: %f -> MCS: %d -> CQI: %d\n", sf_rnti_mcs[sf].sinr, mcs, cqi);
       return cqi;
     }
     sf++;