adding x2c setting with epc

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

@@ -13,9 +13,9 @@ eNBs =
     eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // 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"
 
@@ -172,7 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
                               ipv6       = "192:168:30::17";
                               port       = 36412 ;
                               active     = "yes";
@@ -183,7 +183,7 @@ eNBs =
     enable_measurement_reports = "no";
 
     ///X2
-    enable_x2 = "no";
+    enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
@@ -191,12 +191,12 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "ens3";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "ens3";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "enp68s0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.1.1.68";
+        ENB_INTERFACE_NAME_FOR_S1U               = "enp68s0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.1.1.68";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.1";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
         
     };
@@ -215,7 +215,6 @@ MACRLCs = (
 	remote_s_portd   = 50010;
 	tr_s_preference = "nfapi";
 	tr_n_preference = "local_RRC";
-	scheduler_mode = "fairRR";
         }  
 );
 

ci-scripts/conf_files/ue.nfapi.conf

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

openair3/NAS/TOOLS/display.c

@@ -262,12 +262,10 @@ void display_usim_data(const char *filename) {
 	kasme[USIM_K_ASME_SIZE] = '\0';
 	memcpy(kasme, data.securityctx.Kasme.value, USIM_K_ASME_SIZE);
 	printf("\tKasme\t: \"%s\"\n", kasme);
-	#if 0 //This doesn't compile anymore due to compiler warnings about pointers
-	printf("\tulNAScount\t: 0x%.8x\n",
+	/*printf("\tulNAScount\t: 0x%.8x\n",
 			*(uint32_t*) data.securityctx.ulNAScount.value);
 	printf("\tdlNAScount\t: 0x%.8x\n",
-			*(uint32_t*) data.securityctx.dlNAScount.value);
-	#endif
+			*(uint32_t*) data.securityctx.dlNAScount.value);*/
 	printf("\talgorithmID\t: 0x%.2x\n\n",
 			data.securityctx.algorithmID.value[0]);
 

targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf

@@ -225,21 +225,35 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
                             }
                           );
+    ///X2
+    enable_x2 = "yes";
+    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"; */
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
 
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "lo";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "127.0.0.2";
+        GNB_INTERFACE_NAME_FOR_S1U               = "lo";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.2";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        GNB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.2";
+        GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
 );
@@ -249,7 +263,7 @@ MACRLCs = (
         {
         num_cc = 1;
         local_s_if_name  = "lo:";
-        remote_s_address = "127.0.0.1"; // pnf addr [!]
+        remote_s_address = "127.0.0.2"; // pnf addr [!]
         local_s_address  = "127.0.0.2"; // vnf addr
         local_s_portc    = 50001; // vnf p5 port
         remote_s_portc   = 50000; // pnf p5 port [!]