From 13017042045b589a63b999d4bca3354a4c8c16f4 Mon Sep 17 00:00:00 2001 From: Timo Tietavainen Date: Tue, 14 Jan 2020 11:22:18 +0200 Subject: [PATCH] Fix SGNB CHANGE CONFIRM protobuf message SGNB CHANGE CONFIRM protobuf message produced Golang data structure what had overlapping declaration and caused Golang compilation failure. As a fix change variable type naming in protobuf message file so that generated code won't have any more overlapping declarations. Signed-off-by: Timo Tietavainen Change-Id: I0259867122000622c278d342f5f20cc287c1f24b --- docs/release-notes.rst | 6 ++++++ sgnb_change_confirm.proto | 16 ++++++++-------- x2ap_streaming.proto | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 0cde365..1b04d97 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -31,6 +31,12 @@ ric-plt/streaming-protobufs. Version history --------------- +[1.0.0] - 2020-01-14 + +* Fixed overlapping declaration error hit in Golang data structures, which + were generated from SGNB CHANGE CONFIRM protobuf message. API backward + incompatible change. + [0.2.3] - 2019-12-18 * Implement Protobuf schema for following X2AP messages: diff --git a/sgnb_change_confirm.proto b/sgnb_change_confirm.proto index 0897a11..640844b 100644 --- a/sgnb_change_confirm.proto +++ b/sgnb_change_confirm.proto @@ -65,8 +65,8 @@ message E_RABs_ToBeReleased_SgNBChaConf_Item uint32 e_RAB_ID = 1; EN_DC_ResourceConfiguration en_DC_ResourceConfiguration = 2; oneof resource_configuration { - E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent sgNBPDCPpresent = 3; - E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent sgNBPDCPnotpresent = 4; + E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPpresent sgNBPDCPpresent = 3; + E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPnotpresent sgNBPDCPnotpresent = 4; } repeated E_RABs_ToBeReleased_SgNBChaConf_ItemExtIEs iE_Extensions = 5; } @@ -75,22 +75,22 @@ message E_RABs_ToBeReleased_SgNBChaConf_ItemExtIEs { } -message E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent +message E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPpresent { GTPtunnelEndpoint uL_GTPtunnelEndpoint = 1; GTPtunnelEndpoint dL_GTPtunnelEndpoint = 2; - repeated E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresentExtIEs iE_Extensions = 3; + repeated E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPpresentExtIEs iE_Extensions = 3; } -message E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresentExtIEs +message E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPpresentExtIEs { } -message E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent +message E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPnotpresent { - repeated E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresentExtIEs iE_Extensions = 1; + repeated E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPnotpresentExtIEs iE_Extensions = 1; } -message E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresentExtIEs +message E_RABs_ToBeReleased_SgNBChaConf_SgNBPDCPnotpresentExtIEs { } diff --git a/x2ap_streaming.proto b/x2ap_streaming.proto index dd68fe2..686c87c 100644 --- 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: v0.2.3 + x2ap_streaming_protobuf_revision: v1.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 -- 2.16.6