Change parameter string types to bytes type

There has been identified a problem when Protobuf string type is used: this
type does not support non-UTF8 characters and this limitation can cause
Protobuf encoding/decoding failure of an X2 parameter with arbitrary binary
value. To fix the issue replace string types of all X2 parameters in Protobuf
files with bytes type to support wider value range. Parameters
'protobuf_revision' and 'gNbID' types in x2ap_streaming.proto file were still
left a string type, because undoubtedly these parameter values are always
strings.

Signed-off-by: Timo Tietavainen <timo.tietavainen@nokia.com>
Change-Id: I45f1631e3e3e96c408c7d2c015221ef8e2857608

diff --git a/rrc_cg_config.proto b/rrc_cg_config.proto
index d0fe431..6dff601 100644 (file)
--- a/rrc_cg_config.proto
+++ b/rrc_cg_config.proto
@@ -52,7 +52,7 @@ message CG_ConfigCriticalExtensionsChoice1
 
 message CG_Config_IEs
 {
-    google.protobuf.StringValue scg_CellGroupConfig = 1;
+    google.protobuf.BytesValue scg_CellGroupConfig = 1;
     RadioBearerConfig scg_RB_Config = 2;
     ConfigRestrictModReqSCG configRestrictModReq = 3;
     DRX_Info drx_InfoSCG = 4;

diff --git a/rrc_cg_config_info.proto b/rrc_cg_config_info.proto
index b2c3377..ceebbbd 100644 (file)
--- a/rrc_cg_config_info.proto
+++ b/rrc_cg_config_info.proto
@@ -61,7 +61,7 @@ message CG_ConfigInfo_IEs
     ConfigRestrictInfoSCG configRestrictInfo = 6;
     DRX_Info drx_InfoMCG = 7;
     MeasConfigMN measConfigMN = 8;
-    google.protobuf.StringValue sourceConfigSCG = 9;
+    google.protobuf.BytesValue sourceConfigSCG = 9;
     RadioBearerConfig scg_RB_Config = 10;
     RadioBearerConfig mcg_RB_Config = 11;
     repeated AffectedCarrierFreqCombInfoMRDC mrdc_AssistanceInfo = 12;
@@ -71,7 +71,7 @@ message CG_ConfigInfo_IEs
 message UE_CapabilityRAT_Container
 {
     RAT_Type rat_Type = 1;
-    string ue_CapabilityRAT_Container = 2;
+    bytes ue_CapabilityRAT_Container = 2;
 }
 
 message RAT_Type

diff --git a/rrc_common_types.proto b/rrc_common_types.proto
index 25dce8e..c23455d 100644 (file)
--- a/rrc_common_types.proto
+++ b/rrc_common_types.proto
@@ -1000,9 +1000,9 @@ message ServingCellConfigCommon
     UplinkConfigCommon supplementaryUplinkConfigCommon = 4;
     N_TimingAdvanceOffset n_TimingAdvanceOffset = 5;
     oneof ssb_PositionsInBurst {
-        string shortBitmap = 6;
-        string mediumBitmap = 7;
-        string longBitmap = 8;
+        bytes shortBitmap = 6;
+        bytes mediumBitmap = 7;
+        bytes longBitmap = 8;
     }
     SSB_PeriodicityServingCell ssb_PeriodicityServingCell = 9;
     DMRS_TypeA_Position dmrs_TypeA_Position = 10;
@@ -1084,7 +1084,7 @@ message PDCCH_ConfigCommon
 message ControlResourceSet
 {
     uint32 controlResourceSetId = 1;
-    string frequencyDomainResources = 2;
+    bytes frequencyDomainResources = 2;
     uint32 duration = 3;
     oneof cce_REG_MappingType {
         Interleaved interleaved = 4;
@@ -1556,8 +1556,8 @@ message RadioframeAllocationPeriod
 message SubframeAllocation
 {
     oneof sfAllocation {
-        string oneFrame = 1;
-        string fourFrames = 2;
+        bytes oneFrame = 1;
+        bytes fourFrames = 2;
     }
 }
 
@@ -1599,19 +1599,19 @@ message RateMatchPattern
 
 message Bitmaps
 {
-    string resourceBlocks = 1;
+    bytes resourceBlocks = 1;
     oneof symbolsInResourceBlock {
-        string oneSlot = 2;
-        string twoSlots = 3;
+        bytes oneSlot = 2;
+        bytes twoSlots = 3;
     }
     oneof periodicityAndPattern {
-        string n2 = 4;
-        string n4 = 5;
-        string n5 = 6;
-        string n8 = 7;
-        string n10 = 8;
-        string n20 = 9;
-        string n40 = 10;
+        bytes n2 = 4;
+        bytes n4 = 5;
+        bytes n5 = 6;
+        bytes n8 = 7;
+        bytes n10 = 8;
+        bytes n20 = 9;
+        bytes n40 = 10;
     }
 }
 
@@ -2294,10 +2294,10 @@ message ZP_CSI_RS_Resource
 message CSI_RS_ResourceMapping
 {
     oneof frequencyDomainAllocation {
-        string row1 = 1;
-        string row2 = 2;
-        string row4 = 3;
-        string other = 5;
+        bytes row1 = 1;
+        bytes row2 = 2;
+        bytes row4 = 3;
+        bytes other = 5;
     }
     NrofPorts nrofPorts = 6;
     uint32 firstOFDMSymbolInTimeDomain = 7;
@@ -3239,7 +3239,7 @@ message RRC_ConfiguredUplinkGrant
 {
     uint32 timeDomainOffset = 1;
     uint32 timeDomainAllocation = 2;
-    string frequencyDomainAllocation = 3;
+    bytes frequencyDomainAllocation = 3;
     uint32 antennaPort = 4;
     google.protobuf.UInt32Value dmrs_SeqInitialization = 5;
     uint32 precodingAndNumberOfLayers = 6;
@@ -3888,23 +3888,23 @@ message ReportFreqConfiguration
     CQI_FormatIndicator cqi_FormatIndicator = 1;
     PMI_FormatIndicator pmi_FormatIndicator = 2;
     oneof csi_ReportingBand {
-        string subbands3 = 3;
-        string subbands4 = 4;
-        string subbands5 = 5;
-        string subbands6 = 6;
-        string subbands7 = 7;
-        string subbands8 = 8;
-        string subbands9 = 9;
-        string subbands10 = 10;
-        string subbands11 = 11;
-        string subbands12 = 12;
-        string subbands13 = 13;
-        string subbands14 = 14;
-        string subbands15 = 15;
-        string subbands16 = 16;
-        string subbands17 = 17;
-        string subbands18 = 18;
-        string subbands19_v1530 = 19;
+        bytes subbands3 = 3;
+        bytes subbands4 = 4;
+        bytes subbands5 = 5;
+        bytes subbands6 = 6;
+        bytes subbands7 = 7;
+        bytes subbands8 = 8;
+        bytes subbands9 = 9;
+        bytes subbands10 = 10;
+        bytes subbands11 = 11;
+        bytes subbands12 = 12;
+        bytes subbands13 = 13;
+        bytes subbands14 = 14;
+        bytes subbands15 = 15;
+        bytes subbands16 = 16;
+        bytes subbands17 = 17;
+        bytes subbands18 = 18;
+        bytes subbands19_v1530 = 19;
     }
 }
 
@@ -3951,47 +3951,47 @@ message CodebookSubType_SinglePanel
         CodebookNrOfAntennaPorts_Two two = 1;
         CodebookNrOfAntennaPorts_MoreThanTwo moreThanTwo = 2;
     }
-    string typeI_SinglePanel_ri_Restriction = 3;
+    bytes typeI_SinglePanel_ri_Restriction = 3;
 }
 
 message CodebookNrOfAntennaPorts_Two
 {
-    string twoTX_CodebookSubsetRestriction = 1;
+    bytes twoTX_CodebookSubsetRestriction = 1;
 }
 
 message CodebookNrOfAntennaPorts_MoreThanTwo
 {
     oneof n1_n2 {
-        string two_one_TypeI_SinglePanel_Restriction = 1;
-        string two_two_TypeI_SinglePanel_Restriction = 2;
-        string four_one_TypeI_SinglePanel_Restriction = 3;
-        string three_two_TypeI_SinglePanel_Restriction = 4;
-        string six_one_TypeI_SinglePanel_Restriction = 5;
-        string four_two_TypeI_SinglePanel_Restriction = 6;
-        string eight_one_TypeI_SinglePanel_Restriction = 7;
-        string four_three_TypeI_SinglePanel_Restriction = 8;
-        string six_two_TypeI_SinglePanel_Restriction = 9;
-        string twelve_one_TypeI_SinglePanel_Restriction = 10;
-        string four_four_TypeI_SinglePanel_Restriction = 11;
-        string eight_two_TypeI_SinglePanel_Restriction = 12;
-        string sixteen_one_TypeI_SinglePanel_Restriction = 13;
-    }
-    google.protobuf.StringValue typeI_SinglePanel_codebookSubsetRestriction_i2 = 14;
+        bytes two_one_TypeI_SinglePanel_Restriction = 1;
+        bytes two_two_TypeI_SinglePanel_Restriction = 2;
+        bytes four_one_TypeI_SinglePanel_Restriction = 3;
+        bytes three_two_TypeI_SinglePanel_Restriction = 4;
+        bytes six_one_TypeI_SinglePanel_Restriction = 5;
+        bytes four_two_TypeI_SinglePanel_Restriction = 6;
+        bytes eight_one_TypeI_SinglePanel_Restriction = 7;
+        bytes four_three_TypeI_SinglePanel_Restriction = 8;
+        bytes six_two_TypeI_SinglePanel_Restriction = 9;
+        bytes twelve_one_TypeI_SinglePanel_Restriction = 10;
+        bytes four_four_TypeI_SinglePanel_Restriction = 11;
+        bytes eight_two_TypeI_SinglePanel_Restriction = 12;
+        bytes sixteen_one_TypeI_SinglePanel_Restriction = 13;
+    }
+    google.protobuf.BytesValue typeI_SinglePanel_codebookSubsetRestriction_i2 = 14;
 }
 
 message CodebookSubType_MultiPanel
 {
     oneof ng_n1_n2 {
-        string two_two_one_TypeI_MultiPanel_Restriction = 1;
-        string two_four_one_TypeI_MultiPanel_Restriction = 2;
-        string four_two_one_TypeI_MultiPanel_Restriction = 3;
-        string two_two_two_TypeI_MultiPanel_Restriction = 4;
-        string two_eight_one_TypeI_MultiPanel_Restriction = 5;
-        string four_four_one_TypeI_MultiPanel_Restriction = 6;
-        string two_four_two_TypeI_MultiPanel_Restriction = 7;
-        string four_two_two_TypeI_MultiPanel_Restriction = 8;
+        bytes two_two_one_TypeI_MultiPanel_Restriction = 1;
+        bytes two_four_one_TypeI_MultiPanel_Restriction = 2;
+        bytes four_two_one_TypeI_MultiPanel_Restriction = 3;
+        bytes two_two_two_TypeI_MultiPanel_Restriction = 4;
+        bytes two_eight_one_TypeI_MultiPanel_Restriction = 5;
+        bytes four_four_one_TypeI_MultiPanel_Restriction = 6;
+        bytes two_four_two_TypeI_MultiPanel_Restriction = 7;
+        bytes four_two_two_TypeI_MultiPanel_Restriction = 8;
     }
-    string ri_Restriction = 9;
+    bytes ri_Restriction = 9;
 }
 
 message CodebookType_Type2
@@ -4008,27 +4008,27 @@ message CodebookType_Type2
 message CodebookSubType_TypeII
 {
     oneof n1_n2_codebookSubsetRestriction {
-        string two_one = 1;
-        string two_two = 2;
-        string four_one = 3;
-        string three_two = 4;
-        string six_one = 5;
-        string four_two = 6;
-        string eight_one = 7;
-        string four_three = 8;
-        string six_two = 9;
-        string twelve_one = 10;
-        string four_four = 11;
-        string eight_two = 12;
-        string sixteen_one = 13;
-    }
-    string typeII_RI_Restriction = 14;
+        bytes two_one = 1;
+        bytes two_two = 2;
+        bytes four_one = 3;
+        bytes three_two = 4;
+        bytes six_one = 5;
+        bytes four_two = 6;
+        bytes eight_one = 7;
+        bytes four_three = 8;
+        bytes six_two = 9;
+        bytes twelve_one = 10;
+        bytes four_four = 11;
+        bytes eight_two = 12;
+        bytes sixteen_one = 13;
+    }
+    bytes typeII_RI_Restriction = 14;
 }
 
 message CodebookSubType_TypeII_PortSelection
 {
     PortSelectionSamplingSize portSelectionSamplingSize = 1;
-    string typeII_PortSelectionRI_Restriction = 2;
+    bytes typeII_PortSelectionRI_Restriction = 2;
 }
 
 message PhaseAlphabetSize
