From 1acb719b5ea8676546b87dbd1ab32289317a7ba8 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 19 Oct 2022 17:08:33 +0200
Subject: [PATCH] Change CI SSHConnection class open() and Amarisoft UE class
 prompt

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.
---
 ci-scripts/cls_amarisoft_ue.py | 6 +++---
 ci-scripts/sshconnection.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci-scripts/cls_amarisoft_ue.py b/ci-scripts/cls_amarisoft_ue.py
index 367bfaac3f..9f4976792d 100644
--- a/ci-scripts/cls_amarisoft_ue.py
+++ b/ci-scripts/cls_amarisoft_ue.py
@@ -61,7 +61,7 @@ class AS_UE:
 	def KillASUE(self):
 		mySSH = sshconnection.SSHConnection()
 		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()
 
 	def RunScenario(self):
@@ -70,10 +70,10 @@ class AS_UE:
 
 		logging.debug("Deleting old artifacts :")
 		cmd='rm -rf ' + self.Ping + ' ' + self.UELog 
-		mySSH.command(cmd,'#',5)
+		mySSH.command(cmd, '\$',5)
 		logging.debug("Running scenario :")
 		cmd='echo $USER; nohup '+self.Cmd + ' ' + self.Config + ' &'
-		mySSH.command(cmd,'#',5)
+		mySSH.command(cmd, '\$',5)
 
 		mySSH.close()
 
diff --git a/ci-scripts/sshconnection.py b/ci-scripts/sshconnection.py
index 7c9991119e..5115136dda 100644
--- a/ci-scripts/sshconnection.py
+++ b/ci-scripts/sshconnection.py
@@ -56,7 +56,7 @@ class SSHConnection():
 		self.picocom_closure = True
 
 	def open(self, ipaddress, username, password):
-		prompt = "#" if username == "root" else "\$"
+		prompt = "\$"
 		count = 0
 		connect_status = False
 		while count < 4: