Merge branch 'master' of github.com:/eduardoschulz/Interoperabilidade

RICs/near-realtime/flexric/xapp-oai.diff

@@ -0,0 +1,50 @@
+diff --git a/examples/xApp/c/slice/xapp_slice_moni_ctrl.c b/examples/xApp/c/slice/xapp_slice_moni_ctrl.c
+index 1540c05d..1c399dd1 100644
+--- a/examples/xApp/c/slice/xapp_slice_moni_ctrl.c
++++ b/examples/xApp/c/slice/xapp_slice_moni_ctrl.c
+@@ -26,6 +26,7 @@
+ #include "../../../../src/sm/slice_sm/slice_sm_id.h"
+
+ #include <stdatomic.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <time.h>
+@@ -226,6 +227,7 @@ slice_ctrl_req_data_t fill_slice_sm_ctrl_req(uint16_t ran_func_id, slice_ctrl_ms
+
+ int main(int argc, char *argv[])
+ {
++	int64_t diff;
+   fr_args_t args = init_fr_args(argc, argv);
+
+   //Init the xApp
+@@ -236,8 +238,9 @@ int main(int argc, char *argv[])
+   defer({ free_e2_node_arr_xapp(&nodes); });
+
+   assert(nodes.len > 0);
++	
+   printf("Connected E2 nodes len = %d\n", nodes.len);
+-
++	int64_t connE2_time = time_now_us();
+   // SLICE indication
+   const char* inter_t = "5_ms";
+   sm_ans_xapp_t* slice_handle = NULL;
+@@ -253,6 +256,9 @@ int main(int argc, char *argv[])
+       printf("Registered ran func id = %d \n ", n->rf[j].id);
+
+     slice_handle[i] = report_sm_xapp_api(&nodes.n[i].id, SM_SLICE_ID, (void*)inter_t, sm_cb_slice);
++		int64_t now = time_now_us();
++		printf("time_us_now: %ld\nDiff: %ldμs\n", now, now - connE2_time);
++		diff = now - connE2_time;
+     assert(slice_handle[i].success == true);
+     sleep(2);
+
+@@ -292,6 +298,8 @@ int main(int argc, char *argv[])
+     usleep(1000);
+
+   printf("Test xApp run SUCCESSFULLY\n");
++	printf("Diff time between Connection and Subscription: %ldμs\n", diff);
++
+ }
+
+

docs/rans/oai.md

@@ -1,53 +1,49 @@
-# Configuration files for OPENAIRINTERFACE NR-5G
+# OpenAirInterface
 
-## gNB
+[OpenAirInteface](oai/README.md)
+For our testing we used the 2.1 release of the project.
+### How to Build
 
-```configfile
++ [UHD - Build Instructions](https://files.ettus.com/manual/page_build_guide.html)
++ [OAI - Build Instructions(No E2Agent)](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/doc/BUILD.md)
++ [OAI - Build Instructions(Flexric)](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/openair2/E2AP/README.md)
 
-    amf_ip_address      = ( { ipv4       = "CHANGE for your ip addr to AMF";});
+#### Build with Flexric
+In this setup we have used **OpenAirInterface** built with the _--build-e2_ flag.
 
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "CHANGE for your interface"; #eth0
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CHANGE for your ip addr"; #191.4.205.128/23
-        GNB_INTERFACE_NAME_FOR_NGU               = "CHANGE for your interface"; #eth0
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "CHANGE for your ip addr"; #191.4.205.128/23
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-```
-
-## CU/DU Split
-
-### CU
-
-```configfile
-
-    local_s_if_name = "CHANGE for your interface"; #lo
-    local_s_address = "CHANGE for your ip addr of preference"; #127.0.0.4
-    remote_s_address = "CHANGE for your DU ip addr"; #127.0.0.3
+## 0. Required dependencies
 
-    amf_ip_address      = ( { ipv4       = "CHANGE for your ip addr to AMF";});
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "CHANGE for your interface"; #eth0
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CHANGE for your ip addr"; #191.4.205.128/23
-        GNB_INTERFACE_NAME_FOR_NGU               = "CHANGE for your interface"; #eth0
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "CHANGE for your ip addr"; #191.4.205.128/23
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
+### 0.1 Building Swig
 
+```shell
+$ git clone https://github.com/swig/swig.git && cd swig
+$ git checkout release-4.2
+$ ./autogen.sh
+$ ./configure --prefix=/usr/
+$ make -j$(nproc)
+$ sudo make install
 ```
-### DU
 
-```configfile
+### 0.2 Installing other dependencies
 
-    local_s_if_name = "CHANGE for your interface"; #lo
-    local_s_address = "CHANGE for your ip addr of preference"; #127.0.0.3
-    remote_s_address = "CHANGE for your CU ip addr"; #127.0.0.4
+```shell
+$ sudo apt install libsctp-dev python3 cmake-curses-gui libpcre2-dev
 
 ```
+## 1. Building **OpenAirInterface**
 
+```shell
+$ git clone https://gitlab.eurecom.fr/oai/openairinterface5g oai
+$ cd oai
+$ git checkout v2.1.0
+$ ./build_oai -w USRP --gNB --nrUE --build-e2 
+```
 
+## 2. Building Flexric
 
-
+```shell
+$ cd oai/openair2/E2AP/flexric
+$ cmake -DSWIG_DIR=/usr/share/swig/4.2.0/ -DSWIG_EXECUTABLE=/usr/bin/swig -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 ..
+$ make -j$(nproc)
+$ sudo make install 
+```