merge develop into branch

.gitlab-ci.yml

+job1:
+  script:
+   - echo $PWD
+   - echo $USER
+   - echo $OAI_USER
+   - echo $OAI_EXTRA_ARGS
+   - echo $NFS_SHARE_DIR
+   - echo $EXTERNAL_SHARE_DIR
+   - echo $SHELL
+   - git rev-parse --abbrev-ref HEAD
+   - git_head=`git rev-parse HEAD`
+   - echo $git_head
+   - tmp=`git show-ref --head | grep $git_head`
+   - tmp=(${tmp///// })
+   - git_branch=${tmp[@]:(-1)}
+   - echo $git_branch
+   - source oaienv
+   - echo $OPENAIR_DIR
+   - NFS_TEST_RESULTS_DIR=$NFS_SHARE_DIR/$git_branch/$git_head
+   - EXTERNAL_SHARE_RESULTS_DIR=$EXTERNAL_SHARE_DIR/$git_branch/$git_head
+   - echo $NFS_TEST_RESULTS_DIR
+   - echo $EXTERNAL_SHARE_RESULTS_DIR
+   - echo $NRUNS_LTE_SOFTMODEM
+   - echo $TIMEOUT_CMD
+   - mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
+   - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -c -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS  $OAI_EXTRA_ARGS -g "$OAI_TEST_CASE_GROUP">& $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log
+   - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS `echo $OAI_EXTRA_ARGS` -g "$OAI_TEST_CASE_GROUP" --nrun_lte_softmodem $NRUNS_LTE_SOFTMODEM --timeout_cmd $TIMEOUT_CMD >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
+   - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log
+   - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log
+   - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no "  --rsync-path="mkdir -p $NFS_TEST_RESULTS_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR
+   - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no "  --rsync-path="mkdir -p $EXTERNAL_SHARE_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$EXTERNAL_SHARE_DIR
+   - cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml

cmake_targets/CMakeLists.txt

@@ -133,9 +133,6 @@ else (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
   if (CPUINFO MATCHES "avx2")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -mavx2")
   endif()
-  if (CPUINFO MATCHES "sse4_2")
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -msse4.2")
-  endif()
   if (CPUINFO MATCHES "sse4_1")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -msse4.1")
   endif()
@@ -149,8 +146,8 @@ set(C_FLAGS_PROCESSOR " ${C_FLAGS_PROCESSOR} ${CFLAGS_PROCESSOR_USER}")
 Message("C_FLAGS_PROCESSOR is ${C_FLAGS_PROCESSOR}")
 
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
-  if ( (NOT( C_FLAGS_PROCESSOR MATCHES "ssse3")) OR (NOT( C_FLAGS_PROCESSOR MATCHES "msse4.1")) OR (NOT( C_FLAGS_PROCESSOR MATCHES "msse4.2")) )
-    Message(FATAL_ERROR "For x86 Architecture, you must have following flags: -mssse3 -msse4.1 -msse4.2. The current detected flags are: ${C_FLAGS_PROCESSOR}. You can pass the flags manually in build script, for example: ./build_oai --cflags_processor \"-mssse3 -msse4.1 -msse4.2\" ")
+  if ( (NOT( C_FLAGS_PROCESSOR MATCHES "ssse3")) OR (NOT( C_FLAGS_PROCESSOR MATCHES "msse4.1")) )
+    Message(FATAL_ERROR "For x86 Architecture, you must have following flags: -mssse3 -msse4.1. The current detected flags are: ${C_FLAGS_PROCESSOR}. You can pass the flags manually in build script, for example: ./build_oai --cflags_processor \"-mssse3 -msse4.1\" ")
   endif()
 endif()
 
@@ -252,6 +249,9 @@ endif (${RTAI})
 set(asn1c_call "${OPENAIR_CMAKE}/tools/generate_asn1")
 set(asn1_generated_dir ${OPENAIR_BIN_DIR})
 
+set(protoc_call "${OPENAIR_CMAKE}/tools/generate_protobuf")
+set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
+
 # RRC
 ######
 add_list2_option(RRC_ASN1_VERSION "Rel10" "ASN.1 version of RRC interface" "Rel8" "Rel10" "CBA")
@@ -491,6 +491,7 @@ elseif (${RF_BOARD} STREQUAL "CPRIGW") #to ask
   
 endif (${RF_BOARD} STREQUAL "EXMIMO")
 
+
 if (${TRANSP_PRO} STREQUAL "ETHERNET")
   
   include_directories ("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB")
@@ -501,12 +502,15 @@ if (${TRANSP_PRO} STREQUAL "ETHERNET")
     )
   set(option_TP_lib "-rdynamic -ldl")
   set(LOWLATENCY True)
+
   
 endif (${TRANSP_PRO} STREQUAL "ETHERNET")
 ##########################################################
 
 include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
-	  
+
+Message("LOWLATENCY flag  is ${LOWLATENCY}")
+
 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
@@ -514,6 +518,7 @@ add_boolean_option(ENABLE_SECURITY         True  "Enable LTE integrity and ciphe
 add_boolean_option(ENABLE_USE_MME          True  "eNB connected to MME (INTERFACE S1-C), not standalone eNB")
 add_boolean_option(NO_RRM                  True  "DO WE HAVE A RADIO RESSOURCE MANAGER: NO")
 add_boolean_option(USER_MODE True "????")
+add_boolean_option(RRC_DEFAULT_RAB_IS_AM False "set the RLC mode to AM for the default bearer")
 
 add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????")
 add_boolean_option(DISABLE_USE_NAS False "???")
@@ -527,6 +532,9 @@ add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name")
 add_boolean_option(MESSAGE_CHART_GENERATOR False         "For generating sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchanges in sequence diagrams")
+
+add_boolean_option(ENB_AGENT                   True         "enable eNB agent to inteface with a SDN contrller")
+
 ########################
 # Include order
 ##########################
@@ -741,6 +749,56 @@ include_directories("${OPENAIR_DIR}")
 
 # Utilities Library
 ################
+if (ENB_AGENT)
+  # set the version of protobuf messages, V3 not supported yet
+  add_list1_option(PRPT_VERSION V2 "PRPT MSG  protobuf  grammar version" V2 V3)
+  
+  if (${PRPT_VERSION} STREQUAL "V2")
+    set (PRPTDIR V2)
+  elseif (${PRPT_VERSION} STREQUAL "V3")
+    set (PRPTDIR V3)
+  endif(${PRPT_VERSION} STREQUAL "V2")
+  
+  set(PRPT_MSG_DIR ${OPENAIR2_DIR}/ENB_APP/MESSAGES/${PRPTDIR} )
+  set(PRPT_MSG_FILES
+    ${PRPT_MSG_DIR}/header.proto
+    ${PRPT_MSG_DIR}/progran.proto
+    ${PRPT_MSG_DIR}/stats_common.proto
+    ${PRPT_MSG_DIR}/stats_messages.proto
+    )
+
+  set(PRPT_C_DIR ${protobuf_generated_dir}/${PRPTDIR})
+  message("calling ${protoc_call} ${PRPT_C_DIR} ${PRPT_MSG_FILES}")
+  execute_process(COMMAND ${protoc_call} ${PRPT_C_DIR} ${PRPT_MSG_FILES})
+  file(GLOB PRPT_source ${PRPT_C_DIR}/*.c)
+  set(PRPT_OAI_generated
+    ${PRPT_C_DIR}/header.pb-c.c
+    ${PRPT_C_DIR}/progran.pb-c.c
+    ${PRPT_C_DIR}/stats_common.pb-c.c
+    ${PRPT_C_DIR}/stats_messages.pb-c.c
+    )
+  
+  file(GLOB prpt_h ${PRPT_C_DIR}/*.h)
+  set(prpt_h ${prpt_h} )
+  
+  add_library(PRPT_MSG
+    ${PRPT_OAI_generated}
+    ${PRPT_source}
+    )
+
+  include_directories ("${PRPT_C_DIR}")
+
+  add_library(ASYNC_IF
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/socket_link.c
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/link_manager.c
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/message_queue.c
+    )
+  set(ASYNC_IF_LIB ASYNC_IF)
+  include_directories(${OPENAIR2_DIR}/UTIL/ASYNC_IF)
+
+endif()
+
+
 add_library(HASHTABLE
   ${OPENAIR_DIR}/common/utils/collection/hashtable/hashtable.c
   ${OPENAIR_DIR}/common/utils/collection/hashtable/obj_hashtable.c
@@ -1648,7 +1706,7 @@ add_executable(oaisim_nos1
 target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim_nos1
   -Wl,--start-group
-  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${ASYNC_IF_LIB}
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})

cmake_targets/autotests/README.txt

@@ -6,41 +6,50 @@ Obj.#   Case#   Test#	Description
 01                      pre-commit test case
 01      01              Build OAI 
 01      01      01      Build oaisim.Rel8
-01      01      02      Build oaisim.Rel8 + network device driver(nasmesh_fix)	
-01      01      03      Build (lte-softmodem.Rel8.EXMIMO + lte-softmodem.Rel10.EXMIMO + lte-softmodem.Rel10.USRP)	
-01      01      04      Build (dlsim.Rel10 + ulsim.Rel10 + pucchsim.Rel10 + prachsim.Rel10 + pdcchsim.Rel10 + pbchsim.Rel10 + mbmssim.Rel10
+01      01      02      Build oaisim.Rel10	
+01      01      03      Build oaisim_noS1.Rel10	
+01      01      10      Build lte-softmodem_noS1.USRP.Rel10
+01      01      11      Build lte-softmodem_noS1.EXMIMO.Rel10
+01      01      12      Build lte-softmodem_noS1.BLADERF.Rel10
+01      01      13      Build lte-softmodem_noS1.ETHERNET.Rel10
+01      01      20      Build lte-softmodem.USRP.Rel10
+01      01      21      Build lte-softmodem.EXMIMO.Rel10
+01      01      22      Build lte-softmodem.BLADERF.Rel10
+01      01      23      Build lte-softmodem.ETHERNET.Rel10
+
+01      01      30      Build (dlsim.Rel10 + ulsim.Rel10 + pucchsim.Rel10 + prachsim.Rel10 + pdcchsim.Rel10 + pbchsim.Rel10 + mbmssim.Rel10
                         secu_knas_encrypt_eia1.Rel10 secu_kenb.Rel10 aes128_ctr_encrypt.Rel10 aes128_ctr_decrypt.Rel10 secu_knas_encrypt_eea2.Rel10
                         secu_knas.Rel10 secu_knas_encrypt_eea1.Rel10 kdf.Rel10 aes128_cmac_encrypt.Rel10 secu_knas_encrypt_eia2.Rel10)
-01      01      06      Build oaisim.Rel8 + ITTI
-01      01      07      Build oaisim.Rel10 
-01      01      08      Build oaisim.Rel10 + ITTI
-01      01      20      Build Nasmesh
-01      01      30      Build RRH Gateway
-
-
-01      02              Run OAISIM Rel10 (TDD + 5MHz/10MHz/20MHz + TM 1,2,5,6), and check the operation
-01      02      00      Run OAISIM Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) and search for errors, segmentation fault or exit
-01      02      01      Run OAISIM Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) in PHY_ABSTRACTION mode and search for errors
-01      02      02      Run OAISIM Rel10 TDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2,5,6) and search for errors, segmentation fault or exit
-01      02      03      Run OAISIM Rel10 TDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2,5,6) in PHY_ABSTRACTION mode and search for errors
-01      02      04      Run OAI Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) without PHY_ABSTRACTION mode, ping from from eNB to UE,
+
+01      01      40      Build RRH Gateway for USRP (Rel 10)
+01      01      41      Build RRH Gateway for EXMIMO  (Rel 10)
+01      01      42      Build RRH Gateway for BLADERF  (Rel 10)
+
+
+
+01      02              Run OAISIM-NOS1 Rel10 (TDD + 5MHz/10MHz/20MHz + TM 1,2), and check the operation
+01      02      00      Run OAISIM-NOS1 Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) and search for errors, segmentation fault or exit
+01      02      01      Run OAISIM-NOS1 Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) in PHY_ABSTRACTION mode and search for errors
+01      02      02      Run OAISIM-NOS1 Rel10 TDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2) and search for errors, segmentation fault or exit
+01      02      03      Run OAISIM-NOS1 Rel10 TDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2) in PHY_ABSTRACTION mode and search for errors
+01      02      04      Run OAISIM-NOS1 Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) without PHY_ABSTRACTION mode, ping from from eNB to UE,
                         and for check for no packet losses
-01      02      05      Run OAI Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) in PHY_ABSTRACTION  mode, send ping from from eNB to UE,
+01      02      05      Run OAISIM-NOS1 Rel10 TDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) in PHY_ABSTRACTION  mode, send ping from from eNB to UE,
                         and check for no packet losses
 
-01      03              Run OAISIM Rel10 (FDD + 5MHz/10MHz/20MHz + TM 1,2,5,6), and check the operation
-01      03      00      Run OAISIM Rel10 FDD, 1 eNB + 1 UE 1 eNB (5 MHz/10MHz/20MHz), (TM 1,2,5,6) and search for errors, segmentation fault or exit
-01      03      01      Run OAISIM Rel10 FDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) in PHY_ABSTRACTION mode and search for errors
-01      03      02      Run OAISIM Rel10 FDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2,5,6) and search for errors, segmentation fault or exit
-01      03      03      Run OAISIM Rel10 FDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2,5,6) in PHY_ABSTRACTION mode and search for errors
-01      03      04      Run OAI Rel10 FDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) without PHY_ABSTRACTION mode, ping from from eNB to UE,
+01      03              Run OAISIM-NOS1 Rel10 (FDD + 5MHz/10MHz/20MHz + TM 1,2), and check the operation
+01      03      00      Run OAISIM-NOS1 Rel10 FDD, 1 eNB + 1 UE 1 eNB (5 MHz/10MHz/20MHz), (TM 1,2) and search for errors, segmentation fault or exit
+01      03      01      Run OAISIM-NOS1 Rel10 FDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) in PHY_ABSTRACTION mode and search for errors
+01      03      02      Run OAISIM-NOS1 Rel10 FDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2) and search for errors, segmentation fault or exit
+01      03      03      Run OAISIM-NOS1 Rel10 FDD, 1 eNB + 3 UEs (5 MHz/10MHz/20MHz), (TM 1,2) in PHY_ABSTRACTION mode and search for errors
+01      03      04      Run OAISIM-NOS1 Rel10 FDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) without PHY_ABSTRACTION mode, ping from from eNB to UE,
                         and for check for no packet losses
-01      03      05      Run OAI Rel10 FDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2,5,6) in PHY_ABSTRACTION  mode, send ping from from eNB to UE,
+01      03      05      Run OAISIM-NOS1 Rel10 FDD, 1 eNB + 1 UE (5 MHz/10MHz/20MHz), (TM 1,2) in PHY_ABSTRACTION  mode, send ping from from eNB to UE,
                         and check for no packet losses
 
 
 
-01      04              MBSFN Tests
+01      04              OAISIM-NOS1 MBSFN Tests
 01      04      00      Check if eMBMS procedure is not finished completely, make sure that the SIB13/MCCH have been correclty received by UEs
 01      04      01      Check if eMBMS multicast/broadcast data is received, make sure that the SIB13/MCCH/MTCH have been correclty received by UEs
 01      04      02      Check for eMBMS multicast/broadcast data received in fdd mode, make sure that the SIB13/MCCH/MTCH have been correctly
@@ -88,7 +97,73 @@ Obj.#   Case#   Test#	Description
 01      51      06      mbmssim (TBD)
 
 
-01      55              lte-softmodem tests
+01      55              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX, 2TX/2RX
+01      55      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      55      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      55      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      55      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      55      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      55      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+01      55      06      Band 7 FDD 5MHz UL Throughput for 300 sec for 2TX/2RX
+01      55      07      Band 7 FDD 10MHz UL Throughput for 300 sec for 2TX/2RX
+01      55      08      Band 7 FDD 20MHz UL Throughput for 300 sec for 2TX/2RX
+01      55      09      Band 7 FDD 5MHz DL Throughput for 300 sec for 2TX/2RX
+01      55      10      Band 7 FDD 10MHz DL Throughput for 300 sec for 2TX/2RX
+01      55      11      Band 7 FDD 20MHz DL Throughput for 300 sec for 2TX/2RX
+
+01      56              lte-softmodem tests with USRP B210  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
+01      56      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      56      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      56      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      56      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      56      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      56      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+01      57              lte-softmodem tests with USRP B210 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      57      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      57      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      57      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      57      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      57      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      57      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+01      58               lte-softmodem tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for `TX/1RX, 2TX/2RX
+01      58      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      58      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      58      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      58      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      58      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      58      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+01      59              lte-softmodem tests with USRP X310  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
+
+01      60              lte-softmodem tests with USRP X310 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      60      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      60      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      60      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      60      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      60      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      60      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+01      61              lte-softmodem tests with EXMIMO RF as eNB and ALU EPC w/ Bandrich COTS UE for `TX/1RX, 2TX/2RX
+01      61      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      61      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      61      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      61      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      61      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      61      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+01      62              lte-softmodem tests with EXMIMO RF as eNB and OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
+
+01      63              lte-softmodem tests with EXMIMO RF as eNB and  OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      63      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      63      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      63      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      63      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      63      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      63      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+01      64              lte-softmodem-noS1 tests
 
 02                      Functional test case
 

cmake_targets/autotests/core.py

+#******************************************************************************
+
+#  Eurecom OpenAirInterface
+#  Copyright(c) 1999 - 2013 Eurecom
+
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms and conditions of the GNU General Public License,
+#  version 2, as published by the Free Software Foundation.
+
+#  This program is distributed in the hope it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+#  The full GNU General Public License is included in this distribution in
+#  the file called "COPYING".
+
+#  Contact Information
+#  Openair Admin: openair_admin@eurecom.fr
+#  Openair Tech : openair_tech@eurecom.fr
+#  Forums       : http://forums.eurecom.fsr/openairinterface
+#  Address      : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France
+
+#*****************************************************************************
+
+# \file core.py
+# \brief OAI core testing class that provides various primitives to send/recv cmd to openair class searching for patterns and process the responses and tag the test case as passed/failed/skipped 
+# \author Navid Nikaein
+# \date 2013
+# \version 0.1
+# @ingroup _test
+
+
+import pexpect
+import time
+import re
+import string
+import sys
+import os
+
+import openair
+import log
+
+class core:
+    def __init__(self):
+        self.send_cr = 1
+        self.expect_echo = 0
+        self.expect_response = 1
+        self.flag_errors = 1
+        self.log = None
+
+    def clean(self, obj):
+        if type(obj) is str:
+            return obj
+        else:
+            return repr(obj)
+
+    def mark(self, marker):
+        if self.log:
+            print >> self.log, "\n\n{" + marker + "}\n\n"
+            
+    def expected(self, expected, got):
+        return "================================= Failure ===================================\n"+\
+               "_________________________________ Expected __________________________________\n"+\
+               "--->" + expected + "<-\n" +\
+               "_________________________________ Received __________________________________\n"+\
+               "--->" + got + "<-\n" +\
+               "=============================================================================\n"
+
+    def unexpected(self, notexpected, got):
+        return "================================= Failure ===================================\n"+\
+               "__________________________ not expect to find _______________________________\n"+\
+               "---> " + self.clean(notexpected) + "\n" +\
+               "_________________________________ Received___________________________________\n"+\
+               "---> " + self.clean(got) + "\n" +\
+               "=============================================================================\n"
+
+    def failed(self, command, expect,debug):
+        time.sleep(2)
+        ret = "================================= Failure =================================\n"
+        ret +="_________________________________ Sent ____________________________________\n"
+        ret +="---> " + command + "\n"
+        ret +="______________________________Searching for _______________________________\n"
+        ret +="---> " + self.clean(expect) + "\n" 
+        if debug >= 1 : 
+            ret +="________________________________ Received _________________________________\n"
+            ret +="---> " + self.clean(self.oai.before) + "\n" 
+            ret +="_______________________________ Remaining _________________________________\n"
+            ret +="---> " + self.clean(self.oai.after) + "\n" 
+        ret +="===========================================================================\n"
+        return ret
+
+    def err(self, command):
+        return "============================ Error received ================================\n"+\
+               "__________________________________ Sent ____________________________________\n"+\
+               '---> ' + command + "\n"+\
+               "_________________________________ Error was ________________________________\n"+\
+               "---> " + self.oai.before + "\n" +\
+               "============================================================================\n"
+
+            
+    def wait_quiet(self, timeout=0.5):
+        while 1:
+            try:
+                self.oai.expect(['..*'], timeout=0.5)
+            except pexpect.TIMEOUT, e:
+                return
+#            print '[Flushing ' + self.oai.after + ']'
+
+    # **************************Send*****************************    
+    # 1) send a command and return, do not wait
+    # ************************************************************
+    def send_nowait(self, command, sudo=False):
+        rsp1 = self.prompt1
+        rsp2 = self.prompt2
+        if sudo == True:
+           command = 'echo \'' + '' + '\' | sudo -S -E bash -c \' ' + command + '\' '
+        self.wait_quiet()
+        if self.send_cr:
+            log.stats['cmd'] += 1
+            self.oai.sendline(command)
+        else:
+            self.oai.send(command)
+
+
+    # **************************Send*****************************    
+    # 1) send a command
+    # 2) wait for a return prompt. Don't capture the response.
+    # 3) Check for error or timeout.
+    # ************************************************************
+    def send(self, command,sudo=False, timeout = 50, rsp1=None, rsp2=None,debug=0):
+        if not rsp1:
+            rsp1 = self.prompt1
+        if not rsp2:
+            rsp2 = self.prompt2
+        self.wait_quiet()
+        if sudo == True:
+            command = 'echo \'' + '' + '\' | sudo -S -E bash -c \' ' + command + '\' '
+        if self.send_cr:
+            log.stats['cmd'] += 1
+            self.oai.sendline(command)
+        else:
+            self.oai.send(command)
+
+        if self.expect_echo:
+            #cmd = self.oai.expect([re.escape(command), pexpect.TIMEOUT], timeout=timeout);
+            cmd = self.oai.expect_exact([command, pexpect.TIMEOUT], timeout=timeout);
+            if cmd != 0:
+                raise log.err(self.failed(command, command,debug))
+
+        if self.expect_response:
+            #index = self.oai.expect([re.escape(rsp1), re.escape(rsp2),'%', pexpect.TIMEOUT], timeout=timeout)
+            index = self.oai.expect_exact([rsp1, rsp2, pexpect.TIMEOUT], timeout=timeout)
+
+            if index == 0 or index == 1:
+                return 'OK'
+            elif index == 2:
+                #self.oai.expect([re.escape(rsp1), re.escape(rsp2), pexpect.TIMEOUT], timeout=timeout)
+                self.oai.expect_exact([rsp1, rsp2, pexpect.TIMEOUT], timeout=timeout)
+                if self.flag_errors:
+                    raise log.err(self.err(command))
+                else:
+                    return 'OK'
+            else:
+                raise log.err(self.failed(command, rsp1 + ' or ' + rsp2,debug))
+
+    # **************************send_recv*************************    
+    # 1) send a command
+    # 2) wait for either rsp1 or rsp2 is found (normally prompts)
+    # 3) return everything seen before that
+    # ************************************************************
+    def send_recv(self, command, sudo=False, timeout=100, rsp1=None, rsp2=None,debug=0):
+        if not rsp1:
+            rsp1 = self.prompt1
+        if not rsp2:
+            rsp2 = self.prompt2
+        self.wait_quiet()
+        if sudo == True:
+          #command = 'echo \'' + self.password + '\' | sudo -S -E ' + command
+          command = 'echo \'' + '' + '\' | sudo -S -E bash -c \' ' + command + '\' '
+        if self.send_cr:
+            log.stats['cmd'] += 1
+            self.oai.sendline(command)
+        else:
+            self.oai.send(command)
+        #index = self.oai.expect([re.escape(rsp1), re.escape(rsp2), pexpect.TIMEOUT], timeout=timeout);
+        index = self.oai.expect_exact([rsp1, rsp2, pexpect.TIMEOUT], timeout=timeout);
+        if index == 0 or index == 1 :
+            return self.oai.before
+        else:
+            print "command = " + command + "rsp1  = " + rsp1 + " rsp2 = " + rsp2 + " index = " + str(index)
+            raise log.err(self.failed(command, rsp1 + ' or ' + rsp2,debug))
+
+           
+    # **************************send_expect*************************    
+    # 1) send a command, and optionally specify a the time to wait
+    # 2) search for an expected pattern in the response
+    # 3) raise an error if not found
+    # **************************************************************
+    def send_expect(self, command, expect, sudo=False, delay = 50, rsp1=None, rsp2=None,debug=0):
+        if debug :
+            print command 
+            print expect 
+            print delay
+        rsp = self.send_recv(command, sudo, delay, rsp1, rsp2)
+        #print rsp
+        if  (rsp.find(expect) != -1):
+            return 'Ok'
+        
+        raise log.err(self.failed(command, expect,debug))
+
+           
+    # **************************send_expect_re*************************    
+    # 1) send a command, and optionally specify a the time to wait
+    # 2) search for an expected pattern defined by a regular expression in the response
+    # 3) return a error if raise_err flag is set and re not found, otherwise return 'Ok'
+    # *****************************************************************
+    def send_expect_re(self, command, expect, sudo=False, raise_err=1, delay = 50, rsp1=None, rsp2=None,debug=0):
+        rsp = self.send_recv(command, sudo, delay, rsp1, rsp2)
+#        print rsp
+        match = re.compile(expect).search(rsp)
+        if match:
+            return match
+        if raise_err:
+            raise log.err(self.failed(command, expect,debug))
+        else :
+            return None
+        
+    # **************************send_expect*************************    
+    # 1) send a command, and optionally specify a the time to wait
+    # 2) search for an expected pattern defined by a re in the response
+    # 3) return ok if not found
+    # **************************************************************
+    def send_expect_false(self, command, expect, sudo=False, delay = 5, rsp1=None, rsp2=None,debug=0):
+        rsp = self.send_recv(command, sudo, delay, rsp1, rsp2)
+    #    print rsp
+        if  (rsp.find(expect) == -1):
+            return 'OK'
+        else:
+            print "command = " + command + "expect  = " + expect + "rsp = " + rsp
+            raise log.err(self.failed(command, expect,debug))
+
+    
+    # **************************send_wait*************************    
+    # 1) send a command, and optionally specify a the time to wait
+    # 2) search for an expected pattern in the response
+    # 3) retry for a numretries if not found
+    # 4) return an error if not found after the numtries
+    # 3) return the response if found
+    # **************************************************************
+    def send_wait(self, command, expect, sudo=False, numretries=3, rsp1=None, rsp2=None,debug=0):
+        timer = 0
+        for i in range(numretries):
+            rsp = self.send_recv(command, sudo, 10, rsp1, rsp2)
+            if  (rsp.find(expect) != -1):
+                return rsp;
+            time.sleep(2)
+            timer = timer+2
+        raise log.err(self.failed(command, expect,debug))
+    
+    # **************************send_wait_re*************************    
+    # 1) send a command, and optionally specify a the time to wait
+    # 2) search for an expected pattern defined by a re in the response
+    # 3) retry for a numretries if not found
+    # 4) return an error if not found after the numtries
+    # 3) return the response if found
+    # **************************************************************
+    def send_wait_re(self, command, expect, sudo=False, numretries=3, rsp1=None, rsp2=None,debug=0):
+        timer = 0
+        for i in range(numretries):
+            rsp = self.send_recv(command,sudo)
+            if  re.compile(expect).search(rsp):
+#                print "Found in",i,"attempts"
+                return rsp;
+            time.sleep(2)
+            timer = timer+2
+        raise log.err(self.failed(command, expect,debug))
+    
+    # **************************send_wait_false*************************    
+    # 1) send a command, and optionally specify a the time to wait
+    # 2) search for an expect pattern in the response
+    # 3) return the response if not found 
+    # 4) return an error if the pattern found after the numtries
+    # **************************************************************
+    def send_wait_false(self, command, expect, sudo=False, numretries=3, rsp1=None, rsp2=None,debug=0):