From c82fd2e444713e50fda0352f64cacbc855eb8c3a Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 16 Jan 2020 12:34:30 +0100
Subject: [PATCH] CI: fixing the check after UE mounted tunnel interfaces
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/main.py | 32 +++++++++++++++++--
.../enb_ue_usrp210_band7_test_05mhz_tm1.xml | 4 +--
...enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml | 4 +--
.../enb_usrp210_band13_test_10mhz_tm1.xml | 4 +--
openair2/LAYER2/MAC/ue_procedures.c | 6 ++--
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c | 2 +-
6 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 62690ea8cba..1b106781f53 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -922,7 +922,8 @@ class SSHConnection():
if enbDidSync and eNBinNoS1:
self.command('ifconfig oaitun_enb1', '\$', 4)
- result = re.search('inet addr', str(self.ssh.before))
+ self.command('ifconfig oaitun_enb1', '\$', 4)
+ result = re.search('inet addr:1|inet 1', str(self.ssh.before))
if result is not None:
logging.debug('\u001B[1m oaitun_enb1 interface is mounted and configured\u001B[0m')
else:
@@ -1125,6 +1126,7 @@ class SSHConnection():
if fullSyncStatus and gotSyncStatus and self.air_interface == 'lte':
result = re.search('--no-L2-connect', str(self.Initialize_OAI_UE_args))
if result is None:
+ self.command('ifconfig oaitun_ue1', '\$', 4)
self.command('ifconfig oaitun_ue1', '\$', 4)
# ifconfig output is different between ubuntu 16 and ubuntu 18
result = re.search('inet addr:1|inet 1', str(self.ssh.before))
@@ -3319,6 +3321,9 @@ class SSHConnection():
uciStatMsgCount = 0
pdcpDataReqFailedCount = 0
badDciCount = 0
+ f1aRetransmissionCount = 0
+ fatalErrorCount = 0
+ macBsrTimerExpiredCount = 0
rrcConnectionRecfgComplete = 0
no_cell_sync_found = False
mib_found = False
@@ -3371,9 +3376,18 @@ class SSHConnection():
result = re.search('PDCP data request failed', str(line))
if result is not None and not exitSignalReceived:
pdcpDataReqFailedCount += 1
- result = re.search('bad DCI 1A', str(line))
+ result = re.search('bad DCI 1', str(line))
if result is not None and not exitSignalReceived:
badDciCount += 1
+ result = re.search('Format1A Retransmission but TBS are different', str(line))
+ if result is not None and not exitSignalReceived:
+ f1aRetransmissionCount += 1
+ result = re.search('FATAL ERROR', str(line))
+ if result is not None and not exitSignalReceived:
+ fatalErrorCount += 1
+ result = re.search('MAC BSR Triggered ReTxBSR Timer expiry', str(line))
+ if result is not None and not exitSignalReceived:
+ macBsrTimerExpiredCount += 1
result = re.search('Generating RRCConnectionReconfigurationComplete', str(line))
if result is not None:
rrcConnectionRecfgComplete += 1
@@ -3492,7 +3506,19 @@ class SSHConnection():
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
self.htmlUEFailureMsg += statMsg + '\n'
if badDciCount > 0:
- statMsg = 'UE showed ' + str(badDciCount) + ' "bad DCI 1A" message(s)'
+ statMsg = 'UE showed ' + str(badDciCount) + ' "bad DCI 1(A)" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ self.htmlUEFailureMsg += statMsg + '\n'
+ if f1aRetransmissionCount > 0:
+ statMsg = 'UE showed ' + str(f1aRetransmissionCount) + ' "Format1A Retransmission but TBS are different" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ self.htmlUEFailureMsg += statMsg + '\n'
+ if fatalErrorCount > 0:
+ statMsg = 'UE showed ' + str(fatalErrorCount) + ' "FATAL ERROR:" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ self.htmlUEFailureMsg += statMsg + '\n'
+ if macBsrTimerExpiredCount > 0:
+ statMsg = 'UE showed ' + str(fatalErrorCount) + ' "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
self.htmlUEFailureMsg += statMsg + '\n'
if self.eNBmbmsEnables[0]:
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
index 3eca883aa64..581858e44e1 100644
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
@@ -109,8 +109,8 @@
<testCase id="040642">
<class>Iperf</class>
- <desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc>
- <iperf_args>-c 10.0.1.1 -u -b 8M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+ <desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
+ <iperf_args>-c 10.0.1.1 -u -b 4M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
index 9f7546cab34..2336f8e6144 100644
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
@@ -96,8 +96,8 @@
<testCase id="040644">
<class>Iperf</class>
- <desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc>
- <iperf_args>-u -b 8M -t 30 -i 1 -fm -R</iperf_args>
+ <desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
+ <iperf_args>-u -b 4M -t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
diff --git a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
index d72722aa8c1..680f09c435e 100644
--- a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
@@ -21,8 +21,8 @@
-->
<testCaseList>
- <htmlTabRef>test-10-tm1</htmlTabRef>
- <htmlTabName>Test-10MHz-TM1</htmlTabName>
+ <htmlTabRef>test-lte-m-10-tm1</htmlTabRef>
+ <htmlTabName>Test-LTE-M-10MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount>
<TestCaseRequestedList>
diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c
index c340aa0b8fe..d4277917ebe 100644
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
@@ -2035,9 +2035,9 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
if (sdu_lengths[num_sdus]) {
sdu_length_total += sdu_lengths[num_sdus];
sdu_lcids[num_sdus] = lcid;
- LOG_I(MAC,
- "[UE %d] TX Multiplex RLC PDU TX Got %d bytes for LcId%d\n",
- module_idP, sdu_lengths[num_sdus], lcid);
+ //LOG_I(MAC,
+ // "[UE %d] TX Multiplex RLC PDU TX Got %d bytes for LcId%d\n",
+ // module_idP, sdu_lengths[num_sdus], lcid);
if (buflen ==
(bsr_len + phr_len + total_rlc_pdu_header_len +
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index f198a98b234..68f8ab5f130 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -138,7 +138,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
else
{
ret = write(nas_sock_fd[ctxt_pP->module_id], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
- LOG_I(PDCP,"[PDCP_FIFOS] ret %d TRIED TO PUSH DATA TO rb_id %d handle %d sizeToWrite %d\n",ret,rb_id,nas_sock_fd[ctxt_pP->module_id],sizeToWrite);
+ //LOG_I(PDCP,"[PDCP_FIFOS] ret %d TRIED TO PUSH DATA TO rb_id %d handle %d sizeToWrite %d\n",ret,rb_id,nas_sock_fd[ctxt_pP->module_id],sizeToWrite);
}
} else if (ENB_NAS_USE_TUN) {
ret = write(nas_sock_fd[0], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
--
GitLab