Merge remote-tracking branch 'origin/develop' into RRC-Inactivity-timers-testing

ci-scripts/add_user_to_conf_file.awk

+BEGIN{lineIdx=0;captureUEDesc=0}
+{
+    if ($0 ~/UE0/) {
+        captureUEDesc = 1
+    }
+    if (captureUEDesc == 1) {
+        captureLine[lineIdx] = $0
+        lineIdx = lineIdx + 1
+    }
+    print $0
+}
+END {
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       print ""
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UE0/) {
+               mLine = captureLine[k]
+               gsub("UE0", "UE"ueIdx, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/MSIN=/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%08d", 1111+int(ueIdx))
+                   gsub("00001111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+
+       }
+   }
+}

ci-scripts/add_user_to_subscriber_list.awk

+BEGIN{lineIdx=0}
+{
+    captureLine[lineIdx] = $0
+    lineIdx = lineIdx + 1
+    print $0
+}
+END{
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UserName=/) {
+               mLine = captureLine[k]
+               MSIN=sprintf("%08d", 1111+int(ueIdx))
+               gsub("00001111", MSIN, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/SubscriptionIndex/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%d", 111+int(ueIdx))
+                   gsub("111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+       }
+   }
+}

ci-scripts/buildOnVM.sh

@@ -213,6 +213,6 @@ function build_on_vm {
             echo "sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp/cmake_targets -o /home/ubuntu/tmp/cmake_targets/log/install-build.txt ./my-vm-build.sh" >> $VM_CMDS
         fi
     fi
-    ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
+    ssh -T -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
     rm -f $VM_CMDS
 }

ci-scripts/conf_files/cu.band7.tm1.100PRB.conf

+Active_eNBs = ( "eNB-CU-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-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 100;
+        pbch_repetition                         = "FALSE";
+        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                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -29;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "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                        = -104;
+        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;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    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";
+      }
+    );
+
+    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            = "info";
+  global_log_verbosity        = "medium";
+  pdcp_log_level              = "info";
+  pdcp_log_verbosity          = "high";
+  rrc_log_level               = "info";
+  rrc_log_verbosity           = "medium";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+  gtp_log_level               = "info";
+  gtp_log_verbosity           = "medium";
+};
+
+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/cu.band7.tm1.25PRB.conf

+Active_eNBs = ( "eNB-CU-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-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 25;
+        pbch_repetition                         = "FALSE";
+        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                           = 0;
+        pucch_nCS_AN                            = 0;
+        pucch_n1_AN                             = 0;
+        pdsch_referenceSignalPower              = -25;
+        pdsch_p_b                               = 0;
+        pusch_n_SB                              = 1;
+        pusch_enable64QAM                       = "DISABLE";
+        pusch_hoppingMode                       = "interSubFrame";
+        pusch_hoppingOffset                     = 0;
+        pusch_groupHoppingEnable                = "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                        = -104;
+        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;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    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";
+      }
+    );
+
+    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            = "info";
+  global_log_verbosity        = "medium";
+  pdcp_log_level              = "info";
+  pdcp_log_verbosity          = "high";
+  rrc_log_level               = "info";
+  rrc_log_verbosity           = "medium";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+  gtp_log_level               = "info";
+  gtp_log_verbosity           = "medium";
+};
+
+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/cu.band7.tm1.50PRB.conf

+Active_eNBs = ( "eNB-CU-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-CU-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    tr_s_preference  = "f1"
+
+    local_s_if_name  = "lo";
+    remote_s_address = "127.0.0.3";
+    local_s_address  = "127.0.0.4";
+    local_s_portc    = 501;
+    remote_s_portc   = 500;
+    local_s_portd    = 601;
+    remote_s_portd   = 600;
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                           = "3GPP_eNodeB";
+        node_timing                             = "synch_to_ext_device";
+        node_synch_ref                          = 0;
+        frame_type                              = "FDD";
+        tdd_config                              = 3;
+        tdd_config_s                            = 0;
+        prefix_type                             = "NORMAL";
+        eutra_band                              = 7;
+        downlink_frequency                      = 2680000000L;
+        uplink_frequency_offset                 = -120000000;
+        Nid_cell                                = 0;
+        N_RB_DL                                 = 50;
+        pbch_repetition                         = "FALSE";
+        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                           = 0;
+        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_groupHoppingEnable                = "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                        = -104;
+        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;
+
+        //Parameters for SIB18
+        rxPool_sc_CP_Len                                       = "normal";
+        rxPool_sc_Period                                       = "sf40";
+        rxPool_data_CP_Len                                     = "normal";
+        rxPool_ResourceConfig_prb_Num                          = 20;
+        rxPool_ResourceConfig_prb_Start                        = 5;
+        rxPool_ResourceConfig_prb_End                          = 44;
+        rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+        rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+        rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+        rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+        /*
+        rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+        rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+        rxPool_dataHoppingConfig_rbOffset                               = 0;
+        rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+        */
+
+        // Parameters for SIB19
+        discRxPool_cp_Len                                               = "normal"
+        discRxPool_discPeriod                                           = "rf32"
+        discRxPool_numRetx                                              = 1;
+        discRxPool_numRepetition                                        = 2;
+        discRxPool_ResourceConfig_prb_Num                               = 5;
+        discRxPool_ResourceConfig_prb_Start                             = 3;
+        discRxPool_ResourceConfig_prb_End                               = 21;
+        discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+        discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+        discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+        discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+      }
+    );
+
+
+    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";
+      }
+    );
+
+    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            = "info";
+  global_log_verbosity        = "medium";
+  pdcp_log_level              = "info";
+  pdcp_log_verbosity          = "high";
+  rrc_log_level               = "info";
+  rrc_log_verbosity           = "medium";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+  gtp_log_level               = "info";
+  gtp_log_verbosity           = "medium";
+};
+
+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/du.band7.tm1.100PRB.usrpb210.conf

+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 100;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 115;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -29;
+    max_rxgain                    = 115;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  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";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+};
+
+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/du.band7.tm1.25PRB.usrpb210.conf

+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 25;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 125;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -25;
+    max_rxgain                    = 125;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  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";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+};
+
+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/du.band7.tm1.50PRB.usrpb210.conf

+Active_eNBs = ( "eNB-Eurecom-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+  {
+    ////////// Identification parameters:
+    eNB_CU_ID = 0xe00;
+
+    eNB_name  = "eNB-Eurecom-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2680000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 50;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 120;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
+      }
+    );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
+);
+
+L1s = (
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
+);
+
+RUs = (
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -27;
+    max_rxgain                    = 120;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  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";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+};
+
+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/rcc.band7.tm1.nfapi.conf

@@ -201,9 +201,9 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
-      	local_s_if_name  = "lo:";			  
-      	remote_s_address = "127.0.0.1";
-    	local_s_address  = "127.0.0.2"; 
+	local_s_if_name  = "ens3";
+	remote_s_address = "CI_UE_IP_ADDR";
+	local_s_address  = "CI_ENB_IP_ADDR";
 	local_s_portc    = 50001;
 	remote_s_portc   = 50000;
 	local_s_portd    = 50011;
@@ -216,7 +216,7 @@ MACRLCs = (
 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/ue.nfapi.conf

@@ -20,9 +20,9 @@ L1s = (
         {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
-        local_n_if_name  = "lo";
-        remote_n_address = "127.0.0.2";
-        local_n_address  = "127.0.0.1";
+	local_n_if_name  = "ens3";
+	remote_n_address = "CI_ENB_IP_ADDR";
+	local_n_address  = "CI_UE_IP_ADDR";
 	local_n_portc    = 50000;
 	remote_n_portc   = 50001;
 	local_n_portd    = 50010;

ci-scripts/oai-ci-vm-tool

@@ -34,14 +34,19 @@ function top_usage {
 }
 
 function variant_usage {
+    echo " # OpenAirInterface Build Variants"
     echo "    --variant enb-usrp     OR -v1"
     echo "    --variant basic-sim    OR -v2"
     echo "    --variant phy-sim      OR -v3"
     echo "    --variant cppcheck     OR -v4"
     echo "    --variant enb-ethernet OR -v7"
     echo "    --variant ue-ethernet  OR -v8"
-    echo "    --variant l2-sim       OR -v9"
+    echo " # non-OSA Build Variants"
     echo "    --variant flexran-rtc  OR -v10"
+    echo " # OpenAirInterface Test Variants"
+    echo "    --variant l1-sim       OR -v20"
+    echo "    --variant rf-sim       OR -v21"
+    echo "    --variant l2-sim       OR -v22"
 }
 
 MY_DIR=$(dirname $(readlink -f $0))
@@ -270,31 +275,23 @@ case $key in
     ;;
     -v7)
     VM_NAME=ci-enb-ethernet
+    VM_MEMORY=4096
+    VM_CPU=4
     ARCHIVES_LOC=enb_eth
     LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=8
-    BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
+    NB_PATTERN_FILES=6
+    BUILD_OPTIONS="--eNB -t ETHERNET"
     NBARGS=$[$NBARGS+256]
     shift
     ;;
     -v8)
     VM_NAME=ci-ue-ethernet
+    VM_MEMORY=4096
+    VM_CPU=4
     ARCHIVES_LOC=ue_eth
     LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=8
-    BUILD_OPTIONS="--UE -t ETHERNET --noS1"
-    NBARGS=$[$NBARGS+256]
-    shift
-    ;;
-    -v9)
-    VM_NAME=ci-l2-sim
-    VM_MEMORY=8192
-    VM_CPU=8
-    ARCHIVES_LOC=l2_sim
-    LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=6
-    BUILD_OPTIONS="--eNB -t ETHERNET"
-    RUN_OPTIONS="complex"
+    NB_PATTERN_FILES=10
+    BUILD_OPTIONS="--UE -t ETHERNET"
     NBARGS=$[$NBARGS+256]
     shift
     ;;
@@ -307,6 +304,27 @@ case $key in
     NBARGS=$[$NBARGS+256]
     shift
     ;;
+    -v20)
+    VM_NAME=ci-l1-sim
+    ARCHIVES_LOC=l1_sim
+    RUN_OPTIONS="complex"
+    NBARGS=$[$NBARGS+256]
+    shift
+    ;;
+    -v21)
+    VM_NAME=ci-rf-sim
+    ARCHIVES_LOC=rf_sim
+    RUN_OPTIONS="complex"
+    NBARGS=$[$NBARGS+256]
+    shift
+    ;;
+    -v22)
+    VM_NAME=ci-l2-sim
+    ARCHIVES_LOC=l2_sim
+    RUN_OPTIONS="complex"
+    NBARGS=$[$NBARGS+256]
+    shift
+    ;;
     --variant)
     variant="$2"
     case $variant in
@@ -349,29 +367,22 @@ case $key in
         ;;
         enb-ethernet)
         VM_NAME=ci-enb-ethernet
+        VM_MEMORY=4096
+        VM_CPU=4
         ARCHIVES_LOC=enb_eth
         LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=8
