From a736bec5702ed1918188ef65722a9a416fbe6c7f Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 22 Oct 2024 09:23:21 +0200 Subject: [PATCH] Remove eNB_Trace: it is not used by the CI --- ci-scripts/main.py | 1 - ci-scripts/ran.py | 18 ------------------ ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml | 1 - .../fr1_nsa_2x2_quectel_attach_detach.xml | 1 - ci-scripts/xml_files/fr1_nsa_quectel.xml | 1 - .../fr1_nsa_quectel_attach_detach.xml | 1 - ci-scripts/xml_files/fr1_nsa_quectel_long.xml | 1 - 7 files changed, 24 deletions(-) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 9a35a8ef7c..b1c661d6aa 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -161,7 +161,6 @@ def ExecuteActionWithParam(action): success = CONTAINERS.BuildRunTests(HTML) elif action == 'Initialize_eNB': - RAN.eNB_Trace=test.findtext('eNB_Trace') datalog_rt_stats_file=test.findtext('rt_stats_cfg') if datalog_rt_stats_file is None: RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml' diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index 431e8b1030..9ac1ac0df6 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -90,7 +90,6 @@ class RANManagement(): self.runtime_stats= '' self.datalog_rt_stats={} self.datalog_rt_stats_file='datalog_rt_stats.default.yaml' - self.eNB_Trace = '' #if 'yes', Tshark will be launched at initialization self.USRPIPAddress = '' #checkers from xml self.ran_checkers={} @@ -129,23 +128,6 @@ class RANManagement(): mySSH = SSH.SSHConnection() cwd = os.getcwd() - #Get pcap on enb and/or gnb if enabled in the xml - if self.eNB_Trace=='yes': - if self.air_interface[self.eNB_instance] == 'lte-softmodem': - pcapfile_prefix="enb_" - else: - pcapfile_prefix="gnb_" - mySSH.open(lIpAddr, lUserName, lPassWord) - eth_interface = 'any' - fltr = 'sctp' - logging.debug('\u001B[1m Launching tshark on xNB on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m') - pcapfile = pcapfile_prefix + self.testCase_id + '_log.pcap' - mySSH.command('echo ' + lPassWord + ' | sudo -S rm -f /tmp/' + pcapfile , '\$', 5) - mySSH.command('echo $USER; nohup sudo -E tshark -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + pcapfile + ' > /dev/null 2>&1 &','\$', 5) - mySSH.close() - - - # If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB if EPC.IPAddress != "none": localEpcIpAddr = EPC.IPAddress diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 93e39f15bf..4cf8973581 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -107,7 +107,6 @@ 0 0 lte - yes 172.21.19.13 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 554226f167..2aadb391bc 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 @@ -111,7 +111,6 @@ 0 0 lte - yes 172.21.19.13 diff --git a/ci-scripts/xml_files/fr1_nsa_quectel.xml b/ci-scripts/xml_files/fr1_nsa_quectel.xml index 755f3ad969..7f824010d9 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel.xml @@ -114,7 +114,6 @@ 0 0 lte - yes 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 66bcf54be2..faa365a105 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml @@ -79,7 +79,6 @@ 0 0 lte - yes diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml index aebf6bf668..7687363d78 100644 --- a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml +++ b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml @@ -77,7 +77,6 @@ 0 0 lte - yes