Skip to content

O
OpenXG-RAN
Commit c82fd2e4 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

CI: fixing the check after UE mounted tunnel interfaces 

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 7be64625
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 13 deletions
ci-scripts/main.py
View file @ c82fd2e4
...@@ -922,7 +922,8 @@ class SSHConnection(): ...@@ -922,7 +922,8 @@ class SSHConnection():
if enbDidSync and eNBinNoS1: if enbDidSync and eNBinNoS1:
self.command('ifconfig oaitun_enb1', '\$', 4) 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: if result is not None:
logging.debug('\u001B[1m oaitun_enb1 interface is mounted and configured\u001B[0m') logging.debug('\u001B[1m oaitun_enb1 interface is mounted and configured\u001B[0m')
else: else:
...@@ -1125,6 +1126,7 @@ class SSHConnection(): ...@@ -1125,6 +1126,7 @@ class SSHConnection():
if fullSyncStatus and gotSyncStatus and self.air_interface == 'lte': if fullSyncStatus and gotSyncStatus and self.air_interface == 'lte':
result = re.search('--no-L2-connect', str(self.Initialize_OAI_UE_args)) result = re.search('--no-L2-connect', str(self.Initialize_OAI_UE_args))
if result is None: if result is None:
self.command('ifconfig oaitun_ue1', '\$', 4)
self.command('ifconfig oaitun_ue1', '\$', 4) self.command('ifconfig oaitun_ue1', '\$', 4)
# ifconfig output is different between ubuntu 16 and ubuntu 18 # ifconfig output is different between ubuntu 16 and ubuntu 18
result = re.search('inet addr:1|inet 1', str(self.ssh.before)) result = re.search('inet addr:1|inet 1', str(self.ssh.before))
...@@ -3319,6 +3321,9 @@ class SSHConnection(): ...@@ -3319,6 +3321,9 @@ class SSHConnection():
uciStatMsgCount = 0 uciStatMsgCount = 0
pdcpDataReqFailedCount = 0 pdcpDataReqFailedCount = 0
badDciCount = 0 badDciCount = 0
f1aRetransmissionCount = 0
fatalErrorCount = 0
macBsrTimerExpiredCount = 0
rrcConnectionRecfgComplete = 0 rrcConnectionRecfgComplete = 0
no_cell_sync_found = False no_cell_sync_found = False
mib_found = False mib_found = False
...@@ -3371,9 +3376,18 @@ class SSHConnection(): ...@@ -3371,9 +3376,18 @@ class SSHConnection():
result = re.search('PDCP data request failed', str(line)) result = re.search('PDCP data request failed', str(line))
if result is not None and not exitSignalReceived: if result is not None and not exitSignalReceived:
pdcpDataReqFailedCount += 1 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: if result is not None and not exitSignalReceived:
badDciCount += 1 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)) result = re.search('Generating RRCConnectionReconfigurationComplete', str(line))
if result is not None: if result is not None:
rrcConnectionRecfgComplete += 1 rrcConnectionRecfgComplete += 1
...@@ -3492,7 +3506,19 @@ class SSHConnection(): ...@@ -3492,7 +3506,19 @@ class SSHConnection():
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m') logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
self.htmlUEFailureMsg += statMsg + '\n' self.htmlUEFailureMsg += statMsg + '\n'
if badDciCount > 0: 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') logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
self.htmlUEFailureMsg += statMsg + '\n' self.htmlUEFailureMsg += statMsg + '\n'
if self.eNBmbmsEnables[0]: if self.eNBmbmsEnables[0]:
......
ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
View file @ c82fd2e4
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
<testCase id="040642"> <testCase id="040642">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc> <desc>iperf (5MHz - UL/4Mbps/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> <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_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile> <iperf_profile>balanced</iperf_profile>
</testCase> </testCase>
......
ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
View file @ c82fd2e4
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
<testCase id="040644"> <testCase id="040644">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc> <desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 8M -t 30 -i 1 -fm -R</iperf_args> <iperf_args>-u -b 4M -t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold> <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile> <iperf_profile>balanced</iperf_profile>
</testCase> </testCase>
......
ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
View file @ c82fd2e4
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
--> -->
<testCaseList> <testCaseList>
<htmlTabRef>test-10-tm1</htmlTabRef> <htmlTabRef>test-lte-m-10-tm1</htmlTabRef>
<htmlTabName>Test-10MHz-TM1</htmlTabName> <htmlTabName>Test-LTE-M-10MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon> <htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount> <repeatCount>2</repeatCount>
<TestCaseRequestedList> <TestCaseRequestedList>
......
openair2/LAYER2/MAC/ue_procedures.c
View file @ c82fd2e4
...@@ -2035,9 +2035,9 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP, ...@@ -2035,9 +2035,9 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
if (sdu_lengths[num_sdus]) { if (sdu_lengths[num_sdus]) {
sdu_length_total += sdu_lengths[num_sdus]; sdu_length_total += sdu_lengths[num_sdus];
sdu_lcids[num_sdus] = lcid; sdu_lcids[num_sdus] = lcid;
LOG_I(MAC, //LOG_I(MAC,
"[UE %d] TX Multiplex RLC PDU TX Got %d bytes for LcId%d\n", // "[UE %d] TX Multiplex RLC PDU TX Got %d bytes for LcId%d\n",
module_idP, sdu_lengths[num_sdus], lcid); // module_idP, sdu_lengths[num_sdus], lcid);
if (buflen == if (buflen ==
(bsr_len + phr_len + total_rlc_pdu_header_len + (bsr_len + phr_len + total_rlc_pdu_header_len +
......
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @ c82fd2e4
...@@ -138,7 +138,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) { ...@@ -138,7 +138,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
else else
{ {
ret = write(nas_sock_fd[ctxt_pP->module_id], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite ); 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) { } else if (ENB_NAS_USE_TUN) {
ret = write(nas_sock_fd[0], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite ); ret = write(nas_sock_fd[0], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
......
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