From: Amichai Date: Tue, 21 Jul 2020 09:47:05 +0000 (+0000) Subject: [RIC-571] proto updates: enb_type, gnb_type, setupFromNetwork X-Git-Tag: common/v1.0.47 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=4faef77dad62cc836bce4d90968d66e2db8bfe7a;p=ric-plt%2Fnodeb-rnib.git [RIC-571] proto updates: enb_type, gnb_type, setupFromNetwork Change-Id: I880041641eec504b830b1ed4ab44d4ed29eee50b Signed-off-by: Amichai --- diff --git a/entities/enb.pb.go b/entities/enb.pb.go index c80eb4c..8187eb4 100644 --- a/entities/enb.pb.go +++ b/entities/enb.pb.go @@ -305,11 +305,14 @@ func (NumberOfAntennaPorts) EnumDescriptor() ([]byte, []int) { type EnbType int32 const ( - EnbType_UNKNOWN_ENB_TYPE EnbType = 0 - EnbType_MACRO_ENB EnbType = 1 - EnbType_HOME_ENB EnbType = 2 - EnbType_SHORT_MACRO_ENB EnbType = 3 - EnbType_LONG_MACRO_ENB EnbType = 4 + EnbType_UNKNOWN_ENB_TYPE EnbType = 0 + EnbType_MACRO_ENB EnbType = 1 + EnbType_HOME_ENB EnbType = 2 + EnbType_SHORT_MACRO_ENB EnbType = 3 + EnbType_LONG_MACRO_ENB EnbType = 4 + EnbType_MACRO_NG_ENB EnbType = 5 + EnbType_SHORT_MACRO_NG_ENB EnbType = 6 + EnbType_LONG_MACRO_NG_ENB EnbType = 7 ) // Enum value maps for EnbType. @@ -320,13 +323,19 @@ var ( 2: "HOME_ENB", 3: "SHORT_MACRO_ENB", 4: "LONG_MACRO_ENB", + 5: "MACRO_NG_ENB", + 6: "SHORT_MACRO_NG_ENB", + 7: "LONG_MACRO_NG_ENB", } EnbType_value = map[string]int32{ - "UNKNOWN_ENB_TYPE": 0, - "MACRO_ENB": 1, - "HOME_ENB": 2, - "SHORT_MACRO_ENB": 3, - "LONG_MACRO_ENB": 4, + "UNKNOWN_ENB_TYPE": 0, + "MACRO_ENB": 1, + "HOME_ENB": 2, + "SHORT_MACRO_ENB": 3, + "LONG_MACRO_ENB": 4, + "MACRO_NG_ENB": 5, + "SHORT_MACRO_NG_ENB": 6, + "LONG_MACRO_NG_ENB": 7, } ) @@ -2066,34 +2075,38 @@ var file_enb_proto_rawDesc = []byte{ 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x5f, 0x4f, 0x46, 0x5f, 0x41, 0x4e, 0x54, 0x45, 0x4e, 0x4e, 0x41, 0x5f, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4e, 0x31, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4e, 0x32, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x41, - 0x4e, 0x34, 0x10, 0x03, 0x2a, 0x65, 0x0a, 0x07, 0x45, 0x6e, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x14, 0x0a, 0x10, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x45, 0x4e, 0x42, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x41, 0x43, 0x52, 0x4f, 0x5f, 0x45, - 0x4e, 0x42, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x4f, 0x4d, 0x45, 0x5f, 0x45, 0x4e, 0x42, - 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x48, 0x4f, 0x52, 0x54, 0x5f, 0x4d, 0x41, 0x43, 0x52, - 0x4f, 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x4e, 0x47, 0x5f, - 0x4d, 0x41, 0x43, 0x52, 0x4f, 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x04, 0x2a, 0x74, 0x0a, 0x12, 0x53, - 0x75, 0x62, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, - 0x74, 0x12, 0x1f, 0x0a, 0x1b, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x53, 0x55, 0x42, - 0x46, 0x52, 0x41, 0x4d, 0x45, 0x5f, 0x41, 0x53, 0x53, 0x49, 0x47, 0x4e, 0x4d, 0x45, 0x4e, 0x54, - 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x30, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x53, - 0x41, 0x31, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x32, 0x10, 0x03, 0x12, 0x07, 0x0a, - 0x03, 0x53, 0x41, 0x33, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x34, 0x10, 0x05, 0x12, - 0x07, 0x0a, 0x03, 0x53, 0x41, 0x35, 0x10, 0x06, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x36, 0x10, - 0x07, 0x2a, 0x43, 0x0a, 0x0c, 0x43, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x50, 0x72, 0x65, 0x66, 0x69, - 0x78, 0x12, 0x19, 0x0a, 0x15, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x43, 0x59, 0x43, - 0x4c, 0x49, 0x43, 0x5f, 0x50, 0x52, 0x45, 0x46, 0x49, 0x58, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, - 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, 0x54, 0x45, - 0x4e, 0x44, 0x45, 0x44, 0x10, 0x02, 0x2a, 0x80, 0x01, 0x0a, 0x15, 0x54, 0x72, 0x61, 0x6e, 0x73, - 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x12, 0x22, 0x0a, 0x1e, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e, - 0x53, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x42, 0x41, 0x4e, 0x44, 0x57, 0x49, 0x44, - 0x54, 0x48, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x57, 0x36, 0x10, 0x01, 0x12, 0x08, 0x0a, - 0x04, 0x42, 0x57, 0x31, 0x35, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x57, 0x32, 0x35, 0x10, - 0x03, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x57, 0x35, 0x30, 0x10, 0x04, 0x12, 0x08, 0x0a, 0x04, 0x42, - 0x57, 0x37, 0x35, 0x10, 0x05, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x57, 0x31, 0x30, 0x30, 0x10, 0x06, - 0x12, 0x07, 0x0a, 0x03, 0x42, 0x57, 0x31, 0x10, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x4e, 0x34, 0x10, 0x03, 0x2a, 0xa6, 0x01, 0x0a, 0x07, 0x45, 0x6e, 0x62, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x14, 0x0a, 0x10, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x45, 0x4e, 0x42, 0x5f, + 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x41, 0x43, 0x52, 0x4f, 0x5f, + 0x45, 0x4e, 0x42, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x4f, 0x4d, 0x45, 0x5f, 0x45, 0x4e, + 0x42, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x48, 0x4f, 0x52, 0x54, 0x5f, 0x4d, 0x41, 0x43, + 0x52, 0x4f, 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x4e, 0x47, + 0x5f, 0x4d, 0x41, 0x43, 0x52, 0x4f, 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, + 0x4d, 0x41, 0x43, 0x52, 0x4f, 0x5f, 0x4e, 0x47, 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x05, 0x12, 0x16, + 0x0a, 0x12, 0x53, 0x48, 0x4f, 0x52, 0x54, 0x5f, 0x4d, 0x41, 0x43, 0x52, 0x4f, 0x5f, 0x4e, 0x47, + 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x06, 0x12, 0x15, 0x0a, 0x11, 0x4c, 0x4f, 0x4e, 0x47, 0x5f, 0x4d, + 0x41, 0x43, 0x52, 0x4f, 0x5f, 0x4e, 0x47, 0x5f, 0x45, 0x4e, 0x42, 0x10, 0x07, 0x2a, 0x74, 0x0a, + 0x12, 0x53, 0x75, 0x62, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, + 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x1b, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x53, + 0x55, 0x42, 0x46, 0x52, 0x41, 0x4d, 0x45, 0x5f, 0x41, 0x53, 0x53, 0x49, 0x47, 0x4e, 0x4d, 0x45, + 0x4e, 0x54, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x30, 0x10, 0x01, 0x12, 0x07, 0x0a, + 0x03, 0x53, 0x41, 0x31, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x32, 0x10, 0x03, 0x12, + 0x07, 0x0a, 0x03, 0x53, 0x41, 0x33, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x34, 0x10, + 0x05, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x35, 0x10, 0x06, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, + 0x36, 0x10, 0x07, 0x2a, 0x43, 0x0a, 0x0c, 0x43, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x50, 0x72, 0x65, + 0x66, 0x69, 0x78, 0x12, 0x19, 0x0a, 0x15, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x43, + 0x59, 0x43, 0x4c, 0x49, 0x43, 0x5f, 0x50, 0x52, 0x45, 0x46, 0x49, 0x58, 0x10, 0x00, 0x12, 0x0a, + 0x0a, 0x06, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, + 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x10, 0x02, 0x2a, 0x80, 0x01, 0x0a, 0x15, 0x54, 0x72, 0x61, + 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x12, 0x22, 0x0a, 0x1e, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x54, 0x52, + 0x41, 0x4e, 0x53, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x42, 0x41, 0x4e, 0x44, 0x57, + 0x49, 0x44, 0x54, 0x48, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x57, 0x36, 0x10, 0x01, 0x12, + 0x08, 0x0a, 0x04, 0x42, 0x57, 0x31, 0x35, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x57, 0x32, + 0x35, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x57, 0x35, 0x30, 0x10, 0x04, 0x12, 0x08, 0x0a, + 0x04, 0x42, 0x57, 0x37, 0x35, 0x10, 0x05, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x57, 0x31, 0x30, 0x30, + 0x10, 0x06, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x57, 0x31, 0x10, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/entities/enb.proto b/entities/enb.proto index 3ca7690..2ce0f0f 100644 --- a/entities/enb.proto +++ b/entities/enb.proto @@ -159,6 +159,9 @@ enum EnbType{ HOME_ENB = 2; SHORT_MACRO_ENB = 3; LONG_MACRO_ENB = 4; + MACRO_NG_ENB = 5; + SHORT_MACRO_NG_ENB = 6; + LONG_MACRO_NG_ENB = 7; } enum SubframeAssignment{ diff --git a/entities/gnb.pb.go b/entities/gnb.pb.go index db92984..16105ac 100644 --- a/entities/gnb.pb.go +++ b/entities/gnb.pb.go @@ -230,6 +230,55 @@ func (Ncnrb) EnumDescriptor() ([]byte, []int) { return file_gnb_proto_rawDescGZIP(), []int{1} } +type GnbType int32 + +const ( + GnbType_UNKNOWN_GNB_TYPE GnbType = 0 + GnbType_GNB GnbType = 1 + GnbType_EN_GNB GnbType = 2 +) + +// Enum value maps for GnbType. +var ( + GnbType_name = map[int32]string{ + 0: "UNKNOWN_GNB_TYPE", + 1: "GNB", + 2: "EN_GNB", + } + GnbType_value = map[string]int32{ + "UNKNOWN_GNB_TYPE": 0, + "GNB": 1, + "EN_GNB": 2, + } +) + +func (x GnbType) Enum() *GnbType { + p := new(GnbType) + *p = x + return p +} + +func (x GnbType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (GnbType) Descriptor() protoreflect.EnumDescriptor { + return file_gnb_proto_enumTypes[2].Descriptor() +} + +func (GnbType) Type() protoreflect.EnumType { + return &file_gnb_proto_enumTypes[2] +} + +func (x GnbType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use GnbType.Descriptor instead. +func (GnbType) EnumDescriptor() ([]byte, []int) { + return file_gnb_proto_rawDescGZIP(), []int{2} +} + type Nr_Mode int32 const ( @@ -263,11 +312,11 @@ func (x Nr_Mode) String() string { } func (Nr_Mode) Descriptor() protoreflect.EnumDescriptor { - return file_gnb_proto_enumTypes[2].Descriptor() + return file_gnb_proto_enumTypes[3].Descriptor() } func (Nr_Mode) Type() protoreflect.EnumType { - return &file_gnb_proto_enumTypes[2] + return &file_gnb_proto_enumTypes[3] } func (x Nr_Mode) Number() protoreflect.EnumNumber { @@ -286,6 +335,7 @@ type Gnb struct { ServedNrCells []*ServedNRCell `protobuf:"bytes,1,rep,name=served_nr_cells,json=servedNrCells,proto3" json:"served_nr_cells,omitempty"` RanFunctions []*RanFunction `protobuf:"bytes,2,rep,name=ran_functions,json=ranFunctions,proto3" json:"ran_functions,omitempty"` + GnbType GnbType `protobuf:"varint,3,opt,name=gnb_type,json=gnbType,proto3,enum=entities.GnbType" json:"gnb_type,omitempty"` } func (x *Gnb) Reset() { @@ -334,6 +384,13 @@ func (x *Gnb) GetRanFunctions() []*RanFunction { return nil } +func (x *Gnb) GetGnbType() GnbType { + if x != nil { + return x.GnbType + } + return GnbType_UNKNOWN_GNB_TYPE +} + type ServedNRCell struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1190,7 +1247,7 @@ var file_gnb_proto_rawDesc = []byte{ 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x12, 0x72, 0x61, 0x6e, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x72, - 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x01, 0x0a, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaf, 0x01, 0x0a, 0x03, 0x47, 0x6e, 0x62, 0x12, 0x3e, 0x0a, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x72, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, @@ -1199,192 +1256,199 @@ var file_gnb_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x52, 0x61, 0x6e, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x72, 0x61, 0x6e, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0xbe, 0x01, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, - 0x6c, 0x12, 0x5e, 0x0a, 0x1a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x72, 0x5f, 0x63, - 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, - 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, - 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x17, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, - 0x4e, 0x72, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x4e, 0x0a, 0x12, 0x6e, 0x72, 0x5f, 0x6e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, - 0x72, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, - 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x10, 0x6e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, - 0x73, 0x22, 0xa0, 0x08, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, - 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x0a, - 0x06, 0x6e, 0x72, 0x5f, 0x70, 0x63, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6e, - 0x72, 0x50, 0x63, 0x69, 0x12, 0x17, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x74, 0x61, 0x63, 0x35, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x63, 0x35, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, - 0x72, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x63, 0x12, 0x21, - 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6c, 0x6d, 0x6e, 0x73, 0x18, 0x05, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x50, 0x6c, 0x6d, 0x6e, - 0x73, 0x12, 0x2a, 0x0a, 0x07, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, - 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x06, 0x6e, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x54, 0x0a, - 0x0e, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, - 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, - 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, - 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x72, 0x4d, - 0x6f, 0x64, 0x65, 0x12, 0x63, 0x0a, 0x1b, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, - 0x6c, 0x5f, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, - 0x69, 0x65, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x43, 0x65, - 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x19, 0x61, - 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, - 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x89, 0x05, 0x0a, 0x0c, 0x43, 0x68, 0x6f, - 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x48, 0x0a, 0x03, 0x66, 0x64, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, - 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x46, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, - 0x66, 0x64, 0x64, 0x12, 0x48, 0x0a, 0x03, 0x74, 0x64, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x53, 0x65, 0x72, 0x76, - 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, - 0x2e, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, 0x74, 0x64, 0x64, 0x1a, 0xc1, 0x02, - 0x0a, 0x07, 0x46, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3b, 0x0a, 0x0c, 0x75, 0x6c, 0x5f, - 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x75, 0x6c, 0x46, 0x72, - 0x65, 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3b, 0x0a, 0x0c, 0x64, 0x6c, 0x5f, 0x66, 0x72, 0x65, - 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, - 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x6c, 0x46, 0x72, 0x65, 0x71, 0x49, - 0x6e, 0x66, 0x6f, 0x12, 0x5d, 0x0a, 0x19, 0x75, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6d, - 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, 0x17, 0x75, 0x6c, 0x54, 0x72, 0x61, - 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x12, 0x5d, 0x0a, 0x19, 0x64, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, - 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, - 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, 0x17, 0x64, 0x6c, 0x54, 0x72, 0x61, 0x6e, - 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x1a, 0xa0, 0x01, 0x0a, 0x07, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3b, 0x0a, - 0x0c, 0x6e, 0x72, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, - 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, - 0x6e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x58, 0x0a, 0x16, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, - 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, - 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, 0x15, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x2b, 0x0a, 0x02, 0x4e, 0x72, 0x22, 0x25, 0x0a, 0x04, 0x4d, 0x6f, - 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, - 0x07, 0x0a, 0x03, 0x46, 0x44, 0x44, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x44, 0x44, 0x10, - 0x02, 0x22, 0xd7, 0x02, 0x0a, 0x0f, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, - 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x09, 0x6e, 0x72, 0x5f, 0x61, 0x72, 0x5f, 0x66, - 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x6e, 0x72, 0x41, 0x72, 0x46, 0x63, - 0x6e, 0x12, 0x50, 0x0a, 0x0e, 0x73, 0x75, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x74, 0x69, - 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, - 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x53, 0x75, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x73, 0x75, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x0f, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, - 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, - 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, - 0x79, 0x42, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0e, 0x66, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x6e, 0x63, 0x79, 0x42, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0x8f, 0x01, 0x0a, 0x0e, 0x53, 0x75, - 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x0a, - 0x73, 0x75, 0x6c, 0x5f, 0x61, 0x72, 0x5f, 0x66, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x08, 0x73, 0x75, 0x6c, 0x41, 0x72, 0x46, 0x63, 0x6e, 0x12, 0x5f, 0x0a, 0x1a, 0x73, 0x75, - 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, - 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, - 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, - 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x52, 0x18, 0x73, 0x75, 0x6c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x6f, 0x0a, 0x11, 0x46, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x42, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, - 0x12, 0x2a, 0x0a, 0x11, 0x6e, 0x72, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, - 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0f, 0x6e, 0x72, 0x46, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x42, 0x61, 0x6e, 0x64, 0x12, 0x2e, 0x0a, 0x13, - 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x75, 0x6c, 0x5f, 0x62, 0x61, - 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x11, 0x73, 0x75, 0x70, 0x70, 0x6f, - 0x72, 0x74, 0x65, 0x64, 0x53, 0x75, 0x6c, 0x42, 0x61, 0x6e, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x17, + 0x12, 0x2c, 0x0a, 0x08, 0x67, 0x6e, 0x62, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x47, 0x6e, + 0x62, 0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x67, 0x6e, 0x62, 0x54, 0x79, 0x70, 0x65, 0x22, 0xbe, + 0x01, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x12, + 0x5e, 0x0a, 0x1a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x72, 0x5f, 0x63, 0x65, 0x6c, + 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x53, + 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x17, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x72, + 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x4e, 0x0a, 0x12, 0x6e, 0x72, 0x5f, 0x6e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x5f, + 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, + 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, + 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6e, + 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, + 0xa0, 0x08, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x0a, 0x06, 0x6e, + 0x72, 0x5f, 0x70, 0x63, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6e, 0x72, 0x50, + 0x63, 0x69, 0x12, 0x17, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x63, 0x35, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, + 0x63, 0x35, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, + 0x64, 0x5f, 0x73, 0x74, 0x61, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x63, 0x12, 0x21, 0x0a, 0x0c, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6c, 0x6d, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x50, 0x6c, 0x6d, 0x6e, 0x73, 0x12, + 0x2a, 0x0a, 0x07, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x11, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x2e, 0x4d, + 0x6f, 0x64, 0x65, 0x52, 0x06, 0x6e, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x54, 0x0a, 0x0e, 0x63, + 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x53, + 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, + 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x72, 0x4d, 0x6f, 0x64, + 0x65, 0x12, 0x63, 0x0a, 0x1b, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, + 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, + 0x73, 0x2e, 0x41, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x43, 0x65, 0x6c, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x19, 0x61, 0x64, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x89, 0x05, 0x0a, 0x0c, 0x43, 0x68, 0x6f, 0x69, 0x63, + 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x48, 0x0a, 0x03, 0x66, 0x64, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, + 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, + 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x46, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, 0x66, 0x64, + 0x64, 0x12, 0x48, 0x0a, 0x03, 0x74, 0x64, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, + 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, + 0x4e, 0x52, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x54, + 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, 0x74, 0x64, 0x64, 0x1a, 0xc1, 0x02, 0x0a, 0x07, + 0x46, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3b, 0x0a, 0x0c, 0x75, 0x6c, 0x5f, 0x66, 0x72, + 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x75, 0x6c, 0x46, 0x72, 0x65, 0x71, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3b, 0x0a, 0x0c, 0x64, 0x6c, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, + 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, + 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, + 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x6c, 0x46, 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x5d, 0x0a, 0x19, 0x75, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, - 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x12, 0x25, 0x0a, 0x05, 0x6e, 0x72, 0x73, 0x63, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x2e, 0x4e, 0x72, 0x73, 0x63, 0x73, 0x52, 0x05, 0x6e, 0x72, 0x73, 0x63, 0x73, 0x12, 0x25, - 0x0a, 0x05, 0x6e, 0x63, 0x6e, 0x72, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, - 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x63, 0x6e, 0x72, 0x62, 0x52, 0x05, - 0x6e, 0x63, 0x6e, 0x72, 0x62, 0x22, 0x9b, 0x05, 0x0a, 0x16, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, - 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x15, 0x0a, 0x06, 0x6e, 0x72, 0x5f, 0x70, 0x63, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x05, 0x6e, 0x72, 0x50, 0x63, 0x69, 0x12, 0x15, 0x0a, 0x06, 0x6e, 0x72, 0x5f, 0x63, 0x67, - 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x72, 0x43, 0x67, 0x69, 0x12, 0x2a, - 0x0a, 0x07, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x11, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x2e, 0x4d, 0x6f, - 0x64, 0x65, 0x52, 0x06, 0x6e, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x63, 0x68, - 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, - 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, - 0x65, 0x52, 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x63, 0x35, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x73, 0x74, 0x61, 0x63, 0x35, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x75, 0x72, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x63, - 0x1a, 0x90, 0x03, 0x0a, 0x0c, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, - 0x65, 0x12, 0x47, 0x0a, 0x03, 0x66, 0x64, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, - 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, - 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x46, 0x64, - 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, 0x66, 0x64, 0x64, 0x12, 0x47, 0x0a, 0x03, 0x74, 0x64, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, - 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, - 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, - 0x74, 0x64, 0x64, 0x1a, 0x99, 0x01, 0x0a, 0x07, 0x46, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x46, 0x0a, 0x12, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x66, 0x63, 0x6e, 0x5f, 0x66, 0x72, 0x65, 0x71, - 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, - 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, - 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f, 0x75, 0x6c, 0x61, 0x72, 0x46, 0x63, 0x6e, 0x46, - 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x46, 0x0a, 0x12, 0x64, 0x6c, 0x61, 0x72, 0x5f, - 0x66, 0x63, 0x6e, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, - 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f, - 0x64, 0x6c, 0x61, 0x72, 0x46, 0x63, 0x6e, 0x46, 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x1a, - 0x52, 0x0a, 0x07, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x47, 0x0a, 0x13, 0x61, 0x72, - 0x5f, 0x66, 0x63, 0x6e, 0x5f, 0x6e, 0x72, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, - 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, + 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, 0x17, 0x75, 0x6c, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x12, 0x5d, 0x0a, 0x19, 0x64, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, + 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, + 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, 0x17, 0x64, 0x6c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, + 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x1a, + 0xa0, 0x01, 0x0a, 0x07, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3b, 0x0a, 0x0c, 0x6e, + 0x72, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x6e, 0x72, + 0x46, 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x58, 0x0a, 0x16, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, + 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, 0x15, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x2b, 0x0a, 0x02, 0x4e, 0x72, 0x22, 0x25, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, + 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, + 0x03, 0x46, 0x44, 0x44, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x44, 0x44, 0x10, 0x02, 0x22, + 0xd7, 0x02, 0x0a, 0x0f, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, + 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x09, 0x6e, 0x72, 0x5f, 0x61, 0x72, 0x5f, 0x66, 0x63, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x6e, 0x72, 0x41, 0x72, 0x46, 0x63, 0x6e, 0x12, + 0x50, 0x0a, 0x0e, 0x73, 0x75, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x0f, 0x61, 0x72, 0x46, 0x63, 0x6e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x49, - 0x6e, 0x66, 0x6f, 0x2a, 0x47, 0x0a, 0x05, 0x4e, 0x72, 0x73, 0x63, 0x73, 0x12, 0x11, 0x0a, 0x0d, - 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x4e, 0x52, 0x53, 0x43, 0x53, 0x10, 0x00, 0x12, - 0x09, 0x0a, 0x05, 0x53, 0x43, 0x53, 0x31, 0x35, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x43, - 0x53, 0x33, 0x30, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x43, 0x53, 0x36, 0x30, 0x10, 0x03, - 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x43, 0x53, 0x31, 0x32, 0x30, 0x10, 0x04, 0x2a, 0xe8, 0x02, 0x0a, - 0x05, 0x4e, 0x63, 0x6e, 0x72, 0x62, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, - 0x4e, 0x5f, 0x4e, 0x43, 0x4e, 0x52, 0x42, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, - 0x31, 0x31, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x31, 0x38, 0x10, 0x02, 0x12, - 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x32, 0x34, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, - 0x42, 0x32, 0x35, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x33, 0x31, 0x10, 0x05, - 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x33, 0x32, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x4e, - 0x52, 0x42, 0x33, 0x38, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x35, 0x31, 0x10, - 0x08, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x35, 0x32, 0x10, 0x09, 0x12, 0x09, 0x0a, 0x05, - 0x4e, 0x52, 0x42, 0x36, 0x35, 0x10, 0x0a, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x36, 0x36, - 0x10, 0x0b, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x37, 0x38, 0x10, 0x0c, 0x12, 0x09, 0x0a, - 0x05, 0x4e, 0x52, 0x42, 0x37, 0x39, 0x10, 0x0d, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x39, - 0x33, 0x10, 0x0e, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x30, 0x36, 0x10, 0x0f, 0x12, - 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x30, 0x37, 0x10, 0x10, 0x12, 0x0a, 0x0a, 0x06, 0x4e, - 0x52, 0x42, 0x31, 0x32, 0x31, 0x10, 0x11, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x33, - 0x32, 0x10, 0x12, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x33, 0x33, 0x10, 0x13, 0x12, - 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x33, 0x35, 0x10, 0x14, 0x12, 0x0a, 0x0a, 0x06, 0x4e, - 0x52, 0x42, 0x31, 0x36, 0x30, 0x10, 0x15, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x36, - 0x32, 0x10, 0x16, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x38, 0x39, 0x10, 0x17, 0x12, - 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x32, 0x31, 0x36, 0x10, 0x18, 0x12, 0x0a, 0x0a, 0x06, 0x4e, - 0x52, 0x42, 0x32, 0x31, 0x37, 0x10, 0x19, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x32, 0x34, - 0x35, 0x10, 0x1a, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x32, 0x36, 0x34, 0x10, 0x1b, 0x12, - 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x32, 0x37, 0x30, 0x10, 0x1c, 0x12, 0x0a, 0x0a, 0x06, 0x4e, - 0x52, 0x42, 0x32, 0x37, 0x33, 0x10, 0x1d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x66, 0x6f, 0x2e, 0x53, 0x75, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x0e, 0x73, 0x75, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x44, 0x0a, 0x0f, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x62, + 0x61, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x6e, 0x74, + 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x42, + 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0e, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, + 0x63, 0x79, 0x42, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0x8f, 0x01, 0x0a, 0x0e, 0x53, 0x75, 0x6c, 0x49, + 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x0a, 0x73, 0x75, + 0x6c, 0x5f, 0x61, 0x72, 0x5f, 0x66, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, + 0x73, 0x75, 0x6c, 0x41, 0x72, 0x46, 0x63, 0x6e, 0x12, 0x5f, 0x0a, 0x1a, 0x73, 0x75, 0x6c, 0x5f, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x6e, + 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, + 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, + 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x52, + 0x18, 0x73, 0x75, 0x6c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x6f, 0x0a, 0x11, 0x46, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x42, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x2a, + 0x0a, 0x11, 0x6e, 0x72, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x62, + 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0f, 0x6e, 0x72, 0x46, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x42, 0x61, 0x6e, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x75, + 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x75, 0x6c, 0x5f, 0x62, 0x61, 0x6e, 0x64, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x11, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, + 0x65, 0x64, 0x53, 0x75, 0x6c, 0x42, 0x61, 0x6e, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x17, 0x4e, 0x72, + 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x12, 0x25, 0x0a, 0x05, 0x6e, 0x72, 0x73, 0x63, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, + 0x4e, 0x72, 0x73, 0x63, 0x73, 0x52, 0x05, 0x6e, 0x72, 0x73, 0x63, 0x73, 0x12, 0x25, 0x0a, 0x05, + 0x6e, 0x63, 0x6e, 0x72, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x65, 0x6e, + 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x63, 0x6e, 0x72, 0x62, 0x52, 0x05, 0x6e, 0x63, + 0x6e, 0x72, 0x62, 0x22, 0x9b, 0x05, 0x0a, 0x16, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, + 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, + 0x0a, 0x06, 0x6e, 0x72, 0x5f, 0x70, 0x63, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, + 0x6e, 0x72, 0x50, 0x63, 0x69, 0x12, 0x15, 0x0a, 0x06, 0x6e, 0x72, 0x5f, 0x63, 0x67, 0x69, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x72, 0x43, 0x67, 0x69, 0x12, 0x2a, 0x0a, 0x07, + 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, + 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x65, + 0x52, 0x06, 0x6e, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x63, 0x68, 0x6f, 0x69, + 0x63, 0x65, 0x5f, 0x6e, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x4e, 0x65, + 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x52, + 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x73, 0x74, 0x61, 0x63, 0x35, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, + 0x74, 0x61, 0x63, 0x35, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, + 0x72, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x63, 0x1a, 0x90, + 0x03, 0x0a, 0x0c, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x12, + 0x47, 0x0a, 0x03, 0x66, 0x64, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, + 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, + 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, + 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x46, 0x64, 0x64, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x03, 0x66, 0x64, 0x64, 0x12, 0x47, 0x0a, 0x03, 0x74, 0x64, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, + 0x2e, 0x4e, 0x72, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x52, + 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x03, 0x74, 0x64, + 0x64, 0x1a, 0x99, 0x01, 0x0a, 0x07, 0x46, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x46, 0x0a, + 0x12, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x66, 0x63, 0x6e, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, + 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f, 0x75, 0x6c, 0x61, 0x72, 0x46, 0x63, 0x6e, 0x46, 0x72, 0x65, + 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x46, 0x0a, 0x12, 0x64, 0x6c, 0x61, 0x72, 0x5f, 0x66, 0x63, + 0x6e, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x4e, 0x72, 0x46, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f, 0x64, 0x6c, + 0x61, 0x72, 0x46, 0x63, 0x6e, 0x46, 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, 0x6f, 0x1a, 0x52, 0x0a, + 0x07, 0x54, 0x64, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x47, 0x0a, 0x13, 0x61, 0x72, 0x5f, 0x66, + 0x63, 0x6e, 0x5f, 0x6e, 0x72, 0x5f, 0x66, 0x72, 0x65, 0x71, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, + 0x2e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x0f, 0x61, 0x72, 0x46, 0x63, 0x6e, 0x4e, 0x72, 0x46, 0x72, 0x65, 0x71, 0x49, 0x6e, 0x66, + 0x6f, 0x2a, 0x47, 0x0a, 0x05, 0x4e, 0x72, 0x73, 0x63, 0x73, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, + 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x4e, 0x52, 0x53, 0x43, 0x53, 0x10, 0x00, 0x12, 0x09, 0x0a, + 0x05, 0x53, 0x43, 0x53, 0x31, 0x35, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x43, 0x53, 0x33, + 0x30, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x43, 0x53, 0x36, 0x30, 0x10, 0x03, 0x12, 0x0a, + 0x0a, 0x06, 0x53, 0x43, 0x53, 0x31, 0x32, 0x30, 0x10, 0x04, 0x2a, 0xe8, 0x02, 0x0a, 0x05, 0x4e, + 0x63, 0x6e, 0x72, 0x62, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, + 0x4e, 0x43, 0x4e, 0x52, 0x42, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x31, 0x31, + 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x31, 0x38, 0x10, 0x02, 0x12, 0x09, 0x0a, + 0x05, 0x4e, 0x52, 0x42, 0x32, 0x34, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x32, + 0x35, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x33, 0x31, 0x10, 0x05, 0x12, 0x09, + 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x33, 0x32, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, + 0x33, 0x38, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x35, 0x31, 0x10, 0x08, 0x12, + 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x35, 0x32, 0x10, 0x09, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, + 0x42, 0x36, 0x35, 0x10, 0x0a, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x36, 0x36, 0x10, 0x0b, + 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x37, 0x38, 0x10, 0x0c, 0x12, 0x09, 0x0a, 0x05, 0x4e, + 0x52, 0x42, 0x37, 0x39, 0x10, 0x0d, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x52, 0x42, 0x39, 0x33, 0x10, + 0x0e, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x30, 0x36, 0x10, 0x0f, 0x12, 0x0a, 0x0a, + 0x06, 0x4e, 0x52, 0x42, 0x31, 0x30, 0x37, 0x10, 0x10, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, + 0x31, 0x32, 0x31, 0x10, 0x11, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x33, 0x32, 0x10, + 0x12, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x33, 0x33, 0x10, 0x13, 0x12, 0x0a, 0x0a, + 0x06, 0x4e, 0x52, 0x42, 0x31, 0x33, 0x35, 0x10, 0x14, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, + 0x31, 0x36, 0x30, 0x10, 0x15, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x36, 0x32, 0x10, + 0x16, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x31, 0x38, 0x39, 0x10, 0x17, 0x12, 0x0a, 0x0a, + 0x06, 0x4e, 0x52, 0x42, 0x32, 0x31, 0x36, 0x10, 0x18, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, + 0x32, 0x31, 0x37, 0x10, 0x19, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x32, 0x34, 0x35, 0x10, + 0x1a, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, 0x32, 0x36, 0x34, 0x10, 0x1b, 0x12, 0x0a, 0x0a, + 0x06, 0x4e, 0x52, 0x42, 0x32, 0x37, 0x30, 0x10, 0x1c, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x52, 0x42, + 0x32, 0x37, 0x33, 0x10, 0x1d, 0x2a, 0x34, 0x0a, 0x07, 0x47, 0x6e, 0x62, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x14, 0x0a, 0x10, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x47, 0x4e, 0x42, 0x5f, + 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x4e, 0x42, 0x10, 0x01, 0x12, + 0x0a, 0x0a, 0x06, 0x45, 0x4e, 0x5f, 0x47, 0x4e, 0x42, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -1399,63 +1463,65 @@ func file_gnb_proto_rawDescGZIP() []byte { return file_gnb_proto_rawDescData } -var file_gnb_proto_enumTypes = make([]protoimpl.EnumInfo, 3) +var file_gnb_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_gnb_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_gnb_proto_goTypes = []interface{}{ (Nrscs)(0), // 0: entities.Nrscs (Ncnrb)(0), // 1: entities.Ncnrb - (Nr_Mode)(0), // 2: entities.Nr.Mode - (*Gnb)(nil), // 3: entities.Gnb - (*ServedNRCell)(nil), // 4: entities.ServedNRCell - (*ServedNRCellInformation)(nil), // 5: entities.ServedNRCellInformation - (*Nr)(nil), // 6: entities.Nr - (*NrFrequencyInfo)(nil), // 7: entities.NrFrequencyInfo - (*FrequencyBandItem)(nil), // 8: entities.FrequencyBandItem - (*NrTransmissionBandwidth)(nil), // 9: entities.NrTransmissionBandwidth - (*NrNeighbourInformation)(nil), // 10: entities.NrNeighbourInformation - (*ServedNRCellInformation_ChoiceNRMode)(nil), // 11: entities.ServedNRCellInformation.ChoiceNRMode - (*ServedNRCellInformation_ChoiceNRMode_FddInfo)(nil), // 12: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo - (*ServedNRCellInformation_ChoiceNRMode_TddInfo)(nil), // 13: entities.ServedNRCellInformation.ChoiceNRMode.TddInfo - (*NrFrequencyInfo_SulInformation)(nil), // 14: entities.NrFrequencyInfo.SulInformation - (*NrNeighbourInformation_ChoiceNRMode)(nil), // 15: entities.NrNeighbourInformation.ChoiceNRMode - (*NrNeighbourInformation_ChoiceNRMode_FddInfo)(nil), // 16: entities.NrNeighbourInformation.ChoiceNRMode.FddInfo - (*NrNeighbourInformation_ChoiceNRMode_TddInfo)(nil), // 17: entities.NrNeighbourInformation.ChoiceNRMode.TddInfo - (*RanFunction)(nil), // 18: entities.RanFunction - (*AdditionalCellInformation)(nil), // 19: entities.AdditionalCellInformation + (GnbType)(0), // 2: entities.GnbType + (Nr_Mode)(0), // 3: entities.Nr.Mode + (*Gnb)(nil), // 4: entities.Gnb + (*ServedNRCell)(nil), // 5: entities.ServedNRCell + (*ServedNRCellInformation)(nil), // 6: entities.ServedNRCellInformation + (*Nr)(nil), // 7: entities.Nr + (*NrFrequencyInfo)(nil), // 8: entities.NrFrequencyInfo + (*FrequencyBandItem)(nil), // 9: entities.FrequencyBandItem + (*NrTransmissionBandwidth)(nil), // 10: entities.NrTransmissionBandwidth + (*NrNeighbourInformation)(nil), // 11: entities.NrNeighbourInformation + (*ServedNRCellInformation_ChoiceNRMode)(nil), // 12: entities.ServedNRCellInformation.ChoiceNRMode + (*ServedNRCellInformation_ChoiceNRMode_FddInfo)(nil), // 13: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo + (*ServedNRCellInformation_ChoiceNRMode_TddInfo)(nil), // 14: entities.ServedNRCellInformation.ChoiceNRMode.TddInfo + (*NrFrequencyInfo_SulInformation)(nil), // 15: entities.NrFrequencyInfo.SulInformation + (*NrNeighbourInformation_ChoiceNRMode)(nil), // 16: entities.NrNeighbourInformation.ChoiceNRMode + (*NrNeighbourInformation_ChoiceNRMode_FddInfo)(nil), // 17: entities.NrNeighbourInformation.ChoiceNRMode.FddInfo + (*NrNeighbourInformation_ChoiceNRMode_TddInfo)(nil), // 18: entities.NrNeighbourInformation.ChoiceNRMode.TddInfo + (*RanFunction)(nil), // 19: entities.RanFunction + (*AdditionalCellInformation)(nil), // 20: entities.AdditionalCellInformation } var file_gnb_proto_depIdxs = []int32{ - 4, // 0: entities.Gnb.served_nr_cells:type_name -> entities.ServedNRCell - 18, // 1: entities.Gnb.ran_functions:type_name -> entities.RanFunction - 5, // 2: entities.ServedNRCell.served_nr_cell_information:type_name -> entities.ServedNRCellInformation - 10, // 3: entities.ServedNRCell.nr_neighbour_infos:type_name -> entities.NrNeighbourInformation - 2, // 4: entities.ServedNRCellInformation.nr_mode:type_name -> entities.Nr.Mode - 11, // 5: entities.ServedNRCellInformation.choice_nr_mode:type_name -> entities.ServedNRCellInformation.ChoiceNRMode - 19, // 6: entities.ServedNRCellInformation.additional_cell_information:type_name -> entities.AdditionalCellInformation - 14, // 7: entities.NrFrequencyInfo.sulInformation:type_name -> entities.NrFrequencyInfo.SulInformation - 8, // 8: entities.NrFrequencyInfo.frequency_bands:type_name -> entities.FrequencyBandItem - 0, // 9: entities.NrTransmissionBandwidth.nrscs:type_name -> entities.Nrscs - 1, // 10: entities.NrTransmissionBandwidth.ncnrb:type_name -> entities.Ncnrb - 2, // 11: entities.NrNeighbourInformation.nr_mode:type_name -> entities.Nr.Mode - 15, // 12: entities.NrNeighbourInformation.choice_nr_mode:type_name -> entities.NrNeighbourInformation.ChoiceNRMode - 12, // 13: entities.ServedNRCellInformation.ChoiceNRMode.fdd:type_name -> entities.ServedNRCellInformation.ChoiceNRMode.FddInfo - 13, // 14: entities.ServedNRCellInformation.ChoiceNRMode.tdd:type_name -> entities.ServedNRCellInformation.ChoiceNRMode.TddInfo - 7, // 15: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.ul_freq_info:type_name -> entities.NrFrequencyInfo - 7, // 16: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.dl_freq_info:type_name -> entities.NrFrequencyInfo - 9, // 17: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.ul_transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth - 9, // 18: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.dl_transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth - 7, // 19: entities.ServedNRCellInformation.ChoiceNRMode.TddInfo.nr_freq_info:type_name -> entities.NrFrequencyInfo - 9, // 20: entities.ServedNRCellInformation.ChoiceNRMode.TddInfo.transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth - 9, // 21: entities.NrFrequencyInfo.SulInformation.sul_transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth - 16, // 22: entities.NrNeighbourInformation.ChoiceNRMode.fdd:type_name -> entities.NrNeighbourInformation.ChoiceNRMode.FddInfo - 17, // 23: entities.NrNeighbourInformation.ChoiceNRMode.tdd:type_name -> entities.NrNeighbourInformation.ChoiceNRMode.TddInfo - 7, // 24: entities.NrNeighbourInformation.ChoiceNRMode.FddInfo.ular_fcn_freq_info:type_name -> entities.NrFrequencyInfo - 7, // 25: entities.NrNeighbourInformation.ChoiceNRMode.FddInfo.dlar_fcn_freq_info:type_name -> entities.NrFrequencyInfo - 7, // 26: entities.NrNeighbourInformation.ChoiceNRMode.TddInfo.ar_fcn_nr_freq_info:type_name -> entities.NrFrequencyInfo - 27, // [27:27] is the sub-list for method output_type - 27, // [27:27] is the sub-list for method input_type - 27, // [27:27] is the sub-list for extension type_name - 27, // [27:27] is the sub-list for extension extendee - 0, // [0:27] is the sub-list for field type_name + 5, // 0: entities.Gnb.served_nr_cells:type_name -> entities.ServedNRCell + 19, // 1: entities.Gnb.ran_functions:type_name -> entities.RanFunction + 2, // 2: entities.Gnb.gnb_type:type_name -> entities.GnbType + 6, // 3: entities.ServedNRCell.served_nr_cell_information:type_name -> entities.ServedNRCellInformation + 11, // 4: entities.ServedNRCell.nr_neighbour_infos:type_name -> entities.NrNeighbourInformation + 3, // 5: entities.ServedNRCellInformation.nr_mode:type_name -> entities.Nr.Mode + 12, // 6: entities.ServedNRCellInformation.choice_nr_mode:type_name -> entities.ServedNRCellInformation.ChoiceNRMode + 20, // 7: entities.ServedNRCellInformation.additional_cell_information:type_name -> entities.AdditionalCellInformation + 15, // 8: entities.NrFrequencyInfo.sulInformation:type_name -> entities.NrFrequencyInfo.SulInformation + 9, // 9: entities.NrFrequencyInfo.frequency_bands:type_name -> entities.FrequencyBandItem + 0, // 10: entities.NrTransmissionBandwidth.nrscs:type_name -> entities.Nrscs + 1, // 11: entities.NrTransmissionBandwidth.ncnrb:type_name -> entities.Ncnrb + 3, // 12: entities.NrNeighbourInformation.nr_mode:type_name -> entities.Nr.Mode + 16, // 13: entities.NrNeighbourInformation.choice_nr_mode:type_name -> entities.NrNeighbourInformation.ChoiceNRMode + 13, // 14: entities.ServedNRCellInformation.ChoiceNRMode.fdd:type_name -> entities.ServedNRCellInformation.ChoiceNRMode.FddInfo + 14, // 15: entities.ServedNRCellInformation.ChoiceNRMode.tdd:type_name -> entities.ServedNRCellInformation.ChoiceNRMode.TddInfo + 8, // 16: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.ul_freq_info:type_name -> entities.NrFrequencyInfo + 8, // 17: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.dl_freq_info:type_name -> entities.NrFrequencyInfo + 10, // 18: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.ul_transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth + 10, // 19: entities.ServedNRCellInformation.ChoiceNRMode.FddInfo.dl_transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth + 8, // 20: entities.ServedNRCellInformation.ChoiceNRMode.TddInfo.nr_freq_info:type_name -> entities.NrFrequencyInfo + 10, // 21: entities.ServedNRCellInformation.ChoiceNRMode.TddInfo.transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth + 10, // 22: entities.NrFrequencyInfo.SulInformation.sul_transmission_bandwidth:type_name -> entities.NrTransmissionBandwidth + 17, // 23: entities.NrNeighbourInformation.ChoiceNRMode.fdd:type_name -> entities.NrNeighbourInformation.ChoiceNRMode.FddInfo + 18, // 24: entities.NrNeighbourInformation.ChoiceNRMode.tdd:type_name -> entities.NrNeighbourInformation.ChoiceNRMode.TddInfo + 8, // 25: entities.NrNeighbourInformation.ChoiceNRMode.FddInfo.ular_fcn_freq_info:type_name -> entities.NrFrequencyInfo + 8, // 26: entities.NrNeighbourInformation.ChoiceNRMode.FddInfo.dlar_fcn_freq_info:type_name -> entities.NrFrequencyInfo + 8, // 27: entities.NrNeighbourInformation.ChoiceNRMode.TddInfo.ar_fcn_nr_freq_info:type_name -> entities.NrFrequencyInfo + 28, // [28:28] is the sub-list for method output_type + 28, // [28:28] is the sub-list for method input_type + 28, // [28:28] is the sub-list for extension type_name + 28, // [28:28] is the sub-list for extension extendee + 0, // [0:28] is the sub-list for field type_name } func init() { file_gnb_proto_init() } @@ -1652,7 +1718,7 @@ func file_gnb_proto_init() { File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_gnb_proto_rawDesc, - NumEnums: 3, + NumEnums: 4, NumMessages: 15, NumExtensions: 0, NumServices: 0, diff --git a/entities/gnb.proto b/entities/gnb.proto index 612851a..5f174f9 100644 --- a/entities/gnb.proto +++ b/entities/gnb.proto @@ -30,6 +30,7 @@ import "additional_cell_information.proto"; message Gnb{ repeated ServedNRCell served_nr_cells = 1; repeated RanFunction ran_functions = 2; + GnbType gnb_type = 3; } message ServedNRCell{ @@ -151,3 +152,8 @@ message NrNeighbourInformation{ string configured_stac = 6; } +enum GnbType{ + UNKNOWN_GNB_TYPE = 0; + GNB = 1; + EN_GNB = 2; +} \ No newline at end of file diff --git a/entities/nodeb_info.pb.go b/entities/nodeb_info.pb.go index d55b5c2..501763c 100644 --- a/entities/nodeb_info.pb.go +++ b/entities/nodeb_info.pb.go @@ -211,6 +211,7 @@ type NodebInfo struct { FailureType Failure_Type `protobuf:"varint,10,opt,name=failure_type,json=failureType,proto3,enum=entities.Failure_Type" json:"failure_type,omitempty"` SetupFailure *SetupFailure `protobuf:"bytes,11,opt,name=setup_failure,json=setupFailure,proto3" json:"setup_failure,omitempty"` AssociatedE2TInstanceAddress string `protobuf:"bytes,12,opt,name=associated_e2t_instance_address,json=associatedE2tInstanceAddress,proto3" json:"associated_e2t_instance_address,omitempty"` + SetupFromNetwork bool `protobuf:"varint,13,opt,name=setup_from_network,json=setupFromNetwork,proto3" json:"setup_from_network,omitempty"` } func (x *NodebInfo) Reset() { @@ -336,6 +337,13 @@ func (x *NodebInfo) GetAssociatedE2TInstanceAddress() string { return "" } +func (x *NodebInfo) GetSetupFromNetwork() bool { + if x != nil { + return x.SetupFromNetwork + } + return false +} + type isNodebInfo_Configuration interface { isNodebInfo_Configuration() } @@ -437,7 +445,7 @@ var file_nodeb_info_proto_rawDesc = []byte{ 0x74, 0x6f, 0x1a, 0x1f, 0x78, 0x32, 0x5f, 0x73, 0x65, 0x74, 0x75, 0x70, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6e, 0x62, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xec, 0x04, 0x0a, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x62, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9a, 0x05, 0x0a, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, @@ -475,24 +483,26 @@ var file_nodeb_info_proto_rawDesc = []byte{ 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1c, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x45, 0x32, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x42, 0x0f, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2d, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, - 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, - 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x45, 0x4e, 0x42, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x47, - 0x4e, 0x42, 0x10, 0x02, 0x22, 0x54, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x22, - 0x49, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, - 0x57, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x58, 0x32, 0x5f, - 0x53, 0x45, 0x54, 0x55, 0x50, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x55, 0x52, 0x45, 0x10, 0x01, 0x12, - 0x19, 0x0a, 0x15, 0x45, 0x4e, 0x44, 0x43, 0x5f, 0x58, 0x32, 0x5f, 0x53, 0x45, 0x54, 0x55, 0x50, - 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x55, 0x52, 0x45, 0x10, 0x02, 0x2a, 0x6d, 0x0a, 0x15, 0x45, 0x32, - 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x63, 0x6f, 0x6c, 0x12, 0x23, 0x0a, 0x1f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x45, - 0x32, 0x5f, 0x41, 0x50, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x52, - 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x58, 0x32, 0x5f, 0x53, - 0x45, 0x54, 0x55, 0x50, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x19, - 0x0a, 0x15, 0x45, 0x4e, 0x44, 0x43, 0x5f, 0x58, 0x32, 0x5f, 0x53, 0x45, 0x54, 0x55, 0x50, 0x5f, - 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x72, 0x65, 0x73, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x65, 0x74, 0x75, 0x70, 0x5f, 0x66, 0x72, + 0x6f, 0x6d, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x10, 0x73, 0x65, 0x74, 0x75, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x4e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x42, 0x0f, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x2d, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x04, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, + 0x12, 0x07, 0x0a, 0x03, 0x45, 0x4e, 0x42, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x4e, 0x42, + 0x10, 0x02, 0x22, 0x54, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x22, 0x49, 0x0a, + 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x58, 0x32, 0x5f, 0x53, 0x45, + 0x54, 0x55, 0x50, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x55, 0x52, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, + 0x15, 0x45, 0x4e, 0x44, 0x43, 0x5f, 0x58, 0x32, 0x5f, 0x53, 0x45, 0x54, 0x55, 0x50, 0x5f, 0x46, + 0x41, 0x49, 0x4c, 0x55, 0x52, 0x45, 0x10, 0x02, 0x2a, 0x6d, 0x0a, 0x15, 0x45, 0x32, 0x41, 0x70, + 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, + 0x6c, 0x12, 0x23, 0x0a, 0x1f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x45, 0x32, 0x5f, + 0x41, 0x50, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x52, 0x4f, 0x54, + 0x4f, 0x43, 0x4f, 0x4c, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x58, 0x32, 0x5f, 0x53, 0x45, 0x54, + 0x55, 0x50, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, + 0x45, 0x4e, 0x44, 0x43, 0x5f, 0x58, 0x32, 0x5f, 0x53, 0x45, 0x54, 0x55, 0x50, 0x5f, 0x52, 0x45, + 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entities/nodeb_info.proto b/entities/nodeb_info.proto index 46d93ed..768e05b 100644 --- a/entities/nodeb_info.proto +++ b/entities/nodeb_info.proto @@ -43,6 +43,7 @@ message NodebInfo { Failure.Type failure_type = 10; SetupFailure setup_failure = 11; string associated_e2t_instance_address = 12; + bool setup_from_network = 13; } enum E2ApplicationProtocol { diff --git a/reader/go.mod b/reader/go.mod index 87dfb21..6fe1a87 100644 --- a/reader/go.mod +++ b/reader/go.mod @@ -3,8 +3,8 @@ module gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader go 1.12 require ( - gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.46 - gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.46 + gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.47 + gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.47 github.com/golang/protobuf v1.4.2 github.com/google/go-cmp v0.4.1 // indirect github.com/pkg/errors v0.8.1