Merge branch 'OAI_develop' into oai_develop_nfapi

README.txt

@@ -63,3 +63,4 @@ v1.0.0 -> January 2019. This version first implements the architectural split de
             A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
 v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
 v1.0.2 -> February 2019: Full OAI support for 3.13.1 UHD
+v1.0.3 -> June 2019: Bug fix for LimeSuite v19.04.0 API

ci-scripts/Jenkinsfile-gitlab

@@ -416,6 +416,11 @@ pipeline {
                                 }
                             }
                         }
+                        stage ("Destroy all Virtual Machines") {
+                            steps {
+                                sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                            }
+                        }
                     }
                 }
                 stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
@@ -459,6 +464,7 @@ pipeline {
                 stage ("Test IF4p5 - FDD - Band 7 - B210") {
                     steps {
                         script {
+                            sh "sleep 60"
                             triggerSlaveJob ('eNB-CI-IF4p5-FDD-Band7-B210', 'Test-IF4p5-FDD-Band7')
                         }
                     }
@@ -478,6 +484,7 @@ pipeline {
                 stage ("Test IF4p5 - TDD - Band 40 - B210") {
                     steps {
                         script {
+                            sh "sleep 60"
                             triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band40-B210', 'Test-IF4p5-TDD-Band40')
                         }
                     }
@@ -576,11 +583,6 @@ pipeline {
                 }
             }
         }
-        stage ("Destroy all Virtual Machines") {
-            steps {
-                sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
-            }
-        }
     }
     post {
         always {

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -75,21 +75,6 @@ pipeline {
                     if (params.pythonExecutor != null) {
                         echo "eNB CI executor node  :   ${pythonExecutor}"
                     }
-                    // If not present picking a default XML file
-                    if (params.pythonTestXmlFile == null) {
-                        // picking default
-                        testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                        echo "Test XML file(default):   ${testXMLFile}"
-                        mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                    } else {
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists("ci-scripts/" + xmlFile)) {
-                                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                echo "Test XML file         :   ${xmlFile}"
-                            }
-                        }
-                    }
                     // If not present picking a default Stage Name
                     if (params.pipelineTestStageName == null) {
                         // picking default
@@ -193,6 +178,21 @@ pipeline {
                 script {
                     dir ('ci-scripts') {
                         echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+                        // If not present picking a default XML file
+                        if (params.pythonTestXmlFile == null) {
+                            // picking default
+                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
+                            echo "Test XML file(default):   ${testXMLFile}"
+                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
+                        } else {
+                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                            for (xmlFile in myXmlTestSuite) {
+                                if (fileExists(xmlFile)) {
+                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                                    echo "Test XML file         :   ${xmlFile}"
+                                }
+                            }
+                        }
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],

ci-scripts/Jenkinsfile-tmp-ran

@@ -106,21 +106,6 @@ pipeline {
                     if (params.pythonExecutor != null) {
                         echo "eNB CI executor node  :   ${pythonExecutor}"
                     }
-                    // If not present picking a default XML file
-                    if (params.pythonTestXmlFile == null) {
-                        // picking default
-                        testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                        echo "Test XML file(default):   ${testXMLFile}"
-                        mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                    } else {
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists("ci-scripts/" + xmlFile)) {
-                                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                echo "Test XML file         :   ${xmlFile}"
-                            }
-                        }
-                    }
                     // If not present picking a default Stage Name
                     if (params.pipelineTestStageName == null) {
                         // picking default
@@ -212,6 +197,21 @@ pipeline {
                 script {
                     dir ('ci-scripts') {
                         echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+                        // If not present picking a default XML file
+                        if (params.pythonTestXmlFile == null) {
+                            // picking default
+                            testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
+                            echo "Test XML file(default):   ${testXMLFile}"
+                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
+                        } else {
+                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                            for (xmlFile in myXmlTestSuite) {
+                                if (fileExists(xmlFile)) {
+                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                                    echo "Test XML file         :   ${xmlFile}"
+                                }
+                            }
+                        }
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],

ci-scripts/Jenkinsfile-tmp-ue

@@ -66,35 +66,6 @@ pipeline {
         ansiColor('xterm')
         lock (ciSmartPhoneResource)
     }
-    // the following parameter options are commented out so it shows the ones
-    // that you SHALL have to run the job.
-    // You can use them as template
-    /*
-    parameters {
-        //node-test parameters
-        string(name: 'pythonExecutor', defaultValue: 'nodea', description: 'Node where the pipeline - python scripts will be executed')
-        string(name: 'pythonTestXmlFile', defaultValue: 'enb_usrpB210_band7_50PRB.xml', description: 'Location of the Test XML to be run')
-        string(name: 'pipelineTestStageName', defaultValue: 'Test COTS-UE - OAI eNB - LTEBOX EPC', description: 'Naming of the Test Stage')
-        booleanParam(name: 'pipelineZipsConsoleLog', defaultValue: 'True', description: 'If true, the pipeline script retrieves the job console log, zips it and archives it as artifact')
-        string(name: 'smartphonesResource', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
-
-        //eNB parameters
-        string(name: 'eNB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of eNB')
-        credentials(name: 'eNB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for eNB')
-        string(name: 'eNB_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of eNB source code')
-
-        //EPC parameters
-        string(name: 'EPC_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of EPC')
-        string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
-        credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
-        string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
-
-        //ADB server parameters
-        string(name: 'ADB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of ADB server')
-        credentials(name: 'ADB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for ADB')
-    }
-    */
-
     stages {
         stage ("Verify Parameters") {
             steps {
@@ -106,21 +77,6 @@ pipeline {
                     if (params.pythonExecutor != null) {
                         echo "eNB CI executor node  :   ${pythonExecutor}"
                     }
-                    // If not present picking a default XML file
-                    if (params.pythonTestXmlFile == null) {
-                        // picking default
-                        testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
-                        echo "Test XML file(default):   ${testXMLFile}"
-                        mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
-                    } else {
-                        String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-                        for (xmlFile in myXmlTestSuite) {
-                            if (fileExists("ci-scripts/" + xmlFile)) {
-                                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                                echo "Test XML file         :   ${xmlFile}"
-                            }
-                        }
-                    }
                     // If not present picking a default Stage Name
                     if (params.pipelineTestStageName == null) {
                         // picking default
@@ -212,6 +168,21 @@ pipeline {
                 script {
                     dir ('ci-scripts') {
                         echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+                        // If not present picking a default XML file
+                        if (params.pythonTestXmlFile == null) {
+                            // picking default
+                            testXMLFile = 'xml_files/ue_band20_build.xml'
+                            echo "Test XML file(default):   ${testXMLFile}"
+                            mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
+                        } else {
+                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+                            for (xmlFile in myXmlTestSuite) {
+                                if (fileExists(xmlFile)) {
+                                    mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                                    echo "Test XML file         :   ${xmlFile}"
+                                }
+                            }
+                        }
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']

ci-scripts/buildOnVM.sh

@@ -25,7 +25,7 @@ function build_usage {
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- xenial image already synced"
+    echo "     -- $VM_OSREL image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -33,31 +33,8 @@ function build_usage {
     echo "------"
     echo "    oai-ci-vm-tool build [OPTIONS]"
     echo ""
-    echo "Mandatory Options:"
-    echo "--------"
-    echo "    --job-name #### OR -jn ####"
-    echo "    Specify the name of the Jenkins job."
-    echo ""
-    echo "    --build-id #### OR -id ####"
-    echo "    Specify the build ID of the Jenkins job."
-    echo ""
-    echo "    --workspace #### OR -ws ####"
-    echo "    Specify the workspace."
-    echo ""
-    echo "Options:"
-    echo "--------"
-    variant_usage
-    echo "    Specify the variant to build."
-    echo ""
-    echo "    --keep-vm-alive OR -k"
-    echo "    Keep the VM alive after the build."
-    echo ""
-    echo "    --daemon OR -D"
-    echo "    Run as daemon"
-    echo ""
-    echo "    --help OR -h"
-    echo "    Print this help message."
-    echo ""
+    command_options_usage
+
 }
 
 function build_on_vm {
@@ -95,7 +72,7 @@ function build_on_vm {
         echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
         echo "############################################################"
         acquire_vm_create_lock
-        uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+        uvt-kvm create $VM_NAME release=$VM_OSREL --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
         echo "Waiting for VM to be started"
         uvt-kvm wait $VM_NAME --insecure
 

ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf

@@ -117,3 +117,12 @@ NETWORK_CONTROLLER : {
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";
 };
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #        #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf

@@ -117,3 +117,12 @@ NETWORK_CONTROLLER : {
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";
 };
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #        #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf

@@ -117,3 +117,12 @@ NETWORK_CONTROLLER : {
   FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
   FLEXRAN_AWAIT_RECONF   = "no";
 };
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #        #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf

@@ -171,7 +171,7 @@ eNBs =
                   lastPreamble_r13                  = 63;
                   ra_ResponseWindowSize_r13         = 20; #0
                   mac_ContentionResolutionTimer_r13 = 80; #0
-                  rar_HoppingConfig_r13             = "off";  #1;
+                  rar_HoppingConfig_r13             = 1; // Note 1 means off
               }
           );
 
@@ -360,6 +360,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -141,6 +141,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -213,7 +215,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -141,6 +141,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -213,7 +215,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -141,6 +141,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -213,7 +215,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf

+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                                         = "eNodeB_3GPP";
+        node_timing                                           = "synch_to_ext_device";
+        node_synch_ref                                        = 0;
+        frame_type					      = "TDD";
+        tdd_config 					      = 1;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 40;
+        downlink_frequency      			      = 2350000000L;
+        uplink_frequency_offset 			      = 0;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 25;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antenna_ports          			      = 2;
+        nb_antennas_tx          			      = 2;
+        nb_antennas_rx          			      = 2;
+        tx_gain                                               = 90;
+        rx_gain                                               = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 0;
+        pdsch_referenceSignalPower 			      =-27;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -96;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -106;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+      */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -108;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+
+    log_config :
+    {
+      global_log_level                      ="debug";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+
+  }
+);
+MACRLCs = (
+	{
+        num_cc = 1;
+        tr_s_preference = "local_L1";
+        tr_n_preference = "local_RRC";
+        scheduler_mode = "fairRR";
+        puSch10xSnr     =  150;
+        puCch10xSnr     =  150;
+        }  
+);
+
+L1s = (
+    	{
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+        }  
+);
+
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 2
+         nb_rx          = 2
+         att_tx         = 0
+         att_rx         = 0;
+         bands          = [38];
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 110;
+         eNB_instances  = [0];
+
+    }
+);  
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+NETWORK_CONTROLLER :
+{
+    FLEXRAN_ENABLED        = "no";
+    FLEXRAN_INTERFACE_NAME = "lo";
+    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
+    FLEXRAN_PORT           = 2210;
+    FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
+    FLEXRAN_AWAIT_RECONF   = "no";
+};

ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf

@@ -178,6 +178,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

@@ -18,6 +18,9 @@ eNBs =
 
     tr_s_preference     = "local_mac"
 
+    // In seconds
+    rrc_inactivity_threshold = 30;
+
     ////////// Physical parameters:
 
     component_carriers = (
@@ -178,6 +181,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -241,8 +246,8 @@ THREAD_STRUCT = (
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";
-    FLEXRAN_INTERFACE_NAME = "lo";
-    FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
+    FLEXRAN_INTERFACE_NAME = "eth0";
+    FLEXRAN_IPV4_ADDRESS   = "CI_MME_IP_ADDR";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf

@@ -186,6 +186,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf

@@ -181,6 +181,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -234,7 +236,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/lte-fdd-basic-sim.conf

@@ -178,6 +178,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/lte-tdd-basic-sim.conf

@@ -141,6 +141,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -144,6 +144,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -220,7 +222,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -144,6 +144,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -220,7 +222,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -144,6 +144,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
@@ -220,7 +222,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf

@@ -181,6 +181,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf

@@ -181,6 +181,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf

@@ -181,6 +181,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -179,6 +179,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

ci-scripts/conf_files/rru.tdd.band40.conf

@@ -20,7 +20,7 @@ RUs = (
 THREAD_STRUCT = (
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
     #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
     worker_config      = "WORKER_ENABLE";
   }

ci-scripts/createVM.sh

@@ -25,7 +25,7 @@ function create_usage {
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- xenial image already synced"
+    echo "     -- $VM_OSREL image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -90,7 +90,7 @@ function create_vm {
     echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
     echo "############################################################"
     acquire_vm_create_lock
-    uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+    uvt-kvm create $VM_NAME release=$VM_OSREL --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
     echo "Waiting for VM to be started"
     uvt-kvm wait $VM_NAME --insecure
 

ci-scripts/destroyAllRunningVM.sh

@@ -30,19 +30,7 @@ function destroy_usage {
     echo "------"
     echo "    oai-ci-vm-tool destroy [OPTIONS]"
     echo ""
-    echo "Mandatory Options:"
-    echo "--------"
-    echo "    --job-name #### OR -jn ####"
-    echo "    Specify the name of the Jenkins job."
-    echo ""
-    echo "    --build-id #### OR -id ####"
-    echo "    Specify the build ID of the Jenkins job."
-    echo ""
-    echo "Options:"
-    echo "--------"
-    echo "    --help OR -h"
-    echo "    Print this help message."
-    echo ""
+    command_options_usage
 }
 
 function destroy_vm {

ci-scripts/doc/vm_based_simulator_main_scripts.md

@@ -52,7 +52,7 @@ The main script is including a bunch of sub BASH scripts.
 *  ci-scripts/reportBuildLocally.sh
 *  ci-scripts/reportTestLocally.sh
 
-**NOTE: ci-scripts/runTestOnVM.sh is getting big and will certainly be split to facilate maintenance. Start functions will be also factorized.**
+**NOTE: ci-scripts/runTestOnVM.sh is getting big and will certainly be split to facilitate maintenance. Start functions will be also factorized.**
 
 # 3. Main script features #
 
@@ -62,7 +62,7 @@ It is also **testing if uvtool and apt-cacher are installed.**
 
 It finally provides parameters to the requested functions. Parameter definition is centralized there.
 
-For example: 
+For example:
 
 for VM instance creation:
 
@@ -75,13 +75,122 @@ for OAI variant build:
 *  build log file to parse: LOG_PATTERN
 *  the number of log files to parse: NB_PATTERN_FILES
 
-These last 2 variables are very important if you change the build options or if you modify the build system and add more targets to build (especially true for physical simulator).
+You can get the list of variant specific variables specifying the variant argument when asking for help:
+
+``` bash
+./ci-scripts/oai-ci-vm-tool help variant
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
+               VM_NAME=ci-flexran-rtc           ARCHIVES_LOC=flexran        
+               VM_MEMORY=2048                   VM_CPU=4              
+               NB_PATTERN_FILES=1               BUILD_OPTIONS="cmake . && make -j2"
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant enb-usrp        OR -v1     ( build and test  )
+               VM_NAME=ci-enb-usrp              ARCHIVES_LOC=enb_usrp       
+               VM_MEMORY=2048                   VM_CPU=4              
+               NB_PATTERN_FILES=9               BUILD_OPTIONS="--eNB -w USRP --mu"
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant l1-sim          OR -v20    ( test  )
+               VM_NAME=ci-l1-sim                ARCHIVES_LOC=l1_sim         
+               VM_MEMORY=2048                   VM_CPU=4              
+               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant rf-sim          OR -v21    ( test  )
+               VM_NAME=ci-rf-sim                ARCHIVES_LOC=rf_sim         
+               VM_MEMORY=2048                   VM_CPU=4              
+               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant l2-sim          OR -v22    ( test  )
+               VM_NAME=ci-l2-sim                ARCHIVES_LOC=l2_sim         
+               VM_MEMORY=2048                   VM_CPU=4              
+               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant basic-sim       OR -v2     ( build and test  )
+               VM_NAME=ci-basic-sim             ARCHIVES_LOC=basic_sim      
+               VM_MEMORY=8192                   VM_CPU=4              
+               NB_PATTERN_FILES=13              BUILD_OPTIONS="--eNB --UE"   
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant phy-sim         OR -v3     ( build and test  )
+               VM_NAME=ci-phy-sim               ARCHIVES_LOC=phy_sim        
+               VM_MEMORY=2048                   VM_CPU=4              
+               NB_PATTERN_FILES=3               BUILD_OPTIONS="--phy_simulators"
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant cppcheck        OR -v4     ( build and test  )
+               VM_NAME=ci-cppcheck              ARCHIVES_LOC=cppcheck       
+               VM_MEMORY=4096                   VM_CPU=4              
+               NB_PATTERN_FILES=1               BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -j4"
+               LOG_PATTERN=cppcheck.xml   
+
+    --variant enb-ethernet    OR -v7     ( build and test  )
+               VM_NAME=ci-enb-ethernet          ARCHIVES_LOC=enb_eth        
+               VM_MEMORY=4096                   VM_CPU=4              
+               NB_PATTERN_FILES=8               BUILD_OPTIONS="--eNB"        
+               LOG_PATTERN=.Rel14.txt     
+
+    --variant ue-ethernet     OR -v8     ( build and test  )
+               VM_NAME=ci-ue-ethernet           ARCHIVES_LOC=ue_eth         
+               VM_MEMORY=4096                   VM_CPU=4              
+               NB_PATTERN_FILES=12              BUILD_OPTIONS="--UE"         
+               LOG_PATTERN=.Rel14.txt     
 
-There are many more variables.
+```
+
+To define a new variant you just need to define a function which name conforms to `function variant__v<n>__<variant_name>` where n and variant_name will respectively define the short and long options for your variant. The function only needs to define the variant dependent variables. For many variables, default values are set in the `check_set_variant` function. When a variant doesn't define the BUILD_OPTIONS variable it cannot be used for the `build` `wait` and `create` commands.
+
+The main scripts also allows the definition of non variant-dependant variable via the `--setvar_<variable name> <variable value>` options.
+You can get the list of these variables by using `help setvar`:
+
+```BASH
+./ci-scripts/oai-ci-vm-tool help setvar
+--setvar_<varname> <value> where varname is one of:
+            VM_OSREL :     OS release to use in virtual machines
+    RUN_EXPERIMENTAL :     Enforce execution of variants with EXPERIMENTAL variable set to "true"
+```
+
+To add a new non-variant dependant variable you need:
+* Add an item to the `AUTHORIZED_VAR` array
+* In the `setvar_usage`function,  add your help string in the HELP_VAR["<your variable name>"] variable.
+* Write the bash code for your variable.
+
+Example of non variant dependent usage:
+
+``` bash
+./ci-scripts/oai-ci-vm-tool test -v21  -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci
+Currently testci-b1-rf-sim Testing is not implemented / enabled
+Comment out these lines in ./ci-scripts/oai-ci-vm-tool if you want to run it
+ or use option --setvar_RUN_EXPERIMENTAL=true to test it
+
+
+ ./ci-scripts/oai-ci-vm-tool test -v21  -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci --setvar_RUN_EXPERIMENTAL true
+ Setting RUN_EXPERIMENTAL to true...
+ ############################################################
+ OAI CI VM script
+ ############################################################
+ ENB_VM_NAME         = testci-b1-enb-ethernet
+ ENB_VM_CMD_FILE     = testci-b1-enb-ethernet_cmds.txt
+ UE_VM_NAME          = testci-b1-ue-ethernet
+ UE_VM_CMD_FILE      = testci-b1-ue-ethernet_cmds.txt
+ JENKINS_WKSP        = /usr/local/oai/enhance_CI_extEPC/openairinterface5g
+ ARCHIVES_LOC        = /usr/local/oai/enhance_CI_extEPC/openairinterface5g/archives/rf_sim/test
+ ############################################################
+ Waiting for ENB VM to be started
+...........................
+```
+
+In the same way, you can set the variable `VM_OSREL` to run the test in virtual machines of the specified OS release:
+
+``` bash
+./ci-scripts/oai-ci-vm-tool test -v21  -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci --setvar_VM_OSREL bionic
+```
 
 ---
 
 Next step: [how to create one or several VM instances](./vm_based_simulator_create.md)
 
 You can also go back to the [CI dev main page](./ci_dev_home.md)
-

ci-scripts/reportBuildLocally.sh

@@ -28,56 +28,8 @@ function report_build_usage {
     echo "------"
     echo "    oai-ci-vm-tool report-build [OPTIONS]"
     echo ""
-    echo "Options:"
-    echo "--------"
-    echo ""
-    echo "    --help OR -h"
-    echo "    Print this help message."
-    echo ""
-    echo "Job Options:"
-    echo "------------"
-    echo ""
-    echo "    --git-url #### OR -gu ####"
-    echo "    Specify the URL of the GIT Repository."
-    echo ""
-    echo "    --job-name #### OR -jn ####"
-    echo "    Specify the name of the Jenkins job."
-    echo ""
-    echo "    --build-id #### OR -id ####"
-    echo "    Specify the build ID of the Jenkins job."
-    echo ""
-    echo "    --workspace #### OR -ws ####"
-    echo "    Specify the workspace."
-    echo ""
-    echo "    --trigger merge-request OR -mr"
-    echo "    --trigger push          OR -pu"
-    echo "    Specify trigger action of the Jenkins job. Either a merge-request event or a push event."
-    echo ""
-    echo "Merge-Request Options:"
-    echo "----------------------"
-    echo ""
-    echo "    --src-branch #### OR -sb ####"
-    echo "    Specify the source branch of the merge request."
-    echo ""
-    echo "    --src-commit #### OR -sc ####"
-    echo "    Specify the source commit ID (SHA-1) of the merge request."
-    echo ""
-    echo "    --target-branch #### OR -tb ####"
-    echo "    Specify the target branch of the merge request (usually develop)."
-    echo ""
-    echo "    --target-commit #### OR -tc ####"
-    echo "    Specify the target commit ID (SHA-1) of the merge request."
-    echo ""
-    echo "Push Options:"
-    echo "----------------------"
-    echo ""
-    echo "    --branch #### OR -br ####"
-    echo "    Specify the branch of the push event."
-    echo ""
-    echo "    --commit #### OR -co ####"
-    echo "    Specify the commit ID (SHA-1) of the push event."
-    echo ""
-    echo ""
+    command_options_usage
+
 }
 
 function trigger_usage {
@@ -566,9 +518,11 @@ function report_build {
     summary_table_footer
 
     summary_table_header "OAI Build basic simulator option" ./archives/basic_sim
-    summary_table_row "Basic Simulator eNb - Release 14" ./archives/basic_sim/basic_simulator_enb.txt "Built target lte-softmodem" ./basic_sim_row1.html
-    summary_table_row "Basic Simulator UE - Release 14" ./archives/basic_sim/basic_simulator_ue.txt "Built target lte-uesoftmodem" ./basic_sim_row2.html
+    summary_table_row "LTE SoftModem - Release 14" ./archives/basic_sim/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./basic_sim_row1.html
+    summary_table_row "LTE UE SoftModem - Release 14" ./archives/basic_sim/lte-uesoftmodem.Rel14.txt "Built target lte-uesoftmodem" ./basic_sim_row2.htm
     summary_table_row "Conf 2 UE data - Release 14" ./archives/basic_sim/conf2uedata.Rel14.txt "Built target conf2uedata" ./basic_sim_row3.html
+    summary_table_row "RB Tool - Release 14" ./archives/basic_sim/rb_tool.Rel14.txt "Built target rb_tool" ./basic_sim_row4.html
+    summary_table_row "NASMESH - Release 14" ./archives/basic_sim/nasmesh.Rel14.txt "Built target nasmesh" ./basic_sim_row5.html
     summary_table_footer
 
     summary_table_header "OAI Build Physical simulators option" ./archives/phy_sim
@@ -644,7 +598,7 @@ function report_build {
             cat $DETAILS_TABLE >> ./build_results.html
         done
     fi
-    if [ -f ./basic_sim_row1.html ] || [ -f ./basic_sim_row2.html ] || [ -f ./basic_sim_row3.html ]
+    if [ -f ./basic_sim_row1.html ] || [ -f ./basic_sim_row2.html ] || [ -f ./basic_sim_row3.html ] || [ -f ./basic_sim_row4.html ] || [ -f ./basic_sim_row5.html ]
     then
         for DETAILS_TABLE in `ls ./basic_sim_row*.html`
         do

ci-scripts/reportTestLocally.sh

@@ -28,56 +28,7 @@ function report_test_usage {
     echo "------"
     echo "    oai-ci-vm-tool report-test [OPTIONS]"
     echo ""
-    echo "Options:"
-    echo "--------"
-    echo ""
-    echo "    --help OR -h"
-    echo "    Print this help message."
-    echo ""
-    echo "Job Options:"
-    echo "------------"
-    echo ""
-    echo "    --git-url #### OR -gu ####"
-    echo "    Specify the URL of the GIT Repository."
-    echo ""
-    echo "    --job-name #### OR -jn ####"
-    echo "    Specify the name of the Jenkins job."
-    echo ""
-    echo "    --build-id #### OR -id ####"
-    echo "    Specify the build ID of the Jenkins job."
-    echo ""
-    echo "    --workspace #### OR -ws ####"
-    echo "    Specify the workspace."
-    echo ""
-    echo "    --trigger merge-request OR -mr"
-    echo "    --trigger push          OR -pu"
-    echo "    Specify trigger action of the Jenkins job. Either a merge-request event or a push event."
-    echo ""
-    echo "Merge-Request Options:"
-    echo "----------------------"
-    echo ""
-    echo "    --src-branch #### OR -sb ####"
-    echo "    Specify the source branch of the merge request."
-    echo ""
-    echo "    --src-commit #### OR -sc ####"
-    echo "    Specify the source commit ID (SHA-1) of the merge request."
-    echo ""
-    echo "    --target-branch #### OR -tb ####"
-    echo "    Specify the target branch of the merge request (usually develop)."
-    echo ""
-    echo "    --target-commit #### OR -tc ####"
-    echo "    Specify the target commit ID (SHA-1) of the merge request."
-    echo ""
-    echo "Push Options:"
-    echo "----------------------"
-    echo ""
-    echo "    --branch #### OR -br ####"
-    echo "    Specify the branch of the push event."
-    echo ""
-    echo "    --commit #### OR -co ####"
-    echo "    Specify the commit ID (SHA-1) of the push event."
-    echo ""
-    echo ""
+    command_options_usage
 }
 
 function analyzePingFiles {
@@ -508,26 +459,26 @@ function report_test {
                     NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
                     NB_UE_GOT_SYNC=`egrep -c "got sync" $UE_LOG`
                     NB_ENB_SYNCED_WITH_UE=`egrep -c "Sending NFAPI_START_RESPONSE" $UE_LOG`
-                    if [ $NB_ENB_GOT_SYNC -eq 1 ] && [ $NB_UE_GOT_SYNC -eq 3 ] && [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
+                    if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -gt 2 ] && [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
                     then
                         echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
                     else
                         echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
                     fi
                     echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $NB_ENB_GOT_SYNC -eq 1 ]
+                    if [ $NB_ENB_GOT_SYNC -gt 0 ]
                     then
                         echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
                     else
                         echo "<font color = \"red\"><b>- eNB NEVER got sync</b></font>" >> ./test_simulator_results.html
                     fi
-                    if [ $NB_UE_GOT_SYNC -eq 3 ]
+                    if [ $NB_UE_GOT_SYNC -gt 2 ]
                     then
                         echo "<font color = \"blue\">- UE --> got sync</font>" >> ./test_simulator_results.html
                     else
                         echo "<font color = \"red\"><b>- UE NEVER got sync</b></font>" >> ./test_simulator_results.html
                     fi
-                    if [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
+                    if [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
                     then
                         echo "<font color = \"blue\">- UE attached to eNB</font>" >> ./test_simulator_results.html
                     else

ci-scripts/waitBuildOnVM.sh

@@ -25,7 +25,7 @@ function wait_usage {
     echo "   Original Author: Raphael Defosseux"
     echo "   Requirements:"
     echo "     -- uvtool uvtool-libvirt apt-cacher"
-    echo "     -- xenial image already synced"
+    echo "     -- $VM_OSREL image already synced"
     echo "   Default:"
     echo "     -- eNB with USRP"
     echo ""
@@ -33,28 +33,7 @@ function wait_usage {
     echo "------"
     echo "    oai-ci-vm-tool wait [OPTIONS]"
     echo ""
-    echo "Mandatory Options:"
-    echo "--------"
-    echo "    --job-name #### OR -jn ####"
-    echo "    Specify the name of the Jenkins job."
-    echo ""
-    echo "    --build-id #### OR -id ####"
-    echo "    Specify the build ID of the Jenkins job."
-    echo ""
-    echo "    --workspace #### OR -ws ####"
-    echo "    Specify the workspace."
-    echo ""
-    variant_usage
-    echo "    Specify the variant to build."
-    echo ""
-    echo "Options:"
-    echo "--------"
-    echo "    --keep-vm-alive OR -k"
-    echo "    Keep the VM alive after the build."
-    echo ""
-    echo "    --help OR -h"
-    echo "    Print this help message."
-    echo ""
+    command_options_usage
 }
 
 function wait_on_vm_build {

ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml

@@ -29,10 +29,10 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="050101">
+	<testCase id="050101">
 		<class>Initialize_HSS</class>
 		<desc>Initialize HSS</desc>
-        </testCase>
+	</testCase>
 
 	<testCase id="060101">
 		<class>Initialize_MME</class>

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml

@@ -26,32 +26,32 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  030201 090109
- 030101 000001 090101 000002 040501 040502 000001 040601 040641 040642 000001 090109 030201
+ 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
 
-        <testCase id="000003">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-        </testCase>
+	<testCase id="000003">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+	</testCase>
 
 	<testCase id="030101">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0</Initialize_eNB_args>
 	</testCase>
 
 	<testCase id="030201">
@@ -59,44 +59,44 @@
 		<desc>Terminate eNB</desc>
 	</testCase>
 
-        <testCase id="090101">
-                <class>Initialize_OAI_UE</class>
-                <desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
-                <Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1</Initialize_OAI_UE_args>
-        </testCase>
-
-        <testCase id="090109">
-                <class>Terminate_OAI_UE</class>
-                <desc>Terminate OAI UE</desc>
-        </testCase>
-
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
-                <ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040502">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
-                <ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040601">
+	<testCase id="090101">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
+		<ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040502">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
+		<ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040601">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
 		<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	</testCase>
 
-        <testCase id="040602">
+	<testCase id="040602">
 		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1.2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -u -b 1.2M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
+		<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.2 -u -b 14M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	</testCase>
 
 	<testCase id="040641">
 		<class>Iperf</class>

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml

@@ -26,26 +26,26 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  030201 090109
- 030102 000001 090102 000002 040503 000001 040603 040643 040644 000001 090109 030201
+ 030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
 
 	<testCase id="030102">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0</Initialize_eNB_args>
 	</testCase>
 
 	<testCase id="030201">
@@ -53,37 +53,37 @@
 		<desc>Terminate eNB</desc>
 	</testCase>
 
-        <testCase id="090102">
-                <class>Initialize_OAI_UE</class>
-                <desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
-                <Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1</Initialize_OAI_UE_args>
-        </testCase>
-
-        <testCase id="090109">
-                <class>Terminate_OAI_UE</class>
-                <desc>Terminate OAI UE</desc>
-        </testCase>
-
-        <testCase id="040503">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040603">
+	<testCase id="090102">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040503">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040603">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
 		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	</testCase>
 
-        <testCase id="040604">
+	<testCase id="040604">
 		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1.2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-b 1.2M -t 30 -i 1 -fm</iperf_args>
+		<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 14M -t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	</testCase>
 
 	<testCase id="040643">
 		<class>Iperf</class>

ci-scripts/xml_files/enb_usrp210_band13_build.xml

@@ -37,10 +37,10 @@
 		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
 	</testCase>
 
-        <testCase id="050101">
+	<testCase id="050101">
 		<class>Initialize_HSS</class>
 		<desc>Initialize HSS</desc>
-        </testCase>
+	</testCase>
 
 	<testCase id="060101">
 		<class>Initialize_MME</class>

ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml

@@ -32,11 +32,11 @@
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Waiting for a moment...</desc>
-                <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-        </testCase>
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Waiting for a moment...</desc>
+		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+	</testCase>
 
 	<testCase id="030121">
 		<class>Initialize_eNB</class>
@@ -49,31 +49,31 @@
 		<desc>Terminate eNB</desc>
 	</testCase>
 
-        <testCase id="040102">
-                <class>Initialize_CatM_module</class>
-                <desc>Initialize CAT-M Module</desc>
-        </testCase>
+	<testCase id="040102">
+		<class>Initialize_CatM_module</class>
+		<desc>Initialize CAT-M Module</desc>
+	</testCase>
 
-        <testCase id="040202">
-                <class>Terminate_CatM_module</class>
-                <desc>Terminate CAT-M Module</desc>
-        </testCase>
+	<testCase id="040202">
+		<class>Terminate_CatM_module</class>
+		<desc>Terminate CAT-M Module</desc>
+	</testCase>
 
-        <testCase id="040302">
-                <class>Attach_CatM_module</class>
-                <desc>Attach CAT-M Module</desc>
-        </testCase>
+	<testCase id="040302">
+		<class>Attach_CatM_module</class>
+		<desc>Attach CAT-M Module</desc>
+	</testCase>
 
-        <testCase id="040402">
-                <class>Detach_CatM_module</class>
-                <desc>Detach CAT-M Module</desc>
-        </testCase>
+	<testCase id="040402">
+		<class>Detach_CatM_module</class>
+		<desc>Detach CAT-M Module</desc>
+	</testCase>
 
-        <testCase id="040502">
-                <class>Ping_CatM_module</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040502">
+		<class>Ping_CatM_module</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_build.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>build-tab</htmlTabRef>
 	<htmlTabName>Build</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  010101
  050101 060101 070101
 	</TestCaseRequestedList>
@@ -36,10 +36,10 @@
 		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
 	</testCase>
 
-        <testCase id="050101">
+	<testCase id="050101">
 		<class>Initialize_HSS</class>
 		<desc>Initialize HSS</desc>
-        </testCase>
+	</testCase>
 
 	<testCase id="060101">
 		<class>Initialize_MME</class>

ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml

@@ -24,24 +24,24 @@
 	<htmlTabRef>epc-closure</htmlTabRef>
 	<htmlTabName>EPC-Closure</htmlTabName>
 	<htmlTabIcon>log-out</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  050201 060201 070201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="050201">
-                <class>Terminate_HSS</class>
-                <desc>Terminate HSS</desc>
-        </testCase>
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
 
-        <testCase id="060201">
-                <class>Terminate_MME</class>
-                <desc>Terminate MME</desc>
-        </testCase>
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
 
-        <testCase id="070201">
-                <class>Terminate_SPGW</class>
-                <desc>Terminate SPGW</desc>
-        </testCase>
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  030201
  040101
  030104 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201 030201
@@ -52,61 +52,61 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040601">
+	<testCase id="040601">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
 		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040602">
+	<testCase id="040602">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
 		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040603">
+	<testCase id="040603">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
 		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040604">
+	<testCase id="040604">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040605">
+	<testCase id="040605">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	</testCase>
 
 	<testCase id="040641">
 		<class>Iperf</class>

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+ 030105 040301 040502 040606 040601 040603 040608 040605 040646 040641 040643 040648 040645 040401 040201 030201
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm2</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM2</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+        <TestCaseRequestedList>
+ 030201
+ 040101
+ 030105 040301 040502 040606 040608 040646 040648 040401 040201 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="030105">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+        <testCase id="040301">
+                <class>Attach_UE</class>
+                <desc>Attach UE</desc>
+        </testCase>
+
+        <testCase id="040401">
+                <class>Detach_UE</class>
+                <desc>Detach UE</desc>
+        </testCase>
+
+        <testCase id="040502">
+                <class>Ping</class>
+                <desc>ping (5MHz - 20 sec)</desc>
+                <ping_args>-c 20</ping_args>
+                <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040601">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040606">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040603">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+        </testCase>
+
+        <testCase id="040608">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+        </testCase>
+
+        <testCase id="040605">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        </testCase>
+
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040646">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040643">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040648">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040645">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/enb_usrp210_band40_test_10mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10-tm1</htmlTabRef>
 	<htmlTabName>Test-10MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  030201
  040101
  030114 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201 030201
@@ -32,10 +32,10 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 
 	<testCase id="030114">
-                <class>Initialize_eNB</class>
-                <desc>Initialize eNB (TDD/Band40/10MHz/info)</desc>
-                <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-        </testCase>
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (TDD/Band40/10MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
 
 	<testCase id="030201">
 		<class>Terminate_eNB</class>
@@ -52,38 +52,38 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040511">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040511">
+		<class>Ping</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
 
 	<testCase id="040611">
-                <class>Iperf</class>
-                <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040612">
-                <class>Iperf</class>
-                <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040612">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
 
 	<testCase id="040613">
 		<class>Iperf</class>
@@ -93,20 +93,20 @@
 		<iperf_profile>unbalanced</iperf_profile>
 	</testCase>
 
-        <testCase id="040614">
-                <class>Iperf</class>
-                <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
-                <iperf_args>-t 30 -i 1 -fm</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040615">
-                <class>Iperf</class>
-                <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
-                <iperf_args>-t 30 -i 1 -fm</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	<testCase id="040614">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040615">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
 
 	<testCase id="040651">
 		<class>Iperf</class>

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-20-tm1</htmlTabRef>
 	<htmlTabName>Test-20MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  030201
  040101
  030124 040301 040521 040622 040621 040623 040624 040625 040662 040661 040663 040664 040665 040401 040201 030201
@@ -32,10 +32,10 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 
 	<testCase id="030124">
-                <class>Initialize_eNB</class>
-                <desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
-                <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
-        </testCase>
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
 
 	<testCase id="030201">
 		<class>Terminate_eNB</class>
@@ -52,38 +52,38 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040521">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040521">
+		<class>Ping</class>
+		<desc>ping (20MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
 
 	<testCase id="040621">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>balanced</iperf_profile>
-        </testCase>
-
-        <testCase id="040622">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040622">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
 
 	<testCase id="040623">
 		<class>Iperf</class>
@@ -93,20 +93,20 @@
 		<iperf_profile>unbalanced</iperf_profile>
 	</testCase>
 
-        <testCase id="040624">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
-                <iperf_args>-t 30 -i 1 -fm</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
-
-        <testCase id="040625">
-                <class>Iperf</class>
-                <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-                <iperf_args>-t 30 -i 1 -fm</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        </testCase>
+	<testCase id="040624">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040625">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
 
 	<testCase id="040661">
 		<class>Iperf</class>

ci-scripts/xml_files/enb_usrp210_band40_tracer.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>tracer-test</htmlTabRef>
 	<htmlTabName>T-Tracer</htmlTabName>
 	<htmlTabIcon>duplicate</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  040101
  030100 040300 040401 040201 030201
 	</TestCaseRequestedList>
@@ -51,15 +51,15 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040300">
-                <class>Attach_UE</class>
-                <desc>Attach single UE</desc>
-                <nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-        </testCase>
+	<testCase id="040300">
+		<class>Attach_UE</class>
+		<desc>Attach single UE</desc>
+		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_build.xml

@@ -36,10 +36,10 @@
 		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
 	</testCase>
 
-        <testCase id="050101">
+	<testCase id="050101">
 		<class>Initialize_HSS</class>
 		<desc>Initialize HSS</desc>
-        </testCase>
+	</testCase>
 
 	<testCase id="060101">
 		<class>Initialize_MME</class>

ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml

@@ -28,15 +28,101 @@
  030201
  040101
  030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
+ 030102 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 030201
+ 050102
+ 030102 000020 040301 040504 000021 040302 000001 000022 040303 000002 040504 000023 040401 040201 030201
+ 050202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Waiting for 35 seconds</desc>
+		<idle_sleep_time_in_sec>35</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Waiting for 10 seconds</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000010">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status before attachment</desc>
+		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000011">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status before data disabling</desc>
+		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000012">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status after data disabling</desc>
+		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000013">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status after data re-enabling</desc>
+		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000020">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status before attachment</desc>
+		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000021">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status before data disabling</desc>
+		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000022">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status after data disabling</desc>
+		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="000023">
+		<class>CheckStatusUE</class>
+		<desc>Check UE(s) status after data re-enabling</desc>
+		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+	</testCase>
+
+	<testCase id="050102">
+		<class>Initialize_FlexranCtrl</class>
+		<desc>Starting Flexran Controller</desc>
+	</testCase>
+
+	<testCase id="050202">
+		<class>Terminate_FlexranCtrl</class>
+		<desc>Stopping Flexran Controller</desc>
+	</testCase>
+
 	<testCase id="030101">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
 	</testCase>
 
+	<testCase id="030102">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030103">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
+	</testCase>
+
 	<testCase id="030201">
 		<class>Terminate_eNB</class>
 		<desc>Terminate eNB</desc>
@@ -52,62 +138,100 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040302">
+		<class>DataDisable_UE</class>
+		<desc>Disabling Data Service on UE</desc>
+	</testCase>
+
+	<testCase id="040303">
+		<class>DataEnable_UE</class>
+		<desc>Enabling Data Service on UE</desc>
+	</testCase>
+
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040502">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040503">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040504">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040505">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040603">
+	<testCase id="040603">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040604">
+	<testCase id="040604">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040605">
+	<testCase id="040605">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
 		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040606">
+	<testCase id="040606">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040607">
+	<testCase id="040607">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040641">
 		<class>Iperf</class>
@@ -125,20 +249,20 @@
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
-        <testCase id="040643">
+	<testCase id="040643">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040644">
+	<testCase id="040644">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml

@@ -52,62 +52,62 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040511">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040613">
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040511">
+		<class>Ping</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040613">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040614">
+	<testCase id="040614">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040615">
+	<testCase id="040615">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
 		<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040616">
+	<testCase id="040616">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040617">
+	<testCase id="040617">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040651">
 		<class>Iperf</class>
@@ -125,20 +125,20 @@
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
-        <testCase id="040653">
+	<testCase id="040653">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040654">
+	<testCase id="040654">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_20mhz_tm1.xml

@@ -52,62 +52,62 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040521">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040623">
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040521">
+		<class>Ping</class>
+		<desc>ping (20MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040623">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040624">
+	<testCase id="040624">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040625">
+	<testCase id="040625">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
 		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>unbalanced</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040626">
+	<testCase id="040626">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040627">
+	<testCase id="040627">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040661">
 		<class>Iperf</class>
@@ -125,20 +125,20 @@
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
-        <testCase id="040663">
+	<testCase id="040663">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
-        <testCase id="040664">
+	<testCase id="040664">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
 		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
-        </testCase>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_tracer.xml

@@ -51,15 +51,15 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040300">
-                <class>Attach_UE</class>
-                <desc>Attach single UE</desc>
-                <nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-        </testCase>
+	<testCase id="040300">
+		<class>Attach_UE</class>
+		<desc>Attach single UE</desc>
+		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_05mhz.xml

@@ -27,11 +27,17 @@
 	<TestCaseRequestedList>
  030201
  040101
- 030142 030141 040301 040541 040601 040641 040401 040201 030201 030202
+ 030142 030141 000002 040301 000002 040541 040601 040641 040401 040201 030201 030202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
+
 	<testCase id="030141">
 		<class>Initialize_eNB</class>
 		<desc>Initialize DU (FDD/Band7/5MHz)</desc>
@@ -68,30 +74,30 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040541">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040541">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040601">
+	<testCase id="040601">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040641">
 		<class>Iperf</class>

ci-scripts/xml_files/f1_usrp210_band7_test_10mhz.xml

@@ -27,11 +27,17 @@
 	<TestCaseRequestedList>
  030201
  040101
- 030152 030151 040301 040551 040611 040651 040401 040201 030201 030202
+ 030152 030151 000002 040301 000002 040551 040611 040651 040401 040201 030201 030202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
+
 	<testCase id="030151">
 		<class>Initialize_eNB</class>
 		<desc>Initialize DU (FDD/Band7/10MHz)</desc>
@@ -68,30 +74,30 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040551">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040551">
+		<class>Ping</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040611">
+	<testCase id="040611">
 		<class>Iperf</class>
 		<desc>iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 32M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040651">
 		<class>Iperf</class>

ci-scripts/xml_files/f1_usrp210_band7_test_20mhz.xml

@@ -27,11 +27,17 @@
 	<TestCaseRequestedList>
  030201
  040101
- 030162 030161 040301 040561 040621 040661 040401 040201 030201 030202
+ 030162 030161 000002 040301 000002 040561 040621 040661 040401 040201 030201 030202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
+
 	<testCase id="030161">
 		<class>Initialize_eNB</class>
 		<desc>Initialize DU (FDD/Band7/20MHz)</desc>
@@ -68,30 +74,30 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040561">
-                <class>Ping</class>
-                <desc>ping (20MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040561">
+		<class>Ping</class>
+		<desc>ping (20MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040621">
+	<testCase id="040621">
 		<class>Iperf</class>
 		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040661">
 		<class>Iperf</class>

ci-scripts/xml_files/if4p5_usrp210_band40_build.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>build-tab</htmlTabRef>
 	<htmlTabName>Build</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  010101
  050101 060101 070101
 	</TestCaseRequestedList>
@@ -34,13 +34,13 @@
 	<testCase id="010101">
 		<class>Build_eNB</class>
 		<desc>Build eNB (USRP -- Ethernet Fronthaul)</desc>
-		<Build_eNB_args>-t ETHERNET -w USRP -c --eNB</Build_eNB_args>
+		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
 	</testCase>
 
-        <testCase id="050101">
+	<testCase id="050101">
 		<class>Initialize_HSS</class>
 		<desc>Initialize HSS</desc>
-        </testCase>
+	</testCase>
 
 	<testCase id="060101">
 		<class>Initialize_MME</class>

ci-scripts/xml_files/if4p5_usrp210_band40_epc_closure.xml

@@ -24,25 +24,25 @@
 	<htmlTabRef>epc-closure</htmlTabRef>
 	<htmlTabName>EPC-Closure</htmlTabName>
 	<htmlTabIcon>log-out</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  050201 060201 070201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 
-        <testCase id="050201">
-                <class>Terminate_HSS</class>
-                <desc>Terminate HSS</desc>
-        </testCase>
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
 
-        <testCase id="060201">
-                <class>Terminate_MME</class>
-                <desc>Terminate MME</desc>
-        </testCase>
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
 
-        <testCase id="070201">
-                <class>Terminate_SPGW</class>
-                <desc>Terminate SPGW</desc>
-        </testCase>
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05</htmlTabRef>
 	<htmlTabName>Test-05MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  030201
  040101
  030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
@@ -68,30 +68,30 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
 
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
 
-        <testCase id="040501">
-                <class>Ping</class>
-                <desc>ping (5MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
 
-        <testCase id="040602">
+	<testCase id="040602">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
 		<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	</testCase>
 
 	<testCase id="040642">
 		<class>Iperf</class>

ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml

@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10</htmlTabRef>
 	<htmlTabName>Test-10MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
+	<TestCaseRequestedList>
  030201
  040101
  030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
@@ -40,11 +40,11 @@
 	</testCase>
 	
 	<testCase id="030115">
-                <class>Initialize_eNB</class>
-                <desc>Initialize RCC (TDD/Band40/10MHz/info)</desc>
-                <Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (TDD/Band40/10MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
 		<eNB_instance>1</eNB_instance>
-        </testCase>
+	</testCase>
 
 	<testCase id="030201">
 		<class>Terminate_eNB</class>
@@ -68,30 +68,30 @@
 		<desc>Terminate UE</desc>
 	</testCase>
 
-        <testCase id="040301">
-                <class>Attach_UE</class>
-                <desc>Attach UE</desc>
-        </testCase>
-
-        <testCase id="040401">
-                <class>Detach_UE</class>
-                <desc>Detach UE</desc>
-        </testCase>
-
-        <testCase id="040511">
-                <class>Ping</class>
-                <desc>ping (10MHz - 20 sec)</desc>
-                <ping_args>-c 20</ping_args>
-                <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040612">
-                <class>Iperf</class>
-                <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-                <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
-                <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-                <iperf_profile>single-ue</iperf_profile>
-        </testCase>
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040511">
+		<class>Ping</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040612">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
 
 	<testCase id="040652">
 		<class>Iperf</class>

ci-scripts/xml_files/if4p5_usrp210_band7_build.xml

@@ -34,13 +34,13 @@
 	<testCase id="010101">
 		<class>Build_eNB</class>
 		<desc>Build eNB (USRP -- Ethernet Fronthaul)</desc>
-		<Build_eNB_args>-t ETHERNET -w USRP -c --eNB</Build_eNB_args>
+		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
 	</testCase>
 
-        <testCase id="050101">
+	<testCase id="050101">
 		<class>Initialize_HSS</class>
 		<desc>Initialize HSS</desc>
-        </testCase>
+	</testCase>
 
 	<testCase id="060101">
 		<class>Initialize_MME</class>

ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml

@@ -21,9 +21,9 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>test-10mhz-orange</htmlTabRef>
-        <htmlTabName>Test-10Mhz-Orange</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>	
+	<htmlTabRef>test-10mhz-orange</htmlTabRef>
+	<htmlTabName>Test-10Mhz-Orange</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>	
 	<TestCaseRequestedList>
  090109
  090110 000001 090109

ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml

@@ -21,9 +21,9 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>test-10mHz-sfr</htmlTabRef>
-        <htmlTabName>Test-10MHz-SFR</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
+	<htmlTabRef>test-10mHz-sfr</htmlTabRef>
+	<htmlTabName>Test-10MHz-SFR</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  090109
  090111 000001 090109

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf

@@ -141,6 +141,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf

@@ -141,6 +141,8 @@ eNBs =
                             }
                           );
 
+    enable_measurement_reports = "no";
+
     ///X2
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */