From 54d2b887b8f2f84cc69d84b8bec65649c1b4c4d9 Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Mon, 3 Jul 2023 14:41:21 +0200 Subject: [PATCH] Use Ping instead of PingFromContainer in simulator tests Affected tests: - 5G RFsim TDD do-ra - 5g-rfsim-fdd - 5g-rfsim - 5grfsim-e1 - 5grfsim-24prb - 5grfsim-fr2-32prb - 5grfsim-fdd-phytest - 5grfsim-u0-25prb - 5grfsim-2x2 - 5grfsim-f1 - 5grfsim-f1-accelleran - 4g-l2sim-tdd - 4g-rfsim-fdd-05mhz - 4g-rfsim-fdd-05mhz-nos1 - 4g-rfsim-fdd-10mhz - 4g-rfsim-fdd-20mhz - 4g-rfsim-tdd-05mhz - 5g-l2sim --- .../xml_files/container_4g_l2sim_tdd.xml | 16 +++++----- .../container_4g_rfsim_fdd_05MHz.xml | 16 +++++----- .../container_4g_rfsim_fdd_05MHz_noS1.xml | 16 +++++----- .../container_4g_rfsim_fdd_10MHz.xml | 16 +++++----- .../container_4g_rfsim_fdd_20MHz.xml | 16 +++++----- .../container_4g_rfsim_tdd_05MHz.xml | 16 +++++----- .../xml_files/container_5g_e1_rfsim.xml | 16 +++++----- .../xml_files/container_5g_f1_rfsim.xml | 16 +++++----- .../xml_files/container_5g_fdd_rfsim.xml | 16 +++++----- .../xml_files/container_5g_l2sim_tdd.xml | 16 +++++----- ci-scripts/xml_files/container_5g_rfsim.xml | 32 +++++++++---------- .../xml_files/container_5g_rfsim_24prb.xml | 16 +++++----- .../xml_files/container_5g_rfsim_2x2.xml | 16 +++++----- .../container_5g_rfsim_f1_accelleran.xml | 8 ++--- .../container_5g_rfsim_fdd_phytest.xml | 16 +++++----- .../container_5g_rfsim_fr2_32prb.xml | 16 +++++----- .../xml_files/container_5g_rfsim_tdd_dora.xml | 16 +++++----- .../xml_files/container_5g_rfsim_u0_25prb.xml | 16 +++++----- 18 files changed, 148 insertions(+), 148 deletions(-) diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index 419ede8cbb..22f4a8be3a 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -89,19 +89,19 @@ - PingFromContainer + Ping Ping trf-gen from LTE-UE 1 - l2sim4g-oai-lte-ue1 - -I oaitun_ue1 -c 20 192.168.61.11 - 0 + l2sim4g_ue + -c 20 192.168.61.11 + 0 - PingFromContainer + Ping Ping LTE-UE 1 from trf-gen - l2sim4g-trf-gen - -c 20 12.0.0.2 - 0 + l2sim4g_ext_dn + -c 20 12.0.0.2 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml index a776b85c2c..37d53e09e4 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -95,19 +95,19 @@ - PingFromContainer + Ping Ping Traffic-Gen from LTE-UE - rfsim4g-oai-lte-ue0 - -I oaitun_ue1 -c 20 192.168.61.11 - 5 + rfsim4g_ue + -c 20 192.168.61.11 + 5 - PingFromContainer + Ping Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen - -c 20 12.0.0.2 - 5 + rfsim4g_ext_dn + -c 20 12.0.0.2 + 5 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml index e70d954a22..5a6189dced 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml @@ -75,19 +75,19 @@ - PingFromContainer + Ping Ping Traffic-Gen from LTE-UE - rfsim4g-oai-lte-ue0 - -I oaitun_ue1 -c 20 10.0.1.1 - 5 + rfsim4g_ue + -c 20 10.0.1.1 + 5 - PingFromContainer + Ping Ping LTE-UE from eNB - rfsim4g-oai-enb - -I oaitun_enb1 -c 20 10.0.1.2 - 5 + rfsim4g_enb_nos1 + -c 20 10.0.1.2 + 5 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml index 6b88816c4a..e6c3e1f965 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -95,19 +95,19 @@ - PingFromContainer + Ping Ping Traffic-Gen from LTE-UE - rfsim4g-oai-lte-ue0 - -I oaitun_ue1 -c 20 192.168.61.11 - 5 + rfsim4g_ue + -c 20 192.168.61.11 + 5 - PingFromContainer + Ping Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen - -c 20 12.0.0.2 - 5 + rfsim4g_ext_dn + -c 20 12.0.0.2 + 5 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml index e33554c8ce..86b217a2a4 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -95,19 +95,19 @@ - PingFromContainer + Ping Ping Traffic-Gen from LTE-UE - rfsim4g-oai-lte-ue0 - -I oaitun_ue1 -c 20 192.168.61.11 - 5 + rfsim4g_ue + -c 20 192.168.61.11 + 5 - PingFromContainer + Ping Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen - -c 20 12.0.0.2 - 5 + rfsim4g_ext_dn + -c 20 12.0.0.2 + 5 diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml index c39679e063..862e9cca52 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -96,19 +96,19 @@ - PingFromContainer + Ping Ping Traffic-Gen from LTE-UE - rfsim4g-oai-lte-ue0 - -I oaitun_ue1 -c 20 192.168.61.11 - 5 + rfsim4g_ue + -c 20 192.168.61.11 + 5 - PingFromContainer + Ping Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen - -c 20 12.0.0.2 - 5 + rfsim4g_ext_dn + -c 20 12.0.0.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index 7130976dad..e37ba4cf96 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -87,19 +87,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 192.168.73.135 - 5 + rfsim5g_ue + -c 20 192.168.73.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 8a7549da91..86d369e526 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -87,19 +87,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + rfsim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index e1dc8f0d60..e2d1e3c287 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -80,19 +80,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + rfsim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml index e2631d6e05..6abadf2f4c 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml @@ -87,19 +87,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - l2sim-oai-nr-ue0 - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + l2sim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - l2sim-oai-ext-dn - -c 20 12.1.1.2 - 5 + l2sim5g_ext_dn + -c 20 12.1.1.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 86e5159264..4923177ee5 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -91,35 +91,35 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + rfsim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 + 5 - PingFromContainer + Ping Ping ext-dn from Second NR-UE - rfsim5g-oai-nr-ue2 - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + rfsim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping Second NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.3 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.3 + 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index fea7e03e5e..f124176209 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -80,19 +80,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 -i0.2 192.168.72.135 - 5 + rfsim5g_ue + -c 20 -i0.2 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 -i0.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 -i0.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index 5c5b5a8d8b..b178fe0df7 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -80,19 +80,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + rfsim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 + 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml index d727fdfd1e..d1433db738 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml @@ -58,11 +58,11 @@ - PingFromContainer + Ping Test Connectivity (ping) - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 12.1.1.1 - 0 + rfsim5g_ue + -c 20 12.1.1.1 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml index 4d86cd69ef..1ad3158d20 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -62,19 +62,19 @@ - PingFromContainer + Ping Ping gNB from NR-UE - rfsim5g-oai-nr-ue - -c20 -i0.2 10.0.1.1 - 0 + rfsim5g_ue + -c20 -i0.2 10.0.1.1 + 0 - PingFromContainer + Ping Ping NR-UE from gNB - rfsim5g-oai-gnb - -c20 -i0.2 10.0.1.2 - 0 + rfsim5g_gnb_nos1 + -c20 -i0.2 10.0.1.2 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml index b6209e871c..19bb89518a 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -60,19 +60,19 @@ - PingFromContainer + Ping Ping gNB from NR-UE - rfsim5g-oai-nr-ue - -c20 -i0.2 10.0.1.1 - 0 + rfsim5g_ue + -c20 -i0.2 10.0.1.1 + 0 - PingFromContainer + Ping Ping NR-UE from gNB - rfsim5g-oai-gnb - -c20 -i0.2 10.0.1.2 - 0 + rfsim5g_gnb_nos1 + -c20 -i0.2 10.0.1.2 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml index 095986b751..e7b0e7903d 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -60,19 +60,19 @@ - PingFromContainer + Ping Ping gNB from NR-UE - rfsim5g-oai-nr-ue - -c20 -i0.2 10.0.1.1 - 0 + rfsim5g_ue + -c20 -i0.2 10.0.1.1 + 0 - PingFromContainer + Ping Ping NR-UE from gNB - rfsim5g-oai-gnb - -c20 -i0.2 10.0.1.2 - 0 + rfsim5g_gnb_nos1 + -c20 -i0.2 10.0.1.2 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml index b030f5d423..e9e9374cf1 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -80,19 +80,19 @@ - PingFromContainer + Ping Ping ext-dn from NR-UE - rfsim5g-oai-nr-ue - -I oaitun_ue1 -c 20 192.168.72.135 - 5 + rfsim5g_ue + -c 20 192.168.72.135 + 5 - PingFromContainer + Ping Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn - -c 20 12.1.1.2 - 5 + rfsim5g_ext_dn + -c 20 12.1.1.2 + 5