From 9e5e6bf16dc454f1c199cb5d1628e9b0e9c994c4 Mon Sep 17 00:00:00 2001
From: Dhanuja Elizabeth Thomas <dhanuja.thomas@openairinterface.org>
Date: Fri, 20 Jan 2023 15:42:25 +0100
Subject: [PATCH] Removed reset/reboot of USRP
---
ci-scripts/cls_containerize.py | 1 -
ci-scripts/cls_oaicitest.py | 11 -----------
ci-scripts/ran.py | 21 ---------------------
3 files changed, 33 deletions(-)
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 324e718ba15..f98561f3b56 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -865,7 +865,6 @@ class Containerize():
mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)
# Currently support only one
- mySSH.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 15)
svcName = self.services[self.eNB_instance]
if svcName == '':
logging.warning('no service name given: starting all services in ci-docker-compose.yml!')
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 328785f8d1f..51e43109a0e 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -453,17 +453,6 @@ class OaiCiTest():
UE_prefix = 'NR '
SSH = sshconnection.SSHConnection()
SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- # b2xx_fx3_utils reset procedure
- SSH.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 180)
- result = re.search('type: b200', SSH.getBefore())
- if result is not None:
- logging.debug('Found a B2xx device --> resetting it')
- SSH.command('echo ' + self.UEPassword + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
- # Reloading FGPA bin firmware
- SSH.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 180)
- result = re.search('type: n3xx', str(SSH.getBefore()))
- if result is not None:
- logging.debug('Found a N3xx device --> resetting it')
SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
# Initialize_OAI_UE_args usually start with -C and followed by the location in repository
SSH.command('source oaienv', '\$', 5)
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 8ec72bf40f0..8628d5f3d88 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -365,17 +365,6 @@ class RANManagement():
cwd = os.getcwd()
mySSH.copyout(lIpAddr,lUserName,lPassWord, cwd + "/active_net_interfaces.awk", "/tmp")
- #reboot USRP if requested in xml
- if self.USRPIPAddress!='':
- logging.debug('USRP '+ self.USRPIPAddress +': reboot request')
- mySSH.open(lIpAddr, lUserName, lPassWord)
- cmd2usrp='ssh root@'+self.USRPIPAddress+' reboot'
- mySSH.command2(cmd2usrp,1)
- mySSH.close()
- logging.debug('Waiting for USRP to be ready')
- time.sleep(120)
-
-
if (self.pStatus < 0):
HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus)
HTML.CreateHtmlTabFooter(False)
@@ -437,16 +426,6 @@ class RANManagement():
result = re.search('^rru|^rcc|^du.band', str(config_file))
if result is not None:
rruCheck = True
- # do not reset board twice in IF4.5 case
- result = re.search('^rru|^enb|^du.band', str(config_file))
- if result is not None:
- mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 180)
- result = re.search('type: b200', mySSH.getBefore())
- if result is not None:
- logging.debug('Found a B2xx device --> resetting it')
- mySSH.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
- # Reloading FGPA bin firmware
- mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 180)
# Make a copy and adapt to EPC / eNB IP addresses
mySSH.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
localMmeIpAddr = EPC.MmeIPAddress
--
GitLab