* Compile Rel10 with component carrier
* Add VCD timing for PDCP, RLC, and MAC * Update MAC-PHY interface * update eNB MAC DLSCH scheduler and preprocessor with component carrier * Add test case for dlsim performance git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5708 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
@@ -63,12 +63,12 @@ SHARED_DEPENDENCIES += $(ITTI_MESSAGES_H)
|
||||
endif
|
||||
|
||||
ifdef USE_MME
|
||||
LIBS += $(X2AP_OBJ_DIR)/libx2ap.a
|
||||
#LIBS += $(X2AP_OBJ_DIR)/libx2ap.a
|
||||
LIBS += $(UE_NAS_OBJ_DIR)/libuenas.a $(SECU_OBJ_DIR)/libsecu.a
|
||||
LIBS += $(S1AP_OBJ_DIR)/libs1ap.a $(SCTP_OBJ_DIR)/libsctp.a -lsctp -lcrypt
|
||||
LIBS += $(UDP_OBJ_DIR)/libudp.a $(GTPV1U_OBJ_DIR)/libgtpv1u.a
|
||||
SHARED_DEPENDENCIES += $(UE_NAS_OBJ_DIR)/libuenas.a $(SECU_OBJ_DIR)/libsecu.a $(X2AP_OBJ_DIR)/libx2ap.a $(S1AP_OBJ_DIR)/libs1ap.a $(SCTP_OBJ_DIR)/libsctp.a $(UDP_OBJ_DIR)/libudp.a $(GTPV1U_OBJ_DIR)/libgtpv1u.a
|
||||
#SHARED_DEPENDENCIES += $(UE_NAS_OBJ_DIR)/libuenas.a $(SECU_OBJ_DIR)/libsecu.a $(S1AP_OBJ_DIR)/libs1ap.a $(SCTP_OBJ_DIR)/libsctp.a $(UDP_OBJ_DIR)/libudp.a $(GTPV1U_OBJ_DIR)/libgtpv1u.a
|
||||
#SHARED_DEPENDENCIES += $(UE_NAS_OBJ_DIR)/libuenas.a $(SECU_OBJ_DIR)/libsecu.a $(X2AP_OBJ_DIR)/libx2ap.a $(S1AP_OBJ_DIR)/libs1ap.a $(SCTP_OBJ_DIR)/libsctp.a $(UDP_OBJ_DIR)/libudp.a $(GTPV1U_OBJ_DIR)/libgtpv1u.a
|
||||
SHARED_DEPENDENCIES += $(UE_NAS_OBJ_DIR)/libuenas.a $(SECU_OBJ_DIR)/libsecu.a $(S1AP_OBJ_DIR)/libs1ap.a $(SCTP_OBJ_DIR)/libsctp.a $(UDP_OBJ_DIR)/libudp.a $(GTPV1U_OBJ_DIR)/libgtpv1u.a
|
||||
|
||||
COMMON_CFLAGS += -DLOG_NO_THREAD
|
||||
#-DEMIT_ASN_DEBUG
|
||||
|
||||
@@ -18,7 +18,7 @@ CPUFLAGS += $(shell if grep --silent -w sse4 /proc/cpuinfo ; then echo "-msse4"
|
||||
linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
|
||||
|
||||
ifdef DEBUG
|
||||
CFLAGS += -g -ggdb -DDEBUG_PHY
|
||||
CFLAGS += -g -ggdb -DDEBUG_PHY -DDEBUG_MEAS
|
||||
else
|
||||
CFLAGE += -O2
|
||||
endif
|
||||
|
||||
@@ -335,115 +335,114 @@ void update_mac(Event_t event) {
|
||||
LOG_I(EMU,"A NEW MAC MODEL\n");
|
||||
int i = 0;
|
||||
UE_list_t *UE_list;
|
||||
int enb_module_id=0;
|
||||
int cc_id =0;
|
||||
eNB_MAC_INST *eNB_mac_inst = get_eNB_mac_inst(enb_module_id);
|
||||
OAI_Emulation *oai_emulation = get_OAI_emulation();
|
||||
if(event.optype == READ)
|
||||
{
|
||||
|
||||
eNB_MAC_INST *eNB_mac_inst;
|
||||
eNB_mac_inst = get_eNB_mac_inst();
|
||||
printf("eNB_stats\n\n\n");
|
||||
|
||||
printf("eNB_stats\n\n\n");
|
||||
if(event.key==NULL)
|
||||
{
|
||||
|
||||
LOG_I(EMU,"num_dlactive_UEs :");
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats.num_dlactive_UEs);
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats[cc_id].num_dlactive_UEs);
|
||||
LOG_I(EMU,"available_prbs :");
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats.available_prbs);
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats[cc_id].available_prbs);
|
||||
LOG_I(EMU,"total_available_prbs :");
|
||||
printf("%" PRIu32 "\n", eNB_mac_inst->eNB_stats.total_available_prbs);
|
||||
printf("%" PRIu32 "\n", eNB_mac_inst->eNB_stats[cc_id].total_available_prbs);
|
||||
LOG_I(EMU,"available_ncces :");
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats.available_ncces);
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats[cc_id].available_ncces);
|
||||
LOG_I(EMU,"dlsch_bitrate :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.dlsch_bitrate);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].dlsch_bitrate);
|
||||
LOG_I(EMU,"dlsch_bytes_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.dlsch_bytes_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].dlsch_bytes_tx);
|
||||
LOG_I(EMU,"dlsch_pdus_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.dlsch_pdus_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].dlsch_pdus_tx);
|
||||
LOG_I(EMU,"total_dlsch_bitrate :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.total_dlsch_bitrate);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].total_dlsch_bitrate);
|
||||
LOG_I(EMU,"total_dlsch_bytes_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.total_dlsch_bytes_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].total_dlsch_bytes_tx);
|
||||
LOG_I(EMU,"total_dlsch_pdus_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.total_dlsch_pdus_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].total_dlsch_pdus_tx);
|
||||
LOG_I(EMU,"ulsch_bitrate :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.ulsch_bitrate);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].ulsch_bitrate);
|
||||
LOG_I(EMU,"ulsch_bytes_rx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.ulsch_bytes_rx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].ulsch_bytes_rx);
|
||||
LOG_I(EMU,"ulsch_pdus_rx :");
|
||||
printf("%" PRIu64 "\n",eNB_mac_inst->eNB_stats.ulsch_pdus_rx);
|
||||
printf("%" PRIu64 "\n",eNB_mac_inst->eNB_stats[cc_id].ulsch_pdus_rx);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "num_dlactive_UEs"))
|
||||
{
|
||||
LOG_I(EMU,"num_dlactive_UEs :");
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats.num_dlactive_UEs);
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats[cc_id].num_dlactive_UEs);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "available_prbs"))
|
||||
{
|
||||
LOG_I(EMU,"available_prbs :");
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats.available_prbs);
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats[cc_id].available_prbs);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "total_available_prbs"))
|
||||
{
|
||||
LOG_I(EMU,"total_available_prbs :");
|
||||
printf("%" PRIu32 "\n", eNB_mac_inst->eNB_stats.total_available_prbs);
|
||||
printf("%" PRIu32 "\n", eNB_mac_inst->eNB_stats[cc_id].total_available_prbs);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "available_ncces"))
|
||||
{
|
||||
LOG_I(EMU,"available_ncces :");
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats.available_ncces);
|
||||
printf("%" PRIu16 "\n",eNB_mac_inst->eNB_stats[cc_id].available_ncces);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "dlsch_bitrate"))
|
||||
{
|
||||
LOG_I(EMU,"dlsch_bitrate :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.dlsch_bitrate);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].dlsch_bitrate);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "dlsch_bytes_tx"))
|
||||
{
|
||||
LOG_I(EMU,"dlsch_bytes_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.dlsch_bytes_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].dlsch_bytes_tx);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "dlsch_pdus_tx"))
|
||||
{
|
||||
LOG_I(EMU,"dlsch_pdus_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.dlsch_pdus_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].dlsch_pdus_tx);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "total_dlsch_bitrate"))
|
||||
{
|
||||
LOG_I(EMU,"total_dlsch_bitrate :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.total_dlsch_bitrate);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].total_dlsch_bitrate);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "total_dlsch_bytes_tx"))
|
||||
{
|
||||
LOG_I(EMU,"total_dlsch_bytes_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.total_dlsch_bytes_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].total_dlsch_bytes_tx);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "total_dlsch_pdus_tx"))
|
||||
{
|
||||
LOG_I(EMU,"total_dlsch_pdus_tx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.total_dlsch_pdus_tx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].total_dlsch_pdus_tx);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "ulsch_bitrate"))
|
||||
{
|
||||
LOG_I(EMU,"ulsch_bitrate :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.ulsch_bitrate);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].ulsch_bitrate);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "ulsch_bytes_rx"))
|
||||
{
|
||||
LOG_I(EMU,"ulsch_bytes_rx :");
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats.ulsch_bytes_rx);
|
||||
printf("%" PRIu32 "\n",eNB_mac_inst->eNB_stats[cc_id].ulsch_bytes_rx);
|
||||
}
|
||||
else if(!strcmp((char *) event.key, "ulsch_pdus_rx"))
|
||||
{
|
||||
LOG_I(EMU,"ulsch_pdus_rx :");
|
||||
printf("%" PRIu64 "\n",eNB_mac_inst->eNB_stats.ulsch_pdus_rx);
|
||||
printf("%" PRIu64 "\n",eNB_mac_inst->eNB_stats[cc_id].ulsch_pdus_rx);
|
||||
}
|
||||
}
|
||||
else if(event.optype == WRITE)
|
||||
{
|
||||
LOG_I(EMU,"WRITE OPERATION \n");
|
||||
eNB_MAC_INST *eNB_mac_inst;
|
||||
eNB_mac_inst = get_eNB_mac_inst();
|
||||
OAI_Emulation *oai_emulation;
|
||||
oai_emulation = get_OAI_emulation();
|
||||
|
||||
|
||||
if(event.key==NULL && event.value!=NULL)
|
||||
{
|
||||
|
||||
@@ -720,8 +720,9 @@ void *l2l1_task(void *args_p) {
|
||||
|
||||
#ifdef PRINT_STATS
|
||||
if(last_slot==9 && frame%10==0)
|
||||
if(eNB_avg_thr)
|
||||
fprintf(eNB_avg_thr,"%d %d\n",PHY_vars_eNB_g[eNB_inst][0]->frame,(PHY_vars_eNB_g[eNB_inst][0]->total_system_throughput)/((PHY_vars_eNB_g[eNB_inst][0]->frame+1)*10));
|
||||
if(eNB_avg_thr)
|
||||
fprintf(eNB_avg_thr,"%d %d\n",PHY_vars_eNB_g[eNB_inst]->proc[slot>>1].frame_tx,
|
||||
(PHY_vars_eNB_g[eNB_inst]->total_system_throughput)/((PHY_vars_eNB_g[eNB_inst]->proc[slot>>1].frame_tx+1)*10));
|
||||
if (eNB_stats[eNB_inst]) {
|
||||
len = dump_eNB_stats(PHY_vars_eNB_g[eNB_inst][0], stats_buffer, 0);
|
||||
rewind (eNB_stats[eNB_inst]);
|
||||
@@ -1585,9 +1586,10 @@ void oai_shutdown(void) {
|
||||
|
||||
LOG_N(EMU, ">>>>>>>>>>>>>>>>>>>>>>>>>>> OAIEMU shutdown <<<<<<<<<<<<<<<<<<<<<<<<<<\n\n");
|
||||
}
|
||||
eNB_MAC_INST* get_eNB_mac_inst()
|
||||
|
||||
eNB_MAC_INST* get_eNB_mac_inst(module_id_t module_idP)
|
||||
{
|
||||
return eNB_mac_inst;
|
||||
return (&eNB_mac_inst[module_idP]);
|
||||
}
|
||||
|
||||
OAI_Emulation* get_OAI_emulation()
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "UTIL/OMV/structures.h"
|
||||
#endif
|
||||
|
||||
eNB_MAC_INST* get_eNB_mac_inst(void);
|
||||
eNB_MAC_INST* get_eNB_mac_inst(module_id_t module_idP);
|
||||
OAI_Emulation* get_OAI_emulation(void);
|
||||
void init_channel_vars(LTE_DL_FRAME_PARMS *frame_parms, double ***s_re,double ***s_im,double ***r_re,double ***r_im,double ***r_re0,double ***r_im0);
|
||||
|
||||
|
||||
@@ -63,29 +63,7 @@
|
||||
# include "intertask_interface_init.h"
|
||||
#endif
|
||||
|
||||
mapping log_level_names[] =
|
||||
{
|
||||
{"emerg", LOG_EMERG},
|
||||
{"alert", LOG_ALERT},
|
||||
{"crit", LOG_CRIT},
|
||||
{"error", LOG_ERR},
|
||||
{"warn", LOG_WARNING},
|
||||
{"notice", LOG_NOTICE},
|
||||
{"info", LOG_INFO},
|
||||
{"debug", LOG_DEBUG},
|
||||
{"file", LOG_FILE},
|
||||
{"trace", LOG_TRACE},
|
||||
{NULL, -1}
|
||||
};
|
||||
mapping log_verbosity_names[] =
|
||||
{
|
||||
{"none", 0x0},
|
||||
{"low", 0x5},
|
||||
{"medium", 0x15},
|
||||
{"high", 0x35},
|
||||
{"full", 0x75},
|
||||
{NULL, -1}
|
||||
};
|
||||
|
||||
mapping omg_model_names[] =
|
||||
{
|
||||
{"STATIC", STATIC},
|
||||
|
||||
+32
-22
@@ -30,7 +30,7 @@
|
||||
# \file case01.py
|
||||
# \brief test case 01 for OAI: compilations
|
||||
# \author Navid Nikaein
|
||||
# \date 2013
|
||||
# \date 2013 - 2014
|
||||
# \version 0.1
|
||||
# @ingroup _test
|
||||
|
||||
@@ -41,9 +41,10 @@ import core
|
||||
makerr1 = '***'
|
||||
makerr2 = 'Error 1'
|
||||
|
||||
def execute(oai, user, pw, logfile,logdir):
|
||||
def execute(oai, user, pw, host, logfile,logdir,debug):
|
||||
|
||||
case = '01'
|
||||
rv = 1
|
||||
oai.send('cd $OPENAIR_TARGETS;')
|
||||
|
||||
try:
|
||||
@@ -75,11 +76,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
diag = "check the compilation errors for oai"
|
||||
oai.send('make cleanall;')
|
||||
oai.send('make cleanasn1;')
|
||||
oai.send('rm -f ./oaisim.rel8;')
|
||||
oai.send('rm -f ./oaisim.rel8.'+host)
|
||||
oai.send_expect_false('make -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel8;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
@@ -89,7 +91,7 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
conf = 'make nasmesh_fix; make NAS=1'
|
||||
diag = 'check the compilation errors for oai and nas driver'
|
||||
oai.send('make cleanall;')
|
||||
oai.send('rm -f ./oaisim.rel8.nas;')
|
||||
oai.send('rm -f ./oaisim.rel8.nas'+host)
|
||||
oai.send('rm -f ./nasmesh;')
|
||||
oai.send('make nasmesh_clean;')
|
||||
trace = logdir + '/log_' + case + test + '_1.txt;'
|
||||
@@ -98,10 +100,11 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
trace = logdir + '/log_' + case + test + '_2.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('make NAS=1 -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.nas;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.nas.'+host)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
@@ -116,9 +119,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
diag = 'check the compilation errors for Rel8'
|
||||
oai.send('make cleanall;')
|
||||
oai.send('rm -f ./oaisim.rel8.rf;')
|
||||
oai.send('rm -f ./oaisim.rel8.rf.'+host)
|
||||
oai.send_expect_false('make RTAI=0 -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.rf;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.rf.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -135,11 +138,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
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('rm -f ./dlsim.rel8.'+host)
|
||||
oai.send_expect_false('make dlsim -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./dlsim ./dlsim.rel8;')
|
||||
oai.send('cp ./dlsim ./dlsim.rel8.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
@@ -151,11 +155,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
diag = 'check the compilation errors for ulsim in $OPENAIR1_DIR/SIMULATION/LTE_PHY'
|
||||
oai.send('make clean;')
|
||||
oai.send('rm -f ./ulsim.rel8;')
|
||||
oai.send('rm -f ./ulsim.rel8.'+host)
|
||||
oai.send_expect_false('make ulsim -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./ulsim ./ulsim.rel8;')
|
||||
oai.send('cp ./ulsim ./ulsim.rel8.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
@@ -170,11 +175,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
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('rm -f ./oaisim.rel8.itti.'+host)
|
||||
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;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.itti.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
@@ -188,11 +194,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
oai.send('make clean;')
|
||||
oai.send('make cleanall;')
|
||||
oai.send('make cleanasn1;')
|
||||
oai.send('rm -f ./oaisim.rel10;')
|
||||
oai.send('rm -f ./oaisim.rel10.'+host)
|
||||
oai.send_expect_false('make RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel10;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel10.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
@@ -204,11 +211,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
diag = 'check the compilation errors for ITTI Rel10'
|
||||
oai.send('make cleanall;')
|
||||
oai.send('rm -f ./oaisim.rel10.itti;')
|
||||
oai.send('rm -f ./oaisim.rel10.itti.'+host)
|
||||
oai.send_expect_false('make DISABLE_XER_PRINT=1 ENABLE_ITTI=1 RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel10.itti;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel10.itti.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
rv = 0
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
try:
|
||||
@@ -239,9 +247,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
oai.send('make clean;')
|
||||
oai.send('make cleanall;')
|
||||
oai.send('make cleanasn1;')
|
||||
oai.send('rm -f ./oaisim.rel8.itti.ral;')
|
||||
oai.send('rm -f ./oaisim.rel8.itti.ral.'+host)
|
||||
oai.send_expect_false('make DISABLE_XER_PRINT=1 NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 RLC_STOP_ON_LOST_PDU=1 Rel8=1 -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.itti.ral;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel8.itti.ral.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -256,12 +264,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
oai.send('make clean;')
|
||||
oai.send('make cleanall;')
|
||||
oai.send('make cleanasn1;')
|
||||
oai.send('rm -f ./oaisim.rel10.itti.ral;')
|
||||
oai.send('rm -f ./oaisim.rel10.itti.ral.'+host)
|
||||
oai.send_expect_false('make DISABLE_XER_PRINT=1 NAS=1 OAI_NW_DRIVER_TYPE_ETHERNET=1 ENABLE_ITTI=1 USER_MODE=1 OPENAIR2=1 ENABLE_RAL=1 MIH_C_MEDIEVAL_EXTENSIONS=1 RLC_STOP_ON_LOST_PDU=1 Rel10=1 -j4' + tee, makerr1, 1500)
|
||||
oai.send('cp ./oaisim ./oaisim.rel10.itti.ral;')
|
||||
oai.send('cp ./oaisim ./oaisim.rel10.itti.ral.'+host)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
log.ok(case, test, name, conf, '', logfile)
|
||||
|
||||
return rv
|
||||
|
||||
|
||||
|
||||
+27
-27
@@ -44,7 +44,7 @@ NUM_UE=2
|
||||
NUM_eNB=1
|
||||
NUM_TRIALS=3
|
||||
|
||||
def execute(oai, user, pw, logfile,logdir):
|
||||
def execute(oai, user, pw, host, logfile,logdir,debug):
|
||||
|
||||
case = '02'
|
||||
oai.send('cd $OPENAIR_TARGETS;')
|
||||
@@ -55,15 +55,15 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
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'
|
||||
trace = logdir + '/log_' + case + test + '_1.txt;'
|
||||
trace = logdir + '/log_' + host + case + test + '_1.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./oaisim.rel8 ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + case + test + '_2.txt;'
|
||||
oai.send_expect_false('./oaisim.rel8.' + host + ' ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_2.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./oaisim.rel8 ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + case + test + '_3.txt;'
|
||||
oai.send_expect_false('./oaisim.rel8.' + host + ' ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_3.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./oaisim.rel8 ' + conf + tee, 'FATAL', 30)
|
||||
oai.send_expect_false('./oaisim.rel8.' + host + ' ' + conf + tee, 'FATAL', 30)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
@@ -74,10 +74,10 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
test = '01'
|
||||
name = 'Run oai.rel8.err'
|
||||
conf = '-a -A AWGN -n 100 -l7'
|
||||
trace = logdir + '/log_' + case + test + '_3.txt;'
|
||||
trace = logdir + '/log_' + host + case + test + '_3.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
diag = '[E] Error(s) found during the execution, check the execution logs'
|
||||
oai.send_expect_false('./oaisim.rel8 ' + conf, '[E]', 30)
|
||||
oai.send_expect_false('./oaisim.rel8.'+ host + ' ' + conf, '[E]', 30)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
@@ -91,9 +91,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-a -A AWGN -l7 -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel8 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 50)
|
||||
oai.send_expect('./oaisim.rel8.' + host + ' ' + 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,trace)
|
||||
else:
|
||||
@@ -109,26 +109,26 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_eNB) :
|
||||
for j in range(NUM_UE) :
|
||||
conf = '-a -A AWGN -l6 -u' + str(j+1) +' -b'+ str(i+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 > ' + trace
|
||||
|
||||
if user == 'root' :
|
||||
oai.send('./oaisim.rel8.nas ' + conf + ' &')
|
||||
oai.send('./oaisim.rel8.nas.' + host + ' ' + conf + ' &')
|
||||
else :
|
||||
oai.send('echo '+pw+ ' | sudo -S -E ./oaisim.rel8.nas ' + conf + tee + ' &')
|
||||
oai.send('echo '+pw+ ' | sudo -S -E ./oaisim.rel8.nas.'+ host + ' ' + conf + tee + ' &')
|
||||
time.sleep(20)
|
||||
for k in range(NUM_TRIALS) :
|
||||
trace_ping = logdir + '/log_' + case + test + '_' + str(i) + str(j) + str(k) + '_ping.txt'
|
||||
trace_ping = logdir + '/log_' + host + 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.rel8.nas;')
|
||||
oai.send('pkill oaisim.rel8.nas;')
|
||||
oai.send('pkill oaisim.rel8.nas.'+host)
|
||||
oai.send('pkill oaisim.rel8.nas.'+host)
|
||||
else :
|
||||
oai.send('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas;')
|
||||
oai.send('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas.'+host)
|
||||
time.sleep(1)
|
||||
oai.send('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas;')
|
||||
oai.send('echo '+pw+ ' | sudo -S pkill oaisim.rel8.nas.'+host)
|
||||
|
||||
oai.rm_driver(oai,user,pw)
|
||||
|
||||
@@ -144,9 +144,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -s 20 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -x1'
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel8 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel8.' + host + ' ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -159,9 +159,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -F -s 20 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -x1'
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel8 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel8.' + host + ' ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -173,12 +173,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
diag = 'RRC procedure is not finished completely, check the eNB config file (default is enb.sfr.sud.conf), in addition to the execution logs and trace BCCH, CCCH, and DCCH channels'
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
log_name = logdir + '/log_' + case + test + '_' + str(i) + str(j)
|
||||
log_name = logdir + '/log_' + host + case + test + '_' + str(i) + str(j)
|
||||
itti_name = log_name + '.log'
|
||||
trace_name = log_name + '.txt'
|
||||
conf = '-a -l7 -A AWGN --enb-conf ../../PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf -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.rel8.itti ' + conf
|
||||
command = './oaisim.rel8.itti.' + host + ' ' + 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:
|
||||
@@ -192,9 +192,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
name = 'Run oai.rel8.abs.ocg.otg'
|
||||
diag = 'Check the scenario if the tests 0202 and 0203 are passed.'
|
||||
conf = '-a -c26'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel8 ' + conf + tee, ' DL and UL loss rate below 10% ', 500)
|
||||
oai.send_expect('./oaisim.rel8.' + host + ' ' + conf + tee, ' DL and UL loss rate below 10% ', 500)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
|
||||
+23
-23
@@ -44,7 +44,7 @@ NUM_UE=2
|
||||
NUM_eNB=1
|
||||
NUM_TRIALS=3
|
||||
|
||||
def execute(oai, user, pw, logfile,logdir):
|
||||
def execute(oai, user, pw, host, logfile,logdir,debug):
|
||||
|
||||
case = '03'
|
||||
oai.send('cd $OPENAIR_TARGETS;')
|
||||
@@ -55,15 +55,15 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
name = 'Run oai.rel10.sf'
|
||||
conf = '-a -A AWGN -l7 -n 100'
|
||||
diag = 'OAI is not running normally (Segmentation fault / Exiting / FATAL), debugging might be needed'
|
||||
trace = logdir + '/log_' + case + test + '_1.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_1.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./oaisim.rel10 ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + case + test + '_2.txt'
|
||||
oai.send_expect_false('./oaisim.rel10.' + host + ' ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_2.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./oaisim.rel10 ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + case + test + '_3.txt'
|
||||
oai.send_expect_false('./oaisim.rel10.' + host + ' ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_3.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./oaisim.rel10 ' + conf + tee, 'FATAL', 30)
|
||||
oai.send_expect_false('./oaisim.rel10.' + host + ' ' + conf + tee, 'FATAL', 30)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
@@ -74,10 +74,10 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
test = '01'
|
||||
name = 'Run oai.rel10.err'
|
||||
conf = '-a -A AWGN -l7 -n 100'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
diag = 'Error(s) found in the execution, check the execution logs'
|
||||
oai.send_expect_false('./oaisim.rel10 ' + conf + tee, '[E]', 30)
|
||||
oai.send_expect_false('./oaisim.rel10.' + host + ' ' + conf + tee, '[E]', 30)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
@@ -91,9 +91,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-a -l7 -A AWGN -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 100)
|
||||
oai.send_expect('./oaisim.rel10.' + host + ' ' + 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,trace)
|
||||
else:
|
||||
@@ -106,9 +106,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -s20 -l7 -x 1 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel10.' + host + ' ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -121,9 +121,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -s20 -l7 -F -x 1 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel10.' + host + ' ' + conf + tee, ' Received RRCConnectionReconfigurationComplete from UE ' + str(i), (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -136,9 +136,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -l7 -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'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel10.' + host + ' ' + conf + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -151,9 +151,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -l7 -x 1 -T mscbr -Q3 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received a multicast packet', (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel10.' + host + ' ' + conf + tee, ' Received a multicast packet', (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -166,9 +166,9 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
conf = '-A AWGN -l7 -F -x 1 -T mscbr -Q3 -n' + str((i+1+j) * 100) + ' -u' + str(i+1) +' -b'+ str(j+1)
|
||||
trace = logdir + '/log_' + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
trace = logdir + '/log_' + host + case + test + '_' + str(i) + str(j) + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./oaisim.rel10 ' + conf + tee, ' Received a multicast packet', (i+1) * 200)
|
||||
oai.send_expect('./oaisim.rel10.' + host + ' ' + conf + tee, ' Received a multicast packet', (i+1) * 200)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -192,12 +192,12 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
diag = 'eMBMS procedure is not finished completely, check the eNB config file (enb.sfr.sud.conf), and make sure that the SIB13/MCCH have been correclty received by UEs'
|
||||
for i in range(NUM_UE) :
|
||||
for j in range(NUM_eNB) :
|
||||
log_name = logdir + '/log_' + case + test + '_' + str(i) + str(j)
|
||||
log_name = logdir + '/log_' + host + case + test + '_' + str(i) + str(j)
|
||||
itti_name = log_name + '.log'
|
||||
trace_name = log_name + '.txt'
|
||||
conf = '-A AWGN -l7 -x 1 -Q3 --enb-conf ../../PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf -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
|
||||
command = './oaisim.rel10.itti.' + host + ' ' + conf
|
||||
oai.send('echo ' + command + ' > ' + trace_name + ';')
|
||||
oai.send_expect(command + tee, ' Found MBSFNAreaConfiguration from eNB ' + str(j), (i+1) * 200)
|
||||
except log.err, e:
|
||||
|
||||
+53
-44
@@ -44,7 +44,7 @@ NUM_UE=2
|
||||
NUM_eNB=1
|
||||
NUM_TRIALS=3
|
||||
|
||||
def execute(oai, user, pw, logfile,logdir):
|
||||
def execute(oai, user, pw, host, logfile,logdir,debug):
|
||||
|
||||
case = '04'
|
||||
oai.send('cd $OPENAIR1_DIR;')
|
||||
@@ -52,18 +52,18 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '00'
|
||||
name = 'Run oai.dlsim.sanity'
|
||||
name = 'Perf oai.dlsim.sanity'
|
||||
conf = '-a -A AWGN -n 100'
|
||||
diag = 'dlsim is not running normally (Segmentation fault / Exiting / FATAL), debugging might be needed'
|
||||
trace = logdir + '/log_' + case + test + '_1.txt;'
|
||||
trace = logdir + '/log_' + host + case + test + '_1.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./dlsim.rel8 ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + case + test + '_2.txt;'
|
||||
oai.send_expect_false('./dlsim.rel8.' + host + ' ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_2.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./dlsim.rel8 ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + case + test + '_3.txt;'
|
||||
oai.send_expect_false('./dlsim.rel8.' + host + ' ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_3.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./dlsim.rel8 ' + conf + tee, 'FATAL', 30)
|
||||
oai.send_expect_false('./dlsim.rel8.' + host + ' ' + conf + tee, 'FATAL', 30)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
@@ -72,12 +72,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '01'
|
||||
name = 'Run oai.dlsim.test1'
|
||||
name = 'Perf oai.dlsim.test1'
|
||||
diag = 'Test 1, 10 MHz, R2.FDD (MCS 5), EVA5, -1dB'
|
||||
conf = '-m5 -gF -s-3.2 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test +'.txt'
|
||||
conf = '-m5 -gF -s-1 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test +'.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -85,12 +86,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06'
|
||||
name = 'Run oai.dlsim.test5'
|
||||
name = 'Perf oai.dlsim.test5'
|
||||
diag = 'Test 5, 1.4 MHz, R4.FDD (MCS 4), EVA5, 0dB (70%)'
|
||||
conf = '-m4 -gF -s-2 -w1.0 -f.2 -n500 -B6 -c4 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m4 -gF -s0 -w1.0 -f.2 -n500 -B6 -c4 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, ' effective rate passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -98,12 +100,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06'
|
||||
name = 'Run oai.dlsim.test6'
|
||||
name = 'Perf oai.dlsim.test6'
|
||||
diag = 'Test 6, 10 MHz, R3.FDD (MCS 15), EVA5, 6.7dB (70%)'
|
||||
conf = '-m15 -gF -s4 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m15 -gF -s6.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -111,12 +114,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06b'
|
||||
name = 'Run oai.dlsim.test6b'
|
||||
name = 'Perf oai.dlsim.test6b'
|
||||
diag = 'Test 6b, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (70%)'
|
||||
conf = '-m14 -gF -s4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m14 -gF -s6.7 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -124,12 +128,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '07'
|
||||
name = 'Run oai.dlsim.test7'
|
||||
name = 'Perf oai.dlsim.test7'
|
||||
diag = 'Test 6b, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (30%)'
|
||||
conf = '-m15 -gG -s-1 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O30'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m15 -gG -s6.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O30'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -138,12 +143,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '07b'
|
||||
name = 'Run oai.dlsim.test7b'
|
||||
name = 'Perf oai.dlsim.test7b'
|
||||
diag = 'Test 7b, 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)'
|
||||
conf = '-m14 -gG -s-1 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O30'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m14 -gG -s1.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O30'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -151,12 +157,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '10'
|
||||
name = 'Run oai.dlsim.test10'
|
||||
name = 'Perf oai.dlsim.test10'
|
||||
diag = 'Test 10, 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)'
|
||||
conf = '-m25 -gF -s13 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m25 -gF -s17.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -164,12 +171,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '10b'
|
||||
name = 'Run oai.dlsim.test10b'
|
||||
name = 'Perf oai.dlsim.test10b'
|
||||
diag = 'Test 10b, 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)'
|
||||
conf = '-m25 -gF -s15.2 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m25 -gF -s17.5 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -177,12 +185,13 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '11'
|
||||
name = 'Run oai.dlsim.test11'
|
||||
name = 'Perf oai.dlsim.test11'
|
||||
diag = 'Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%)'
|
||||
conf = '-m26 -gF -s14.2 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m26 -gF -s17.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect('./dlsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
cmd = 'taskset -c 0 ./dlsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
|
||||
+56
-48
@@ -44,7 +44,7 @@ NUM_UE=2
|
||||
NUM_eNB=1
|
||||
NUM_TRIALS=3
|
||||
|
||||
def execute(oai, user, pw, logfile,logdir):
|
||||
def execute(oai, user, pw, host,logfile,logdir,debug):
|
||||
|
||||
case = '04'
|
||||
oai.send('cd $OPENAIR1_DIR;')
|
||||
@@ -52,18 +52,18 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '00'
|
||||
name = 'Run oai.dlsim.sanity'
|
||||
name = 'Perf oai.dlsim.sanity'
|
||||
conf = '-a -A AWGN -n 100'
|
||||
diag = 'ulsim is not running normally (Segmentation fault / Exiting / FATAL), debugging might be needed'
|
||||
trace = logdir + '/log_' + case + test + '_1.txt;'
|
||||
trace = logdir + '/log_' + host + case + test + '_1.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./ulsim.rel8 ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + case + test + '_2.txt;'
|
||||
oai.send_expect_false('./ulsim.rel8.' + host + ' ' + conf + tee, 'Segmentation fault', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_2.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./ulsim.rel8 ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + case + test + '_3.txt;'
|
||||
oai.send_expect_false('./ulsim.rel8.' + host + ' ' + conf + tee, 'Exiting', 30)
|
||||
trace = logdir + '/log_' + host + case + test + '_3.txt;'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
oai.send_expect_false('./ulsim.rel8 ' + conf + tee, 'FATAL', 30)
|
||||
oai.send_expect_false('./ulsim.rel8.' + host + ' ' + conf + tee, 'FATAL', 30)
|
||||
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
@@ -72,13 +72,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '01'
|
||||
name = 'Run oai.ulsim.test1'
|
||||
name = 'Perf oai.ulsim.test1'
|
||||
diag = 'Test 1, 10 MHz, R2.FDD (MCS 5), EVA5, -1dB'
|
||||
conf = '-m5 -gF -s-3.2 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test +'.txt'
|
||||
conf = '-m5 -gF -s-1 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test +'.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -86,13 +87,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06'
|
||||
name = 'Run oai.ulsim.test5'
|
||||
name = 'Perf oai.ulsim.test5'
|
||||
diag = 'Test 5, 1.4 MHz, R4.FDD (MCS 4), EVA5, 0dB (70%)'
|
||||
conf = '-m4 -gF -s-2 -w1.0 -f.2 -n500 -B6 -c4 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m4 -gF -s0 -w1.0 -f.2 -n500 -B6 -c4 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -100,13 +102,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06'
|
||||
name = 'Run oai.ulsim.test6'
|
||||
name = 'Perf oai.ulsim.test6'
|
||||
diag = 'Test 6, 10 MHz, R3.FDD (MCS 15), EVA5, 6.7dB (70%)'
|
||||
conf = '-m15 -gF -s4 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m15 -gF -s6.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -114,13 +117,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '06b'
|
||||
name = 'Run oai.ulsim.test6b'
|
||||
name = 'Perf oai.ulsim.test6b'
|
||||
diag = 'Test 6b, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (70%)'
|
||||
conf = '-m14 -gF -s4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m14 -gF -s6.7 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -128,13 +132,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '07'
|
||||
name = 'Run oai.ulsim.test7'
|
||||
name = 'Perf oai.ulsim.test7'
|
||||
diag = 'Test 6b, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (30%)'
|
||||
conf = '-m15 -gG -s-1 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O30'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m15 -gG -s6.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O30'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -142,13 +147,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '10'
|
||||
name = 'Run oai.ulsim.test10'
|
||||
name = 'Perf oai.ulsim.test10'
|
||||
diag = 'Test 10, 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)'
|
||||
conf = '-m25 -gF -s13 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m25 -gF -s17.4 -w1.0 -f.2 -n500 -B25 -c3 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -156,13 +162,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '10b'
|
||||
name = 'Run oai.ulsim.test10b'
|
||||
name = 'Perf oai.ulsim.test10b'
|
||||
diag = 'Test 10b, 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)'
|
||||
conf = '-m25 -gF -s15.2 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m25 -gF -s17.5 -w1.0 -f.2 -n500 -B25 -c3 -z2 -r1022 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
@@ -170,13 +177,14 @@ def execute(oai, user, pw, logfile,logdir):
|
||||
|
||||
try:
|
||||
test = '11'
|
||||
name = 'Run oai.ulsim.test11'
|
||||
name = 'Perf oai.ulsim.test11'
|
||||
diag = 'Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%)'
|
||||
conf = '-m26 -gF -s14.2 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + case + test + '.txt'
|
||||
conf = '-m26 -gF -s17.7 -w1.0 -f.2 -n500 -B50 -c2 -z2 -O70'
|
||||
trace = logdir + '/log_' + host + case + test + '.txt'
|
||||
tee = ' 2>&1 | tee ' + trace
|
||||
print test + 'not performed'
|
||||
#oai.send_expect('./ulsim.rel8 ' + conf + tee, ' effective rate passed', 150)
|
||||
#print test + 'not performed'
|
||||
cmd = 'taskset -c 0 ./ulsim.rel8.' + host + ' ' + conf + tee
|
||||
oai.send_expect(cmd, 'passed', 150)
|
||||
except log.err, e:
|
||||
log.fail(case, test, name, conf, e.value, diag, logfile,trace)
|
||||
else:
|
||||
|
||||
+16
-11
@@ -78,13 +78,14 @@ for arg in sys.argv:
|
||||
i= i + 1
|
||||
|
||||
# get the oai object
|
||||
host = os.uname()[1]
|
||||
oai = openair('localdomain','localhost')
|
||||
#start_time = time.time() # datetime.datetime.now()
|
||||
try:
|
||||
user = getpass.getuser()
|
||||
print '\n******* Note that the user <'+user+'> should be a sudoer *******\n'
|
||||
print '******* Connecting to the localhost to perform the test *******\n'
|
||||
print '******* Make sure that the prompt is correct *******\n'
|
||||
|
||||
|
||||
if not pw :
|
||||
print "username: " + user
|
||||
@@ -94,7 +95,7 @@ try:
|
||||
#print "password: " + pw
|
||||
|
||||
prompt = os.getenv("PS1")[-2]
|
||||
print "your prompt: " + prompt
|
||||
print "your prompt is: " + prompt
|
||||
|
||||
oai.connect(user,pw,prompt)
|
||||
#oai.get_shell()
|
||||
@@ -106,9 +107,11 @@ except :
|
||||
test = 'test01'
|
||||
ctime=datetime.datetime.utcnow().strftime("%Y-%m-%d.%Hh%M")
|
||||
logfile = user+'.'+test+'.'+ctime+'.txt'
|
||||
logdir = os.getcwd() + '/pre-ci-logs';
|
||||
oai.send_nowait('mkdir -p -m 755' + logdir + ';')
|
||||
|
||||
logdir = os.getcwd() + '/pre-ci-logs-'+host;
|
||||
oai.create_dir(logdir,debug)
|
||||
print 'log dir: ' + logdir
|
||||
#oai.send_nowait('mkdir -p -m 755' + logdir + ';')
|
||||
|
||||
#print '=================start the ' + test + ' at ' + ctime + '=================\n'
|
||||
#print 'Results will be reported in log file : ' + logfile
|
||||
log.writefile(logfile,'====================start'+test+' at ' + ctime + '=======================\n')
|
||||
@@ -118,12 +121,14 @@ oai.kill(user, pw)
|
||||
oai.rm_driver(oai,user,pw)
|
||||
|
||||
# start te test cases
|
||||
case01.execute(oai, user, pw, logfile,logdir)
|
||||
case02.execute(oai, user, pw, logfile,logdir)
|
||||
case03.execute(oai, user, pw, logfile,logdir)
|
||||
if dlsim != 0 :
|
||||
case04.execute(oai, user, pw, logfile,logdir)
|
||||
case05.execute(oai, user, pw, logfile,logdir)
|
||||
rv=case01.execute(oai, user, pw, host,logfile,logdir,debug)
|
||||
if rv != 0 :
|
||||
case02.execute(oai, user, pw, host, logfile,logdir,debug)
|
||||
case03.execute(oai, user, pw, host, logfile,logdir,debug)
|
||||
case04.execute(oai, user, pw, host, logfile,logdir,debug)
|
||||
#case05.execute(oai, user, pw, host, logfile,logdir,debug)
|
||||
else :
|
||||
print 'Compilation error: skip test case 02,03,04,05'
|
||||
|
||||
oai.kill(user, pw)
|
||||
oai.rm_driver(oai,user,pw)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
[*] GTKWave Analyzer v3.3.34 (w)1999-2012 BSI
|
||||
[*] Thu Dec 19 10:33:06 2013
|
||||
[*]
|
||||
[dumpfile] "/tmp/log.vcd"
|
||||
[dumpfile] "/tmp/openair_dump_eNB.vcd"
|
||||
[dumpfile_mtime] "Thu Dec 19 10:26:58 2013"
|
||||
[dumpfile_size] 68919271
|
||||
[savefile] "$OPENAIR_TARGETS/itti_vcd_tasks.sav"
|
||||
|
||||
Reference in New Issue
Block a user