diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index 8169dd6888..33b78f3501 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -368,25 +368,16 @@ class OaiCiTest(): ueIP = ue.getIP() if not ueIP: return (False, f"UE {ue.getName()} has no IP address") + svrIP = cn.getIP() + if not svrIP: + return (False, f"CN {cn.getName()} has no IP address") ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log' ping_time = re.findall("-c *(\d+)",str(self.ping_args)) local_ping_log_file = f'{logPath}/{ping_log_file}' - # if has pattern %cn_ip%, replace with cn IP address, else we assume the IP is present - if re.search('%cn_ip%', self.ping_args): - self.ping_args = re.sub('%cn_ip%', cn.getIP(), self.ping_args) - else: - # verify we would have the right IP - m = re.search(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+', self.ping_args) - if not m: - raise Exception(f"no IP address in {self.ping_args}") - ip = m.group(0) - cnip = cn.getIP() - if ip != cnip: - raise Exception(f"IP mismatch: options specify {ip} but core has {cnip}") - else: - logging.warning(f"\u001B[1mIP {ip} in iperf options matches CN IP {cnip}\u001B[0m") + if re.search('%cn_ip%', self.ping_args) or re.search(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+', self.ping_args): + raise Exception(f"ping_args should not have IP address: {self.ping_args}") interface = f'-I {ue.getIFName()}' if ue.getIFName() else '' - ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} 2>&1 | tee /tmp/{ping_log_file}' + ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {svrIP} 2>&1 | tee /tmp/{ping_log_file}' cmd = cls_cmd.getConnection(ue.getHost()) response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5) ue_header = f'UE {ue.getName()} ({ueIP})' diff --git a/ci-scripts/tests/ping-iperf.py b/ci-scripts/tests/ping-iperf.py index 6fcc159e3d..225fe4e868 100644 --- a/ci-scripts/tests/ping-iperf.py +++ b/ci-scripts/tests/ping-iperf.py @@ -25,7 +25,7 @@ class TestPingIperf(unittest.TestCase): self.cont = cls_containerize.Containerize() def test_ping(self): - self.ci.ping_args = "-c3 127.0.0.1" + self.ci.ping_args = "-c3" self.ci.ping_packetloss_threshold = "0" self.ci.svr_id = "test" infra_file = "tests/config/infra_ping_iperf.yaml" diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index 543db0bf75..98e0ec7d08 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -103,7 +103,7 @@ obelix l2sim4g_ext_dn obelix - -c 20 192.168.61.11 + -c 20 0 @@ -114,7 +114,7 @@ obelix l2sim4g_ue obelix - -c 20 12.0.0.2 + -c 20 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 7604a6fb20..aa80d4b5dc 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -118,7 +118,7 @@ cacofonix rfsim4g_ext_dn cacofonix - -c 20 192.168.61.11 + -c 20 5 @@ -129,7 +129,7 @@ cacofonix rfsim4g_ue cacofonix - -c 20 12.0.0.2 + -c 20 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 9783ddacfb..bfcade47ab 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 @@ -89,7 +89,7 @@ cacofonix rfsim4g_enb_nos1 cacofonix - -c 20 10.0.1.1 + -c 20 5 @@ -100,7 +100,7 @@ cacofonix rfsim4g_ue cacofonix - -c 20 10.0.1.2 + -c 20 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 15064739a1..0cf4944a6c 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -118,7 +118,7 @@ cacofonix rfsim4g_ext_dn cacofonix - -c 20 192.168.61.11 + -c 20 5 @@ -129,7 +129,7 @@ cacofonix rfsim4g_ue cacofonix - -c 20 12.0.0.2 + -c 20 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 9bf9ac5dd9..069db0c585 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -118,7 +118,7 @@ cacofonix rfsim4g_ext_dn cacofonix - -c 20 192.168.61.11 + -c 20 5 @@ -129,7 +129,7 @@ cacofonix rfsim4g_ue cacofonix - -c 20 12.0.0.2 + -c 20 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 8a19ffd262..df44214af9 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -111,7 +111,7 @@ cacofonix rfsim4g_ext_dn cacofonix - -c 20 192.168.61.11 + -c 20 5 @@ -122,7 +122,7 @@ cacofonix rfsim4g_ue cacofonix - -c 20 12.0.0.2 + -c 20 5 diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index 82c5dfa774..95ae2f7b0a 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -90,7 +90,7 @@ cacofonix cacofonix cacofonix rfsim5g_5gc_fixed_ip cacofonix - -c 20 12.1.1.1 -i0.25 + -c 20 -i0.25 5 diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 9fa92e49bb..f45265db43 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -119,7 +119,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 192.168.72.135 -i0.25 + -c 20 -i0.25 5 @@ -170,7 +170,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 192.168.72.135 -i0.5 -w25 + -c 20 -i0.5 -w25 80 diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index 25620b6a42..5000ed1bb2 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -83,7 +83,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -94,7 +94,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 -i 0.25 12.1.1.2 + -c 20 -i 0.25 5 diff --git a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml index 9805953b27..d0d3446f41 100644 --- a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml @@ -136,7 +136,7 @@ carabe carabe oai_ext_dn carabe - -c 20 192.168.70.135 + -c 20 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 77b09c4781..f20820629b 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -143,7 +143,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -154,7 +154,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 -i 0.25 12.1.1.2 + -c 20 -i 0.25 5 @@ -165,7 +165,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -176,7 +176,7 @@ cacofonix rfsim5g_ue2 cacofonix - -c 20 -i 0.25 12.1.1.3 + -c 20 -i 0.25 5 @@ -187,7 +187,7 @@ cacofonix cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -198,7 +198,7 @@ cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix rfsim5g_ext_dn cacofonix - -c 20 192.168.72.135 -i 0.25 -s 1016 + -c 20 -i 0.25 -s 1016 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index e139be4978..f4ee341c94 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -92,7 +92,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i0.2 192.168.72.135 + -c 20 -i0.2 5 @@ -103,7 +103,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 12.1.1.2 -i0.2 + -c 20 -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 5557d3156d..77d39a3c55 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -83,7 +83,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -94,7 +94,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 -i 0.25 12.1.1.2 + -c 20 -i 0.25 5 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 8346325253..cd908d0d82 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -83,7 +83,7 @@ cacofonix rfsim5g_gnb_nos1 cacofonix - -c20 -i0.2 10.0.1.1 + -c20 -i0.2 0 @@ -94,7 +94,7 @@ cacofonix rfsim5g_ue cacofonix - -c20 -i0.2 10.0.1.2 + -c20 -i0.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 b55ad45cee..db10ff6478 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -75,7 +75,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i0.2 192.168.72.135 + -c 20 -i0.2 0 @@ -86,7 +86,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 12.1.1.2 -i0.2 + -c 20 -i0.2 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml index 0d1f6e59c0..72a6836882 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml @@ -83,7 +83,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -94,7 +94,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 -i 0.25 12.1.1.2 + -c 20 -i 0.25 5 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 4bc1e8a8e5..bf71fc98ab 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -82,7 +82,7 @@ cacofonix rfsim5g_gnb_nos1 cacofonix - -c20 -i0.2 10.0.1.1 + -c20 -i0.2 0 @@ -93,7 +93,7 @@ cacofonix rfsim5g_ue cacofonix - -c20 -i0.2 10.0.1.2 + -c20 -i0.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 c7807fcb88..bedb40799e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -83,7 +83,7 @@ cacofonix rfsim5g_ext_dn cacofonix - -c 20 -i 0.25 192.168.72.135 + -c 20 -i 0.25 5 @@ -94,7 +94,7 @@ cacofonix rfsim5g_ue cacofonix - -c 20 -i 0.25 12.1.1.2 + -c 20 -i 0.25 5 diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml index 2213abd413..a6d39d3f98 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml @@ -121,7 +121,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Ping ping (5MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml index 2853e270f6..3e306844de 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml @@ -129,7 +129,7 @@ Ping ping (5MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml index fbff50c09c..9d54eceaeb 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml @@ -159,7 +159,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Ping ping (5MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano @@ -168,7 +168,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Ping ping (5MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml index 78d4138517..2889101ee8 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml @@ -115,7 +115,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Ping ping (10MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml index 223404f07e..fb18ce090f 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml @@ -108,7 +108,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Ping ping (10MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml index 5a04dff1fc..5501ad86fb 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml @@ -144,7 +144,7 @@ Ping ping (10MHz - 20 sec) - -c 20 192.168.61.200 + -c 20 5 lte_oai_ue_carabe nano-cn4g diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml index 3ea5b45735..3a64107484 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml @@ -114,7 +114,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Ping ping (20MHz - 20 sec) - -c 20 %cn_ip% + -c 20 5 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml index 99c6ada431..bb6359d636 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml @@ -122,7 +122,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Ping ping (5MHz - 20 sec) - -c 20 %cn_ip% + -c 20 25 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml index 390badad91..0d4d1cae81 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml @@ -129,7 +129,7 @@ Ping ping (5MHz - 20 sec) - -c 20 %cn_ip% + -c 20 25 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml index 1d2eff3707..e261a3a057 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml @@ -113,7 +113,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Ping ping (10MHz - 20 sec) - -c 20 %cn_ip% + -c 20 25 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml index 2db8e754b9..dd8ef337b8 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml @@ -113,7 +113,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Ping ping (20MHz - 20 sec) - -c 20 %cn_ip% + -c 20 25 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml index 57554d17f2..1719ad2691 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml @@ -114,7 +114,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Ping ping (20MHz - 20 sec) - -c 20 %cn_ip% + -c 20 25 adb_ue_1 adb_ue_2 ltebox-nano diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml index 511f5a0e9c..f127601e39 100644 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml +++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml @@ -96,7 +96,7 @@ Ping: 20 pings up2 porcepix-cn4g - -c 20 %cn_ip% + -c 20 1 60 @@ -106,7 +106,7 @@ Ping: 100 pings, size 1024 up2 porcepix-cn4g - -c 100 -s 1024 -i 0.2 %cn_ip% + -c 100 -s 1024 -i 0.2 1 60 diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml index 0c85c4f028..af3299061a 100644 --- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml +++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml @@ -96,7 +96,7 @@ Ping: 20 pings up2 porcepix-cn4g - -c 20 %cn_ip% + -c 20 1 60 @@ -106,7 +106,7 @@ Ping: 100 pings, size 1024 up2 porcepix-cn4g - -c 100 -s 1024 -i 0.2 %cn_ip% + -c 100 -s 1024 -i 0.2 1 60 diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml index c0c95f1ea8..035163f3db 100644 --- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml @@ -169,7 +169,7 @@ Ping: 20pings in 20sec idefix ltebox-nepes - -c 20 %cn_ip% + -c 20 1 15 @@ -179,7 +179,7 @@ Ping: 100pings in 20sec idefix ltebox-nepes - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15 @@ -189,7 +189,7 @@ Ping: 20pings in 20sec idefix ltebox-nepes - -c 20 %cn_ip% + -c 20 1 15 @@ -199,7 +199,7 @@ Ping: 100pings in 20sec idefix ltebox-nepes - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15 diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml index 1d91dbd482..07c0c095a2 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml @@ -90,7 +90,7 @@ Ping: 100pings in 20sec up2-aerial oc-cn5g-20897-aerial2 - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 5 diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml index 29c864e8d1..7eb6411827 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml @@ -226,7 +226,7 @@ Ping: 50 pings in 10sec, multi-ue amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 oc-cn5g - -c 50 -i 0.2 %cn_ip% + -c 50 -i 0.2 5 25 @@ -242,7 +242,7 @@ Ping: 50pings in 10sec, multi-ue amarisoft_ue_16 oc-cn5g - -c 50 -i 0.2 %cn_ip% + -c 50 -i 0.2 5 30 diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml b/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml index 87031898ba..739534be21 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml @@ -223,7 +223,7 @@ Ping: 20pings in 20sec, multi-ue amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 oc-cn5g - -c 20 %cn_ip% + -c 20 5 25 @@ -239,7 +239,7 @@ Ping: 50pings in 10sec, multi-ue amarisoft_ue_16 oc-cn5g - -c 50 -i 0.2 %cn_ip% + -c 50 -i 0.2 5 30 diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml index e75eb2a977..f4f415acdf 100644 --- a/ci-scripts/xml_files/container_sa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml @@ -131,7 +131,7 @@ Ping: 20pings in 20sec idefix sabox-nepes - -c 20 %cn_ip% + -c 20 1 15 @@ -141,7 +141,7 @@ Ping: 100pings in 20sec idefix sabox-nepes - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15 diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml index 10acef9644..1718eb3152 100644 --- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml @@ -132,7 +132,7 @@ Ping: 50pings in 10sec idefix sabox-nepes - -c 20 -i 0.2 %cn_ip% + -c 20 -i 0.2 1 25 diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml index d9743704df..614b9ac57e 100644 --- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml @@ -144,7 +144,7 @@ Ping: 20pings in 20sec idefix sabox-nepes - -c 20 %cn_ip% + -c 20 1 25 @@ -154,7 +154,7 @@ Ping: 100pings in 20sec idefix sabox-nepes - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 110 @@ -164,7 +164,7 @@ Ping: 20pings in 20sec idefix sabox-nepes - -c 20 %cn_ip% + -c 20 1 110 @@ -174,7 +174,7 @@ Ping: 100pings in 20sec idefix sabox-nepes - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 110 diff --git a/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml b/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml index 9c408a81f5..e71ec3e37c 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml @@ -85,7 +85,7 @@ Ping: 100 pings in 10 sec up2-fhi72 oc-cn5g-20897 - -c 100 -i 0.1 %cn_ip% + -c 100 -i 0.1 1 15 diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml index 5374d216c8..28abfb3871 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml @@ -84,7 +84,7 @@ Ping: 100 pings in 10 sec up2-fhi72 oc-cn5g-20897 - -c 100 -i 0.1 %cn_ip% + -c 100 -i 0.1 1 15 diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml index 90687e39f0..94e97176ff 100644 --- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml @@ -109,7 +109,7 @@ Ping: 100pings in 20sec up2 matix-cn5g - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15 diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml index 631acc3285..a701fc5ab9 100644 --- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml @@ -109,7 +109,7 @@ Ping: 100pings in 20sec up2 matix-cn5g - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15 diff --git a/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml index 58e2825ff3..7f5a926948 100644 --- a/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml @@ -109,7 +109,7 @@ Ping: 100pings in 20sec up2 matix-cn5g - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15 diff --git a/ci-scripts/xml_files/container_sa_n310_nrue.xml b/ci-scripts/xml_files/container_sa_n310_nrue.xml index 00b4dfa583..7d093be3d7 100644 --- a/ci-scripts/xml_files/container_sa_n310_nrue.xml +++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml @@ -128,7 +128,7 @@ Ping: 20pings in 20sec oai_ue_caracal oc-cn5g - -c 20 %cn_ip% + -c 20 1 25 @@ -138,7 +138,7 @@ Ping: 100pings in 20sec oai_ue_caracal oc-cn5g - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 30 diff --git a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml index d301bee3ac..f72dafee06 100644 --- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml @@ -125,7 +125,7 @@ Ping: 20pings in 20sec idefix sabox-nepes - -c 20 %cn_ip% + -c 20 1 15 @@ -135,7 +135,7 @@ Ping: 100pings in 20sec idefix sabox-nepes - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 1 15