diff --git a/targets/TEST/OAI/case01.py b/targets/TEST/OAI/case01.py index acfbd1fcb1f8022cf29efcf5b963a9bc4faecee8..3ec93f01c6265dd1170364b19e468bad129ea6e1 100644 --- a/targets/TEST/OAI/case01.py +++ b/targets/TEST/OAI/case01.py @@ -44,8 +44,10 @@ makerr2 = 'Error 1' def execute(oai, user, pw, logfile): case = '01' + logs_dir = 'pre-ci-logs'; oai.send('cd $OPENAIR_TARGETS;') - + oai.send('mkdir ' + logs_dir + ';') + try: test = '00' name = 'Check oai.svn.add' @@ -69,11 +71,12 @@ def execute(oai, user, pw, logfile): test = '01' name = 'Compile oai.rel8.make' conf = 'make' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = "check the compilation errors for oai" oai.send('make cleanall;') oai.send('make cleanasn1;') oai.send('rm -f ./oaisim.rel8;') - oai.send_expect_false('make -j4;', makerr1, 1500) + oai.send_expect_false('make -j4' + tee, makerr1, 1500) oai.send('cp ./oaisim ./oaisim.rel8;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -89,8 +92,10 @@ def execute(oai, user, pw, logfile): oai.send('rm -f ./oaisim.rel8.nas;') oai.send('rm -f ./nasmesh;') oai.send('make nasmesh_clean;') - oai.send_expect_false('make nasmesh_fix;', makerr1, 60) - oai.send_expect_false('make NAS=1 -j4;', makerr1, 1500) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_1.txt;' + oai.send_expect_false('make nasmesh_fix' + tee, makerr1, 60) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_2.txt;' + oai.send_expect_false('make NAS=1 -j4' + tee, makerr1, 1500) oai.send('cp ./oaisim ./oaisim.rel8.nas;') except log.err, e: @@ -105,10 +110,11 @@ def execute(oai, user, pw, logfile): test = '03' name = 'Compile oai.rel8.rf.make' conf = 'make RTAI=0 Rel8=1' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = 'check the compilation errors for Rel8' oai.send('make cleanall;') oai.send('rm -f ./oaisim.rel8.rf;') - oai.send_expect_false('make RTAI=0 -j4;', makerr1, 1500) + oai.send_expect_false('make RTAI=0 -j4' + tee, makerr1, 1500) oai.send('cp ./oaisim ./oaisim.rel8.rf;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -122,10 +128,11 @@ def execute(oai, user, pw, logfile): test = '04' name = 'Compile oai.rel8.phy.dlsim.make' conf = 'make dlsim' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = 'check the compilation errors for dlsim in $OPENAIR1_DIR/SIMULATION/LTE_PHY' oai.send('make clean;') oai.send('rm -f ./dlsim.rel8;') - oai.send_expect_false('make dlsim -j4;', makerr1, 1500) + oai.send_expect_false('make dlsim -j4' + tee, makerr1, 1500) oai.send('cp ./dlsim ./dlsim.rel8;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -136,10 +143,11 @@ def execute(oai, user, pw, logfile): test = '05' name = 'Compile oai.rel8.phy.ulsim.make' conf = 'make ulsim' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = 'check the compilation errors for dlsim in $OPENAIR1_DIR/SIMULATION/LTE_PHY' oai.send('make clean;') oai.send('rm -f ./ulsim.rel8;') - oai.send_expect_false('make ulsim -j4;', makerr1, 1500) + oai.send_expect_false('make ulsim -j4' + tee, makerr1, 1500) oai.send('cp ./ulsim ./ulsim.rel8;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -153,12 +161,13 @@ def execute(oai, user, pw, logfile): test = '06' name = 'Compile oai.rel10.make' conf = 'make Rel10=1' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = 'check the compilation errors for Rel10' oai.send('make clean;') oai.send('make cleanall;') oai.send('make cleanasn1;') oai.send('rm -f ./oaisim.rel10;') - oai.send_expect_false('make Rel10=1 -j4;', makerr1, 1500) + oai.send_expect_false('make Rel10=1 -j4' + tee, makerr1, 1500) oai.send('cp ./oaisim ./oaisim.rel10;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -169,12 +178,13 @@ def execute(oai, user, pw, logfile): #test = '07' #name = 'Compile oai.rel8.cellular.eNB.make' #conf = 'make rrc_cellular=1 eNB_flag=1' + #tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' #diag = 'check the compilation errors for eNB/RG RRC Cellular' #oai.send('make clean;') #oai.send('make cleanall;') #oai.send('make cleanasn1;') #oai.send('rm -f ./oaisim.rel8.cellular.rg;') - #oai.send_expect_false('make rrc_cellular=1 eNB_flag=1 -j4;', makerr1, 1500) + #oai.send_expect_false('make rrc_cellular=1 eNB_flag=1 -j4' + tee, makerr1, 1500) #oai.send('cp ./oaisim ./oaisim.rel8.cellular.rg;') #except log.err, e: #log.fail(case, test, name, conf, e.value, diag, logfile) @@ -187,12 +197,13 @@ def execute(oai, user, pw, logfile): #test = '08' #name = 'Compile oai.rel8.cellular.UE.make' #conf = 'make rrc_cellular=1 UE_flag=1' + #tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' #diag = 'check the compilation errors for UE/MT RRC Cellular' #oai.send('make clean;') #oai.send('make cleanall;') #oai.send('make cleanasn1;') #oai.send('rm -f ./oaisim.rel8.cellular.mt;') - #oai.send_expect_false('make rrc_cellular=1 UE_flag=1 -j4;', makerr1, 1500) + #oai.send_expect_false('make rrc_cellular=1 UE_flag=1 -j4' + tee, makerr1, 1500) #oai.send('cp ./oaisim ./oaisim.rel8.cellular.mt;') #except log.err, e: #log.fail(case, test, name, conf, e.value, diag, logfile) @@ -205,13 +216,14 @@ def execute(oai, user, pw, logfile): #test = '09' #name = 'Compile oai.rel8.cellular.nas.eNB' #conf = 'make nas_sim_rg_cellular' + #tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' #diag = 'check the compilation errors for NAS SIM RRC Cellular (node RG)' #oai.send('make clean;') #oai.send('make cleanall;') #oai.send('make cleanasn1;') #oai.send('make cleancell') #oai.send('rm -f ./nas_sim_rg_cellular;') - #oai.send_expect_false('make nas_sim_rg_cellular -j4;', makerr1, 1500) + #oai.send_expect_false('make nas_sim_rg_cellular -j4' + tee, makerr1, 1500) #except log.err, e: #log.fail(case, test, name, conf, e.value, diag, logfile) #log.skip(case, test, name, conf, '', '', logfile) @@ -223,13 +235,14 @@ def execute(oai, user, pw, logfile): #test = '10' #name = 'Compile oai.rel8.cellular.nas.UE' #conf = 'make nas_sim_mt_cellular' + #tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' #diag = 'check the compilation errors for NAS SIM RRC Cellular (node MT)' #oai.send('make clean;') #oai.send('make cleanall;') #oai.send('make cleanasn1;') #oai.send('make cleancell') #oai.send('rm -f ./nas_sim_mt_cellular;') - #oai.send_expect_false('make nas_sim_mt_cellular -j4;', makerr1, 1500) + #oai.send_expect_false('make nas_sim_mt_cellular -j4' + tee, makerr1, 1500) #except log.err, e: #log.fail(case, test, name, conf, e.value, diag, logfile) #log.skip(case, test, name, conf, '', '', logfile) @@ -241,12 +254,13 @@ def execute(oai, user, pw, logfile): test = '11' name = 'Compile oai.rel8.itti.make' conf = 'make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel8=1' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = 'check the compilation errors for ITTI Rel8' oai.send('make clean;') oai.send('make cleanall;') oai.send('make cleanasn1;') oai.send('rm -f ./oaisim.rel8.itti;') - oai.send_expect_false('make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel8=1 -j4;', makerr1, 1500) + oai.send_expect_false('make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel8=1 -j4' + tee, makerr1, 1500) oai.send('cp ./oaisim ./oaisim.rel8.itti;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -256,12 +270,13 @@ def execute(oai, user, pw, logfile): test = '12' name = 'Compile oai.rel10.itti.make' conf = 'make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel10=1' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt;' diag = 'check the compilation errors for ITTI Rel10' oai.send('make clean;') oai.send('make cleanall;') oai.send('make cleanasn1;') oai.send('rm -f ./oaisim.rel10.itti;') - oai.send_expect_false('make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel10=1 -j4;', makerr1, 1500) + oai.send_expect_false('make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel10=1 -j4' + tee, makerr1, 1500) oai.send('cp ./oaisim ./oaisim.rel10.itti;') except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) diff --git a/targets/TEST/OAI/case02.py b/targets/TEST/OAI/case02.py index 4f585543b108cb7a6dc863be40903eeb046f44d4..7cf7d7c83d0656d40008ef183b92b702c5036c47 100644 --- a/targets/TEST/OAI/case02.py +++ b/targets/TEST/OAI/case02.py @@ -47,17 +47,22 @@ NUM_TRIALS=3 def execute(oai, user, pw, logfile): case = '02' + logs_dir = 'pre-ci-logs'; oai.send('cd $OPENAIR_TARGETS;') oai.send('cd SIMU/USER;') + oai.send('mkdir ' + logs_dir + ';') try: test = '00' name = 'Run oai.rel8.sf' conf = '-a -A AWGN -n 100' diag = 'OAI is not running normally (Segmentation fault / Exiting / FATAL), debugging might be needed' - oai.send_expect_false('./oaisim.rel8 ' + conf, 'Segmentation fault', 30) - oai.send_expect_false('./oaisim.rel8 ' + conf, 'Exiting', 30) - oai.send_expect_false('./oaisim.rel8 ' + conf, 'FATAL', 30) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_1.txt' + oai.send_expect_false('./oaisim.rel8 ' + conf + tee, 'Segmentation fault', 30) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_2.txt' + oai.send_expect_false('./oaisim.rel8 ' + conf + tee, 'Exiting', 30) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_3.txt' + oai.send_expect_false('./oaisim.rel8 ' + conf + tee, 'FATAL', 30) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -68,6 +73,7 @@ def execute(oai, user, pw, logfile): test = '01' name = 'Run oai.rel8.err' conf = '-a -A AWGN -n 100' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt' diag = 'Error(s) found in the execution, check the execution logs' oai.send_expect_false('./oaisim.rel8 ' + conf, '[E]', 30) @@ -83,7 +89,8 @@ def execute(oai, user, pw, logfile): 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) - oai.send_expect('./oaisim.rel8 ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel8 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -97,13 +104,14 @@ def execute(oai, user, pw, logfile): for i in range(NUM_UE) : for j in range(NUM_eNB) : conf = '-a -A AWGN -u' + str(i+1) +' -b'+ str(j+1) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' if user == 'root' : oai.send_nowait('./oaisim.rel8.nas ' + conf + ' > /dev/null &') else : oai.send_nowait('echo '+pw+ ' | sudo -S -E ./oaisim.rel8.nas ' + conf + ' > /dev/null &') time.sleep(2) for k in range(NUM_TRIALS) : - oai.send_expect('ping 10.0.'+str(j+1)+'.'+str(NUM_eNB+i+1) + ' -c ' + str(random.randint(2, 10))+ ' -s ' + str(random.randint(128, 1500)), ' 0% packet loss', 300) + oai.send_expect('ping 10.0.'+str(j+1)+'.'+str(NUM_eNB+i+1) + ' -c ' + str(random.randint(2, 10))+ ' -s ' + str(random.randint(128, 1500)) + tee, ' 0% packet loss', 300) if user == 'root' : oai.send('pkill oaisim;') oai.send('pkill oaisim.rel8.nas;') @@ -127,7 +135,8 @@ def execute(oai, user, pw, logfile): for i in range(NUM_UE) : for j in range(NUM_eNB) : conf = '-A AWGN -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -s15 -x1' - oai.send_expect('./oaisim.rel8 ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel8 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -140,7 +149,8 @@ def execute(oai, user, pw, logfile): for i in range(NUM_UE) : for j in range(NUM_eNB) : conf = '-A AWGN -F -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -s15 -x1' - oai.send_expect('./oaisim.rel8 ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel8 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -153,7 +163,8 @@ def execute(oai, user, pw, logfile): 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) - oai.send_expect('./oaisim.rel8.itti ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel8.itti ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: diff --git a/targets/TEST/OAI/case03.py b/targets/TEST/OAI/case03.py index b92cc2f3185a60a6d7fb6ca661f8c79ffee431f4..2bc0b4c42937a227d66eb42c7934585fc013dd07 100644 --- a/targets/TEST/OAI/case03.py +++ b/targets/TEST/OAI/case03.py @@ -47,20 +47,25 @@ NUM_TRIALS=3 def execute(oai, user, pw, logfile): case = '03' + logs_dir = 'pre-ci-logs'; oai.send('cd $OPENAIR_TARGETS;') oai.send('cd SIMU/USER;') + oai.send('mkdir ' + logs_dir + ';') try: test = '00' name = 'Run oai.rel10.sf' conf = '-a -A AWGN -n 100' diag = 'OAI is not running normally (Segmentation fault / Exiting / FATAL), debugging might be needed' - oai.send_expect_false('./oaisim.rel10 ' + conf, 'Segmentation fault', 30) - oai.send_expect_false('./oaisim.rel10 ' + conf, 'Exiting', 30) - oai.send_expect_false('./oaisim.rel10 ' + conf, 'FATAL', 30) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_1.txt' + oai.send_expect_false('./oaisim.rel10 ' + conf + tee, 'Segmentation fault', 30) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_2.txt' + oai.send_expect_false('./oaisim.rel10 ' + conf + tee, 'Exiting', 30) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_3.txt' + oai.send_expect_false('./oaisim.rel10 ' + conf + tee, 'FATAL', 30) except log.err, e: - log.fail(case, test, name, conf, e.value, diag, logfile) + log.fail(case, test, name, conf, e.value, di69ag, logfile) else: log.ok(case, test, name, conf, '', logfile) @@ -68,8 +73,9 @@ def execute(oai, user, pw, logfile): test = '01' name = 'Run oai.rel10.err' conf = '-a -A AWGN -n 100' + tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt' diag = 'Error(s) found in the execution, check the execution logs' - oai.send_expect_false('./oaisim.rel10 ' + conf, '[E]', 30) + oai.send_expect_false('./oaisim.rel10 ' + conf + tee, '[E]', 30) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) @@ -83,7 +89,8 @@ def execute(oai, user, pw, logfile): for i in range(NUM_UE) : for j in range(NUM_eNB) : conf = '-a -A AWGN -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) - oai.send_expect('./oaisim.rel10 ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -95,8 +102,9 @@ def execute(oai, user, pw, logfile): 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 AWGN -s 15 -x 1 -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) - oai.send_expect('./oaisim.rel10 ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) + conf = '-A AWGN -s 15 -x 1 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -108,8 +116,9 @@ def execute(oai, user, pw, logfile): diag = 'RRC procedure is not finished completely in FDD mode, 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 AWGN -F -s 15 -x 1 -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) - oai.send_expect('./oaisim.rel10 ' + conf, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) + conf = '-A AWGN -F -s 15 -x 1 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -122,7 +131,8 @@ def execute(oai, user, pw, logfile): 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) - oai.send_expect('./oaisim.rel10 ' + conf, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -135,7 +145,8 @@ def execute(oai, user, pw, logfile): for i in range(NUM_UE) : for j in range(NUM_eNB) : conf = '-A AWGN -s 15 -x 1 -T mscbr -Q3 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1) - oai.send_expect('./oaisim.rel10 ' + conf, ' Received a multicast packet', (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received a multicast packet', (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -148,7 +159,8 @@ def execute(oai, user, pw, logfile): for i in range(NUM_UE) : for j in range(NUM_eNB) : conf = '-A AWGN -F -s 15 -x 1 -T mscbr -Q3 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1) - oai.send_expect('./oaisim.rel10 ' + conf, ' Received a multicast packet', (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received a multicast packet', (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: @@ -159,7 +171,8 @@ def execute(oai, user, pw, logfile): # name = 'Run oai.rel10.phy.eMBMS.Relay.OTG.fdd' # diag = 'eMBMS multicast/broadcast DF relaying is not working properly in fdd mode, make sure that the SIB13/MCCH/MTCH have been correclty received by UEs' # conf = '-c43 -F -T mbvbr -Q4 -j1 -n120' - # oai.send_expect('./oaisim.rel10 ' + conf, ' MTCH for sync area 1', 100) + # tee = ' | tee ' + logs_dir + '/log_' + case + test + '.txt' + # oai.send_expect('./oaisim.rel10 ' + conf + tee, ' MTCH for sync area 1', 100) # except log.err, e: # log.fail(case, test, name, conf, e.value, diag, logfile) # else: @@ -172,7 +185,8 @@ def execute(oai, user, pw, logfile): 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) - oai.send_expect('./oaisim.rel10.itti ' + conf, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 100) + tee = ' | tee ' + logs_dir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt' + oai.send_expect('./oaisim.rel10.itti ' + conf + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 100) except log.err, e: log.fail(case, test, name, conf, e.value, diag, logfile) else: