* add X2AP messages and generate libx2ap_LIB (currently enabled for oaisim)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7854 818b1a75-f10b-46b9-bf7c-635c3b92a50f

cmake_targets/CMakeLists.txt

@@ -296,7 +296,7 @@ set(S1AP_ASN_FILES
   ${S1AP_ASN_DIR}/S1AP-PDU.asn
   )
 set(S1AP_C_DIR ${asn1_generated_dir}/${ASN1RELDIR})
-
+#message("calling ${asn1c_call} ${S1AP_C_DIR} ${S1AP_ASN_FILES}")
 execute_process(COMMAND ${asn1c_call} ${S1AP_C_DIR} ${S1AP_ASN_FILES})
 file(GLOB S1AP_source ${S1AP_C_DIR}/*.c)
 
@@ -351,6 +351,58 @@ add_library(S1AP_EPC
   ${S1AP_DIR}/s1ap_mme_retransmission.c
   ${S1AP_DIR}/s1ap_mme_ta.c
   )
+
+#X2AP
+# Same limitation as described in RRC/S1AP: unknown generated file list
+# so we generate it at cmake time
+##############
+add_list1_option(X2AP_VERSION R11 "X2AP Asn.1 grammar version" R10 R11)
+set(X2AP_DIR ${OPENAIR2_DIR}/X2AP)
+if (${X2AP_VERSION} STREQUAL "R11")
+  set (ASN1RELDIR R11.2)
+elseif (${X2AP_VERSION} STREQUAL "R10")
+  set (ASN1RELDIR R.UNKNOWN)
+endif(${X2AP_VERSION} STREQUAL "R11")
+set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${ASN1RELDIR})
+set(X2AP_ASN_FILES
+  ${X2AP_ASN_DIR}/X2AP-CommonDataTypes.asn
+  ${X2AP_ASN_DIR}/X2AP-Constants.asn
+  ${X2AP_ASN_DIR}/X2AP-IEs.asn
+  ${X2AP_ASN_DIR}/X2AP-PDU.asn
+  ${X2AP_ASN_DIR}/X2AP-Containers.asn
+  )
+
+set(X2AP_C_DIR ${asn1_generated_dir}/${ASN1RELDIR})
+#message("calling ${asn1c_call} ${X2AP_C_DIR} ${X2AP_ASN_FILES}")
+execute_process(COMMAND ${asn1c_call} ${X2AP_C_DIR} ${X2AP_ASN_FILES})
+file(GLOB X2AP_source ${X2AP_C_DIR}/*.c)
+
+set(X2AP_OAI_generated
+  ${X2AP_C_DIR}/x2ap_decoder.c
+  ${X2AP_C_DIR}/x2ap_encoder.c
+  ${X2AP_C_DIR}/x2ap_xer_print.c
+  ${X2AP_C_DIR}/x2ap_ies_defs.h
+  )
+file(GLOB x2ap_h ${X2AP_C_DIR}/*.h)
+set(x2ap_h ${x2ap_h} )
+
+#message("calling ${X2AP_DIR}/MESSAGES/ASN1/asn1tostruct.py -f ${X2AP_ASN_DIR}/X2AP-PDU-Contents.asn -o ${X2AP_C_DIR}")
+add_custom_command (
+  OUTPUT ${X2AP_OAI_generated}
+  COMMAND ${asn1c_call} ${X2AP_C_DIR} ${X2AP_ASN_FILES}
+  COMMAND python ${X2AP_DIR}/MESSAGES/ASN1/asn1tostruct.py -f ${X2AP_ASN_DIR}/X2AP-PDU-Contents.asn -o ${X2AP_C_DIR}
+  DEPENDS ${X2AP_ASN_FILES}
+  )
+
+add_library(X2AP_LIB
+  ${X2AP_OAI_generated}
+  ${X2AP_source}
+  ${X2AP_DIR}/x2ap_common.c
+  )
+
+include_directories ("${X2AP_C_DIR}")
+include_directories ("${X2AP_DIR}")
+
 # Hardware dependant options
 ###################################
 add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4")
@@ -614,8 +666,8 @@ include_directories("${OPENAIRCN_DIR}/NAS/COMMON/IES")
 include_directories("${OPENAIRCN_DIR}/NAS/COMMON/UTIL")
 include_directories("${OPENAIRCN_DIR}/SECU")
 include_directories("${OPENAIRCN_DIR}/SCTP")
-include_directories("${OPENAIR2_DIR}/X2AP")
 include_directories("${OPENAIRCN_DIR}/S1AP")
+include_directories("${OPENAIR2_DIR}/X2AP")
 include_directories("${OPENAIRCN_DIR}/UDP")
 include_directories("${OPENAIRCN_DIR}/GTPV1-U")
 include_directories("${OPENAIR_DIR}/targets/COMMON")
@@ -1781,6 +1833,7 @@ Message("-- HW_SOURCE=${HW_SOURCE}")
 add_executable(oaisim
   ${rrc_h}
   ${s1ap_h}
+  ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1804,7 +1857,7 @@ add_executable(oaisim
 target_include_directories(oaisim PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
   -Wl,--end-group )
 
 target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
@@ -1820,6 +1873,7 @@ target_link_libraries (oaisim forms)
 add_executable(oaisim_nos1
   ${rrc_h}
   ${s1ap_h}
+  ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
@@ -1839,7 +1893,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    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}
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})

openair2/UTIL/LOG/log.h

@@ -268,6 +268,7 @@ typedef enum {
   USIM,
   LOCALIZE,
   RRH,
+  X2AP,
   MAX_LOG_COMPONENTS,
 }
 comp_name_t;

openair2/X2AP/MESSAGES/ASN1/R11.2/X2AP-CommonDataTypes.asn

@@ -31,12 +31,112 @@ X2ap-PrivateIE-ID	::= CHOICE {
 	global				OBJECT IDENTIFIER
 }
 
-X2ap-ProcedureCode		::= INTEGER (0..255)
+--X2ap-ProcedureCode		::= INTEGER (0..255)
+X2ap-ProcedureCode       ::= INTEGER {
+    id-handoverPreparation                                          (0),
+    id-handoverCancel                                               (1),
+    id-loadIndication                                               (2),
+    id-errorIndication                                              (3),
+    id-snStatusTransfer                                             (4),
+    id-uEContextRelease                                             (5),
+    id-x2Setup                                                      (6),
+    id-reset                                                        (7),
+    id-eNBConfigurationUpdate                                       (8),
+    id-resourceStatusReportingInitiation                            (9),
+    id-resourceStatusReporting                                      (10),
+    id-privateMessage                                               (11),
+    id-mobilitySettingsChange                                       (12),
+    id-rLFIndication                                                (13),
+    id-handoverReport                                               (14),
+    id-cellActivation                                               (15)
+} (0..255)
 
-
-X2ap-ProtocolIE-ID		::= INTEGER (0..x2ap-maxProtocolIEs)
+--X2ap-ProtocolIE-ID		::= INTEGER (0..x2ap-maxProtocolIEs)
+X2ap-ProtocolIE-ID       ::= INTEGER {
+    id-E-RABs-Admitted-Item                                                     (0),
+    id-E-RABs-Admitted-List                                                     (1),
+    id-E-RAB-Item                                                               (2),
+    id-E-RABs-NotAdmitted-List                                                  (3),
+    id-E-RABs-ToBeSetup-Item                                                    (4),
+    id-Cause                                                                    (5),
+    id-CellInformation                                                          (6),
+    id-CellInformation-Item                                                     (7),
+    id-New-eNB-UE-X2AP-ID                                                       (9),
+    id-Old-eNB-UE-X2AP-ID                                                       (10),
+    id-TargetCell-ID                                                            (11),
+    id-TargeteNBtoSource-eNBTransparentContainer                                (12),
+    id-TraceActivation                                                          (13),
+    id-UE-ContextInformation                                                    (14),
+    id-UE-HistoryInformation                                                    (15),
+    id-UE-X2AP-ID                                                               (16),
+    id-CriticalityDiagnostics                                                   (17),
+    id-E-RABs-SubjectToStatusTransfer-List                                      (18),
+    id-E-RABs-SubjectToStatusTransfer-Item                                      (19),
+    id-ServedCells                                                              (20),
+    id-GlobalENB-ID                                                             (21),
+    id-TimeToWait                                                               (22),
+    id-GUMMEI-ID                                                                (23),
+    id-GUGroupIDList                                                            (24),
+    id-ServedCellsToAdd                                                         (25),
+    id-ServedCellsToModify                                                      (26),
+    id-ServedCellsToDelete                                                      (27),
+    id-Registration-Request                                                     (28),
+    id-CellToReport                                                             (29),
+    id-ReportingPeriodicity                                                     (30),
+    id-CellToReport-Item                                                        (31),
+    id-CellMeasurementResult                                                    (32),
+    id-CellMeasurementResult-Item                                               (33),
+    id-GUGroupIDToAddList                                                       (34),
+    id-GUGroupIDToDeleteList                                                    (35),
+    id-SRVCCOperationPossible                                                   (36),
+    id-Measurement-ID                                                           (37),
+    id-ReportCharacteristics                                                    (38),
+    id-ENB1-Measurement-ID                                                      (39),
+    id-ENB2-Measurement-ID                                                      (40),
+    id-Number-of-Antennaports                                                   (41),
+    id-CompositeAvailableCapacityGroup                                          (42),
+    id-ENB1-Cell-ID                                                             (43),
+    id-ENB2-Cell-ID                                                             (44),
+    id-ENB2-Proposed-Mobility-Parameters                                        (45),
+    id-ENB1-Mobility-Parameters                                                 (46),
+    id-ENB2-Mobility-Parameters-Modification-Range                              (47),
+    id-FailureCellPCI                                                           (48),
+    id-Re-establishmentCellECGI                                                 (49),
+    id-FailureCellCRNTI                                                         (50),
+    id-ShortMAC-I                                                               (51),
+    id-SourceCellECGI                                                           (52),
+    id-FailureCellECGI                                                          (53),
+    id-HandoverReportType                                                       (54),
+    id-PRACH-Configuration                                                      (55),
+    id-MBSFN-Subframe-Info                                                      (56),
+    id-ServedCellsToActivate                                                    (57),
+    id-ActivatedCellList                                                        (58),
+    id-DeactivationIndication                                                   (59),
+    id-UE-RLF-Report-Container                                                  (60),
+    id-ABSInformation								(61),
+    id-InvokeIndication								(62),
+    id-ABS-Status								(63),
+    id-PartialSuccessIndicator							(64),
+    id-MeasurementInitiationResult-List						(65),
+    id-MeasurementInitiationResult-Item						(66),
+    id-MeasurementFailureCause-Item						(67),
+    id-CompleteFailureCauseInformation-List					(68),
+    id-CompleteFailureCauseInformation-Item					(69),
+    id-CSG-Id									(70),
+    id-CSGMembershipStatus							(71),
+    id-MDTConfiguration								(72),
+    id-ManagementBasedMDTallowed						(74),
+    id-RRCConnSetupIndicator							(75),	
+    id-NeighbourTAC								(76),
+    id-Time-UE-StayedInCell-EnhancedGranularity					(77),	
+    id-RRCConnReestabIndicator							(78),	
+    id-MBMS-Service-Area-List							(79),
+    id-HO-cause									(80),
+    id-TargetCellInUTRAN							(81),
+    id-MultibandInfoList							(84)
+} (0..x2ap-maxProtocolIEs)
 
 
 X2ap-TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessful-outcome}
 
-END
+END
\ No newline at end of file

openair2/X2AP/MESSAGES/ASN1/R11.2/X2AP-PDU.asn

@@ -52,52 +52,52 @@ X2ap-UnsuccessfulOutcome ::= SEQUENCE {
 }
 
 X2ap-HandoverRequest ::= SEQUENCE {
-    handoverRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-HandoverRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-HandoverRequestAcknowledge ::= SEQUENCE {
-    handoverRequestAcknowledge-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-HandoverRequestAcknowledge-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-HandoverPreparationFailure ::= SEQUENCE {
-    handoverPreparationFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-HandoverPreparationFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-SNStatusTransfer ::= SEQUENCE {
-    snStatusTransfer-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-SNStatusTransfer-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-UEContextRelease ::= SEQUENCE {
-    ueContextRelease-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-UEContextRelease-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-HandoverCancel ::= SEQUENCE {
-    handoverCancel-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-HandoverCancel-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-HandoverReport ::= SEQUENCE {
-    handoverReport-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-HandoverReport-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ErrorIndication ::= SEQUENCE {
-    errorIndication-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ErrorIndication-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ResetRequest ::= SEQUENCE {
-    resetRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ResetRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ResetResponse ::= SEQUENCE {
-    resetResponse-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ResetResponse-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
@@ -117,83 +117,83 @@ X2SetupFailure ::= SEQUENCE {
 }
 
 X2ap-LoadInformation ::= SEQUENCE {
-    loadInformation-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-LoadInformation-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ENBConfigurationUpdate ::= SEQUENCE {
-    eNBConfigurationUpdate-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ENBConfigurationUpdate-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
-    eNBConfigurationUpdateAcknowledge-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ENBConfigurationUpdateAcknowledge-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ENBConfigurationUpdateFailure ::= SEQUENCE {
-    eNBConfigurationUpdateFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ENBConfigurationUpdateFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ResourceStatusRequest ::= SEQUENCE {
-    resourceStatusRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ResourceStatusRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ResourceStatusResponse ::= SEQUENCE {
-    resourceStatusResponse-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ResourceStatusResponse-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ResourceStatusFailure ::= SEQUENCE {
-    resourceStatusFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ResourceStatusFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-ResourceStatusUpdate ::= SEQUENCE {
-    resourceStatusUpdate-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-ResourceStatusUpdate-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-RLFIndication ::= SEQUENCE {
-    rlfIndication-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-RLFIndication-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-PrivateMessage ::= SEQUENCE {
-    privateMessage-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-PrivateMessage-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-MobilityChangeRequest ::= SEQUENCE {
-    mobilityChangeRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-MobilityChangeRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-MobilityChangeAcknowledge ::= SEQUENCE {
-    mobilityChangeAcknowledge-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-MobilityChangeAcknowledge-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-MobilityChangeFailure ::= SEQUENCE {
-    mobilityChangeFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-MobilityChangeFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-CellActivationRequest ::= SEQUENCE {
-    cellActivationRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-CellActivationRequest-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-CellActivationResponse ::= SEQUENCE {
-    cellActivationResponse-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-CellActivationResponse-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
 X2ap-CellActivationFailure ::= SEQUENCE {
-    cellActivationFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
+    x2ap-CellActivationFailure-ies SEQUENCE (SIZE (0..x2ap-maxProtocolIEs)) OF X2ap-IE,
     ...
 }
 
-END
+END
\ No newline at end of file

openair2/X2AP/x2ap_common.h

@@ -35,23 +35,36 @@
 #include "X2ap-ABSInformation.h"
 #include "X2ap-ABSInformationTDD.h"
 #include "X2ap-ABS-Status.h"
+#include "X2ap-ActivatedCellList.h"
 #include "X2ap-AllocationAndRetentionPriority.h"
 #include "X2ap-AreaScopeOfMDT.h"
 #include "X2ap-AS-SecurityInformation.h"
 #include "X2ap-BandInfo.h"
 #include "X2ap-BitRate.h"
 #include "X2ap-BroadcastPLMNs-Item.h"
+
 #include "X2ap-CapacityValue.h"
 #include "X2ap-Cause.h"
 #include "X2ap-CauseMisc.h"
 #include "X2ap-CauseProtocol.h"
 #include "X2ap-CauseRadioNetwork.h"
 #include "X2ap-CauseTransport.h"
+#include "X2ap-CellActivationFailure.h"
+#include "X2ap-CellActivationRequest.h"
+#include "X2ap-CellActivationResponse.h"
 #include "X2ap-CellBasedMDT.h"
 #include "X2ap-CellCapacityClassValue.h"
 #include "X2ap-CellIdListforMDT.h"
+#include "X2ap-CellInformation-Item.h"
+#include "X2ap-CellInformation-List.h"
 #include "X2ap-Cell-Size.h"
+#include "X2ap-CellToReport-Item.h"
+#include "X2ap-CellToReport-List.h"
 #include "X2ap-CellType.h"
+#include "X2ap-CellMeasurementResult-Item.h" 
+#include "X2ap-CellMeasurementResult-List.h"
+#include "X2ap-CompleteFailureCauseInformation-Item.h"
+#include "X2ap-CompleteFailureCauseInformation-List.h"
 #include "X2ap-CompositeAvailableCapacityGroup.h"
 #include "X2ap-CompositeAvailableCapacity.h"
 #include "X2ap-COUNTvalue.h"
@@ -73,16 +86,24 @@
 #include "X2ap-ECGI.h"
 #include "X2ap-ENB-ID.h"
 #include "X2ap-ENBConfigurationUpdateFailure.h"
+#include "X2ap-ENBConfigurationUpdateAcknowledge.h"
+#include "X2ap-ENBConfigurationUpdate.h"
 #include "X2ap-EncryptionAlgorithms.h"
 #include "X2ap-EPLMNs.h"
 #include "X2ap-E-RAB-ID.h"
 #include "X2ap-E-RAB-Item.h"
+#include "X2ap-E-RABs-Admitted-List.h"
 #include "X2ap-E-RAB-Level-QoS-Parameters.h"
 #include "X2ap-E-RAB-List.h"
+#include "X2ap-E-RABs-SubjectToStatusTransfer-Item.h"
+#include "X2ap-E-RABs-Admitted-Item.h"
+#include "X2ap-E-RABs-SubjectToStatusTransfer-List.h"
+#include "X2ap-ErrorIndication.h"
 #include "X2ap-EUTRA-Mode-Info.h"
 #include "X2ap-EUTRANCellIdentifier.h"
 #include "X2ap-EUTRANTraceID.h"
 #include "X2ap-EventType.h"
+
 #include "X2ap-FDD-Info.h"
 #include "X2ap-ForbiddenInterRATs.h"
 #include "X2ap-ForbiddenLACs.h"
@@ -103,7 +124,11 @@
 #include "X2ap-HandoverCancel.h"
 #include "X2ap-HandoverReportType.h"
 #include "X2ap-HandoverRequest.h"
+#include "X2ap-HandoverReport.h"
 #include "X2ap-HandoverRestrictionList.h"
+#include "X2ap-HandoverPreparationFailure.h"
+#include "X2ap-HandoverRequestAcknowledge.h"
+
 #include "X2ap-HFN.h"
 #include "X2ap-HWLoadIndicator.h"
 #include "X2ap-IE-Extensions.h"
@@ -118,6 +143,7 @@
 #include "X2ap-LastVisitedGERANCellInformation.h"
 #include "X2ap-LastVisitedUTRANCellInformation.h"
 #include "X2ap-LoadIndicator.h"
+#include "X2ap-LoadInformation.h"
 #include "X2ap-LocationReportingInformation.h"
 #include "X2ap-ManagementBasedMDTallowed.h"
 #include "X2ap-MBMS-Service-Area-Identity.h"
@@ -129,6 +155,10 @@
 #include "X2ap-Measurement-ID.h"
 #include "X2ap-MeasurementsToActivate.h"
 #include "X2ap-MeasurementThresholdA2.h"
+#include "X2ap-MeasurementInitiationResult-Item.h"
+#include "X2ap-MeasurementInitiationResult-List.h"
+
+#include "X2ap-MeasurementFailureCause-Item.h"
 #include "X2ap-MME-Code.h"
 #include "X2ap-MME-Group-ID.h"
 #include "X2ap-MobilityChangeAcknowledge.h"
@@ -141,6 +171,8 @@
 #include "X2ap-NextHopChainingCount.h"
 #include "X2ap-Number-of-Antennaports.h"
 #include "X2ap-Oneframe.h"
+#include "X2ap-Old-ECGIs.h"
+#include "X2ap-PartialSuccessIndicator.h"
 #include "X2ap-PCI.h"
 #include "X2ap-PDCP-SN.h"
 #include "X2AP-PDU.h"
@@ -166,14 +198,22 @@
 #include "X2ap-ReportCharacteristics.h"
 #include "X2ap-ReportingTriggerMDT.h"
 #include "X2ap-ReportIntervalMDT.h"
+#include "X2ap-ReportingPeriodicity.h"
 #include "X2ap-ResourceStatusFailure.h"
+#include "X2ap-ResourceStatusResponse.h"
+#include "X2ap-ResourceStatusUpdate.h"
+
 #include "X2ap-RNTP-Threshold.h"
 #include "X2ap-RRCConnReestabIndicator.h"
 #include "X2ap-RRCConnSetupIndicator.h"
 #include "X2ap-RRC-Context.h"
+#include "X2ap-RLFIndication.h"
+#include "X2ap-ResourceStatusRequest.h"
 #include "X2ap-S1TNLLoadIndicator.h"
-#include "X2ap-ServedCell-Information.h"
+//nclude "X2ap-ServedCellInformation.h"
 #include "X2ap-ServedCells.h"
+#include "X2ap-ServedCellsToModify.h"
+#include "X2ap-ServedCellsToActivate.h"
 #include "X2ap-ShortMAC-I.h"
 #include "X2ap-SpecialSubframe-Info.h"
 #include "X2ap-SpecialSubframePatterns.h"
@@ -181,6 +221,8 @@
 #include "X2ap-SubframeAllocation.h"
 #include "X2ap-SubframeAssignment.h"
 #include "X2ap-SubscriberProfileIDforRFP.h"
+#include "X2ap-SNStatusTransfer.h"
+
 #include "X2ap-TABasedMDT.h"
 #include "X2ap-TAC.h"
 #include "X2ap-TAListforMDT.h"
@@ -193,6 +235,7 @@
 #include "X2ap-TimeToWait.h"
 #include "X2ap-Time-UE-StayedInCell-EnhancedGranularity.h"
 #include "X2ap-Time-UE-StayedInCell.h"
+#include "X2ap-E-RABs-ToBeSetup-Item.h"
 #include "X2ap-TraceActivation.h"
 #include "X2ap-TraceCollectionEntityIPAddress.h"
 #include "X2ap-TraceDepth.h"
@@ -201,6 +244,7 @@
 #include "X2ap-TriggeringMessage.h"
 #include "X2ap-TypeOfError.h"
 #include "X2ap-UEAggregateMaximumBitRate.h"
+#include "X2ap-UE-ContextInformation.h"
 #include "X2ap-UE-HistoryInformation.h"
 #include "X2ap-UE-RLF-Report-Container.h"
 #include "X2ap-UE-S1AP-ID.h"
@@ -218,10 +262,17 @@
 #include "X2ap-UsableABSInformationFDD.h"
 #include "X2ap-UsableABSInformation.h"
 #include "X2ap-UsableABSInformationTDD.h"
+
+#include "X2ap-ResetResponse.h"
+#include "X2ap-ResetRequest.h"
 #include "X2SetupFailure.h"
 #include "X2SetupRequest.h"
 #include "X2SetupResponse.h"
 
+#include "X2ap-Old-ECGIs.h"
+#include "X2ap-Criticality.h"
+#include "X2ap-ProcedureCode.h"
+
 #ifndef X2AP_COMMON_H_
 #define X2AP_COMMON_H_