@@ -4346,15 +4346,15 @@ message SSB_ConfigMobility
 message SSB_ToMeasure
 {
     oneof c {
-        string shortBitmap = 1;
-        string mediumBitmap = 2;
-        string longBitmap = 3;
+        bytes shortBitmap = 1;
+        bytes mediumBitmap = 2;
+        bytes longBitmap = 3;
     }
 }
 
 message SS_RSSI_Measurement
 {
-    string measurementSlots = 1;
+    bytes measurementSlots = 1;
     uint32 endSymbol = 2;
 }
 
@@ -4410,8 +4410,8 @@ message CSI_RS_Resource_Mobility
     }
     AssociatedSSB associatedSSB = 7;
     oneof frequencyDomainAllocation {
-        string row1 = 8;
-        string row2 = 9;
+        bytes row1 = 8;
+        bytes row2 = 9;
     }
     uint32 firstOFDMSymbolInTimeDomain = 10;
     uint32 sequenceGenerationConfig = 11;
@@ -5172,7 +5172,7 @@ message SearchSpace
         uint32 sl2560 = 17;
     }
     google.protobuf.UInt32Value duration = 18;
-    google.protobuf.StringValue monitoringSymbolsWithinSlot = 19;
+    google.protobuf.BytesValue monitoringSymbolsWithinSlot = 19;
     NrofCandidates nrofCandidates = 20;
     oneof searchSpaceType {
         Common common = 21;
@@ -5410,10 +5410,10 @@ message PLMN_IdentityList_EUTRA_5GC
 message CellAccessRelatedInfo_EUTRA_5GC
 {
     PLMN_IdentityList_EUTRA_5GC plmn_IdentityList_eutra_5gc = 1;
-    string trackingAreaCode_eutra_5gc = 2;
+    bytes trackingAreaCode_eutra_5gc = 2;
     google.protobuf.UInt32Value ranac_5gc = 3;
     oneof cellidentity_eutra_5gc {
-        string cellIdentity_EUTRA = 4;
+        bytes cellIdentity_EUTRA = 4;
         uint32 cellId_index = 5;
     }
 }
@@ -5426,8 +5426,8 @@ message PLMN_IdentityList_EUTRA_EPC
 message CellAccessRelatedInfo_EUTRA_EPC
 {
     PLMN_IdentityList_EUTRA_EPC plmn_IdentityList_eutra_epc = 1;
-    string trackingAreaCode_eutra_epc = 2;
-    string cellidentity_eutra_epc = 3;
+    bytes trackingAreaCode_eutra_epc = 2;
+    bytes cellidentity_eutra_epc = 3;
 }
 
 message CGI_info_EPC
@@ -5444,9 +5444,9 @@ message PLMN_IdentityInfo
         notreserved = 2;
     }
     repeated PLMN_Identity plmn_IdentityList = 1;
-    google.protobuf.StringValue trackingAreaCode = 2;
+    google.protobuf.BytesValue trackingAreaCode = 2;
     google.protobuf.UInt32Value ranac = 3;
-    string cellIdentity = 4;
+    bytes cellIdentity = 4;
     CellReservedForOperatorUse cellReservedForOperatorUse = 5;
 }
 
@@ -5920,7 +5920,7 @@ message SI_SchedulingInfo
     SI_WindowLength si_WindowLength = 2;
     SI_RequestConfig si_RequestConfig = 3;
     SI_RequestConfig si_RequestConfigSUL = 4;
-    google.protobuf.StringValue systemInformationAreaID = 5;
+    google.protobuf.BytesValue systemInformationAreaID = 5;
 }
 
 message SI_WindowLength
@@ -6213,8 +6213,8 @@ message SIB_N_TimingAdvanceOffset
 
 message SIB_SSB_PositionsInBurst
 {
-    string inOneGroup = 1;
-    google.protobuf.StringValue groupPresence = 2;
+    bytes inOneGroup = 1;
+    google.protobuf.BytesValue groupPresence = 2;
 }
 
 message SIB_SSB_PeriodicityServingCell
@@ -6360,7 +6360,7 @@ message UAC_BarringInfoSet
 {
     UAC_BarringFactor uac_BarringFactor = 1;
     UAC_BarringTime uac_BarringTime = 2;
-    string uac_BarringForAccessIdentity = 3;
+    bytes uac_BarringForAccessIdentity = 3;
 }
 
 message UAC_BarringFactor

diff --git a/rrc_failure_information.proto b/rrc_failure_information.proto
index f087204..aa26591 100644 (file)
--- a/rrc_failure_information.proto
+++ b/rrc_failure_information.proto
@@ -43,7 +43,7 @@ message FailureInformation
 message FailureInformation_IEs
 {
     FailureInfoRLC_Bearer failureInfoRLC_Bearer = 1;
-    google.protobuf.StringValue lateNonCriticalExtension = 2;
+    google.protobuf.BytesValue lateNonCriticalExtension = 2;
 }
 
 message FailureInfoRLC_Bearer

diff --git a/rrc_measurement_report.proto b/rrc_measurement_report.proto
index d9c55bc..c2541f8 100644 (file)
--- a/rrc_measurement_report.proto
+++ b/rrc_measurement_report.proto
@@ -46,5 +46,5 @@ message MeasurementReport
 message MeasurementReport_IEs
 {
     MeasResults measResults = 1;
-    google.protobuf.StringValue lateNonCriticalExtension = 2;
+    google.protobuf.BytesValue lateNonCriticalExtension = 2;
 }

diff --git a/rrc_reconfiguration.proto b/rrc_reconfiguration.proto
index afc1411..677697c 100644 (file)
--- a/rrc_reconfiguration.proto
+++ b/rrc_reconfiguration.proto
@@ -52,7 +52,7 @@ message RRCReconfiguration_IEs
     RadioBearerConfig radioBearerConfig = 1;
     CellGroupConfig secondaryCellGroup = 2;
     MeasConfig measConfig = 3;
