From fa3f1a8d53ce8ba29f13ef70d599719629f60511 Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@openairinterface.org>
Date: Wed, 13 Dec 2023 17:20:28 +0100
Subject: [PATCH] (ci): adding new packages in cuup dockerfile

- Removed rfsim option from cu, cu-cp and cu-up
---
 ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml | 2 +-
 ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml | 4 ++--
 docker/Dockerfile.nr-cuup.rhel9                             | 1 +
 docker/Dockerfile.nr-cuup.ubuntu20                          | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
index 93d9011f83..8d62746300 100644
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -167,7 +167,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cu
         environment: 
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
index 7b4a0fcc96..4eaa942824 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -169,7 +169,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cucp
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
@@ -191,7 +191,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cuup
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cucp
diff --git a/docker/Dockerfile.nr-cuup.rhel9 b/docker/Dockerfile.nr-cuup.rhel9
index 5ae63a0e48..dd3c0529f7 100644
--- a/docker/Dockerfile.nr-cuup.rhel9
+++ b/docker/Dockerfile.nr-cuup.rhel9
@@ -43,6 +43,7 @@ RUN yum repolist --disablerepo=* && \
         tzdata \
         atlas \
         net-tools \
+        iproute2 \
         iputils && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
diff --git a/docker/Dockerfile.nr-cuup.ubuntu20 b/docker/Dockerfile.nr-cuup.ubuntu20
index 9cd795ac1f..0ed9d2cb13 100644
--- a/docker/Dockerfile.nr-cuup.ubuntu20
+++ b/docker/Dockerfile.nr-cuup.ubuntu20
@@ -44,6 +44,8 @@ RUN apt-get update && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan5 \
+        iproute2 \
+        net-tools \
         libubsan1 \
         liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*