- Fix recent issues with ping in pre-ci
- Corrected PDCP layer to manage more than one UE correctly * use eNB_id, UE_id as identifiers for connections * splitted UE/eNB data * Use the real rb_id for index in array (instead of the one used for communication with RLC/IP driver pre-ci OK, except for the random issue related to Msg3 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4730 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Cedric Roux
+17
-96
@@ -164,6 +164,22 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06'
|
||||
name = 'Compile oai.rel8.itti.make'
|
||||
conf = 'make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel8=1'
|
||||
trace = logdir + '/log_' + case + test + '.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
diag = 'check the compilation errors for ITTI Rel8'
|
||||
oai.send('make clean;')
|
||||
oai.send('rm -f ./oaisim.rel8.itti;')
|
||||
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,trace)
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
try:
|
||||
test = '07'
|
||||
name = 'Compile oai.rel10.make'
|
||||
conf = 'make Rel10=1'
|
||||
trace = logdir + '/log_' + case + test + '.txt;'
|
||||
@@ -180,109 +196,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
#try:
|
||||
#test = '07'
|
||||
#name = 'Compile oai.rel8.cellular.eNB.make'
|
||||
#conf = 'make rrc_cellular=1 eNB_flag=1'
|
||||
#tee = ' | tee ' + logdir + '/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' + 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)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
#else:
|
||||
#log.ok(case, test, name, conf, '', logfile)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
|
||||
#try:
|
||||
#test = '08'
|
||||
#name = 'Compile oai.rel8.cellular.UE.make'
|
||||
#conf = 'make rrc_cellular=1 UE_flag=1'
|
||||
#tee = ' | tee ' + logdir + '/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' + 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)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
#else:
|
||||
#log.ok(case, test, name, conf, '', logfile)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
|
||||
#try:
|
||||
#test = '09'
|
||||
#name = 'Compile oai.rel8.cellular.nas.eNB'
|
||||
#conf = 'make nas_sim_rg_cellular'
|
||||
#tee = ' | tee ' + logdir + '/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' + tee, makerr1, 1500)
|
||||
#except log.err, e:
|
||||
#log.fail(case, test, name, conf, e.value, diag, logfile)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
#else:
|
||||
#log.ok(case, test, name, conf, '', logfile)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
|
||||
#try:
|
||||
#test = '10'
|
||||
#name = 'Compile oai.rel8.cellular.nas.UE'
|
||||
#conf = 'make nas_sim_mt_cellular'
|
||||
#tee = ' | tee ' + logdir + '/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' + tee, makerr1, 1500)
|
||||
#except log.err, e:
|
||||
#log.fail(case, test, name, conf, e.value, diag, logfile)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
#else:
|
||||
#log.ok(case, test, name, conf, '', logfile)
|
||||
#log.skip(case, test, name, conf, '', '', logfile)
|
||||
|
||||
try:
|
||||
test = '11'
|
||||
name = 'Compile oai.rel8.itti.make'
|
||||
conf = 'make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel8=1'
|
||||
trace = logdir + '/log_' + case + test + '.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
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' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.itti;')
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
try:
|
||||
test = '12'
|
||||
test = '08'
|
||||
name = 'Compile oai.rel10.itti.make'
|
||||
conf = 'make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 Rel10=1'
|
||||
trace = logdir + '/log_' + case + test + '.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
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' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel10.itti;')
|
||||
|
||||
+17
-14
@@ -103,29 +103,32 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
test = '03'
|
||||
name = 'Run oai.rel8.abs.ping'
|
||||
diag = 'Data-plane is not working normally, check the OAI protocol stack, OAI driver, and normal operation of the OS'
|
||||
|
||||
oai.driver(oai,user,pw)
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-a -A AWGN -l7 -u' + str(i+1) +' -b'+ str(j+1)
|
||||
|
||||
for i in range(NUM_eNB) :
|
||||
for j in range(NUM_UE) :
|
||||
conf = '-a -A AWGN -l6 -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace_ping = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '_ping.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
tee_ping = ' 2>&1 | tee ' + trace_ping
|
||||
tee = ' 2>&1 > ' + trace
|
||||
|
||||
if user == 'root' :
|
||||
oai.send_nowait('./oaisim.rel8.nas ' + conf + tee + ' &')
|
||||
oai.send('./oaisim.rel8.nas ' + conf + ' &')
|
||||
else :
|
||||
oai.send_nowait('echo '+pw+ ' | sudo -S -E ./oaisim.rel8.nas ' + conf + tee + ' &')
|
||||
time.sleep(2)
|
||||
oai.send('echo '+pw+ ' | sudo -S -E ./oaisim.rel8.nas ' + conf + tee + ' &')
|
||||
time.sleep(20)
|
||||
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)) + tee_ping, ' 0% packet loss', 300)
|
||||
trace_ping = logdir + '/log_' + case + test + '_' + str(i) + str(j) + str(k) + '_ping.txt'
|
||||
tee_ping = ' 2>&1 | tee ' + trace_ping
|
||||
|
||||
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_ping, ' 0% packet loss', 20)
|
||||
if user == 'root' :
|
||||
oai.send('pkill oaisim;')
|
||||
oai.send('pkill oaisim.rel8.nas;')
|
||||
oai.send('pkill oaisim.rel8.nas;')
|
||||
else :
|
||||
oai.send_nowait('echo '+pw+ ' | sudo -S pkill oaisim ;')
|
||||
oai.send_nowait('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas;')
|
||||
oai.send('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas;')
|
||||
time.sleep(1)
|
||||
oai.send_nowait('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas;')
|
||||
oai.send('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas;')
|
||||
|
||||
oai.rm_driver(oai,user,pw)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user