Merge branch 'main' into agpl_main

Author: andrepuschmann

.gitlab-ci.yml

@@ -326,7 +326,7 @@ pages:
     - sed -i 's/commit_hash/'$CI_COMMIT_SHA'/' public/index.html
     - sed -i 's/zmq_job_id/'$( cat ./zmq/job.env  )'/' public/index.html
     - sed -i 's/zmq-tsan_job_id/'$( cat ./zmq-tsan/job.env  )'/' public/index.html
-    - sed -i 's/zmq-asan_job_id/'$( cat ./zmq-asan/job.env  )'/' public/index.html
+    # - sed -i 's/zmq-asan_job_id/'$( cat ./zmq-asan/job.env  )'/' public/index.html
     - sed -i 's/rf_job_id/'$( cat ./rf/job.env  )'/' public/index.html
 
   needs:
@@ -342,8 +342,8 @@ pages:
       artifacts: true
     - job: zmq-tsan
       artifacts: true
-    - job: zmq-asan
-      artifacts: true
+    # - job: zmq-asan
+    #   artifacts: true
     - job: rf
       artifacts: true
   artifacts:

.gitlab/ci/build.yml

@@ -563,20 +563,20 @@ avx2 [tsan, clean]:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
   cache: []
 
-avx2 [asan]:
-  extends: .avx
-  rules:
-    - if: $CI_DESCRIPTION =~ /Nightly/
-  variables:
-    OS: ubuntu-22.04
-    TEST_MODE: asan
-    COMPILER: gcc
-    BUILD_TYPE: Debug
-    ENABLE_ASAN: "True"
-    ASSERT_LEVEL: PARANOID
-    CPU_FLAG: "avx2"
-    ENABLE_AVX512: "False"
-    ENABLE_AVX2: "True"
+# avx2 [asan]:
+#   extends: .avx
+#   rules:
+#     - if: $CI_DESCRIPTION =~ /Nightly/
+#   variables:
+#     OS: ubuntu-22.04
+#     TEST_MODE: asan
+#     COMPILER: gcc
+#     BUILD_TYPE: Debug
+#     ENABLE_ASAN: "True"
+#     ASSERT_LEVEL: PARANOID
+#     CPU_FLAG: "avx2"
+#     ENABLE_AVX512: "False"
+#     ENABLE_AVX2: "True"
 
 avx512:
   extends: .avx

.gitlab/ci/e2e.yml

@@ -27,17 +27,20 @@
 
 .e2e-run:
   stage: e2e
-  timeout: 10h
+  resource_group: e2e
+  timeout: 4h
   interruptible: false
   image:
-    name: registry.gitlab.com/softwareradiosystems/retina/launcher/3.11-alpine:0.0.16
+    name: registry.gitlab.com/softwareradiosystems/retina/launcher/3.11-alpine:0.0.18
     entrypoint: ["/bin/sh", "-c"]
   variables:
     REQUEST: "" # Retina YAML request
-    LOG_LEVEL: "debug"
+    LOG_LEVEL: "info"
     MARKERS: ""
     ARGS: ""
-    FORCE_DOWNLOAD: "true"
+    FORCE_DOWNLOAD: "false"  # Download only failed tests by default
+    PCAP: "" # Disabled by default
+    FAIL_IF_INTERNAL_ERRORS: "true" # Enabled by default
   tags:
     - on-prem-amd64
   extends:
@@ -57,24 +60,31 @@
       export LOGNAME=$GITLAB_USER_LOGIN
       export RETINA_LOGLEVEL="$LOG_LEVEL"
       export RETINA_FORCE_DOWNLOAD_REPORT="$FORCE_DOWNLOAD"
+      export RETINA_PCAP_ENABLE="$PCAP"
+      export RETINA_FAIL_IF_INTERNAL_ERRORS="$FAIL_IF_INTERNAL_ERRORS"
     - retina-launcher --retina-request ${REQUEST} --self-contained-html --html=./log/report.html --junitxml=out.xml "${ARGS}" -m "${MARKERS}" .
   after_script:
     - |
       echo "*******************************************************************************************************************************"
       echo "Test report ---> https://softwareradiosystems.gitlab.io/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/$CI_JOB_NAME/report.html"
       echo "*******************************************************************************************************************************"
+    - du -hs tests/e2e/log/
     - mv tests/e2e/log ${CI_PROJECT_DIR}/$CI_JOB_NAME
     - echo "$CI_JOB_ID" >> ${CI_PROJECT_DIR}/$CI_JOB_NAME/job.env
 
 smoke-zmq-tsan:
   extends: .e2e-run
   rules:
+    - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
     - if: $ON_MR
+      when: manual
+      allow_failure: false
   variables:
     REQUEST: "${CI_PROJECT_DIR}/.gitlab/ci/retina_request_zmq.yml"
     MARKERS: "smoke and not tcp and not multiue"
     ARGS: "-x"
-    FORCE_DOWNLOAD: "false"
+    LOG_LEVEL: "debug"
+    PCAP: "true"
   needs:
     - job: "avx2 [tsan, cached]"
       artifacts: true
@@ -110,11 +120,11 @@ zmq-tsan:
       artifacts: true
       optional: true
 
-zmq-asan:
-  extends: zmq
-  needs:
-    - job: "avx2 [asan]"
-      artifacts: true
+# zmq-asan:
+#   extends: zmq
+#   needs:
+#     - job: "avx2 [asan]"
+#       artifacts: true
 
 zmq-multiue:
   extends: zmq
@@ -125,10 +135,11 @@ rf:
   extends: .e2e-run
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly/
-  allow_failure: true
   variables:
     REQUEST: "${CI_PROJECT_DIR}/.gitlab/ci/retina_request_rf.yml"
     MARKERS: "rf and not tcp and not multiue"
+    LOG_LEVEL: "warning"
+    FAIL_IF_INTERNAL_ERRORS: ""
   needs:
     - job: "avx2 [basic]"
       artifacts: true

.gitlab/ci/retina_request_rf.yml

@@ -20,7 +20,7 @@
 
 - name: amarisoft-ue
   type: ue
-  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2021-09-18_ba49eb7_47a0213a4_0.2.0
+  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2021-09-18_97e143d_344d33aee_0.2.8
   resources:
     - type: sdr
       model: b200 
@@ -29,12 +29,12 @@
 
 - name: srs-gnb
   type: gnb
-  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.1_0.2.2
+  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.1_0.2.8
   resources:
     - type: sdr
       model: b200 
   path: ../../build/apps/gnb/gnb
 
 - name: open5gs
   type: epc
-  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.0
+  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.4

.gitlab/ci/retina_request_zmq.yml

@@ -20,19 +20,19 @@
 
 - name: amarisoft-ue
   type: ue
-  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2021-09-18_ba49eb7_47a0213a4_0.2.0
+  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2021-09-18_97e143d_344d33aee_0.2.8
   resources:
     - type: zmq
     - type: license
       model: amarisoft-5g
 
 - name: srs-gnb
   type: gnb
-  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.1_0.2.2
+  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.1_0.2.8
   resources:
     - type: zmq
   path: ../../build/apps/gnb/gnb
 
 - name: open5gs
   type: epc
-  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.0
+  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.4

CMakeLists.txt

@@ -77,6 +77,12 @@ if (ENABLE_EXPORT)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif (ENABLE_EXPORT)
 
+########################################################################
+# Install Dirs
+########################################################################
+
+set(DATA_DIR share/${CMAKE_PROJECT_NAME})
+
 ########################################################################
 # Compiler specific setup
 ########################################################################
@@ -297,6 +303,7 @@ add_custom_target(all_srsran_headers SOURCES ${ALL_HEADER_FILES})
 ########################################################################
 
 add_subdirectory(apps)
+add_subdirectory(configs)
 add_subdirectory(docs)
 add_subdirectory(external)
 add_subdirectory(lib)

apps/gnb/gnb.cpp

@@ -378,9 +378,9 @@ int main(int argc, char** argv)
 
   // Set log-level of app and all non-layer specific components to app level.
   srslog::basic_logger& gnb_logger = srslog::fetch_basic_logger("GNB");
-  for (const auto& id : {"GNB", "ALL", "SCTP-GW", "IO-EPOLL", "UDP-GW"}) {
+  for (const auto& id : {"GNB", "ALL", "SCTP-GW", "IO-EPOLL", "UDP-GW", "PCAP"}) {
     auto& logger = srslog::fetch_basic_logger(id, false);
-    logger.set_level(srslog::str_to_basic_level(gnb_cfg.log_cfg.app_level));
+    logger.set_level(srslog::str_to_basic_level(gnb_cfg.log_cfg.lib_level));
     logger.set_hex_dump_max_size(gnb_cfg.log_cfg.hex_max_size);
   }
 
@@ -391,7 +391,7 @@ int main(int argc, char** argv)
     du_logger.set_hex_dump_max_size(gnb_cfg.log_cfg.hex_max_size);
   }
 
