From fbbe8a1df755a4eb71190b912dcae270e9904bb7 Mon Sep 17 00:00:00 2001 From: winckel Date: Tue, 26 Nov 2013 13:31:48 +0000 Subject: [PATCH] Added ITTI log generation for ITTI tests. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4526 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- targets/TEST/OAI/case02.py | 14 +++++++++----- targets/TEST/OAI/case03.py | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/targets/TEST/OAI/case02.py b/targets/TEST/OAI/case02.py index c4ca1100bc..71adaf23d3 100644 --- a/targets/TEST/OAI/case02.py +++ b/targets/TEST/OAI/case02.py @@ -168,12 +168,16 @@ def execute(oai, user, pw, logfile,logdir): diag = 'RRC procedure is not finished completely, check the execution logs and trace BCCH, CCCH, and DCCH channels' for i in range(NUM_UE) : for j in range(NUM_eNB) : - conf = '-a -A AWGN -n' + str((i+1+j) * 40) + ' -u' + str(i+1) +' -b'+ str(j+1) - trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' - tee = ' 2>&1 | tee ' + trace - oai.send_expect('./oaisim.rel8.itti ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50) + log_name = logdir + '/log_' + case + test + '_' + str(i) + str(j) + itti_name = log_name + '.log' + trace_name = log_name + '.txt' + conf = '-a -A AWGN -n' + str((i+1+j) * 40) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -K' + itti_name + tee = ' 2>&1 | tee -a ' + trace_name + command = './oaisim.rel8.itti ' + conf + oai.send('echo ' + command + ' > ' + trace_name + ';') + oai.send_expect(command + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50) except log.err, e: - log.fail(case, test, name, conf, e.value, diag, logfile,trace) + log.fail(case, test, name, conf, e.value, diag, logfile, trace_name) else: log.ok(case, test, name, conf, '', logfile) diff --git a/targets/TEST/OAI/case03.py b/targets/TEST/OAI/case03.py index eb5c86a9da..7af3a23664 100644 --- a/targets/TEST/OAI/case03.py +++ b/targets/TEST/OAI/case03.py @@ -192,12 +192,16 @@ def execute(oai, user, pw, logfile,logdir): diag = 'eMBMS procedure is not finished completely, make sure that the SIB13/MCCH have been correclty received by UEs' for i in range(NUM_UE) : for j in range(NUM_eNB) : - conf = '-A AWGN -s 15 -x 1 -Q3 -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) - trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' - tee = ' 2>&1 | tee ' + trace - oai.send_expect('./oaisim.rel10.itti ' + conf + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 100) + log_name = logdir + '/log_' + case + test + '_' + str(i) + str(j) + itti_name = log_name + '.log' + trace_name = log_name + '.txt' + conf = '-A AWGN -s 15 -x 1 -Q3 -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -K' + itti_name + tee = ' 2>&1 | tee -a ' + trace_name + command = './oaisim.rel10.itti ' + conf + oai.send('echo ' + command + ' > ' + trace_name + ';') + oai.send_expect(command + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 100) except log.err, e: - log.fail(case, test, name, conf, e.value, diag, logfile,trace) + log.fail(case, test, name, conf, e.value, diag, logfile, trace_name) else: log.ok(case, test, name, conf, '', logfile)