From 34c9aec59e50c41a4ef23b2a7c445d85f7197634 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 8 Jan 2020 14:31:54 +0100
Subject: [PATCH] CI: simplification of the X2 HO scenario. But sill failing!
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/main.py | 23 ++++++++++++++++++-
...enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml | 6 ++---
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 860dcb3ea25..6adf57264b9 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -134,6 +134,7 @@ class SSHConnection():
self.eNBLogFiles = ['', '', '']
self.eNBOptions = ['', '', '']
self.eNBmbmsEnables = [False, False, False]
+ self.eNBstatuses = [-1, -1, -1]
self.ping_args = ''
self.ping_packetloss_threshold = ''
self.iperf_args = ''
@@ -899,6 +900,8 @@ class SSHConnection():
logging.debug('\u001B[1m oaitun_enm1 interface is mounted and configured\u001B[0m')
else:
logging.error('\u001B[1m oaitun_enm1 interface is either NOT mounted or NOT configured\u001B[0m')
+ if enbDidSync:
+ self.eNBstatuses[int(self.eNB_instance)] = int(self.eNB_serverId)
self.close()
self.CreateHtmlTestRow('-O ' + config_file + extra_options, 'OK', ALL_PROCESSES_OK)
@@ -2992,7 +2995,24 @@ class SSHConnection():
def CheckeNBProcess(self, status_queue):
try:
- self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
+ # At least the instance 0 SHALL be on!
+ if self.eNBstatuses[0] == 0:
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ elif self.eNBstatuses[0] == 1:
+ lIpAddr = self.eNB1IPAddress
+ lUserName = self.eNB1UserName
+ lPassWord = self.eNB1Password
+ elif self.eNBstatuses[0] == 2:
+ lIpAddr = self.eNB2IPAddress
+ lUserName = self.eNB2UserName
+ lPassWord = self.eNB2Password
+ else:
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ self.open(lIpAddr, lUserName, lPassWord)
self.command('stdbuf -o0 ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
result = re.search('lte-softmodem', str(self.ssh.before))
if result is None:
@@ -3589,6 +3609,7 @@ class SSHConnection():
else:
self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
self.eNBmbmsEnables[int(self.eNB_instance)] = False
+ self.eNBstatuses[int(self.eNB_instance)] = -1
def TerminateHSS(self):
self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
index 9f257577664..22f8b632660 100644
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
@@ -30,11 +30,9 @@
050102
030104 000002 030105 000002
040301 000002
- 040540 040615 040616 040655 040656
+ 040540 040615 040655
050401 000001
- 040541 040617 040618 040657 040658
- 050402 000001
- 040542
+ 040541 040617 040657
040401 000001
040201 000002 030201 030202
050202
--
GitLab