adding a few ifdefs for Rel10 and updated test scripts

pre-ci works again (except for eMBMS)


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5937 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/ENB_APP/enb_app.c

@@ -152,7 +152,9 @@ static void configure_rrc(uint32_t enb_id, const Enb_properties_array_t *enb_pro
       RRC_CONFIGURATION_REQ (msg_p).pucch_delta_shift[CC_id]                        = enb_properties->properties[enb_id]->pucch_delta_shift[CC_id];
       RRC_CONFIGURATION_REQ (msg_p).pucch_nRB_CQI[CC_id]                            = enb_properties->properties[enb_id]->pucch_nRB_CQI[CC_id];
       RRC_CONFIGURATION_REQ (msg_p).pucch_nCS_AN[CC_id]                             = enb_properties->properties[enb_id]->pucch_nCS_AN[CC_id];
+#ifndef Rel10
       RRC_CONFIGURATION_REQ (msg_p).pucch_n1_AN[CC_id]                              = enb_properties->properties[enb_id]->pucch_n1_AN[CC_id];
+#endif
 
   // SRS Config
       RRC_CONFIGURATION_REQ (msg_p).srs_enable[CC_id]                               = enb_properties->properties[enb_id]->srs_enable[CC_id];

openair2/ENB_APP/enb_config.c

@@ -305,7 +305,9 @@ static void enb_config_display(void) {
 	    printf( "\tpucch_delta_shift for CC %d:\t%d:\n",j,enb_properties.properties[i]->pucch_delta_shift[j]);
 	    printf( "\tpucch_nRB_CQI for CC %d:\t%d:\n",j,enb_properties.properties[i]->pucch_nRB_CQI[j]);
 	    printf( "\tpucch_nCS_AN for CC %d:\t%d:\n",j,enb_properties.properties[i]->pucch_nCS_AN[j]);
+#ifndef Rel10
 	    printf( "\tpucch_n1_AN for CC %d:\t%d:\n",j,enb_properties.properties[i]->pucch_n1_AN[j]);
+#endif
 	    
 	    // SRS Config
 	    printf( "\tsrs_enable for CC %d:\t%d:\n",j,enb_properties.properties[i]->srs_enable[j]);

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -741,8 +741,10 @@ uint8_t do_SIB23(uint8_t Mod_id,
           = configuration->pucch_nRB_CQI[0];
   (*sib2)->radioResourceConfigCommon.pucch_ConfigCommon.nCS_AN 
           = configuration->pucch_nCS_AN[0];
+#ifndef Rel10
   (*sib2)->radioResourceConfigCommon.pucch_ConfigCommon.n1PUCCH_AN 
           = configuration->pucch_n1_AN[0];
+#endif
 
   // SRS Config
   if (configuration->srs_enable[0]) {

targets/TEST/OAI/case01.py

@@ -114,13 +114,13 @@ def execute(oai, user, pw, host, logfile,logdir,debug):
     try:
         test = '03'
         name = 'Compile oai.rel8.rf.make' 
-        conf = 'make RTAI=0 Rel8=1'
+        conf = 'make RTAI=0 EXMIMO=1 Rel8=1'
         trace = logdir + '/log_' + case + test + '.txt;'
         tee = ' 2>&1 | tee ' + trace
         diag = 'check the compilation errors for Rel8'
         oai.send('make cleanall;')
         oai.send('rm -f ./oaisim.rel8.rf.'+host)
-        oai.send_expect_false('make RTAI=0 -j4' + tee, makerr1,  1500)
+        oai.send_expect_false('make RTAI=0 EXMIMO=1 -j4' + tee, makerr1,  1500)
         oai.send('cp ./oaisim ./oaisim.rel8.rf.'+host)
     except log.err, e:
         log.fail(case, test, name, conf, e.value, diag, logfile,trace)

targets/TEST/OAI/case02.py

@@ -176,7 +176,7 @@ def execute(oai, user, pw, host, logfile,logdir,debug):
                 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.band7.conf -n' + str((i+1+j) * 50) + ' -u' + str(i+1) +' -b'+ str(j+1) + ' -K' + itti_name
+                conf = '-a -l7 -A AWGN --enb-conf ../../PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.exmimo2.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.' + host + ' ' + conf
                 oai.send('echo ' + command + ' > ' + trace_name + ';')