[RIC-384] Update ran_function proto

Change-Id: If9f01670b535232804720b041ff51a5e1d44dc3e
Signed-off-by: idanshal <idan.shalom@intl.att.com>

diff --git a/entities/ran_function.pb.go b/entities/ran_function.pb.go
index 07b57bc..892a572 100644 (file)
--- a/entities/ran_function.pb.go
+++ b/entities/ran_function.pb.go
@@ -111,9 +111,9 @@ type RanFunction struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RanFunctionId         uint32                 `protobuf:"varint,1,opt,name=ran_function_id,json=ranFunctionId,proto3" json:"ran_function_id,omitempty"`
+       RanFunctionId         uint32                 `protobuf:"varint,1,opt,name=ran_function_id,json=ranFunctionId,proto3" json:"ran_function_id"`
        RanFunctionDefinition *RanFunctionDefinition `protobuf:"bytes,2,opt,name=ran_function_definition,json=ranFunctionDefinition,proto3" json:"ran_function_definition,omitempty"`
-       RanFunctionRevision   uint32                 `protobuf:"varint,3,opt,name=ran_function_revision,json=ranFunctionRevision,proto3" json:"ran_function_revision,omitempty"`
+       RanFunctionRevision   uint32                 `protobuf:"varint,3,opt,name=ran_function_revision,json=ranFunctionRevision,proto3" json:"ran_function_revision"`
 }
 
 func (x *RanFunction) Reset() {
@@ -308,10 +308,12 @@ type RanFunctionName struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RanFunctionShortName   string `protobuf:"bytes,1,opt,name=ran_function_short_name,json=ranFunctionShortName,proto3" json:"ran_function_short_name,omitempty"`
-       RanFunctionE2SmOid     string `protobuf:"bytes,2,opt,name=ran_function_e2sm_oid,json=ranFunctionE2smOid,proto3" json:"ran_function_e2sm_oid,omitempty"`
-       RanFunctionDescription string `protobuf:"bytes,3,opt,name=ran_function_description,json=ranFunctionDescription,proto3" json:"ran_function_description,omitempty"`
-       RanFunctionInstance    uint32 `protobuf:"varint,4,opt,name=ran_function_instance,json=ranFunctionInstance,proto3" json:"ran_function_instance,omitempty"`
+       RanFunctionShortName   string `protobuf:"bytes,1,opt,name=ran_function_short_name,json=ranFunctionShortName,proto3" json:"ran_function_short_name"`
+       RanFunctionE2SmOid     string `protobuf:"bytes,2,opt,name=ran_function_e2sm_oid,json=ranFunctionE2smOid,proto3" json:"ran_function_e2sm_oid"`
+       RanFunctionDescription string `protobuf:"bytes,3,opt,name=ran_function_description,json=ranFunctionDescription,proto3" json:"ran_function_description"`
+       // Types that are assignable to OptionalRanFunctionInstance:
+       //      *RanFunctionName_RanFunctionInstance
+       OptionalRanFunctionInstance isRanFunctionName_OptionalRanFunctionInstance `protobuf_oneof:"optional_ran_function_instance"`
 }
 
 func (x *RanFunctionName) Reset() {
@@ -367,21 +369,38 @@ func (x *RanFunctionName) GetRanFunctionDescription() string {
        return ""
 }
 
+func (m *RanFunctionName) GetOptionalRanFunctionInstance() isRanFunctionName_OptionalRanFunctionInstance {
+       if m != nil {
+               return m.OptionalRanFunctionInstance
+       }
+       return nil
+}
+
 func (x *RanFunctionName) GetRanFunctionInstance() uint32 {
-       if x != nil {
+       if x, ok := x.GetOptionalRanFunctionInstance().(*RanFunctionName_RanFunctionInstance); ok {
                return x.RanFunctionInstance
        }
        return 0
 }
 
+type isRanFunctionName_OptionalRanFunctionInstance interface {
+       isRanFunctionName_OptionalRanFunctionInstance()
+}
+
+type RanFunctionName_RanFunctionInstance struct {
+       RanFunctionInstance uint32 `protobuf:"varint,4,opt,name=ran_function_instance,json=ranFunctionInstance,proto3,oneof"`
+}
+
+func (*RanFunctionName_RanFunctionInstance) isRanFunctionName_OptionalRanFunctionInstance() {}
+
 type RicEventTriggerStyle struct {
        state         protoimpl.MessageState
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RicEventTriggerStyleType  uint32 `protobuf:"varint,1,opt,name=ric_event_trigger_style_type,json=ricEventTriggerStyleType,proto3" json:"ric_event_trigger_style_type,omitempty"`
-       RicEventTriggerStyleName  string `protobuf:"bytes,2,opt,name=ric_event_trigger_style_name,json=ricEventTriggerStyleName,proto3" json:"ric_event_trigger_style_name,omitempty"`
-       RicEventTriggerFormatType uint32 `protobuf:"varint,3,opt,name=ric_event_trigger_format_type,json=ricEventTriggerFormatType,proto3" json:"ric_event_trigger_format_type,omitempty"`
+       RicEventTriggerStyleType  uint32 `protobuf:"varint,1,opt,name=ric_event_trigger_style_type,json=ricEventTriggerStyleType,proto3" json:"ric_event_trigger_style_type"`
+       RicEventTriggerStyleName  string `protobuf:"bytes,2,opt,name=ric_event_trigger_style_name,json=ricEventTriggerStyleName,proto3" json:"ric_event_trigger_style_name"`
+       RicEventTriggerFormatType uint32 `protobuf:"varint,3,opt,name=ric_event_trigger_format_type,json=ricEventTriggerFormatType,proto3" json:"ric_event_trigger_format_type"`
 }
 
 func (x *RicEventTriggerStyle) Reset() {
@@ -442,8 +461,8 @@ type RanParameterDef struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RanParameterId   uint32           `protobuf:"varint,1,opt,name=ran_parameter_id,json=ranParameterId,proto3" json:"ran_parameter_id,omitempty"`
-       RanParameterName string           `protobuf:"bytes,2,opt,name=ran_parameter_name,json=ranParameterName,proto3" json:"ran_parameter_name,omitempty"`
+       RanParameterId   uint32           `protobuf:"varint,1,opt,name=ran_parameter_id,json=ranParameterId,proto3" json:"ran_parameter_id"`
+       RanParameterName string           `protobuf:"bytes,2,opt,name=ran_parameter_name,json=ranParameterName,proto3" json:"ran_parameter_name"`
        RanParameterType RanParameterType `protobuf:"varint,3,opt,name=ran_parameter_type,json=ranParameterType,proto3,enum=entities.RanParameterType" json:"ran_parameter_type,omitempty"`
 }
 
@@ -505,12 +524,12 @@ type RicReportStyle struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RicReportStyleType             uint32             `protobuf:"varint,1,opt,name=ric_report_style_type,json=ricReportStyleType,proto3" json:"ric_report_style_type,omitempty"`
-       RicReportStyleName             string             `protobuf:"bytes,2,opt,name=ric_report_style_name,json=ricReportStyleName,proto3" json:"ric_report_style_name,omitempty"`
-       RicReportActionFormatType      uint32             `protobuf:"varint,3,opt,name=ric_report_action_format_type,json=ricReportActionFormatType,proto3" json:"ric_report_action_format_type,omitempty"`
+       RicReportStyleType             uint32             `protobuf:"varint,1,opt,name=ric_report_style_type,json=ricReportStyleType,proto3" json:"ric_report_style_type"`
+       RicReportStyleName             string             `protobuf:"bytes,2,opt,name=ric_report_style_name,json=ricReportStyleName,proto3" json:"ric_report_style_name"`
+       RicReportActionFormatType      uint32             `protobuf:"varint,3,opt,name=ric_report_action_format_type,json=ricReportActionFormatType,proto3" json:"ric_report_action_format_type"`
        RicReportRanParameterDefs      []*RanParameterDef `protobuf:"bytes,4,rep,name=ric_report_ran_parameter_defs,json=ricReportRanParameterDefs,proto3" json:"ric_report_ran_parameter_defs,omitempty"`
-       RicIndicationHeaderFormatType  uint32             `protobuf:"varint,5,opt,name=ric_indication_header_format_type,json=ricIndicationHeaderFormatType,proto3" json:"ric_indication_header_format_type,omitempty"`
-       RicIndicationMessageFormatType uint32             `protobuf:"varint,6,opt,name=ric_indication_message_format_type,json=ricIndicationMessageFormatType,proto3" json:"ric_indication_message_format_type,omitempty"`
+       RicIndicationHeaderFormatType  uint32             `protobuf:"varint,5,opt,name=ric_indication_header_format_type,json=ricIndicationHeaderFormatType,proto3" json:"ric_indication_header_format_type"`
+       RicIndicationMessageFormatType uint32             `protobuf:"varint,6,opt,name=ric_indication_message_format_type,json=ricIndicationMessageFormatType,proto3" json:"ric_indication_message_format_type"`
 }
 
 func (x *RicReportStyle) Reset() {
@@ -592,13 +611,13 @@ type RicInsertStyle struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RicInsertStyleType             uint32             `protobuf:"varint,1,opt,name=ric_insert_style_type,json=ricInsertStyleType,proto3" json:"ric_insert_style_type,omitempty"`
-       RicInsertStyleName             string             `protobuf:"bytes,2,opt,name=ric_insert_style_name,json=ricInsertStyleName,proto3" json:"ric_insert_style_name,omitempty"`
-       RicInsertActionFormatType      uint32             `protobuf:"varint,3,opt,name=ric_insert_action_format_type,json=ricInsertActionFormatType,proto3" json:"ric_insert_action_format_type,omitempty"`
+       RicInsertStyleType             uint32             `protobuf:"varint,1,opt,name=ric_insert_style_type,json=ricInsertStyleType,proto3" json:"ric_insert_style_type"`
+       RicInsertStyleName             string             `protobuf:"bytes,2,opt,name=ric_insert_style_name,json=ricInsertStyleName,proto3" json:"ric_insert_style_name"`
+       RicInsertActionFormatType      uint32             `protobuf:"varint,3,opt,name=ric_insert_action_format_type,json=ricInsertActionFormatType,proto3" json:"ric_insert_action_format_type"`
        RicInsertRanParameterDefs      []*RanParameterDef `protobuf:"bytes,4,rep,name=ric_insert_ran_parameter_defs,json=ricInsertRanParameterDefs,proto3" json:"ric_insert_ran_parameter_defs,omitempty"`
-       RicIndicationHeaderFormatType  uint32             `protobuf:"varint,5,opt,name=ric_indication_header_format_type,json=ricIndicationHeaderFormatType,proto3" json:"ric_indication_header_format_type,omitempty"`
-       RicIndicationMessageFormatType uint32             `protobuf:"varint,6,opt,name=ric_indication_message_format_type,json=ricIndicationMessageFormatType,proto3" json:"ric_indication_message_format_type,omitempty"`
-       RicCallProcessIdFormatType     uint32             `protobuf:"varint,7,opt,name=ric_call_process_id_format_type,json=ricCallProcessIdFormatType,proto3" json:"ric_call_process_id_format_type,omitempty"`
+       RicIndicationHeaderFormatType  uint32             `protobuf:"varint,5,opt,name=ric_indication_header_format_type,json=ricIndicationHeaderFormatType,proto3" json:"ric_indication_header_format_type"`
+       RicIndicationMessageFormatType uint32             `protobuf:"varint,6,opt,name=ric_indication_message_format_type,json=ricIndicationMessageFormatType,proto3" json:"ric_indication_message_format_type"`
+       RicCallProcessIdFormatType     uint32             `protobuf:"varint,7,opt,name=ric_call_process_id_format_type,json=ricCallProcessIdFormatType,proto3" json:"ric_call_process_id_format_type"`
 }
 
 func (x *RicInsertStyle) Reset() {
@@ -687,11 +706,11 @@ type RicControlStyle struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RicControlStyleType         uint32 `protobuf:"varint,1,opt,name=ric_control_style_type,json=ricControlStyleType,proto3" json:"ric_control_style_type,omitempty"`
-       RicControlStyleName         string `protobuf:"bytes,2,opt,name=ric_control_style_name,json=ricControlStyleName,proto3" json:"ric_control_style_name,omitempty"`
-       RicControlHeaderFormatType  uint32 `protobuf:"varint,3,opt,name=ric_control_header_format_type,json=ricControlHeaderFormatType,proto3" json:"ric_control_header_format_type,omitempty"`
-       RicControlMessageFormatType uint32 `protobuf:"varint,4,opt,name=ric_control_message_format_type,json=ricControlMessageFormatType,proto3" json:"ric_control_message_format_type,omitempty"`
-       RicCallProcessIdFormatType  uint32 `protobuf:"varint,5,opt,name=ric_call_process_id_format_type,json=ricCallProcessIdFormatType,proto3" json:"ric_call_process_id_format_type,omitempty"`
+       RicControlStyleType         uint32 `protobuf:"varint,1,opt,name=ric_control_style_type,json=ricControlStyleType,proto3" json:"ric_control_style_type"`
+       RicControlStyleName         string `protobuf:"bytes,2,opt,name=ric_control_style_name,json=ricControlStyleName,proto3" json:"ric_control_style_name"`
+       RicControlHeaderFormatType  uint32 `protobuf:"varint,3,opt,name=ric_control_header_format_type,json=ricControlHeaderFormatType,proto3" json:"ric_control_header_format_type"`
+       RicControlMessageFormatType uint32 `protobuf:"varint,4,opt,name=ric_control_message_format_type,json=ricControlMessageFormatType,proto3" json:"ric_control_message_format_type"`
+       RicCallProcessIdFormatType  uint32 `protobuf:"varint,5,opt,name=ric_call_process_id_format_type,json=ricCallProcessIdFormatType,proto3" json:"ric_call_process_id_format_type"`
 }
 
 func (x *RicControlStyle) Reset() {
@@ -766,9 +785,9 @@ type RicPolicyStyle struct {
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       RicPolicyStyleType        uint32             `protobuf:"varint,1,opt,name=ric_policy_style_type,json=ricPolicyStyleType,proto3" json:"ric_policy_style_type,omitempty"`
-       RicPolicyStyleName        string             `protobuf:"bytes,2,opt,name=ric_policy_style_name,json=ricPolicyStyleName,proto3" json:"ric_policy_style_name,omitempty"`
-       RicPolicyActionFormatType uint32             `protobuf:"varint,3,opt,name=ric_policy_action_format_type,json=ricPolicyActionFormatType,proto3" json:"ric_policy_action_format_type,omitempty"`
+       RicPolicyStyleType        uint32             `protobuf:"varint,1,opt,name=ric_policy_style_type,json=ricPolicyStyleType,proto3" json:"ric_policy_style_type"`
+       RicPolicyStyleName        string             `protobuf:"bytes,2,opt,name=ric_policy_style_name,json=ricPolicyStyleName,proto3" json:"ric_policy_style_name"`
+       RicPolicyActionFormatType uint32             `protobuf:"varint,3,opt,name=ric_policy_action_format_type,json=ricPolicyActionFormatType,proto3" json:"ric_policy_action_format_type"`
        RicPolicyRanParameterDefs []*RanParameterDef `protobuf:"bytes,4,rep,name=ric_policy_ran_parameter_defs,json=ricPolicyRanParameterDefs,proto3" json:"ric_policy_ran_parameter_defs,omitempty"`
 }
 
@@ -888,7 +907,7 @@ var file_ran_function_proto_rawDesc = []byte{
        0x74, 0x79, 0x6c, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x65, 0x6e,
        0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x52, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
        0x53, 0x74, 0x79, 0x6c, 0x65, 0x52, 0x0f, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-       0x53, 0x74, 0x79, 0x6c, 0x65, 0x73, 0x22, 0xe9, 0x01, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x46, 0x75,
+       0x53, 0x74, 0x79, 0x6c, 0x65, 0x73, 0x22, 0x8d, 0x02, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x46, 0x75,
        0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x17, 0x72, 0x61,
        0x6e, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74,
        0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x72, 0x61, 0x6e,
@@ -899,142 +918,144 @@ var file_ran_function_proto_rawDesc = []byte{
        0x6d, 0x4f, 0x69, 0x64, 0x12, 0x38, 0x0a, 0x18, 0x72, 0x61, 0x6e, 0x5f, 0x66, 0x75, 0x6e, 0x63,
        0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
        0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x72, 0x61, 0x6e, 0x46, 0x75, 0x6e, 0x63, 0x74,
-       0x69, 0x6f, 0x6e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x32,
+       0x69, 0x6f, 0x6e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34,
        0x0a, 0x15, 0x72, 0x61, 0x6e, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
-       0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x72,
-       0x61, 0x6e, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-       0x63, 0x65, 0x22, 0xd8, 0x01, 0x0a, 0x14, 0x52, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54,
-       0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x3e, 0x0a, 0x1c, 0x72,
-       0x69, 0x63, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-       0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-       0x0d, 0x52, 0x18, 0x72, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x69, 0x67, 0x67,
-       0x65, 0x72, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3e, 0x0a, 0x1c, 0x72,
-       0x69, 0x63, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+       0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52,
+       0x13, 0x72, 0x61, 0x6e, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x73, 0x74,
+       0x61, 0x6e, 0x63, 0x65, 0x42, 0x20, 0x0a, 0x1e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
+       0x5f, 0x72, 0x61, 0x6e, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e,
+       0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x22, 0xd8, 0x01, 0x0a, 0x14, 0x52, 0x69, 0x63, 0x45, 0x76,
+       0x65, 0x6e, 0x74, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12,
+       0x3e, 0x0a, 0x1c, 0x72, 0x69, 0x63, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x69,
+       0x67, 0x67, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+       0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x18, 0x72, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54,
+       0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12,
+       0x3e, 0x0a, 0x1c, 0x72, 0x69, 0x63, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x69,
+       0x67, 0x67, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+       0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x18, 0x72, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54,
+       0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+       0x40, 0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x69,
+       0x67, 0x67, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65,
+       0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74,
+       0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70,
+       0x65, 0x22, 0xb3, 0x01, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+       0x65, 0x72, 0x44, 0x65, 0x66, 0x12, 0x28, 0x0a, 0x10, 0x72, 0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72,
+       0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+       0x0e, 0x72, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12,
+       0x2c, 0x0a, 0x12, 0x72, 0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+       0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x61, 0x6e,
+       0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x48, 0x0a,
+       0x12, 0x72, 0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x74,
+       0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69,
+       0x74, 0x69, 0x65, 0x73, 0x2e, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+       0x72, 0x54, 0x79, 0x70, 0x65, 0x52, 0x10, 0x72, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65,
+       0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x22, 0xab, 0x03, 0x0a, 0x0e, 0x52, 0x69, 0x63, 0x52,
+       0x65, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69,
+       0x63, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74,
+       0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x69, 0x63, 0x52, 0x65,
+       0x70, 0x6f, 0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a,
+       0x15, 0x72, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c,
+       0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x69,
+       0x63, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65,
+       0x12, 0x40, 0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x61,
+       0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70,
+       0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x52, 0x65, 0x70, 0x6f,
+       0x72, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79,
+       0x70, 0x65, 0x12, 0x5b, 0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
+       0x5f, 0x72, 0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x64,
+       0x65, 0x66, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69,
+       0x74, 0x69, 0x65, 0x73, 0x2e, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+       0x72, 0x44, 0x65, 0x66, 0x52, 0x19, 0x72, 0x69, 0x63, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52,
+       0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x73, 0x12,
+       0x48, 0x0a, 0x21, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+       0x6e, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f,
+       0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1d, 0x72, 0x69, 0x63, 0x49,
+       0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46,
+       0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4a, 0x0a, 0x22, 0x72, 0x69, 0x63,
+       0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73,
+       0x61, 0x67, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+       0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1e, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x61,
+       0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
+       0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0xf0, 0x03, 0x0a, 0x0e, 0x52, 0x69, 0x63, 0x49, 0x6e, 0x73,
+       0x65, 0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f,
+       0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70,
+       0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65,
+       0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72,
+       0x69, 0x63, 0x5f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f,
+       0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x69, 0x63, 0x49,
+       0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40,
+       0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x61, 0x63, 0x74,
+       0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+       0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74,
+       0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65,
+       0x12, 0x5b, 0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x72,
+       0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x66,
+       0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69,
+       0x65, 0x73, 0x2e, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44,
+       0x65, 0x66, 0x52, 0x19, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x52, 0x61, 0x6e,
+       0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x73, 0x12, 0x48, 0x0a,
+       0x21, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+       0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79,
+       0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1d, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64,
+       0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72,
+       0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4a, 0x0a, 0x22, 0x72, 0x69, 0x63, 0x5f, 0x69,
+       0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+       0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20,
+       0x01, 0x28, 0x0d, 0x52, 0x1e, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69,
+       0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54,
+       0x79, 0x70, 0x65, 0x12, 0x43, 0x0a, 0x1f, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x5f,
+       0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+       0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x72, 0x69,
+       0x63, 0x43, 0x61, 0x6c, 0x6c, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x49, 0x64, 0x46, 0x6f,
+       0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x0f, 0x52, 0x69, 0x63,
+       0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x33, 0x0a, 0x16,
+       0x72, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x73, 0x74, 0x79, 0x6c,
+       0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x72, 0x69,
+       0x63, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70,
+       0x65, 0x12, 0x33, 0x0a, 0x16, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
        0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-       0x09, 0x52, 0x18, 0x72, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x69, 0x67, 0x67,
-       0x65, 0x72, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x1d, 0x72,
-       0x69, 0x63, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-       0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
-       0x28, 0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x69, 0x67,
-       0x67, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0xb3, 0x01,
-       0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65,
-       0x66, 0x12, 0x28, 0x0a, 0x10, 0x72, 0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-       0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x72, 0x61, 0x6e,
-       0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x12, 0x72,
-       0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d,
-       0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61,
-       0x6d, 0x65, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x48, 0x0a, 0x12, 0x72, 0x61, 0x6e,
-       0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
-       0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73,
-       0x2e, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70,
-       0x65, 0x52, 0x10, 0x72, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x54,
-       0x79, 0x70, 0x65, 0x22, 0xab, 0x03, 0x0a, 0x0e, 0x52, 0x69, 0x63, 0x52, 0x65, 0x70, 0x6f, 0x72,
-       0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f, 0x72, 0x65,
-       0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
-       0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x69, 0x63, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74,
-       0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63,
-       0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x6e, 0x61,
-       0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x69, 0x63, 0x52, 0x65, 0x70,
-       0x6f, 0x72, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x1d,
-       0x72, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f,
-       0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
-       0x01, 0x28, 0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x41, 0x63,
-       0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5b,
-       0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e,
-       0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x66, 0x73, 0x18,
-       0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73,
-       0x2e, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66,
-       0x52, 0x19, 0x72, 0x69, 0x63, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x50, 0x61,
-       0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x73, 0x12, 0x48, 0x0a, 0x21, 0x72,
-       0x69, 0x63, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x65,
-       0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65,
-       0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1d, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64, 0x69, 0x63,
-       0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61,
-       0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4a, 0x0a, 0x22, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x64,
-       0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f,
-       0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-       0x0d, 0x52, 0x1e, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-       0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70,
-       0x65, 0x22, 0xf0, 0x03, 0x0a, 0x0e, 0x52, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53,
-       0x74, 0x79, 0x6c, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x73, 0x65,
-       0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-       0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74,
-       0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f, 0x69,
-       0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-       0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72,
-       0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x1d, 0x72, 0x69,
-       0x63, 0x5f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-       0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-       0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x74, 0x69,
-       0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5b, 0x0a, 0x1d,
-       0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x5f, 0x70,
-       0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x66, 0x73, 0x18, 0x04, 0x20,
-       0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x52,
-       0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x52, 0x19,
-       0x72, 0x69, 0x63, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61,
-       0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x73, 0x12, 0x48, 0x0a, 0x21, 0x72, 0x69, 0x63,
-       0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x65, 0x61, 0x64,
-       0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05,
-       0x20, 0x01, 0x28, 0x0d, 0x52, 0x1d, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74,
-       0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54,
-       0x79, 0x70, 0x65, 0x12, 0x4a, 0x0a, 0x22, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63,
-       0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x66, 0x6f,
-       0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52,
-       0x1e, 0x72, 0x69, 0x63, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65,
-       0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
-       0x43, 0x0a, 0x1f, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x63,
-       0x65, 0x73, 0x73, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79,
-       0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x72, 0x69, 0x63, 0x43, 0x61, 0x6c,
-       0x6c, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x49, 0x64, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-       0x54, 0x79, 0x70, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x0f, 0x52, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x74,
-       0x72, 0x6f, 0x6c, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x33, 0x0a, 0x16, 0x72, 0x69, 0x63, 0x5f,
-       0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79,
-       0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x72, 0x69, 0x63, 0x43, 0x6f, 0x6e,
-       0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a,
-       0x16, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x73, 0x74, 0x79,
-       0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x72,
-       0x69, 0x63, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61,
-       0x6d, 0x65, 0x12, 0x42, 0x0a, 0x1e, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-       0x6c, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f,
-       0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x72, 0x69, 0x63, 0x43,
-       0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d,
-       0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x44, 0x0a, 0x1f, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x6f,
-       0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x66, 0x6f,
-       0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52,
-       0x1b, 0x72, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61,
-       0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x43, 0x0a, 0x1f,
-       0x72, 0x69, 0x63, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73,
-       0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
-       0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x72, 0x69, 0x63, 0x43, 0x61, 0x6c, 0x6c, 0x50, 0x72,
-       0x6f, 0x63, 0x65, 0x73, 0x73, 0x49, 0x64, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70,
-       0x65, 0x22, 0x95, 0x02, 0x0a, 0x0e, 0x52, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x53,
-       0x74, 0x79, 0x6c, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
-       0x63, 0x79, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-       0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x53, 0x74,
-       0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f, 0x70,
-       0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-       0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-       0x79, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x1d, 0x72, 0x69,
-       0x63, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-       0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-       0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x41, 0x63, 0x74, 0x69,
-       0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5b, 0x0a, 0x1d,
-       0x72, 0x69, 0x63, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x5f, 0x70,
-       0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x66, 0x73, 0x18, 0x04, 0x20,
-       0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x52,
-       0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x52, 0x19,
-       0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61,
-       0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x73, 0x2a, 0x94, 0x01, 0x0a, 0x10, 0x52, 0x61,
-       0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e,
-       0x0a, 0x1a, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x52, 0x41, 0x4e, 0x5f, 0x50, 0x41,
-       0x52, 0x41, 0x4d, 0x45, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x0b,
-       0x0a, 0x07, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x45,
-       0x4e, 0x55, 0x4d, 0x45, 0x52, 0x41, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x42,
-       0x4f, 0x4f, 0x4c, 0x45, 0x41, 0x4e, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x42, 0x49, 0x54, 0x5f,
-       0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x43, 0x54, 0x45,
-       0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52,
-       0x49, 0x4e, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x06,
-       0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+       0x09, 0x52, 0x13, 0x72, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x79,
+       0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x42, 0x0a, 0x1e, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x6f,
+       0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72,
+       0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a,
+       0x72, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+       0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x44, 0x0a, 0x1f, 0x72, 0x69,
+       0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+       0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20,
+       0x01, 0x28, 0x0d, 0x52, 0x1b, 0x72, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d,
+       0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65,
+       0x12, 0x43, 0x0a, 0x1f, 0x72, 0x69, 0x63, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x70, 0x72, 0x6f,
+       0x63, 0x65, 0x73, 0x73, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74,
+       0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1a, 0x72, 0x69, 0x63, 0x43, 0x61,
+       0x6c, 0x6c, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x49, 0x64, 0x46, 0x6f, 0x72, 0x6d, 0x61,
+       0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x95, 0x02, 0x0a, 0x0e, 0x52, 0x69, 0x63, 0x50, 0x6f, 0x6c,
+       0x69, 0x63, 0x79, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72, 0x69, 0x63, 0x5f,
+       0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70,
+       0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69,
+       0x63, 0x79, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x72,
+       0x69, 0x63, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f,
+       0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x69, 0x63, 0x50,
+       0x6f, 0x6c, 0x69, 0x63, 0x79, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40,
+       0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x61, 0x63, 0x74,
+       0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+       0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x19, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+       0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65,
+       0x12, 0x5b, 0x0a, 0x1d, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x72,
+       0x61, 0x6e, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x66,
+       0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69,
+       0x65, 0x73, 0x2e, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44,
+       0x65, 0x66, 0x52, 0x19, 0x72, 0x69, 0x63, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x61, 0x6e,
+       0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x44, 0x65, 0x66, 0x73, 0x2a, 0x94, 0x01,
+       0x0a, 0x10, 0x52, 0x61, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x54, 0x79,
+       0x70, 0x65, 0x12, 0x1e, 0x0a, 0x1a, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x52, 0x41,
+       0x4e, 0x5f, 0x50, 0x41, 0x52, 0x41, 0x4d, 0x45, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45,
+       0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x01, 0x12,
+       0x0e, 0x0a, 0x0a, 0x45, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x41, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12,
+       0x0b, 0x0a, 0x07, 0x42, 0x4f, 0x4f, 0x4c, 0x45, 0x41, 0x4e, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a,
+       0x42, 0x49, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c,
+       0x4f, 0x43, 0x54, 0x45, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x14,
+       0x0a, 0x10, 0x50, 0x52, 0x49, 0x4e, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49,
+       0x4e, 0x47, 0x10, 0x06, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1211,6 +1232,9 @@ func file_ran_function_proto_init() {
                        }
                }
        }
+       file_ran_function_proto_msgTypes[3].OneofWrappers = []interface{}{
+               (*RanFunctionName_RanFunctionInstance)(nil),
+       }
        type x struct{}
        out := protoimpl.TypeBuilder{
                File: protoimpl.DescBuilder{

diff --git a/entities/ran_function.proto b/entities/ran_function.proto
index 12e7170..716ad95 100644 (file)
--- a/entities/ran_function.proto
+++ b/entities/ran_function.proto
@@ -47,7 +47,9 @@ message RanFunctionName {
     string ran_function_short_name = 1;
     string ran_function_e2sm_oid = 2;
     string ran_function_description = 3;
-    uint32 ran_function_instance = 4;
+    oneof optional_ran_function_instance {
+        uint32 ran_function_instance = 4;
+    }
 }
 
 message RicEventTriggerStyle {

diff --git a/reader/go.mod b/reader/go.mod
index 6773be3..281e4cf 100644 (file)
--- 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.39
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.39
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.40
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.40
        github.com/golang/protobuf v1.4.2
        github.com/google/go-cmp v0.4.1 // indirect
        github.com/pkg/errors v0.8.1