Skip to content

O
OpenXG-RAN
Commit c256c2e8 authored by Boris Djalal's avatar Boris Djalal
Browse files
Options

Fix. 

Signed-off-by: default avatarBoris Djalal <boris.djalal@eurecom.fr>
parent d330867d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
ci-scripts/main.py
View file @ c256c2e8
...@@ -1972,7 +1972,7 @@ class SSHConnection(): ...@@ -1972,7 +1972,7 @@ class SSHConnection():
try: try:
self.open(self.OAIUEIPAddress, self.OAIUEUserName, self.OAIUEPassword) self.open(self.OAIUEIPAddress, self.OAIUEUserName, self.OAIUEPassword)
self.command('stdbuf -o0 ps -aux | grep -v grep | grep --color=never ' + self.air_interface + '-uesoftmodem', '\$', 5) self.command('stdbuf -o0 ps -aux | grep -v grep | grep --color=never ' + self.air_interface + '-uesoftmodem', '\$', 5)
result = re.search(air_interface + '-uesoftmodem', str(self.ssh.before)) result = re.search(self.air_interface + '-uesoftmodem', str(self.ssh.before))
if result is None: if result is None:
logging.debug('\u001B[1;37;41m OAI UE Process Not Found! \u001B[0m') logging.debug('\u001B[1;37;41m OAI UE Process Not Found! \u001B[0m')
status_queue.put(OAI_UE_PROCESS_FAILED) status_queue.put(OAI_UE_PROCESS_FAILED)
...@@ -1986,7 +1986,7 @@ class SSHConnection(): ...@@ -1986,7 +1986,7 @@ class SSHConnection():
try: try:
self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword) self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
self.command('stdbuf -o0 ps -aux | grep -v grep | grep --color=never ' + self.air_interface + '-softmodem', '\$', 5) self.command('stdbuf -o0 ps -aux | grep -v grep | grep --color=never ' + self.air_interface + '-softmodem', '\$', 5)
result = re.search(air_interface + '-softmodem', str(self.ssh.before)) result = re.search(self.air_interface + '-softmodem', str(self.ssh.before))
if result is None: if result is None:
logging.debug('\u001B[1;37;41m eNB Process Not Found! \u001B[0m') logging.debug('\u001B[1;37;41m eNB Process Not Found! \u001B[0m')
status_queue.put(ENB_PROCESS_FAILED) status_queue.put(ENB_PROCESS_FAILED)
...@@ -2364,7 +2364,7 @@ class SSHConnection(): ...@@ -2364,7 +2364,7 @@ class SSHConnection():
self.command('echo ' + self.eNBPassword + ' | sudo -S killall --signal SIGINT ' + self.air_interface + '-softmodem || true', '\$', 5) self.command('echo ' + self.eNBPassword + ' | sudo -S killall --signal SIGINT ' + self.air_interface + '-softmodem || true', '\$', 5)
time.sleep(5) time.sleep(5)
self.command('stdbuf -o0 ps -aux | grep -v grep | grep ' + self.air_interface + '-softmodem', '\$', 5) self.command('stdbuf -o0 ps -aux | grep -v grep | grep ' + self.air_interface + '-softmodem', '\$', 5)
result = re.search(air_interface + '-softmodem', str(self.ssh.before)) result = re.search(self.air_interface + '-softmodem', str(self.ssh.before))
if result is not None: if result is not None:
self.command('echo ' + self.eNBPassword + ' | sudo -S killall --signal SIGKILL ' + self.air_interface + '-softmodem || true', '\$', 5) self.command('echo ' + self.eNBPassword + ' | sudo -S killall --signal SIGKILL ' + self.air_interface + '-softmodem || true', '\$', 5)
time.sleep(5) time.sleep(5)
...@@ -2512,7 +2512,7 @@ class SSHConnection(): ...@@ -2512,7 +2512,7 @@ class SSHConnection():
self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT ' + self.air_interface + '-uesoftmodem || true', '\$', 5) self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT ' + self.air_interface + '-uesoftmodem || true', '\$', 5)
time.sleep(5) time.sleep(5)
self.command('stdbuf -o0 ps -aux | grep -v grep | grep ' + self.air_interface + '-uesoftmodem', '\$', 5) self.command('stdbuf -o0 ps -aux | grep -v grep | grep ' + self.air_interface + '-uesoftmodem', '\$', 5)
result = re.search(air_interface + '-uesoftmodem', str(self.ssh.before)) result = re.search(self.air_interface + '-uesoftmodem', str(self.ssh.before))
if result is not None: if result is not None:
self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL ' + self.air_interface + '-uesoftmodem || true', '\$', 5) self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL ' + self.air_interface + '-uesoftmodem || true', '\$', 5)
time.sleep(5) time.sleep(5)
...@@ -3144,11 +3144,6 @@ def GetParametersFromXML(action): ...@@ -3144,11 +3144,6 @@ def GetParametersFromXML(action):
SSH.eNB_instance = test.findtext('UE_instance') SSH.eNB_instance = test.findtext('UE_instance')
if (SSH.UE_instance is None): if (SSH.UE_instance is None):
SSH.UE_instance = '0' SSH.UE_instance = '0'
SSH.air_interface = test.findtext('air_interface')
if (SSH.air_interface is None):
SSH.air_interface = 'lte'
else:
SSH.air_interface = SSH.air_interface.lower()
if action == 'Ping' or action == 'Ping_CatM_module': if action == 'Ping' or action == 'Ping_CatM_module':
SSH.ping_args = test.findtext('ping_args') SSH.ping_args = test.findtext('ping_args')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment