fix timing

build

@@ -1,11 +1,33 @@
 #!/bin/bash
+# Install docker and compose plugin
+
+# Add Docker's official GPG key:
+sudo apt-get update
+sudo apt-get install ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+sudo apt-get install -y docker-compose-plugin
+
+#---
+
+
 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
+docker compose build
+
+
 
 #install ZeroMQ
 sudo apt-get install -y libzmq3-dev 
@@ -27,20 +49,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
 
 sudo ip netns add ue1
 
@@ -55,9 +74,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
-

run

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+ip netns add ue1
+
+#start oran ric
+cd /opt/oran-sc-ric
+docker compose up -d 
+
+#start srsRAN 4g
+sleep 15
+screen -dmS srsue srsue /opt/oran-sc-ric/e2-agents/srsRAN/ue_zmq.conf
+
+# start gnb
+cd /opt/srsRAN_Project/docker
+docker compose up -d 5gc
+cd ../build/apps/gnb
+sleep 15
+screen -dmS gnb ./gnb -c /opt/oran-sc-ric/e2-agents/srsRAN/gnb_zmq.yaml
+
+#start ping
+sleep 15
+LC_ALL=C screen -dmS ping ip netns exec ue1 ping -i 0.1 10.45.1.1
+
+#start xapp
+sleep 15
+cd /opt/oran-sc-ric
+screen -S xapp docker compose exec python_xapp_runner ./simple_mon_xapp.py --metrics=DRB.UEThpDl,DRB.UEThpUl
+

stop

@@ -5,3 +5,5 @@ cd /opt/oran-sc-ric
 docker compose down
 pkill srsue
 pkill gnb
+pkill ping
+ip netns delete ue1