Merge branch 'develop' into develop-nr

nfapi/oai_integration/nfapi.c

@@ -21,31 +21,55 @@
 
 #include <stdio.h>
 #include <pthread.h>
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "common/utils/LOG/log.h"
+static char nfapi_str_mode[6][24] = {"MONOLITHIC","PNF","VNF","UE_STUB_PNF","UE_STUB_OFFNET","<UNKNOWN NFAPI MODE>"};
 
-void set_thread_priority(int priority)
-{
+typedef struct {
+  nfapi_mode_t nfapi_mode;
+} nfapi_params_t;
+
+static nfapi_params_t nfapi_params;
+
+void set_thread_priority(int priority) {
   //printf("%s(priority:%d)\n", __FUNCTION__, priority);
-
   pthread_attr_t ptAttr;
-
   struct sched_param schedParam;
   schedParam.__sched_priority = priority; //79;
-  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0)
-  {
+
+  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0) {
     printf("Failed to set scheduler to SCHED_RR\n");
   }
 
-  if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0)
-  {
+  if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0) {
     printf("Failed to set pthread sched policy SCHED_RR\n");
   }
 
   pthread_attr_setinheritsched(&ptAttr, PTHREAD_EXPLICIT_SCHED);
-
   struct sched_param thread_params;
   thread_params.sched_priority = 20;
-  if(pthread_attr_setschedparam(&ptAttr, &thread_params) != 0)
-  {
+
+  if(pthread_attr_setschedparam(&ptAttr, &thread_params) != 0) {
     printf("failed to set sched param\n");
   }
 }
+
+char *nfapi_get_strmode(void) {
+  if (nfapi_params.nfapi_mode > NFAPI_MODE_UNKNOWN)
+    return nfapi_str_mode[NFAPI_MODE_UNKNOWN];
+
+  return nfapi_str_mode[nfapi_params.nfapi_mode];
+}
+
+void nfapi_logmode() {
+  LOG_I(ENB_APP,"nfapi running mode: %s\n",nfapi_get_strmode());
+}
+
+nfapi_mode_t nfapi_getmode(void) {
+  return nfapi_params.nfapi_mode;
+}
+
+void nfapi_setmode(nfapi_mode_t nfapi_mode) {
+  nfapi_params.nfapi_mode = nfapi_mode;
+  nfapi_logmode();
+}

nfapi/oai_integration/vendor_ext.h

@@ -1,12 +1,12 @@
 /*
  * Copyright 2017 Cisco Systems, Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,48 +20,62 @@
 #include "nfapi_interface.h"
 
 typedef enum {
-	P5_VENDOR_EXT_REQ = NFAPI_VENDOR_EXT_MSG_MIN,
-	P5_VENDOR_EXT_RSP,
+  P5_VENDOR_EXT_REQ = NFAPI_VENDOR_EXT_MSG_MIN,
+  P5_VENDOR_EXT_RSP,
 
-	P7_VENDOR_EXT_REQ,
-	P7_VENDOR_EXT_IND
+  P7_VENDOR_EXT_REQ,
+  P7_VENDOR_EXT_IND
 
 } vendor_ext_message_id_e;
 
 typedef struct {
-	nfapi_p4_p5_message_header_t header;
-	uint16_t dummy1;
-	uint16_t dummy2;
+  nfapi_p4_p5_message_header_t header;
+  uint16_t dummy1;
+  uint16_t dummy2;
 } vendor_ext_p5_req;
 
 typedef struct {
-	nfapi_p4_p5_message_header_t header;
-	uint16_t error_code;
+  nfapi_p4_p5_message_header_t header;
+  uint16_t error_code;
 } vendor_ext_p5_rsp;
 
 typedef struct {
-	nfapi_p7_message_header_t header;
-	uint16_t dummy1;
-	uint16_t dummy2;
+  nfapi_p7_message_header_t header;
+  uint16_t dummy1;
+  uint16_t dummy2;
 } vendor_ext_p7_req;
 
 typedef struct {
-	nfapi_p7_message_header_t header;
-	uint16_t error_code;
+  nfapi_p7_message_header_t header;
+  uint16_t error_code;
 } vendor_ext_p7_ind;
 
 typedef struct {
-	nfapi_tl_t tl;
-	uint32_t dummy;
+  nfapi_tl_t tl;
+  uint32_t dummy;
 } vendor_ext_tlv_1;
 
 #define VENDOR_EXT_TLV_1_TAG 0xF001
 
 typedef struct {
-	nfapi_tl_t tl;
-	uint32_t dummy;
+  nfapi_tl_t tl;
+  uint32_t dummy;
 } vendor_ext_tlv_2;
 
 #define VENDOR_EXT_TLV_2_TAG 0xF002
 
+typedef enum {
+  NFAPI_MONOLITHIC=0,
+  NFAPI_MODE_PNF,
+  NFAPI_MODE_VNF,
+  NFAPI_UE_STUB_PNF,
+  NFAPI_UE_STUB_OFFNET,
+  NFAPI_MODE_UNKNOWN
+} nfapi_mode_t;
+
+char *nfapi_get_strmode(void);
+void nfapi_logmode(void);
+nfapi_mode_t nfapi_getmode(void);
+void nfapi_setmode(nfapi_mode_t nfapi_mode);
+#define NFAPI_MODE (nfapi_getmode())
 #endif // _VENDOR_EXT_