-  for (const auto& id : {"CU-CP", "CU-CP-F1", "CU-CP-E1", "NGAP"}) {
+  for (const auto& id : {"CU-CP", "CU-CP-F1", "CU-CP-E1"}) {
     auto& cu_cp_logger = srslog::fetch_basic_logger(id, false);
     cu_cp_logger.set_level(srslog::str_to_basic_level(gnb_cfg.log_cfg.cu_level));
     cu_cp_logger.set_hex_dump_max_size(gnb_cfg.log_cfg.hex_max_size);
@@ -430,6 +430,10 @@ int main(int argc, char** argv)
   rrc_logger.set_level(srslog::str_to_basic_level(gnb_cfg.log_cfg.rrc_level));
   rrc_logger.set_hex_dump_max_size(gnb_cfg.log_cfg.hex_max_size);
 
+  auto& ngap_logger = srslog::fetch_basic_logger("NGAP", false);
+  ngap_logger.set_level(srslog::str_to_basic_level(gnb_cfg.log_cfg.ngap_level));
+  ngap_logger.set_hex_dump_max_size(gnb_cfg.log_cfg.hex_max_size);
+
   auto& sdap_logger = srslog::fetch_basic_logger("SDAP", false);
   sdap_logger.set_level(srslog::str_to_basic_level(gnb_cfg.log_cfg.sdap_level));
   sdap_logger.set_hex_dump_max_size(gnb_cfg.log_cfg.hex_max_size);
@@ -628,7 +632,7 @@ int main(int argc, char** argv)
   // DU QoS config
   const std::map<uint8_t, du_qos_config>& du_qos_cfg = generate_du_qos_config(gnb_cfg);
   for (const auto& it : du_qos_cfg) {
-    gnb_logger.info("QoS RLC configuration: 5QI={} RLC={}", it.first, it.second.rlc);
+    gnb_logger.debug("QoS RLC configuration: 5QI={} RLC={}", it.first, it.second.rlc);
   }
 
   // Cell configuration.
@@ -692,6 +696,10 @@ int main(int argc, char** argv)
   ngap_p->close();
   mac_p->close();
 
+  gnb_logger.info("Stopping radio...");
+  radio->stop();
+  gnb_logger.info("Radio stopped successfully");
+
   gnb_logger.info("Stopping lower PHY...");
   lower->get_controller().stop();
   gnb_logger.info("Lower PHY stopped successfully");

apps/gnb/gnb_appconfig.h

@@ -198,24 +198,25 @@ struct amf_appconfig {
 };
 
 struct log_appconfig {
-  std::string filename          = "/tmp/gnb.log"; // Path to write log file or "stdout" to print to console.
-  std::string all_level         = "info";         // Default log level for all layers.
-  std::string app_level         = "info"; // Generic log level assigned to all layers without layer-specific level.
-  std::string du_level          = "info";
-  std::string cu_level          = "info";
-  std::string phy_level         = "info";
-  std::string radio_level       = "info";
-  std::string mac_level         = "info";
-  std::string rlc_level         = "info";
-  std::string f1u_level         = "info";
-  std::string pdcp_level        = "info";
-  std::string rrc_level         = "info";
-  std::string sdap_level        = "info";
-  std::string gtpu_level        = "info";
-  std::string fapi_level        = "info";
-  uint32_t    hex_max_size      = 32;       // Maximum number of bytes to write when dumping hex arrays.
-  bool        broadcast_enabled = false;    // Set to true to log broadcasting messages and all PRACH opportunities.
-  std::string phy_rx_symbols_filename = ""; // Set to a valid file path to print the received symbols.
+  std::string filename    = "/tmp/gnb.log"; // Path to write log file or "stdout" to print to console.
+  std::string all_level   = "warning";      // Default log level for all layers.
+  std::string lib_level   = "warning"; // Generic log level assigned to library components without layer-specific level.
+  std::string du_level    = "warning";
+  std::string cu_level    = "warning";
+  std::string phy_level   = "warning";
+  std::string radio_level = "warning";
+  std::string mac_level   = "warning";
+  std::string rlc_level   = "warning";
+  std::string f1u_level   = "warning";
+  std::string pdcp_level  = "warning";
+  std::string rrc_level   = "warning";
+  std::string ngap_level  = "warning";
+  std::string sdap_level  = "warning";
+  std::string gtpu_level  = "warning";
+  std::string fapi_level  = "warning";
+  uint32_t    hex_max_size            = 0;     // Maximum number of bytes to write when dumping hex arrays.
+  bool        broadcast_enabled       = false; // Set to true to log broadcasting messages and all PRACH opportunities.
+  std::string phy_rx_symbols_filename = "";    // Set to a valid file path to print the received symbols.
 };
 
 struct pcap_appconfig {

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -38,23 +38,26 @@ static void configure_cli11_log_args(CLI::App& app, log_appconfig& log_params)
   };
 
   app.add_option("--filename", log_params.filename, "Log file output path")->capture_default_str();
-  app.add_option("--all_level", log_params.all_level, "Log level of all loggers")
+  app.add_option(
+         "--all_level", log_params.all_level, "Default log level for PHY, MAC, RLC, PDCP, RRC, SDAP, NGAP and GTPU")
       ->capture_default_str()
       ->check(level_check);
-  app.add_option("--app_level", log_params.app_level, "Generic log level")->capture_default_str()->check(level_check);
-  app.add_option("--du_level", log_params.du_level, "Log level for the DU")->capture_default_str()->check(level_check);
-  app.add_option("--cu_level", log_params.cu_level, "Log level for the CU")->capture_default_str()->check(level_check);
   app.add_option("--phy_level", log_params.phy_level, "PHY log level")->capture_default_str()->check(level_check);
-  app.add_option("--radio_level", log_params.radio_level, "Radio log level")->capture_default_str()->check(level_check);
   app.add_option("--mac_level", log_params.mac_level, "MAC log level")->capture_default_str()->check(level_check);
   app.add_option("--rlc_level", log_params.rlc_level, "RLC log level")->capture_default_str()->check(level_check);
-  app.add_option("--f1u_level", log_params.f1u_level, "F1-U log level")->capture_default_str()->check(level_check);
   app.add_option("--pdcp_level", log_params.pdcp_level, "PDCP log level")->capture_default_str()->check(level_check);
   app.add_option("--rrc_level", log_params.rrc_level, "RRC log level")->capture_default_str()->check(level_check);
   app.add_option("--sdap_level", log_params.sdap_level, "SDAP log level")->capture_default_str()->check(level_check);
+  app.add_option("--ngap_level", log_params.ngap_level, "NGAP log level")->capture_default_str()->check(level_check);
   app.add_option("--gtpu_level", log_params.gtpu_level, "GTPU log level")->capture_default_str()->check(level_check);
+  app.add_option("--radio_level", log_params.radio_level, "Radio log level")->capture_default_str()->check(level_check);
   app.add_option("--fapi_level", log_params.fapi_level, "FAPI log level")->capture_default_str()->check(level_check);
-  app.add_option("--hex_max_size", log_params.hex_max_size, "Maximum number of bytes to print in hex")
+  app.add_option("--f1u_level", log_params.f1u_level, "F1-U log level")->capture_default_str()->check(level_check);
+  app.add_option("--du_level", log_params.du_level, "Log level for the DU")->capture_default_str()->check(level_check);
+  app.add_option("--cu_level", log_params.cu_level, "Log level for the CU")->capture_default_str()->check(level_check);
+  app.add_option("--lib_level", log_params.lib_level, "Generic log level")->capture_default_str()->check(level_check);
+  app.add_option(
+         "--hex_max_size", log_params.hex_max_size, "Maximum number of bytes to print in hex (zero for no hex dumps)")
       ->capture_default_str()
       ->check(CLI::Range(0, 1024));
   app.add_option("--broadcast_enabled",
@@ -68,30 +71,15 @@ static void configure_cli11_log_args(CLI::App& app, log_appconfig& log_params)
 
   // Post-parsing callback. This allows us to set the log level to "all" level, if no level is provided.
   app.callback([&]() {
-    if (app.count("--app_level") == 0) {
-      log_params.app_level = log_params.all_level;
-    }
-    if (app.count("--du_level") == 0) {
-      log_params.du_level = log_params.all_level;
-    }
-    if (app.count("--cu_level") == 0) {
-      log_params.cu_level = log_params.all_level;
-    }
     if (app.count("--phy_level") == 0) {
       log_params.phy_level = log_params.all_level;
     }
-    if (app.count("--radio_level") == 0) {
-      log_params.radio_level = log_params.all_level;
-    }
     if (app.count("--mac_level") == 0) {
       log_params.mac_level = log_params.all_level;
     }
     if (app.count("--rlc_level") == 0) {
       log_params.rlc_level = log_params.all_level;
     }
-    if (app.count("--f1u_level") == 0) {
-      log_params.f1u_level = log_params.all_level;
-    }
     if (app.count("--pdcp_level") == 0) {
       log_params.pdcp_level = log_params.all_level;
     }
@@ -101,10 +89,10 @@ static void configure_cli11_log_args(CLI::App& app, log_appconfig& log_params)
     if (app.count("--sdap_level") == 0) {
       log_params.sdap_level = log_params.all_level;
     }
-    if (app.count("--gtpu_level") == 0) {
-      log_params.gtpu_level = log_params.all_level;
+    if (app.count("--ngap_level") == 0) {
+      log_params.ngap_level = log_params.all_level;
     }
-    if (app.count("--fapi_level") == 0) {
+    if (app.count("--gtpu_level") == 0) {
       log_params.gtpu_level = log_params.all_level;
     }
   });