-        BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
+        NB_PATTERN_FILES=6
+        BUILD_OPTIONS="--eNB -t ETHERNET"
         NBARGS=$[$NBARGS+256]
         ;;
         ue-ethernet)
         VM_NAME=ci-ue-ethernet
+        VM_MEMORY=4096
+        VM_CPU=4
         ARCHIVES_LOC=ue_eth
         LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=8
-        BUILD_OPTIONS="--UE -t ETHERNET --noS1"
-        NBARGS=$[$NBARGS+256]
-        ;;
-        l2-sim)
-        VM_NAME=ci-l2-sim
-        VM_MEMORY=8192
-        VM_CPU=8
-        ARCHIVES_LOC=l2_sim
-        LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=6
-        BUILD_OPTIONS="--eNB -t ETHERNET"
-        RUN_OPTIONS="complex"
+        NB_PATTERN_FILES=10
+        BUILD_OPTIONS="--UE -t ETHERNET"
         NBARGS=$[$NBARGS+256]
         ;;
         flexran-rtc)
@@ -382,6 +393,24 @@ case $key in
         BUILD_OPTIONS="cmake . && make -j2"
         NBARGS=$[$NBARGS+256]
         ;;
+        l1-sim)
+        VM_NAME=ci-l1-sim
+        ARCHIVES_LOC=l1_sim
+        RUN_OPTIONS="complex"
+        NBARGS=$[$NBARGS+256]
+        ;;
+        rf-sim)
+        VM_NAME=ci-rf-sim
+        ARCHIVES_LOC=rf_sim
+        RUN_OPTIONS="complex"
+        NBARGS=$[$NBARGS+256]
+        ;;
+        l2-sim)
+        VM_NAME=ci-l2-sim
+        ARCHIVES_LOC=l2_sim
+        RUN_OPTIONS="complex"
+        NBARGS=$[$NBARGS+256]
+        ;;
         *)
         echo ""
         echo "Syntax Error: Invalid Variant option -> $variant"
@@ -536,11 +565,23 @@ ARCHIVES_LOC=${JENKINS_WKSP}/archives/${ARCHIVES_LOC}
 STATUS=0
 if [ $CREATE_CMD -eq 1 ]
 then
+    if [[ $VM_NAME =~ .*-l2-sim.* ]]
+    then
+        echo "Selected variant is no more a build variant"
+        exit 0
+    else
         create_vm
+    fi
 fi
 if [ $BUILD_CMD -eq 1 ]
 then
+    if [[ $VM_NAME =~ .*-l2-sim.* ]]
+    then
+        echo "Selected variant is no more a build variant"
+        exit 0
+    else
         build_on_vm
+    fi
     if [ $DAEMON -eq 0 ] && [ $STATUS -eq 0 ]
     then
         check_on_vm_build
@@ -548,7 +589,13 @@ then
 fi
 if [ $WAIT_CMD -eq 1 ]
 then
+    if [[ $VM_NAME =~ .*-l2-sim.* ]]
+    then
+        echo "Selected variant is no more a build variant"
+        exit 0
+    else
         wait_on_vm_build
+    fi
     if [ $STATUS -eq 0 ]
     then
         check_on_vm_build
@@ -556,6 +603,24 @@ then
 fi
 if [ $TEST_CMD -eq 1 ]
 then
+    # Comment out or delete the following lines if you want to run L1-simulator in your branch and/or merge request
+    if [[ $VM_NAME =~ .*-l1-sim.* ]]
+    then
+        echo "Currently L1-Simulator Testing is not implemented / enabled"
+        echo "Comment out these lines in ./ci-scripts/oai-ci-vm-tool if you want to run it"
+        echo "STATUS seems OK"
+        exit $STATUS
+    fi
+    # end to comment out for L1-simulator
+    # Comment out or delete the following lines if you want to run RF-simulator in your branch and/or merge request
+    if [[ $VM_NAME =~ .*-rf-sim.* ]]
+    then
+        echo "Currently RF-Simulator Testing is not implemented / enabled"
+        echo "Comment out these lines in ./ci-scripts/oai-ci-vm-tool if you want to run it"
+        echo "STATUS seems OK"
+        exit $STATUS
+    fi
+    # end to comment out for RF-simulator
     ARCHIVES_LOC=${ARCHIVES_LOC}/test
     run_test_on_vm
 fi

ci-scripts/reportBuildLocally.sh

