maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change CI SSHConnection class open() and Amarisoft UE class prompt

Browse Source 
The Amarisoft root prompt contained '#' (as usual for root). However, to
integrate this into the UE management logic (cls_module_ue.py), we are
forced to use '$'. We changed the root command prompt to use '$', and
therefore change it here as well.
This commit is contained in:
Robert Schmidt
2022-10-20 15:02:18 +02:00
parent b9db3044fb
commit 1acb719b5e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_amarisoft_ue.py
+3 -3
View File
@@ -61,7 +61,7 @@ class AS_UE:
def KillASUE(self): def KillASUE(self):
mySSH = sshconnection.SSHConnection() mySSH = sshconnection.SSHConnection()
mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword) mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
mySSH.command('killall --signal SIGKILL lteue-avx2', '#', 5) mySSH.command('killall --signal SIGKILL lteue-avx2', '\$', 5)
mySSH.close() mySSH.close()
def RunScenario(self): def RunScenario(self):
@@ -70,10 +70,10 @@ class AS_UE:
logging.debug("Deleting old artifacts :") logging.debug("Deleting old artifacts :")
cmd='rm -rf ' + self.Ping + ' ' + self.UELog cmd='rm -rf ' + self.Ping + ' ' + self.UELog
mySSH.command(cmd,'#',5) mySSH.command(cmd, '\$',5)
logging.debug("Running scenario :") logging.debug("Running scenario :")
cmd='echo $USER; nohup '+self.Cmd + ' ' + self.Config + ' &' cmd='echo $USER; nohup '+self.Cmd + ' ' + self.Config + ' &'
mySSH.command(cmd,'#',5) mySSH.command(cmd, '\$',5)
mySSH.close() mySSH.close()
ci-scripts/sshconnection.py
+1 -1
View File
@@ -56,7 +56,7 @@ class SSHConnection():
self.picocom_closure = True self.picocom_closure = True
def open(self, ipaddress, username, password): def open(self, ipaddress, username, password):
prompt = "#" if username == "root" else "\$" prompt = "\$"
count = 0 count = 0
connect_status = False connect_status = False
while count < 4: while count < 4: