From 6b0a1730078b561b33e1f7e39112760b1e3c37f7 Mon Sep 17 00:00:00 2001 From: Melissa Elkadi Date: Fri, 19 Mar 2021 09:53:30 -0700 Subject: [PATCH] Updated configuration files --- ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf | 11 ++++++----- common/utils/LOG/log.h | 2 +- .../CONF/rcc.band78.tm1.106PRB.nfapi.conf | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf index 76ca1c3350..115b30f73f 100644 --- a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf @@ -183,7 +183,7 @@ eNBs = enable_measurement_reports = "no"; ///X2 - enable_x2 = "yes"; + enable_x2 = "no"; t_reloc_prep = 1000; /* unit: millisecond */ tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ @@ -191,10 +191,10 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "enp67s0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "10.1.1.68"; - ENB_INTERFACE_NAME_FOR_S1U = "enp67s0"; - ENB_IPV4_ADDRESS_FOR_S1U = "10.1.1.68"; + ENB_INTERFACE_NAME_FOR_S1_MME = "ctrl0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.16.0.1"; + ENB_INTERFACE_NAME_FOR_S1U = "ctrl0"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.16.0.1"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1"; ENB_PORT_FOR_X2C = 36422; # Spec 36422 @@ -215,6 +215,7 @@ MACRLCs = ( remote_s_portd = 50010; tr_s_preference = "nfapi"; tr_n_preference = "local_RRC"; + scheduler_mode = "fairRR"; } ); diff --git a/common/utils/LOG/log.h b/common/utils/LOG/log.h index 721506b43d..80f07f9c0a 100644 --- a/common/utils/LOG/log.h +++ b/common/utils/LOG/log.h @@ -106,7 +106,7 @@ extern "C" { /* .log_format = 0x13 uncolored standard messages * .log_format = 0x93 colored standard messages */ /* keep white space in first position; switching it to 0 allows colors to be disabled*/ -#define LOG_WITH_COLORS 1 +#define LOG_WITH_COLORS 0 #if LOG_WITH_COLORS #define LOG_RED "\033[1;31m" /*!< \brief VT100 sequence for bold red foreground */ #define LOG_GREEN "\033[32m" /*!< \brief VT100 sequence for green foreground */ diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf index 3b177b6d6e..4d8e7f2410 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf @@ -13,9 +13,9 @@ gNBs = gNB_name = "gNB-Eurecom-5GNRBox"; // Tracking area code, 0x0000 and 0xfffe are reserved values - tracking_area_code = 1; + tracking_area_code = 5; - plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;}); + plmn_list = ({mcc = 320; mnc = 230; mnc_length = 3;}); tr_s_preference = "local_mac" @@ -232,13 +232,13 @@ gNBs = } ); ///X2 - enable_x2 = "yes"; + enable_x2 = "no"; t_reloc_prep = 1000; /* unit: millisecond */ tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ target_enb_x2_ip_address = ( - { ipv4 = "127.0.0.1"; /* "CI_FR1_CTL_ENB_IP_ADDR"; */ + { ipv4 = "127.0.0.1"; ipv6 = "192:168:30::17"; preference = "ipv4"; }