-    google.protobuf.StringValue lateNonCriticalExtension = 4;
+    google.protobuf.BytesValue lateNonCriticalExtension = 4;
     RRCReconfiguration_v1530_IEs nonCriticalExtension = 5;
 }
 
@@ -60,7 +60,7 @@ message RRCReconfiguration_v1530_IEs
 {
     CellGroupConfig masterCellGroup = 1;
     TrueOpt fullConfig = 2;
-    repeated string dedicatedNAS_MessageList = 3;
+    repeated bytes dedicatedNAS_MessageList = 3;
     MasterKeyUpdate masterKeyUpdate = 4;
     SIB1 dedicatedSIB1_Delivery = 5;
     SystemInformation dedicatedSystemInformationDelivery = 6;
@@ -72,7 +72,7 @@ message MasterKeyUpdate
 {
     bool keySetChangeIndicator = 1;
     uint32 nextHopChainingCount = 2;
-    google.protobuf.StringValue nas_Container = 3;
+    google.protobuf.BytesValue nas_Container = 3;
 }
 
 message RRCReconfiguration_v1540_IEs

diff --git a/rrc_reconfiguration_complete.proto b/rrc_reconfiguration_complete.proto
index 009acdd..427f29b 100644 (file)
--- a/rrc_reconfiguration_complete.proto
+++ b/rrc_reconfiguration_complete.proto
@@ -46,7 +46,7 @@ message RRCReconfigurationComplete
 
 message RRCReconfigurationComplete_IEs
 {
-    google.protobuf.StringValue lateNonCriticalExtension = 1;
+    google.protobuf.BytesValue lateNonCriticalExtension = 1;
     RRCReconfigurationComplete_v1530_IEs nonCriticalExtension = 2;
 }
 

diff --git a/rrc_sib.proto b/rrc_sib.proto
index fc8dfca..922c69b 100644 (file)
--- a/rrc_sib.proto
+++ b/rrc_sib.proto
@@ -48,7 +48,7 @@ message SIB1
     UE_TimersAndConstants ue_TimersAndConstants = 8;
     SIB1UAC_BarringInfo uac_BarringInfo = 9;
     TrueOpt useFullResumeID = 10;
-    google.protobuf.StringValue lateNonCriticalExtension = 11;
+    google.protobuf.BytesValue lateNonCriticalExtension = 11;
 }
 
 message SIB1CellSelectionInfo
@@ -213,7 +213,7 @@ message SIB3
 {
     IntraFreqNeighCellList intraFreqNeighCellList = 1;
     IntraFreqBlackCellList intraFreqBlackCellList = 2;
-    google.protobuf.StringValue lateNonCriticalExtension = 3;
+    google.protobuf.BytesValue lateNonCriticalExtension = 3;
 }
 
 message IntraFreqNeighCellList
@@ -238,7 +238,7 @@ message IntraFreqBlackCellList
 message SIB4
 {
     InterFreqCarrierFreqList interFreqCarrierFreqList = 1;
-    google.protobuf.StringValue lateNonCriticalExtension = 2;
+    google.protobuf.BytesValue lateNonCriticalExtension = 2;
 }
 
 message InterFreqCarrierFreqList
@@ -304,7 +304,7 @@ message SIB5
     CarrierFreqListEUTRA carrierFreqListEUTRA = 1;
     uint32 t_ReselectionEUTRA = 2;
     SpeedStateScaleFactors t_ReselectionEUTRA_SF = 3;
-    google.protobuf.StringValue lateNonCriticalExtension = 4;
+    google.protobuf.BytesValue lateNonCriticalExtension = 4;
 }
 
 message CarrierFreqListEUTRA
@@ -356,10 +356,10 @@ message CarrierFreqEUTRAThreshX_Q
 
 message SIB6
 {
-    string messageIdentifier = 1;
-    string serialNumber = 2;
-    string warningType = 3;
-    google.protobuf.StringValue lateNonCriticalExtension = 4;
+    bytes messageIdentifier = 1;
+    bytes serialNumber = 2;
+    bytes warningType = 3;
+    google.protobuf.BytesValue lateNonCriticalExtension = 4;
 }
 
 message SIB7
@@ -370,13 +370,13 @@ message SIB7
         lastSegment = 2;
     }
 
-    string messageIdentifier = 1;
-    string serialNumber = 2;
+    bytes messageIdentifier = 1;
+    bytes serialNumber = 2;
     WarningMessageSegmentType warningMessageSegmentType = 3;
     uint32 warningMessageSegmentNumber = 4;
-    string warningMessageSegment = 5;
-    google.protobuf.StringValue dataCodingScheme = 6;
-    google.protobuf.StringValue lateNonCriticalExtension = 7;
+    bytes warningMessageSegment = 5;
+    google.protobuf.BytesValue dataCodingScheme = 6;
+    google.protobuf.BytesValue lateNonCriticalExtension = 7;
 }
 
 message SIB8
@@ -387,26 +387,26 @@ message SIB8
         lastSegment = 2;
     }
 
-    string messageIdentifier = 1;
-    string serialNumber = 2;
+    bytes messageIdentifier = 1;
+    bytes serialNumber = 2;
     WarningMessageSegmentType warningMessageSegmentType = 3;
     uint32 warningMessageSegmentNumber = 4;
-    string warningMessageSegment = 5;
-    google.protobuf.StringValue dataCodingScheme = 6;
-    google.protobuf.StringValue warningAreaCoordinatesSegment = 7;
-    google.protobuf.StringValue lateNonCriticalExtension = 8;
+    bytes warningMessageSegment = 5;
+    google.protobuf.BytesValue dataCodingScheme = 6;
+    google.protobuf.BytesValue warningAreaCoordinatesSegment = 7;
+    google.protobuf.BytesValue lateNonCriticalExtension = 8;
 }
 
 message SIB9
 {
     SIB9TimeInfo timeInfo = 1;
-    google.protobuf.StringValue lateNonCriticalExtension = 2;
+    google.protobuf.BytesValue lateNonCriticalExtension = 2;
 }
 
 message SIB9TimeInfo
 {
     uint64 timeInfoUTC = 1;
-    google.protobuf.StringValue dayLightSavingTime = 2;
+    google.protobuf.BytesValue dayLightSavingTime = 2;
     google.protobuf.Int32Value leapSeconds = 3;
     google.protobuf.Int32Value localTimeOffset = 4;
 }

diff --git a/rrc_system_information.proto b/rrc_system_information.proto
index 8a10dd5..5ccb580 100644 (file)
--- a/rrc_system_information.proto
+++ b/rrc_system_information.proto
@@ -46,7 +46,7 @@ message SystemInformation
 message SystemInformation_IEs
 {
     repeated SIB_TypeAndInfo sib_TypeAndInfo = 1;
-    google.protobuf.StringValue lateNonCriticalExtension = 2;
+    google.protobuf.BytesValue lateNonCriticalExtension = 2;
 }
 
 message SIB_TypeAndInfo

