diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index ed04b34aef..97eaed8ba5 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -511,37 +511,34 @@ class OaiCiTest(): return (False, f"UE {ue.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)) - #target address is different depending on EPC type - if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE): - Target = EPC.MmeIPAddress - elif re.match('OAICN5G', EPC.Type, re.IGNORECASE): - Target = EPC.MmeIPAddress - elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE): - Target = "172.21.6.100" - else: - Target = EPC.IPAddress + local_ping_log_file = f'{os.getcwd()}/{ping_log_file}' + # if has pattern %cn_ip%, replace with core IP address, else we assume the IP is present + if re.search('%cn_ip%', self.ping_args): + #target address is different depending on EPC type + if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE): + self.ping_args = re.sub('%cn_ip%', EPC.MmeIPAddress, self.ping_args) + elif re.match('OAICN5G', EPC.Type, re.IGNORECASE): + self.ping_args = re.sub('%cn_ip%', EPC.MmeIPAddress, self.ping_args) + elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE): + self.ping_args = re.sub('%cn_ip%', '172.21.6.100', self.ping_args) + else: + self.ping_args = re.sub('%cn_ip%', EPC.IPAddress, self.ping_args) #ping from module NIC rather than IP address to make sure round trip is over the air interface = f'-I {ue.getIFName()}' if ue.getIFName() else '' - ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {Target} &> /tmp/{ping_log_file}' + ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} 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) if response.returncode != 0: - ping_status = -1 - else: - #copy the ping log file to have it locally for analysis (ping stats) - cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=ping_log_file) - - cmd.close() - - # TIMEOUT CASE - ue_header = f'UE {ue.getName()} ({ueIP})' - if ping_status < 0: message = ue_header + ': ping crashed: TIMEOUT?' logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m') return (False, message) - #search is done on cat result - logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file) - with open(ping_log_file, 'r') as f: + + #copy the ping log file to have it locally for analysis (ping stats) + cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=local_ping_log_file) + cmd.close() + + ue_header = f'UE {ue.getName()} ({ueIP})' + with open(local_ping_log_file, 'r') as f: ping_output = "".join(f.readlines()) result = re.search(', (?P[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output) if result is None: 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 0023edd171..7d43346bd6 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 @@ -110,7 +110,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Ping ping (5MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 5 adb_ue_1 adb_ue_2 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 bf8cb5e256..34bee784a4 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 @@ -148,7 +148,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Ping ping (5MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 5 adb_ue_1 adb_ue_2 @@ -156,7 +156,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Ping ping (5MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 5 adb_ue_1 adb_ue_2 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 ea89f4193a..040211347b 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 @@ -104,7 +104,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Ping ping (10MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 5 adb_ue_1 adb_ue_2 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 788a1759dc..dc6df2da57 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 @@ -97,7 +97,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Ping ping (10MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 5 adb_ue_1 adb_ue_2 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 4fef927a3b..8015a54f43 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 @@ -103,7 +103,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Ping ping (20MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 5 adb_ue_1 adb_ue_2 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 eb11412ef5..1aaa731b93 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 @@ -111,7 +111,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Ping ping (5MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 25 adb_ue_1 adb_ue_2 diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml index 887b5dab9b..c3a0b2ef89 100644 --- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml +++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml @@ -101,7 +101,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Ping ping (5MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 25 adb_ue_1 adb_ue_2 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 3874ff7028..e82564338f 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 @@ -101,7 +101,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Ping ping (10MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 25 adb_ue_1 adb_ue_2 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 77e00d72ac..3e558f0ac3 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 @@ -101,7 +101,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Ping ping (20MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 25 adb_ue_1 adb_ue_2 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 fd454f13e2..645de59565 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 @@ -103,7 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Ping ping (20MHz - 20 sec) - -c 20 + -c 20 %cn_ip% 25 adb_ue_1 adb_ue_2 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 480825bede..49cd79783a 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 @@ -102,7 +102,7 @@ Ping Ping: 20 pings nrmodule2_quectel - -c 20 + -c 20 %cn_ip% 1 60 @@ -111,7 +111,7 @@ Ping Ping: 100 pings, size 1024 nrmodule2_quectel - -c 100 -s 1024 -i 0,2 + -c 100 -s 1024 -i 0,2 %cn_ip% 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 b3dc7efab7..a9ed0b2bea 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 @@ -102,7 +102,7 @@ Ping Ping: 20 pings nrmodule2_quectel - -c 20 + -c 20 %cn_ip% 1 60 @@ -111,7 +111,7 @@ Ping Ping: 100 pings, size 1024 nrmodule2_quectel - -c 100 -s 1024 -i 0,2 + -c 100 -s 1024 -i 0,2 %cn_ip% 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 ee264b6c43..6a2f31aac2 100644 --- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml @@ -151,7 +151,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 1 15 @@ -160,7 +160,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 15 @@ -169,7 +169,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 1 15 @@ -178,7 +178,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 15 diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml index 7959718eb0..8241d2da83 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml @@ -123,7 +123,7 @@ Ping Ping: 20pings in 20sec, multi-ue amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 - -c 20 + -c 20 %cn_ip% 1 25 @@ -132,7 +132,7 @@ Ping Ping: 100pings in 20sec, multi-ue amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 30 diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml index 97b77e2499..9d36b76084 100644 --- a/ci-scripts/xml_files/container_sa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml @@ -113,7 +113,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 1 15 @@ -122,7 +122,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 15 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 3fab62b265..a00a575a81 100644 --- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml @@ -119,7 +119,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 1 25 @@ -128,7 +128,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 110 @@ -137,7 +137,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 1 110 @@ -146,7 +146,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 110 diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 185d637218..78787d34fa 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -144,7 +144,7 @@ Ping Ping: 20pings in 20sec nrmodule2_quectel - -c 20 + -c 20 %cn_ip% 5 @@ -152,7 +152,7 @@ Ping Ping: 100pings in 20sec nrmodule2_quectel - -c 100 -i 0,2 + -c 100 -i 0,2 %cn_ip% 5 diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml index d1515898ff..37a80058d3 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml @@ -144,7 +144,7 @@ Ping Ping: 20pings in 20sec nrmodule2_quectel - -c 20 + -c 20 %cn_ip% 5 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel.xml b/ci-scripts/xml_files/fr1_nsa_quectel.xml index 962b3eef7e..e300bd7f1c 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel.xml @@ -141,7 +141,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 1 15 @@ -150,7 +150,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 1 15 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml index 593e2d326d..732dd3bb7d 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml @@ -109,7 +109,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 50 @@ -117,7 +117,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 50 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml index 89825cdbf2..a37cbb4d72 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml @@ -106,7 +106,7 @@ Ping Ping: 20pings in 20sec idefix - -c 20 + -c 20 %cn_ip% 50 @@ -114,7 +114,7 @@ Ping Ping: 100pings in 20sec idefix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 50 diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml index 454cd1486b..97a6404c55 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml @@ -79,7 +79,7 @@ Ping Ping from CN to UE: 20pings in 20sec - -c 20 + -c 20 %cn_ip% 5 @@ -87,7 +87,7 @@ Ping Ping from CN to UE: 100pings in 20sec oai_ue_obelix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 5 diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml index 7105828be4..00c3431aa0 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml @@ -95,7 +95,7 @@ Ping Ping from CN to UE: 20pings in 20sec oai_ue_obelix - -c 20 + -c 20 %cn_ip% 5 @@ -103,7 +103,7 @@ Ping Ping from CN to UE: 100pings in 20sec oai_ue_obelix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 5 diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml index fcc6088096..315674c9e6 100644 --- a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml +++ b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml @@ -80,7 +80,7 @@ Ping Ping from CN to UE: 20pings in 20sec oai_ue_obelix - -c 20 + -c 20 %cn_ip% 5 @@ -88,7 +88,7 @@ Ping Ping from CN to UE: 100pings in 20sec oai_ue_obelix - -c 100 -i 0.2 + -c 100 -i 0.2 %cn_ip% 5 diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml index b13de6f3ef..5fd276e6ce 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel.xml @@ -114,7 +114,7 @@ Ping Ping: 40pings in 40sec nrmodule2_quectel - -c 40 + -c 40 %cn_ip% 1 10 @@ -123,7 +123,7 @@ Ping Ping: 100pings in 20sec nrmodule2_quectel - -c 100 -i 0,2 + -c 100 -i 0,2 %cn_ip% 1 10 diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml index d1c250862d..507e9b1b92 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml @@ -111,7 +111,7 @@ Ping Ping: 40pings in 40sec nrmodule2_quectel - -c 40 + -c 40 %cn_ip% 1 20 diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml index 94cf5d71ef..006526e177 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml @@ -119,7 +119,7 @@ Ping Ping: 40pings in 40sec nrmodule2_quectel - -c 40 + -c 40 %cn_ip% 1 20