From f03a57477fb9ee2b0bb042963dd86f8545df114e Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:05:45 +0200 Subject: [PATCH 01/11] make run script --- run | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 run diff --git a/run b/run new file mode 100755 index 0000000..d5df399 --- /dev/null +++ b/run @@ -0,0 +1,20 @@ +#!/bin/bash + +#start oran ric +cd /opt/oran-sc-ric +cd oran-sc-ric +docker compose up -d + +# start gnb +cd /opt/srsRAN_Project/build/apps/gnb +sudo screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml +sudo ip netns add ue1 + +#start srsRAN 4g +sleep 10 +screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf + + +#start xapp +screen -S xapp docker compose exec python_xapp_runner ./simple_mon_xapp.py --metrics=DRB.UEThpDl,DRB.UEThpUl + -- 2.43.0 From 49bff50c50f4377b9eb573d4f089fac40286c13d Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:11:36 +0200 Subject: [PATCH 02/11] fix run script --- run | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/run b/run index d5df399..ec4f7c8 100755 --- a/run +++ b/run @@ -6,7 +6,9 @@ cd oran-sc-ric docker compose up -d # start gnb -cd /opt/srsRAN_Project/build/apps/gnb +cd /opt/srsRAN_Project/docker +docker compose up -d 5gc +cd ../build/apps/gnb sudo screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml sudo ip netns add ue1 -- 2.43.0 From 4ad35ca0ae605439fe086c7bcdc3616dc3fa5168 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:14:40 +0200 Subject: [PATCH 03/11] test --- run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run b/run index ec4f7c8..0813030 100755 --- a/run +++ b/run @@ -7,7 +7,7 @@ docker compose up -d # start gnb cd /opt/srsRAN_Project/docker -docker compose up -d 5gc +docker compose up -d --build 5gc cd ../build/apps/gnb sudo screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml sudo ip netns add ue1 -- 2.43.0 From 4ce3142f6bdfe9b3110a696678162ccf0535c507 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:16:56 +0200 Subject: [PATCH 04/11] test again --- run | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run b/run index 0813030..7d1c95f 100755 --- a/run +++ b/run @@ -7,8 +7,9 @@ docker compose up -d # start gnb cd /opt/srsRAN_Project/docker -docker compose up -d --build 5gc +docker compose up -d 5gc cd ../build/apps/gnb +sleep 10 sudo screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml sudo ip netns add ue1 -- 2.43.0 From f6e544697853b230266a9b47f22337511c6bf3e9 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:19:54 +0200 Subject: [PATCH 05/11] add running of xapp --- run | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run b/run index 7d1c95f..0ccab94 100755 --- a/run +++ b/run @@ -17,7 +17,8 @@ sudo ip netns add ue1 sleep 10 screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf - +sleep 5 #start xapp +cd /opt/oran-sc-ric screen -S xapp docker compose exec python_xapp_runner ./simple_mon_xapp.py --metrics=DRB.UEThpDl,DRB.UEThpUl -- 2.43.0 From 950a5ebcdd6c6a0cc9f2198a5e2a4b8b80a182bf Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:23:56 +0200 Subject: [PATCH 06/11] add auto ping --- run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/run b/run index 0ccab94..1b7e197 100755 --- a/run +++ b/run @@ -17,8 +17,12 @@ sudo ip netns add ue1 sleep 10 screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf -sleep 5 + +#start ping +screen -dmS ping ip netns exec ue1 ping -i 0.1 10.45.1.1 + #start xapp +sleep 5 cd /opt/oran-sc-ric screen -S xapp docker compose exec python_xapp_runner ./simple_mon_xapp.py --metrics=DRB.UEThpDl,DRB.UEThpUl -- 2.43.0 From a605596f7685bb8ed617e93904ff8539a4f1ae6a Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:27:57 +0200 Subject: [PATCH 07/11] fix timing interval in ping command --- run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run b/run index 1b7e197..dcc0600 100755 --- a/run +++ b/run @@ -19,7 +19,7 @@ screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf #start ping -screen -dmS ping ip netns exec ue1 ping -i 0.1 10.45.1.1 +screen -dmS ping ip netns exec ue1 ping -i 0,1 10.45.1.1 #start xapp sleep 5 -- 2.43.0 From eb803830bf2d93d68c6736a792dcd56a7f3d8d4d Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:33:22 +0200 Subject: [PATCH 08/11] optimise timings --- run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/run b/run index dcc0600..6f142c4 100755 --- a/run +++ b/run @@ -9,16 +9,17 @@ docker compose up -d cd /opt/srsRAN_Project/docker docker compose up -d 5gc cd ../build/apps/gnb -sleep 10 +sleep 5 sudo screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml sudo ip netns add ue1 #start srsRAN 4g -sleep 10 +sleep 5 screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf #start ping +sleep 5 screen -dmS ping ip netns exec ue1 ping -i 0,1 10.45.1.1 #start xapp -- 2.43.0 From 620939446500f839a096dd5350dd84fbb6b3e0e2 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 15:34:53 +0200 Subject: [PATCH 09/11] stop ping as well --- stop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stop b/stop index eed2302..9ddd11c 100755 --- a/stop +++ b/stop @@ -4,4 +4,5 @@ docker compose down cd /opt/oran-sc-ric docker compose down pkill srsue -pkill gnb \ No newline at end of file +pkill gnb +pkill ping \ No newline at end of file -- 2.43.0 From 8d807ea659e63afc015bfde6525b19640657acb1 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 16:28:29 +0200 Subject: [PATCH 10/11] split functionality build and run --- deploy => build | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) rename deploy => build (72%) diff --git a/deploy b/build similarity index 72% rename from deploy rename to build index 1337f5e..6cb1b6e 100755 --- a/deploy +++ b/build @@ -3,9 +3,7 @@ cd /opt apt update apt install -y cmake make gcc g++ pkg-config libfftw3-dev libmbedtls-dev libsctp-dev libyaml-cpp-dev libgtest-dev screen libtool swig git clone https://github.com/srsran/oran-sc-ric.git -cd oran-sc-ric -docker compose up -d -cd /opt + #install ZeroMQ sudo apt-get install -y libzmq3-dev @@ -27,20 +25,17 @@ cd czmq make -j`nproc` sudo make install sudo ldconfig + #-----# cd /opt git clone https://github.com/srsran/srsRAN_Project/ -cd srsRAN_Project/docker +cd srsRAN_Project git checkout test -docker compose up -d --build 5gc -cd .. mkdir build cd build cmake .. -DENABLE_EXPORT=ON -DENABLE_ZEROMQ=ON make -j`nproc` -# make test -cd apps/gnb -sudo screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml +#make test sudo ip netns add ue1 @@ -55,9 +50,3 @@ cmake ../ make -j`nproc` make install srsran_install_configs.sh user -sleep 10 -screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf - -cd /opt/oran-sc-ric -docker compose exec python_xapp_runner ./simple_mon_xapp.py --metrics=DRB.UEThpDl,DRB.UEThpUl - -- 2.43.0 From 865561f85dbeebf4be6020a3aa40c2a3b217f166 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Thu, 18 Apr 2024 17:08:57 +0200 Subject: [PATCH 11/11] Build the docker image --- build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build b/build index 6cb1b6e..fc6a017 100755 --- a/build +++ b/build @@ -3,6 +3,9 @@ cd /opt apt update apt install -y cmake make gcc g++ pkg-config libfftw3-dev libmbedtls-dev libsctp-dev libyaml-cpp-dev libgtest-dev screen libtool swig git clone https://github.com/srsran/oran-sc-ric.git +cd oran-sc-ric +docker compose build + #install ZeroMQ -- 2.43.0