diff --git a/sgnb_addition_request.proto b/sgnb_addition_request.proto
index f30637e..7413ffc 100644 (file)
--- a/sgnb_addition_request.proto
+++ b/sgnb_addition_request.proto
@@ -46,9 +46,9 @@ message SgNBAdditionRequest_IEs
 {
     uint32 id_MeNB_UE_X2AP_ID = 1;
     NRUESecurityCapabilities id_NRUESecurityCapabilities = 2;
-    string id_SgNBSecurityKey = 3;
+    bytes id_SgNBSecurityKey = 3;
     UEAggregateMaximumBitRate id_SgNBUEAggregateMaximumBitRate = 4;
-    google.protobuf.StringValue id_SelectedPLMN = 5;
+    google.protobuf.BytesValue id_SelectedPLMN = 5;
     HandoverRestrictionList id_HandoverRestrictionList = 6;
     E_RABs_ToBeAdded_SgNBAddReqList id_E_RABs_ToBeAdded_SgNBAddReqList = 7;
     CG_ConfigInfo id_MeNBtoSgNBContainer = 8;

diff --git a/sgnb_modification_confirm.proto b/sgnb_modification_confirm.proto
index 4822ef1..74f61f7 100644 (file)
--- a/sgnb_modification_confirm.proto
+++ b/sgnb_modification_confirm.proto
@@ -46,7 +46,7 @@ message SgNBModificationConfirm_IEs
     uint32 id_MeNB_UE_X2AP_ID = 1;
     uint32 id_SgNB_UE_X2AP_ID = 2;
     E_RABs_AdmittedToBeModified_SgNBModConfList id_E_RABs_AdmittedToBeModified_SgNBModConfList = 3;
-    google.protobuf.StringValue id_MeNBtoSgNBContainer = 4;
+    google.protobuf.BytesValue id_MeNBtoSgNBContainer = 4;
     CriticalityDiagnostics id_CriticalityDiagnostics = 5;
     google.protobuf.UInt32Value id_MeNB_UE_X2AP_ID_Extension = 6;
     MeNBResourceCoordinationInformation id_MeNBResourceCoordinationInformation = 7;

diff --git a/sgnb_modification_request.proto b/sgnb_modification_request.proto
index 5e696ec..55d50e3 100644 (file)
--- a/sgnb_modification_request.proto
+++ b/sgnb_modification_request.proto
@@ -49,7 +49,7 @@ message SgNBModificationRequest_IEs
     uint32 id_MeNB_UE_X2AP_ID = 1;
     uint32 id_SgNB_UE_X2AP_ID = 2;
     Cause id_Cause = 3;
-    google.protobuf.StringValue id_SelectedPLMN = 4;
+    google.protobuf.BytesValue id_SelectedPLMN = 4;
     HandoverRestrictionList id_HandoverRestrictionList = 5;
     TrueOpt id_SCGConfigurationQuery = 6;
     UE_ContextInformation_SgNBModReq id_UE_ContextInformation_SgNBModReq = 7;
@@ -64,7 +64,7 @@ message SgNBModificationRequest_IEs
 message UE_ContextInformation_SgNBModReq
 {
     NRUESecurityCapabilities nRUE_SecurityCapabilities = 1;
-    google.protobuf.StringValue sgNB_SecurityKey = 2;
+    google.protobuf.BytesValue sgNB_SecurityKey = 2;
     UEAggregateMaximumBitRate sgNBUEAggregateMaximumBitRate = 3;
     E_RABs_ToBeAdded_SgNBModReq_List e_RABs_ToBeAdded = 4;
     E_RABs_ToBeModified_SgNBModReq_List e_RABs_ToBeModified = 5;

diff --git a/sgnb_reconfiguration_complete.proto b/sgnb_reconfiguration_complete.proto
index e0c3b26..b4c1f70 100644 (file)
--- a/sgnb_reconfiguration_complete.proto
+++ b/sgnb_reconfiguration_complete.proto
@@ -54,7 +54,7 @@ message ResponseInformationSgNBReconfComp
 
 message ResponseInformationSgNBReconfComp_SuccessItem
 {
-    google.protobuf.StringValue meNBtoSgNBContainer = 1;
+    google.protobuf.BytesValue meNBtoSgNBContainer = 1;
     repeated ResponseInformationSgNBReconfComp_SuccessItemExtIEs iE_Extensions = 2;
 }
 

diff --git a/sn_status_transfer.proto b/sn_status_transfer.proto
index e3c703e..e76df5d 100644 (file)
--- a/sn_status_transfer.proto
+++ b/sn_status_transfer.proto
@@ -64,7 +64,7 @@ message E_RABs_SubjectToStatusTransfer_ItemIEs
 message E_RABs_SubjectToStatusTransfer_Item
 {
     uint32 e_RAB_ID = 1;
-    google.protobuf.StringValue receiveStatusofULPDCPSDUs = 2;
+    google.protobuf.BytesValue receiveStatusofULPDCPSDUs = 2;
     COUNTvalue uL_COUNTvalue = 3;
     COUNTvalue dL_COUNTvalue = 4;
     repeated E_RABs_SubjectToStatusTransfer_ItemExtIEs iE_Extensions = 5;
@@ -72,10 +72,10 @@ message E_RABs_SubjectToStatusTransfer_Item
 
 message E_RABs_SubjectToStatusTransfer_ItemExtIEs
 {
-    google.protobuf.StringValue id_ReceiveStatusOfULPDCPSDUsExtended = 1;
+    google.protobuf.BytesValue id_ReceiveStatusOfULPDCPSDUsExtended = 1;
     COUNTValueExtended id_ULCOUNTValueExtended = 2;
     COUNTValueExtended id_DLCOUNTValueExtended = 3;
-    google.protobuf.StringValue id_ReceiveStatusOfULPDCPSDUsPDCP_SNlength18 = 4;
+    google.protobuf.BytesValue id_ReceiveStatusOfULPDCPSDUsPDCP_SNlength18 = 4;
     COUNTvaluePDCP_SNlength18 id_ULCOUNTValuePDCP_SNlength18 = 5;
     COUNTvaluePDCP_SNlength18 id_DLCOUNTValuePDCP_SNlength18 = 6;
 }

diff --git a/x2ap_common_types.proto b/x2ap_common_types.proto
index 1754a5a..c34224b 100644 (file)
--- a/x2ap_common_types.proto
+++ b/x2ap_common_types.proto
@@ -115,7 +115,7 @@ message GBR_QosInformation_ExtIEs
 
 message GlobalGNB_ID
 {
-    string pLMN_Identity = 1;
+    bytes pLMN_Identity = 1;
     GNB_ID gNB_ID = 2;
     repeated GlobalGNB_ID_ExtIEs iE_Extensions = 3;
 }
@@ -123,7 +123,7 @@ message GlobalGNB_ID
 message GNB_ID
 {
     oneof c {
-        string gNB_ID = 1;
+        bytes gNB_ID = 1;
     }
 }
 
@@ -133,8 +133,8 @@ message GlobalGNB_ID_ExtIEs
 
 message GTPtunnelEndpoint
 {
-    string transportLayerAddress = 1;
-    string gTP_TEID = 2;
+    bytes transportLayerAddress = 1;
+    bytes gTP_TEID = 2;
     repeated GTPtunnelEndpoint_ExtIEs iE_Extensions = 3;
 }
 
@@ -208,8 +208,8 @@ message SplitSRBs
 
 message NRCGI
 {
-    string pLMN_Identity = 1;
-    string nRcellIdentifier = 2;
+    bytes pLMN_Identity = 1;
+    bytes nRcellIdentifier = 2;
     repeated NRCGI_ExtIEs iE_Extensions = 3;
 }
 
@@ -219,8 +219,8 @@ message NRCGI_ExtIEs
 
 message ECGI
 {
-    string pLMN_Identity = 1;
-    string eUTRANcellIdentifier = 2;
+    bytes pLMN_Identity = 1;
+    bytes eUTRANcellIdentifier = 2;
 }
 
 message E_RAB_List
@@ -335,8 +335,8 @@ message CriticalityDiagnostics_ExtIEs
 message SgNBResourceCoordinationInformation
 {
     NRCGI nR_CGI = 1;
-    string uLCoordinationInformation = 2;
-    google.protobuf.StringValue dLCoordinationInformation = 3;
+    bytes uLCoordinationInformation = 2;
+    google.protobuf.BytesValue dLCoordinationInformation = 3;
     repeated SgNBResourceCoordinationInformationExtIEs iE_Extensions = 4;
 }
 
@@ -367,7 +367,7 @@ message RRC_Config_Ind
 
 message HandoverRestrictionList
 {
-    string servingPLMN = 1;
+    bytes servingPLMN = 1;
     EPLMNs equivalentPLMNs = 2;
     ForbiddenTAs forbiddenTAs = 3;
     ForbiddenLAs forbiddenLAs = 4;
@@ -377,7 +377,7 @@ message HandoverRestrictionList
 
 message EPLMNs
 {
-    repeated string items = 1;
+    repeated bytes items = 1;
 }
 
 message ForbiddenTAs
@@ -387,13 +387,13 @@ message ForbiddenTAs
 
 message ForbiddenTAs_Item
 {
-    string pLMN_Identity = 1;
+    bytes pLMN_Identity = 1;
     ForbiddenTACs forbiddenTACs = 2;
 }
 
 message ForbiddenTACs
 {
-   repeated string items = 1;
+   repeated bytes items = 1;
 }
 
 message ForbiddenLAs
@@ -403,13 +403,13 @@ message ForbiddenLAs
 
 message ForbiddenLAs_Item
 {
-    string pLMN_Identity = 1;
+    bytes pLMN_Identity = 1;
     ForbiddenLACs forbiddenLACs = 2;
 }
 
 message ForbiddenLACs
 {
-    repeated string items = 1;
+    repeated bytes items = 1;
 }
 
 message ForbiddenInterRATs
@@ -454,7 +454,7 @@ message CNTypeRestrictionsItem
         fiveGC_forbidden = 1;
     }
 
-    string plmn_Id = 1;
+    bytes plmn_Id = 1;
     CN_type cn_type = 2;
 }
 
@@ -469,8 +469,8 @@ message NRrestrictionin5GS
 
 message NRUESecurityCapabilities
 {
-    string nRencryptionAlgorithms = 1;
-    string nRintegrityProtectionAlgorithms = 2;
+    bytes nRencryptionAlgorithms = 1;
+    bytes nRintegrityProtectionAlgorithms = 2;
 }
 
 message UEAggregateMaximumBitRate
@@ -508,8 +508,8 @@ message DuplicationActivation
 message MeNBResourceCoordinationInformation
 {
     ECGI eUTRA_Cell_ID = 1;
-    string uLCoordinationInformation = 2;
-    google.protobuf.StringValue dLCoordinationInformation = 3;
+    bytes uLCoordinationInformation = 2;
+    google.protobuf.BytesValue dLCoordinationInformation = 3;
     repeated MeNBResourceCoordinationInformationExtIEs iE_Extensions = 4;
 }
 

diff --git a/x2ap_streaming.proto b/x2ap_streaming.proto
index 0f8f7b2..221947a 100644 (file)
--- a/x2ap_streaming.proto
+++ b/x2ap_streaming.proto
@@ -60,7 +60,7 @@ import "gnb_status_indication.proto";
    Dashes converted to underscores to make protobuf message syntax correct.
 
    Revision number of this X2AP Streaming protobuf file is:
-       x2ap_streaming_protobuf_revision: v2.0.0
+       x2ap_streaming_protobuf_revision: v3.0.0
    The location of X2AP Streaming protobuf files is a Linux Foundation
    repository:
        https://gerrit.o-ran-sc.org/r/ric-plt/streaming-protobufs