@@ -599,25 +599,25 @@ function report_build {
     fi
 
     summary_table_header "OAI Build eNB -- ETHERNET transport option" ./archives/enb_eth
-    summary_table_row "LTE SoftModem w/o S1 - Release 14" ./archives/enb_eth/lte-softmodem-nos1.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
+    summary_table_row "LTE SoftModem - Release 14" ./archives/enb_eth/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
     summary_table_row "Coding - Release 14" ./archives/enb_eth/coding.Rel14.txt "Built target coding" ./enb_eth_row2.html
     summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
     summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_eth_row4.html
-    summary_table_row "RB Tools - Release 14" ./archives/enb_eth/rb_tool.Rel14.txt "Built target rb_tool" ./enb_eth_row5.html
-    summary_table_row "NAS Mesh - Release 14" ./archives/enb_eth/nasmesh.Rel14.txt "Built target nasmesh" ./enb_eth_row6.html
-    summary_table_row "RF Simulator - Release 14" ./archives/enb_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./enb_eth_row7.html
-    summary_table_row "TCP OAI Bridge - Release 14" ./archives/enb_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./enb_eth_row8.html
+    summary_table_row "RF Simulator - Release 14" ./archives/enb_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./enb_eth_row5.html
+    summary_table_row "TCP OAI Bridge - Release 14" ./archives/enb_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./enb_eth_row6.html
     summary_table_footer
 
     summary_table_header "OAI Build UE -- ETHERNET transport option" ./archives/ue_eth
-    summary_table_row "LTE UE SoftModem w/o S1 - Release 14" ./archives/ue_eth/lte-uesoftmodem-nos1.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
+    summary_table_row "LTE UE SoftModem - Release 14" ./archives/ue_eth/lte-uesoftmodem.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
     summary_table_row "Coding - Release 14" ./archives/ue_eth/coding.Rel14.txt "Built target coding" ./ue_eth_row2.html
     summary_table_row "OAI ETHERNET transport - Release 14" ./archives/ue_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
     summary_table_row "Parameters Lib Config - Release 14" ./archives/ue_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./ue_eth_row4.html
-    summary_table_row "RB Tools - Release 14" ./archives/ue_eth/rb_tool.Rel14.txt "Built target rb_tool" ./ue_eth_row5.html
-    summary_table_row "NAS Mesh - Release 14" ./archives/ue_eth/nasmesh.Rel14.txt "Built target nasmesh" ./ue_eth_row6.html
-    summary_table_row "RF Simulator - Release 14" ./archives/ue_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./ue_eth_row7.html
-    summary_table_row "TCP OAI Bridge - Release 14" ./archives/ue_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./ue_eth_row8.html
+    summary_table_row "RF Simulator - Release 14" ./archives/ue_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./ue_eth_row5.html
+    summary_table_row "TCP OAI Bridge - Release 14" ./archives/ue_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./ue_eth_row6.html
+    summary_table_row "Conf 2 UE Data - Release 14" ./archives/ue_eth/conf2uedata.Rel14.txt "Built target conf2uedata" ./ue_eth_row7.html
+    summary_table_row "NVRAM - Release 14" ./archives/ue_eth/nvram.Rel14.txt "Built target nvram" ./ue_eth_row8.html
+    summary_table_row "UE IP - Release 14" ./archives/ue_eth/ue_ip.Rel14.txt "Built target ue_ip" ./ue_eth_row9.html
+    summary_table_row "USIM - Release 14" ./archives/ue_eth/usim.Rel14.txt "Built target usim" ./ue_eth_row9a.html
     summary_table_footer
 
     if [ -e ./archives/red_hat ]

ci-scripts/waitBuildOnVM.sh

@@ -98,7 +98,7 @@ function wait_on_vm_build {
         echo "while [ \$(ps -aux | grep --color=never build_oai | grep -v grep | wc -l) -gt 0 ]; do sleep 3; done" >> $VM_CMDS
     fi
 
-    ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
+    ssh -T -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
     rm -f $VM_CMDS
 }
 
@@ -124,12 +124,17 @@ function check_on_vm_build {
 
     if [ $KEEP_VM_ALIVE -eq 0 ]
     then
+      if [[ "$VM_NAME" == *"-enb-ethernet"* ]] || [[ "$VM_NAME" == *"-ue-ethernet"* ]]
+      then
+        echo "Hack to not destroy in current pipeline"
+      else
         echo "############################################################"
         echo "Destroying VM"
         echo "############################################################"
         uvt-kvm destroy $VM_NAME
         ssh-keygen -R $VM_IP_ADDR
       fi
+    fi
     rm -f $VM_CMDS
 
     echo "############################################################"

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.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
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030101 000001 090101 000002 040501 040502 000001 040601 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="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="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>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<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">
+		<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 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>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        </testCase>
+
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 8M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_05mhz.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
+
+-->
+<testCaseList>
+	<htmlTabRef>test-f1-05</htmlTabRef>
+	<htmlTabName>Test-F1-CU/DU-05MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 040101
+ 030142 030141 040301 040541 040601 040641 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030141">
+		<class>Initialize_eNB</class>
+		<desc>Initialize DU (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030142">
+		<class>Initialize_eNB</class>
+		<desc>Initialize CU (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.25PRB.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate CU</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate DU</desc>
+		<eNB_instance>1</eNB_instance>
+	</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="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">
+		<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 id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_10mhz.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
+
+-->
+<testCaseList>
+	<htmlTabRef>test-f1-10</htmlTabRef>
+	<htmlTabName>Test-F1-CU/DU-10MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 040101
+ 030152 030151 040301 040551 040611 040651 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030151">
+		<class>Initialize_eNB</class>
+		<desc>Initialize DU (FDD/Band7/10MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030152">
+		<class>Initialize_eNB</class>
+		<desc>Initialize CU (FDD/Band7/10MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.50PRB.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate CU</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate DU</desc>
+		<eNB_instance>1</eNB_instance>
+	</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="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">
+		<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 id="040651">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/f1_usrp210_band7_test_20mhz.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
+
+-->
+<testCaseList>
+	<htmlTabRef>test-f1-20</htmlTabRef>
+	<htmlTabName>Test-F1-CU/DU-20MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 040101
+ 030162 030161 040301 040561 040621 040661 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030161">
+		<class>Initialize_eNB</class>
+		<desc>Initialize DU (FDD/Band7/20MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030162">
+		<class>Initialize_eNB</class>
+		<desc>Initialize CU (FDD/Band7/20MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.100PRB.conf</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate CU</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate DU</desc>
+		<eNB_instance>1</eNB_instance>
+	</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="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">
+		<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 id="040661">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 15M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml

@@ -96,7 +96,7 @@
 		<class>Iperf</class>
 		<desc>iperf (10MHz - 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_packetloss_threshold>60</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 

ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml

@@ -21,8 +21,8 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>test-05</htmlTabRef>
-	<htmlTabName>Test-05MHz</htmlTabName>
+	<htmlTabRef>test-if4p5-05</htmlTabRef>
+	<htmlTabName>Test-IF4.5-05MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  040101

ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml

@@ -21,8 +21,8 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>test-10</htmlTabRef>
-	<htmlTabName>Test-10MHz</htmlTabName>
+	<htmlTabRef>test-if4p5-10</htmlTabRef>
+	<htmlTabName>Test-IF4.5-10MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  040101

ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml

@@ -21,8 +21,8 @@
 
 -->
 <testCaseList>
-	<htmlTabRef>test-20</htmlTabRef>
-	<htmlTabName>Test-20MHz</htmlTabName>
+	<htmlTabRef>test-if4p5-20</htmlTabRef>
+	<htmlTabName>Test-IF4.5-20MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  040101

ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml

@@ -25,14 +25,14 @@
         <htmlTabName>Test-10Mhz-Orange</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>	
 	<TestCaseRequestedList>
-090102 000001 090109
+090110 000001 090109
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="090102">
+	<testCase id="090110">
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE -- sniffing Orange frequency</desc>
-		<Initialize_OAI_UE_args>-C 816000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>-C 816000000 -r 50 --ue-rxgain 130 --ue-scan-carrier --no-L2-connect --nokrnmod 1</Initialize_OAI_UE_args>
 	</testCase>
 
 	<testCase id="000001">

ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml

@@ -25,14 +25,14 @@
         <htmlTabName>Test-10MHz-SFR</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
-090104 000001 090109
+090111 000001 090109
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="090104">
+	<testCase id="090111">
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE -- sniffing SFR frequency</desc>
-		<Initialize_OAI_UE_args>-C 806000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>-C 806000000 -r 50 --ue-rxgain 130 --ue-scan-carrier --no-L2-connect --nokrnmod 1</Initialize_OAI_UE_args>
 	</testCase>
 
 	<testCase id="000001">

cmake_targets/CMakeLists.txt

@@ -664,12 +664,7 @@ add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION w
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
 
-#############################################################################
-# Flag for UE compilation to avoid issues in common eNB/UE PDCP/RLC functions
-#############################################################################
-
-add_boolean_option(UETARGET                 False         "set UE as target for compiler")
-
+########################
 # Include order
 ##########################
 add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
@@ -2292,6 +2287,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
     ${T_SOURCE}
     ${CONFIG_SOURCES}
     ${SHLIB_LOADER_SOURCES}
+    ${NFAPI_USER_DIR}/nfapi.c
     )
   target_link_libraries (${myExe}
 

cmake_targets/build_oai

@@ -70,7 +70,6 @@ DISABLE_LOG_X="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
 UE_NAS_USE_TUN="False"
-UETARGET="False"
 BASIC_SIMULATOR=0
 trap handle_ctrl_c INT
 
@@ -219,7 +218,6 @@ function main() {
 	    shift;;
        --UE)
             UE=1
-            UETARGET="True"
             echo_info "Will compile UE"
             shift;;
        --mu)
@@ -549,9 +547,6 @@ function main() {
     echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
     echo "set (DISABLE_LOG_X $DISABLE_LOG_X)"        >>  $cmake_file
     echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"        >>  $cmake_file
-    if [ "$UE" = 1 ] ; then
-       echo "set (UETARGET $UETARGET )"                   >> $cmake_file
-    fi
     if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
      echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
      echo "set (LINUX True )"              >>  $cmake_file
@@ -945,7 +940,6 @@ function main() {
     echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"         >>  $cmake_file
     echo "set (LINUX True )"                          >>  $cmake_file
     echo "set (PDCP_USE_NETLINK True )"               >>  $cmake_file
-    echo "set (UETARGET True )"                       >>  $cmake_file
     echo "set (BASIC_SIMULATOR \"True\" )"            >>  $cmake_file
 #    echo "set (UE_NAS_USE_TUN \"True\" )"             >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)' >> $cmake_file

common/utils/T/tracer/gui/xy_plot.c

@@ -130,9 +130,13 @@ static void paint(gui *_gui, widget *_this)
           this->common.y + FLIP(y),
           this->common.x + this->vrule_width + 5,
           this->common.y + FLIP(y));
+      /* do not print out of the widget (take care of top) */
+      y = FLIP(y)-this->label_height/2+this->label_baseline;
+      if (y - this->label_baseline < 0)
+        y = this->label_baseline;
       x_draw_string(g->x, g->xwin, DEFAULT_FONT, FOREGROUND_COLOR,
           this->common.x + this->vrule_width - vwidth - 2,
-          this->common.y + FLIP(y)-this->label_height/2+this->label_baseline,
+          this->common.y + y,
           v);
     }
     break;

nfapi/oai_integration/nfapi.c

@@ -21,31 +21,55 @@
 
 #include <stdio.h>
 #include <pthread.h>
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "common/utils/LOG/log.h"
+static char nfapi_str_mode[6][24] = {"MONOLITHIC","PNF","VNF","UE_STUB_PNF","UE_STUB_OFFNET","<UNKNOWN NFAPI MODE>"};
 
-void set_thread_priority(int priority)
-{
-  //printf("%s(priority:%d)\n", __FUNCTION__, priority);
+typedef struct {
+  nfapi_mode_t nfapi_mode;
+} nfapi_params_t;
 
-  pthread_attr_t ptAttr;
+static nfapi_params_t nfapi_params;
 
+void set_thread_priority(int priority) {
+  //printf("%s(priority:%d)\n", __FUNCTION__, priority);
+  pthread_attr_t ptAttr;
   struct sched_param schedParam;
   schedParam.__sched_priority = priority; //79;
-  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0)
-  {
+
+  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0) {
     printf("Failed to set scheduler to SCHED_RR\n");
   }
 
-  if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0)
-  {
+  if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0) {
     printf("Failed to set pthread sched policy SCHED_RR\n");
   }
 
   pthread_attr_setinheritsched(&ptAttr, PTHREAD_EXPLICIT_SCHED);
-
   struct sched_param thread_params;
   thread_params.sched_priority = 20;
-  if(pthread_attr_setschedparam(&ptAttr, &thread_params) != 0)
-  {
+
+  if(pthread_attr_setschedparam(&ptAttr, &thread_params) != 0) {
     printf("failed to set sched param\n");
   }
 }
+
+char *nfapi_get_strmode(void) {
+  if (nfapi_params.nfapi_mode > NFAPI_MODE_UNKNOWN)
+    return nfapi_str_mode[NFAPI_MODE_UNKNOWN];
+
+  return nfapi_str_mode[nfapi_params.nfapi_mode];
+}
+
+void nfapi_logmode() {
+  LOG_I(ENB_APP,"nfapi running mode: %s\n",nfapi_get_strmode());
+}
+
+nfapi_mode_t nfapi_getmode(void) {
+  return nfapi_params.nfapi_mode;
+}
+
+void nfapi_setmode(nfapi_mode_t nfapi_mode) {
+  nfapi_params.nfapi_mode = nfapi_mode;
+  nfapi_logmode();
+}

nfapi/oai_integration/nfapi_pnf.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "debug.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 #include "nfapi_pnf_interface.h"
 #include "nfapi.h"
 #include "nfapi_pnf.h"
@@ -76,7 +77,7 @@ extern void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame, int subfra
 extern void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, L1_rxtx_proc_t *proc, nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
 extern void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, nfapi_dl_config_request_pdu_t *dl_config_pdu, uint8_t *sdu);
 
-extern uint8_t  nfapi_mode;
+
 
 nfapi_tx_request_pdu_t *tx_request_pdu[1023][10][10]; // [frame][subframe][max_num_pdus]
 
@@ -485,7 +486,7 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
   // to keep only the necessary just to keep the nfapi FSM rolling by sending a dummy response.
   LTE_DL_FRAME_PARMS *fp;
 
-  if (nfapi_mode!=3) {
+  if (NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
     fp = &eNB->frame_parms;
   } else {
@@ -647,7 +648,7 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
     num_tlv++;
   }
 
-  if(nfapi_mode!=3) {
+  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     printf("[PNF] CONFIG_REQUEST[num_tlv:%d] TLVs processed:%d\n", req->num_tlv, num_tlv);
     printf("[PNF] Simulating PHY CONFIG - DJP\n");
     PHY_Config_t phy_config;
@@ -672,7 +673,7 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
   nfapi_pnf_config_resp(config, &nfapi_resp);
   printf("[PNF] Sent NFAPI_CONFIG_RESPONSE phy_id:%d\n", phy_info->id);
 
-  if(nfapi_mode ==3)
+  if(NFAPI_MODE==NFAPI_UE_STUB_PNF)
     free(fp);
 
   return 0;
@@ -1023,7 +1024,7 @@ int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi
   p7_config->tx_req = &pnf_phy_tx_req;
   p7_config->lbt_dl_config_req = &pnf_phy_lbt_dl_config_req;
 
-  if (nfapi_mode==3) {
+  if (NFAPI_MODE==NFAPI_UE_STUB_PNF) {
     p7_config->dl_config_req = &memcpy_dl_config_req;
     p7_config->ul_config_req = &memcpy_ul_config_req;
     p7_config->hi_dci0_req = &memcpy_hi_dci0_req;
@@ -1080,7 +1081,7 @@ int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi
   //phy_init_RU(RC.ru[0]);
   printf("[PNF] About to call init_eNB_afterRU()\n");
 
-  if (nfapi_mode != 3) {
+  if (NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     init_eNB_afterRU();
   }
 
@@ -1364,8 +1365,8 @@ void *pnf_start_thread(void *ptr) {
 void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port) {
   printf("%s() PNF\n\n\n\n\n\n", __FUNCTION__);
 
-  if(nfapi_mode!=3) {
-    nfapi_mode = 1;  // PNF!
+  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
+    nfapi_setmode(NFAPI_PNF);  // PNF!
   }
 
   nfapi_pnf_config_t *config = nfapi_pnf_config_create();

nfapi/oai_integration/nfapi_vnf.c

@@ -904,10 +904,10 @@ void vnf_start_thread(void *ptr) {
 }
 
 static vnf_info vnf;
-extern uint8_t nfapi_mode;
+
 /*------------------------------------------------------------------------------*/
 void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port) {
-  nfapi_mode = 2;
+  nfapi_setmode(NFAPI_MODE_VNF);
   memset(&vnf, 0, sizeof(vnf));
   memset(vnf.p7_vnfs, 0, sizeof(vnf.p7_vnfs));
   vnf.p7_vnfs[0].timing_window = 32;

nfapi/oai_integration/vendor_ext.h

@@ -64,4 +64,18 @@ typedef struct {
 
 #define VENDOR_EXT_TLV_2_TAG 0xF002
 
+typedef enum {
+  NFAPI_MONOLITHIC=0,
+  NFAPI_MODE_PNF,
+  NFAPI_MODE_VNF,
+  NFAPI_UE_STUB_PNF,
+  NFAPI_UE_STUB_OFFNET,
+  NFAPI_MODE_UNKNOWN
+} nfapi_mode_t;
+
+char *nfapi_get_strmode(void);
+void nfapi_logmode(void);
+nfapi_mode_t nfapi_getmode(void);
+void nfapi_setmode(nfapi_mode_t nfapi_mode);
+#define NFAPI_MODE (nfapi_getmode())
 #endif // _VENDOR_EXT_

openair1/PHY/CODING/lte_segmentation.c

@@ -59,6 +59,7 @@ int lte_segmentation(unsigned char *input_buffer,
   }
 
   if ((*C)>MAX_NUM_DLSCH_SEGMENTS) {
+    printf("%d\n",*(int*)0);
     LOG_E(PHY,"lte_segmentation.c: too many segments %d, B %d, L %d, Bprime %d\n",*C,B,L,Bprime);
     return(-1);
   }

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -528,7 +528,7 @@ void fill_dci_and_dlsch(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_proc_t
 
     dlsch0->harq_mask |= (1 << rel8->harq_process);
 
-    if (rel8->rnti_type == 1) LOG_D(PHY,"DCI 1A: round %d, mcs %d, rballoc %x, rv %d, rnti %x, harq process %d\n",dlsch0_harq->round,rel8->mcs_1,rel8->resource_block_coding,rel8->redundancy_version_1,rel8->rnti,rel8->harq_process);
+    if (rel8->rnti_type == 1) LOG_D(PHY,"DCI 1A: round %d, mcs %d, TBS %d, rballoc %x, rv %d, rnti %x, harq process %d\n",dlsch0_harq->round,rel8->mcs_1,dlsch0_harq->TBS,rel8->resource_block_coding,rel8->redundancy_version_1,rel8->rnti,rel8->harq_process);
 
     break;
   case NFAPI_DL_DCI_FORMAT_1:
@@ -1750,6 +1750,7 @@ void fill_mdci_and_dlsch(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,mDCI_ALLOC_t *dc
   if (dlsch0->rnti != rel13->rnti) {     // if rnti of dlsch is not the same as in the config, this is a new entry
     dlsch0_harq->round = 0;
     dlsch0->harq_mask =0;
+    printf("*********************** rnti %x => %x, pos %d\n",rel13->rnti,dlsch0->rnti,UE_id);
   }
   if ((dlsch0->harq_mask & (1 << rel13->harq_process)) > 0) {
     if ((rel13->new_data_indicator != dlsch0_harq->ndi)||(dci_alloc->ra_flag==1))
@@ -1768,7 +1769,8 @@ void fill_mdci_and_dlsch(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,mDCI_ALLOC_t *dc
       dlsch0_harq->TBS         = TBStable[get_I_TBS(dlsch0_harq->mcs)][1];
     else if (rel13->tpc == 1)  //N1A_PRB=3, get TBS from table using mcs and nb_rb=3
       dlsch0_harq->TBS         = TBStable[get_I_TBS(dlsch0_harq->mcs)][2];
-    LOG_D(PHY,"TBS = %d(%d)\n",dlsch0_harq->TBS,dlsch0_harq->mcs);
+    else AssertFatal(1==0,"Don't know how to set TBS (TPC %d)\n",rel13->tpc);
+    LOG_D(PHY,"fill_mdci_and_dlsch : TBS = %d(%d) %p, %x\n",dlsch0_harq->TBS,dlsch0_harq->mcs,dlsch0,rel13->rnti);
   }
   dlsch0->active = 1;
   dlsch0->harq_mask |= (1 << rel13->harq_process);

openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

@@ -571,6 +571,8 @@ int dlsch_encoding_all(PHY_VARS_eNB *eNB,
   unsigned int L,C,B;
   B = dlsch->harq_processes[dlsch->harq_ids[frame%2][subframe]]->B;
 
+  LOG_D(PHY,"B %d, harq_pid %d\n",B,dlsch->harq_ids[frame%2][subframe]);
+
   if(B<=6144) {
     L=0;
     C=1;
@@ -703,7 +705,7 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
   //  if (dlsch->harq_processes[harq_pid]->Ndi == 1) {  // this is a new packet
   if (dlsch->harq_processes[harq_pid]->round == 0) {  // this is a new packet
 #ifdef DEBUG_DLSCH_CODING
-    printf("encoding thinks this is a new packet for harq_pid %d (%p) \n",harq_pid,dlsch->harq_processes[harq_pid]->b);
+    printf("encoding thinks this is a new packet for harq_pid %d (%p), A %d \n",harq_pid,dlsch,A);
 #endif
     /*
     int i;

openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c

@@ -2171,8 +2171,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
                                       uint8_t beamforming_mode,
                                       uint16_t tc_rnti)
 {
-
-    uint8_t harq_pid=0;
     uint8_t frame_type=frame_parms->frame_type;
     uint8_t tpmi=0;
     LTE_UE_DLSCH_t *dlsch0=NULL,*dlsch1=NULL;
@@ -2488,15 +2486,15 @@ int generate_ue_dlsch_params_from_dci(int frame,
     case format1E_2A_M10PRB:
       if (!dlsch[0]) return -1;
 
-      harq_pid  = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->harq_pid;
+      dci_info_extarcted.harq_pid  = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->harq_pid;
 
-      if (harq_pid>=8) {
-        LOG_E(PHY,"Format 1E_2A_M10PRB: harq_pid=%d >= 8\n", harq_pid);
+      if (dci_info_extarcted.harq_pid>=8) {
+        LOG_E(PHY,"Format 1E_2A_M10PRB: harq_pid=%d >= 8\n", dci_info_extarcted.harq_pid);
         return(-1);
       }
 
-      dlsch[0]->current_harq_pid = harq_pid;
-      dlsch[0]->harq_ack[subframe].harq_id = harq_pid;
+      dlsch[0]->current_harq_pid = dci_info_extarcted.harq_pid;
+      dlsch[0]->harq_ack[subframe].harq_id = dci_info_extarcted.harq_pid;
 
       /*
         tbswap = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->tb_swap;
@@ -2511,7 +2509,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
       */
       dlsch0 = dlsch[0];
 
-      dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
+      dlsch0_harq = dlsch[0]->harq_processes[dci_info_extarcted.harq_pid];
       // Needs to be checked
       dlsch0_harq->codeword=0;
       conv_rballoc(((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->rah,
@@ -2627,7 +2625,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
         // is NAK or an ACK was not received
 
         dlsch0->harq_ack[subframe].ack              = 1;
-        dlsch0->harq_ack[subframe].harq_id          = harq_pid;
+        dlsch0->harq_ack[subframe].harq_id          = dci_info_extarcted.harq_pid;
         dlsch0->harq_ack[subframe].send_harq_status = 1;
         dlsch0->active = 0;
         return(0);
@@ -2683,7 +2681,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
     {
       T(T_UE_PHY_DLSCH_UE_DCI, T_INT(0), T_INT(frame%1024), T_INT(subframe),
         T_INT(dlsch[0]->rnti), T_INT(dci_format),
-        T_INT(harq_pid),
+        T_INT(dci_info_extarcted.harq_pid),
         T_INT(dlsch0_harq->mcs),
         T_INT(dlsch0_harq->TBS));
     }

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -1517,17 +1517,21 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
         ue->ulsch[eNB_id]->harq_processes[harq_pid]->O_ACK = ack_status_cw0 + ack_status_cw1;
       }
 
-      if ( LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
-        if(ue->ulsch[eNB_id]->o_ACK[0]) {
-          LOG_I(PHY,"PUSCH ACK\n");
+      if (ue->ulsch[eNB_id]->o_ACK[0]) {
         T(T_UE_PHY_DLSCH_UE_ACK, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx), T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti),
           T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->current_harq_pid));
       } else {
-          LOG_I(PHY,"PUSCH NACK\n");
         T(T_UE_PHY_DLSCH_UE_NACK, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx), T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti),
           T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->current_harq_pid));
       }
 
+      if ( LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
+        if(ue->ulsch[eNB_id]->o_ACK[0]) {
+          LOG_I(PHY,"PUSCH ACK\n");
+        } else {
+          LOG_I(PHY,"PUSCH NACK\n");
+        }
+
         LOG_I(PHY,"[UE  %d][PDSCH %x] AbsSubFrame %d.%d Generating ACK (%d,%d) for %d bits on PUSCH\n",
               Mod_id,
               ue->ulsch[eNB_id]->rnti,
@@ -2035,15 +2039,13 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
         }
       }
 
-      if (LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
-        if(pucch_payload[0]) {
+      if (pucch_payload[0]) {
         T(T_UE_PHY_DLSCH_UE_ACK, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx), T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti),
           T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->current_harq_pid));
       } else {
         T(T_UE_PHY_DLSCH_UE_NACK, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx), T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->rnti),
           T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->current_harq_pid));
       }
-      }
 
       generate_pucch1x(ue->common_vars.txdataF,
                        &ue->frame_parms,
@@ -2739,8 +2741,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
                                              CBA_RNTI,
                                              eNB_id,
                                              0)==0)) {
-        if (LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
-          LOG_USEDINLOG_VAR(int8_t,harq_pid) = subframe2harq_pid(&ue->frame_parms,
+        int harq_pid = subframe2harq_pid(&ue->frame_parms,
                                          pdcch_alloc2ul_frame(&ue->frame_parms,proc->frame_rx,proc->subframe_rx),
                                          pdcch_alloc2ul_subframe(&ue->frame_parms,proc->subframe_rx));
         T(T_UE_PHY_ULSCH_UE_DCI, T_INT(eNB_id), T_INT(proc->frame_rx%1024), T_INT(proc->subframe_rx),
@@ -2751,6 +2752,10 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
           T_INT(ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb),
           T_INT(ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb),
           T_INT(ue->ulsch[eNB_id]->harq_processes[harq_pid]->TBS));
+        if (LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
+          LOG_USEDINLOG_VAR(int8_t,harq_pid) = subframe2harq_pid(&ue->frame_parms,
+                                               pdcch_alloc2ul_frame(&ue->frame_parms,proc->frame_rx,proc->subframe_rx),
+                                               pdcch_alloc2ul_subframe(&ue->frame_parms,proc->subframe_rx));
           LOG_D(PHY,"[UE  %d] Generate UE ULSCH C_RNTI format 0 (subframe %d)\n",ue->Mod_id,subframe_rx);
         }
       }

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

@@ -92,11 +92,11 @@ static int tun_alloc(char *dev) {
   return fd;
 }
 
-int netlink_init_tun(char *ifprefix) {
+int netlink_init_tun(char *ifprefix, int num_if) {
   int ret;
   char ifname[64];
 
-  for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
+  for (int i = 0; i < num_if; i++) {
     sprintf(ifname, "oaitun_%.3s%d",ifprefix,i+1);
     nas_sock_fd[i] = tun_alloc(ifname);