From ffc6503d44c4949c77f6e910beb07261ff3c2d89 Mon Sep 17 00:00:00 2001 From: severindellsperger Date: Thu, 13 Jun 2024 09:13:48 +0200 Subject: [PATCH 1/2] add normalized delay, jitter and packet loss --- jagw/base.pb.go | 8 +- jagw/enums.pb.go | 6 +- jagw/filters.pb.go | 10 +- jagw/requestservice.pb.go | 40 ++-- jagw/requestservice_grpc.pb.go | 71 ++++-- jagw/subscriptionservice.pb.go | 24 +- jagw/subscriptionservice_grpc.pb.go | 67 +++--- jagw/topology.pb.go | 327 ++++++++++++++++------------ 8 files changed, 315 insertions(+), 238 deletions(-) diff --git a/jagw/base.pb.go b/jagw/base.pb.go index e73e890..48bcc8f 100644 --- a/jagw/base.pb.go +++ b/jagw/base.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.2 +// protoc v5.27.0 // source: core/base.proto package jagw @@ -112,7 +112,7 @@ func file_core_base_proto_rawDescGZIP() []byte { } var file_core_base_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_core_base_proto_goTypes = []interface{}{ +var file_core_base_proto_goTypes = []any{ (*MultiTopologyIdentifier)(nil), // 0: jagw.MultiTopologyIdentifier } var file_core_base_proto_depIdxs = []int32{ @@ -129,7 +129,7 @@ func file_core_base_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_core_base_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_core_base_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*MultiTopologyIdentifier); i { case 0: return &v.state diff --git a/jagw/enums.pb.go b/jagw/enums.pb.go index cfdc13b..a0afc1e 100644 --- a/jagw/enums.pb.go +++ b/jagw/enums.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.2 +// protoc v5.27.0 // source: core/enums.proto package jagw @@ -102,7 +102,7 @@ func file_core_enums_proto_rawDescGZIP() []byte { } var file_core_enums_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_core_enums_proto_goTypes = []interface{}{ +var file_core_enums_proto_goTypes = []any{ (StringOperator)(0), // 0: jagw.StringOperator } var file_core_enums_proto_depIdxs = []int32{ diff --git a/jagw/filters.pb.go b/jagw/filters.pb.go index bbdd0a8..ffa1d4b 100644 --- a/jagw/filters.pb.go +++ b/jagw/filters.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.2 +// protoc v5.27.0 // source: core/filters.proto package jagw @@ -176,7 +176,7 @@ func file_core_filters_proto_rawDescGZIP() []byte { } var file_core_filters_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_core_filters_proto_goTypes = []interface{}{ +var file_core_filters_proto_goTypes = []any{ (*StringFilter)(nil), // 0: jagw.StringFilter (*RangeFilter)(nil), // 1: jagw.RangeFilter (StringOperator)(0), // 2: jagw.StringOperator @@ -197,7 +197,7 @@ func file_core_filters_proto_init() { } file_core_enums_proto_init() if !protoimpl.UnsafeEnabled { - file_core_filters_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_core_filters_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*StringFilter); i { case 0: return &v.state @@ -209,7 +209,7 @@ func file_core_filters_proto_init() { return nil } } - file_core_filters_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_core_filters_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*RangeFilter); i { case 0: return &v.state diff --git a/jagw/requestservice.pb.go b/jagw/requestservice.pb.go index 3482fa5..1eea592 100644 --- a/jagw/requestservice.pb.go +++ b/jagw/requestservice.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.2 +// protoc v5.27.0 // source: requestservice/requestservice.proto package jagw @@ -1053,7 +1053,7 @@ func file_requestservice_requestservice_proto_rawDescGZIP() []byte { } var file_requestservice_requestservice_proto_msgTypes = make([]protoimpl.MessageInfo, 17) -var file_requestservice_requestservice_proto_goTypes = []interface{}{ +var file_requestservice_requestservice_proto_goTypes = []any{ (*MeasurementsRequest)(nil), // 0: jagw.MeasurementsRequest (*MeasurementsResponse)(nil), // 1: jagw.MeasurementsResponse (*Measurement)(nil), // 2: jagw.Measurement @@ -1128,7 +1128,7 @@ func file_requestservice_requestservice_proto_init() { file_core_topology_proto_init() file_core_filters_proto_init() if !protoimpl.UnsafeEnabled { - file_requestservice_requestservice_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*MeasurementsRequest); i { case 0: return &v.state @@ -1140,7 +1140,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*MeasurementsResponse); i { case 0: return &v.state @@ -1152,7 +1152,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*Measurement); i { case 0: return &v.state @@ -1164,7 +1164,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*MeasurementDetailsRequest); i { case 0: return &v.state @@ -1176,7 +1176,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*MeasurementDetailsResponse); i { case 0: return &v.state @@ -1188,7 +1188,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*MeasurementColumn); i { case 0: return &v.state @@ -1200,7 +1200,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*TopologyRequest); i { case 0: return &v.state @@ -1212,7 +1212,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*LsNodeCoordinatesRequest); i { case 0: return &v.state @@ -1224,7 +1224,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*TelemetryRequest); i { case 0: return &v.state @@ -1236,7 +1236,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*LsNodeResponse); i { case 0: return &v.state @@ -1248,7 +1248,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*LsLinkResponse); i { case 0: return &v.state @@ -1260,7 +1260,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*LsPrefixResponse); i { case 0: return &v.state @@ -1272,7 +1272,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*LsSrv6SidResponse); i { case 0: return &v.state @@ -1284,7 +1284,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*LsNodeEdgeResponse); i { case 0: return &v.state @@ -1296,7 +1296,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*LsNodeCoordinatesResponse); i { case 0: return &v.state @@ -1308,7 +1308,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*PeerResponse); i { case 0: return &v.state @@ -1320,7 +1320,7 @@ func file_requestservice_requestservice_proto_init() { return nil } } - file_requestservice_requestservice_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_requestservice_requestservice_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*TelemetryResponse); i { case 0: return &v.state diff --git a/jagw/requestservice_grpc.pb.go b/jagw/requestservice_grpc.pb.go index 6791eaf..cd848df 100644 --- a/jagw/requestservice_grpc.pb.go +++ b/jagw/requestservice_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.6 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.0 // source: requestservice/requestservice.proto package jagw @@ -15,8 +15,21 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 + +const ( + RequestService_GetLsNodes_FullMethodName = "/jagw.RequestService/GetLsNodes" + RequestService_GetLsLinks_FullMethodName = "/jagw.RequestService/GetLsLinks" + RequestService_GetLsPrefixes_FullMethodName = "/jagw.RequestService/GetLsPrefixes" + RequestService_GetLsSrv6Sids_FullMethodName = "/jagw.RequestService/GetLsSrv6Sids" + RequestService_GetLsNodeEdges_FullMethodName = "/jagw.RequestService/GetLsNodeEdges" + RequestService_GetPeers_FullMethodName = "/jagw.RequestService/GetPeers" + RequestService_GetLsNodeCoordinates_FullMethodName = "/jagw.RequestService/GetLsNodeCoordinates" + RequestService_GetTelemetryData_FullMethodName = "/jagw.RequestService/GetTelemetryData" + RequestService_GetMeasurements_FullMethodName = "/jagw.RequestService/GetMeasurements" + RequestService_GetMeasurementDetails_FullMethodName = "/jagw.RequestService/GetMeasurementDetails" +) // RequestServiceClient is the client API for RequestService service. // @@ -43,8 +56,9 @@ func NewRequestServiceClient(cc grpc.ClientConnInterface) RequestServiceClient { } func (c *requestServiceClient) GetLsNodes(ctx context.Context, in *TopologyRequest, opts ...grpc.CallOption) (*LsNodeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(LsNodeResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetLsNodes", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetLsNodes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -52,8 +66,9 @@ func (c *requestServiceClient) GetLsNodes(ctx context.Context, in *TopologyReque } func (c *requestServiceClient) GetLsLinks(ctx context.Context, in *TopologyRequest, opts ...grpc.CallOption) (*LsLinkResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(LsLinkResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetLsLinks", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetLsLinks_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -61,8 +76,9 @@ func (c *requestServiceClient) GetLsLinks(ctx context.Context, in *TopologyReque } func (c *requestServiceClient) GetLsPrefixes(ctx context.Context, in *TopologyRequest, opts ...grpc.CallOption) (*LsPrefixResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(LsPrefixResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetLsPrefixes", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetLsPrefixes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -70,8 +86,9 @@ func (c *requestServiceClient) GetLsPrefixes(ctx context.Context, in *TopologyRe } func (c *requestServiceClient) GetLsSrv6Sids(ctx context.Context, in *TopologyRequest, opts ...grpc.CallOption) (*LsSrv6SidResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(LsSrv6SidResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetLsSrv6Sids", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetLsSrv6Sids_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -79,8 +96,9 @@ func (c *requestServiceClient) GetLsSrv6Sids(ctx context.Context, in *TopologyRe } func (c *requestServiceClient) GetLsNodeEdges(ctx context.Context, in *TopologyRequest, opts ...grpc.CallOption) (*LsNodeEdgeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(LsNodeEdgeResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetLsNodeEdges", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetLsNodeEdges_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -88,8 +106,9 @@ func (c *requestServiceClient) GetLsNodeEdges(ctx context.Context, in *TopologyR } func (c *requestServiceClient) GetPeers(ctx context.Context, in *TopologyRequest, opts ...grpc.CallOption) (*PeerResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeerResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetPeers", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetPeers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -97,8 +116,9 @@ func (c *requestServiceClient) GetPeers(ctx context.Context, in *TopologyRequest } func (c *requestServiceClient) GetLsNodeCoordinates(ctx context.Context, in *LsNodeCoordinatesRequest, opts ...grpc.CallOption) (*LsNodeCoordinatesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(LsNodeCoordinatesResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetLsNodeCoordinates", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetLsNodeCoordinates_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -106,8 +126,9 @@ func (c *requestServiceClient) GetLsNodeCoordinates(ctx context.Context, in *LsN } func (c *requestServiceClient) GetTelemetryData(ctx context.Context, in *TelemetryRequest, opts ...grpc.CallOption) (*TelemetryResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TelemetryResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetTelemetryData", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetTelemetryData_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -115,8 +136,9 @@ func (c *requestServiceClient) GetTelemetryData(ctx context.Context, in *Telemet } func (c *requestServiceClient) GetMeasurements(ctx context.Context, in *MeasurementsRequest, opts ...grpc.CallOption) (*MeasurementsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(MeasurementsResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetMeasurements", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetMeasurements_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -124,8 +146,9 @@ func (c *requestServiceClient) GetMeasurements(ctx context.Context, in *Measurem } func (c *requestServiceClient) GetMeasurementDetails(ctx context.Context, in *MeasurementDetailsRequest, opts ...grpc.CallOption) (*MeasurementDetailsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(MeasurementDetailsResponse) - err := c.cc.Invoke(ctx, "/jagw.RequestService/GetMeasurementDetails", in, out, opts...) + err := c.cc.Invoke(ctx, RequestService_GetMeasurementDetails_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -206,7 +229,7 @@ func _RequestService_GetLsNodes_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetLsNodes", + FullMethod: RequestService_GetLsNodes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetLsNodes(ctx, req.(*TopologyRequest)) @@ -224,7 +247,7 @@ func _RequestService_GetLsLinks_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetLsLinks", + FullMethod: RequestService_GetLsLinks_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetLsLinks(ctx, req.(*TopologyRequest)) @@ -242,7 +265,7 @@ func _RequestService_GetLsPrefixes_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetLsPrefixes", + FullMethod: RequestService_GetLsPrefixes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetLsPrefixes(ctx, req.(*TopologyRequest)) @@ -260,7 +283,7 @@ func _RequestService_GetLsSrv6Sids_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetLsSrv6Sids", + FullMethod: RequestService_GetLsSrv6Sids_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetLsSrv6Sids(ctx, req.(*TopologyRequest)) @@ -278,7 +301,7 @@ func _RequestService_GetLsNodeEdges_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetLsNodeEdges", + FullMethod: RequestService_GetLsNodeEdges_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetLsNodeEdges(ctx, req.(*TopologyRequest)) @@ -296,7 +319,7 @@ func _RequestService_GetPeers_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetPeers", + FullMethod: RequestService_GetPeers_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetPeers(ctx, req.(*TopologyRequest)) @@ -314,7 +337,7 @@ func _RequestService_GetLsNodeCoordinates_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetLsNodeCoordinates", + FullMethod: RequestService_GetLsNodeCoordinates_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetLsNodeCoordinates(ctx, req.(*LsNodeCoordinatesRequest)) @@ -332,7 +355,7 @@ func _RequestService_GetTelemetryData_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetTelemetryData", + FullMethod: RequestService_GetTelemetryData_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetTelemetryData(ctx, req.(*TelemetryRequest)) @@ -350,7 +373,7 @@ func _RequestService_GetMeasurements_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetMeasurements", + FullMethod: RequestService_GetMeasurements_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetMeasurements(ctx, req.(*MeasurementsRequest)) @@ -368,7 +391,7 @@ func _RequestService_GetMeasurementDetails_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/jagw.RequestService/GetMeasurementDetails", + FullMethod: RequestService_GetMeasurementDetails_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RequestServiceServer).GetMeasurementDetails(ctx, req.(*MeasurementDetailsRequest)) diff --git a/jagw/subscriptionservice.pb.go b/jagw/subscriptionservice.pb.go index 43801b3..e4dc5ab 100644 --- a/jagw/subscriptionservice.pb.go +++ b/jagw/subscriptionservice.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.2 +// protoc v5.27.0 // source: subscriptionservice/subscriptionservice.proto package jagw @@ -691,7 +691,7 @@ func file_subscriptionservice_subscriptionservice_proto_rawDescGZIP() []byte { } var file_subscriptionservice_subscriptionservice_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_subscriptionservice_subscriptionservice_proto_goTypes = []interface{}{ +var file_subscriptionservice_subscriptionservice_proto_goTypes = []any{ (*TopologySubscription)(nil), // 0: jagw.TopologySubscription (*TelemetrySubscription)(nil), // 1: jagw.TelemetrySubscription (*LsNodeEvent)(nil), // 2: jagw.LsNodeEvent @@ -746,7 +746,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { file_core_topology_proto_init() file_core_filters_proto_init() if !protoimpl.UnsafeEnabled { - file_subscriptionservice_subscriptionservice_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*TopologySubscription); i { case 0: return &v.state @@ -758,7 +758,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*TelemetrySubscription); i { case 0: return &v.state @@ -770,7 +770,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*LsNodeEvent); i { case 0: return &v.state @@ -782,7 +782,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*LsLinkEvent); i { case 0: return &v.state @@ -794,7 +794,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*LsPrefixEvent); i { case 0: return &v.state @@ -806,7 +806,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*LsSrv6SidEvent); i { case 0: return &v.state @@ -818,7 +818,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*LsNodeEdgeEvent); i { case 0: return &v.state @@ -830,7 +830,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*PeerEvent); i { case 0: return &v.state @@ -842,7 +842,7 @@ func file_subscriptionservice_subscriptionservice_proto_init() { return nil } } - file_subscriptionservice_subscriptionservice_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_subscriptionservice_subscriptionservice_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*TelemetryEvent); i { case 0: return &v.state diff --git a/jagw/subscriptionservice_grpc.pb.go b/jagw/subscriptionservice_grpc.pb.go index b41646c..36698c8 100644 --- a/jagw/subscriptionservice_grpc.pb.go +++ b/jagw/subscriptionservice_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.6 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.0 // source: subscriptionservice/subscriptionservice.proto package jagw @@ -15,8 +15,18 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 + +const ( + SubscriptionService_SubscribeToLsNodes_FullMethodName = "/jagw.SubscriptionService/SubscribeToLsNodes" + SubscriptionService_SubscribeToLsLinks_FullMethodName = "/jagw.SubscriptionService/SubscribeToLsLinks" + SubscriptionService_SubscribeToLsPrefixes_FullMethodName = "/jagw.SubscriptionService/SubscribeToLsPrefixes" + SubscriptionService_SubscribeToLsSrv6Sids_FullMethodName = "/jagw.SubscriptionService/SubscribeToLsSrv6Sids" + SubscriptionService_SubscribeToLsNodeEdges_FullMethodName = "/jagw.SubscriptionService/SubscribeToLsNodeEdges" + SubscriptionService_SubscribeToPeers_FullMethodName = "/jagw.SubscriptionService/SubscribeToPeers" + SubscriptionService_SubscribeToTelemetryData_FullMethodName = "/jagw.SubscriptionService/SubscribeToTelemetryData" +) // SubscriptionServiceClient is the client API for SubscriptionService service. // @@ -40,11 +50,12 @@ func NewSubscriptionServiceClient(cc grpc.ClientConnInterface) SubscriptionServi } func (c *subscriptionServiceClient) SubscribeToLsNodes(ctx context.Context, in *TopologySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToLsNodesClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[0], "/jagw.SubscriptionService/SubscribeToLsNodes", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[0], SubscriptionService_SubscribeToLsNodes_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToLsNodesClient{stream} + x := &subscriptionServiceSubscribeToLsNodesClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -72,11 +83,12 @@ func (x *subscriptionServiceSubscribeToLsNodesClient) Recv() (*LsNodeEvent, erro } func (c *subscriptionServiceClient) SubscribeToLsLinks(ctx context.Context, in *TopologySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToLsLinksClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[1], "/jagw.SubscriptionService/SubscribeToLsLinks", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[1], SubscriptionService_SubscribeToLsLinks_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToLsLinksClient{stream} + x := &subscriptionServiceSubscribeToLsLinksClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -104,11 +116,12 @@ func (x *subscriptionServiceSubscribeToLsLinksClient) Recv() (*LsLinkEvent, erro } func (c *subscriptionServiceClient) SubscribeToLsPrefixes(ctx context.Context, in *TopologySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToLsPrefixesClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[2], "/jagw.SubscriptionService/SubscribeToLsPrefixes", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[2], SubscriptionService_SubscribeToLsPrefixes_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToLsPrefixesClient{stream} + x := &subscriptionServiceSubscribeToLsPrefixesClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -136,11 +149,12 @@ func (x *subscriptionServiceSubscribeToLsPrefixesClient) Recv() (*LsPrefixEvent, } func (c *subscriptionServiceClient) SubscribeToLsSrv6Sids(ctx context.Context, in *TopologySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToLsSrv6SidsClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[3], "/jagw.SubscriptionService/SubscribeToLsSrv6Sids", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[3], SubscriptionService_SubscribeToLsSrv6Sids_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToLsSrv6SidsClient{stream} + x := &subscriptionServiceSubscribeToLsSrv6SidsClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -168,11 +182,12 @@ func (x *subscriptionServiceSubscribeToLsSrv6SidsClient) Recv() (*LsSrv6SidEvent } func (c *subscriptionServiceClient) SubscribeToLsNodeEdges(ctx context.Context, in *TopologySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToLsNodeEdgesClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[4], "/jagw.SubscriptionService/SubscribeToLsNodeEdges", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[4], SubscriptionService_SubscribeToLsNodeEdges_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToLsNodeEdgesClient{stream} + x := &subscriptionServiceSubscribeToLsNodeEdgesClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -200,11 +215,12 @@ func (x *subscriptionServiceSubscribeToLsNodeEdgesClient) Recv() (*LsNodeEdgeEve } func (c *subscriptionServiceClient) SubscribeToPeers(ctx context.Context, in *TopologySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToPeersClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[5], "/jagw.SubscriptionService/SubscribeToPeers", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[5], SubscriptionService_SubscribeToPeers_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToPeersClient{stream} + x := &subscriptionServiceSubscribeToPeersClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -232,11 +248,12 @@ func (x *subscriptionServiceSubscribeToPeersClient) Recv() (*PeerEvent, error) { } func (c *subscriptionServiceClient) SubscribeToTelemetryData(ctx context.Context, in *TelemetrySubscription, opts ...grpc.CallOption) (SubscriptionService_SubscribeToTelemetryDataClient, error) { - stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[6], "/jagw.SubscriptionService/SubscribeToTelemetryData", opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &SubscriptionService_ServiceDesc.Streams[6], SubscriptionService_SubscribeToTelemetryData_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &subscriptionServiceSubscribeToTelemetryDataClient{stream} + x := &subscriptionServiceSubscribeToTelemetryDataClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -320,7 +337,7 @@ func _SubscriptionService_SubscribeToLsNodes_Handler(srv interface{}, stream grp if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToLsNodes(m, &subscriptionServiceSubscribeToLsNodesServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToLsNodes(m, &subscriptionServiceSubscribeToLsNodesServer{ServerStream: stream}) } type SubscriptionService_SubscribeToLsNodesServer interface { @@ -341,7 +358,7 @@ func _SubscriptionService_SubscribeToLsLinks_Handler(srv interface{}, stream grp if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToLsLinks(m, &subscriptionServiceSubscribeToLsLinksServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToLsLinks(m, &subscriptionServiceSubscribeToLsLinksServer{ServerStream: stream}) } type SubscriptionService_SubscribeToLsLinksServer interface { @@ -362,7 +379,7 @@ func _SubscriptionService_SubscribeToLsPrefixes_Handler(srv interface{}, stream if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToLsPrefixes(m, &subscriptionServiceSubscribeToLsPrefixesServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToLsPrefixes(m, &subscriptionServiceSubscribeToLsPrefixesServer{ServerStream: stream}) } type SubscriptionService_SubscribeToLsPrefixesServer interface { @@ -383,7 +400,7 @@ func _SubscriptionService_SubscribeToLsSrv6Sids_Handler(srv interface{}, stream if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToLsSrv6Sids(m, &subscriptionServiceSubscribeToLsSrv6SidsServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToLsSrv6Sids(m, &subscriptionServiceSubscribeToLsSrv6SidsServer{ServerStream: stream}) } type SubscriptionService_SubscribeToLsSrv6SidsServer interface { @@ -404,7 +421,7 @@ func _SubscriptionService_SubscribeToLsNodeEdges_Handler(srv interface{}, stream if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToLsNodeEdges(m, &subscriptionServiceSubscribeToLsNodeEdgesServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToLsNodeEdges(m, &subscriptionServiceSubscribeToLsNodeEdgesServer{ServerStream: stream}) } type SubscriptionService_SubscribeToLsNodeEdgesServer interface { @@ -425,7 +442,7 @@ func _SubscriptionService_SubscribeToPeers_Handler(srv interface{}, stream grpc. if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToPeers(m, &subscriptionServiceSubscribeToPeersServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToPeers(m, &subscriptionServiceSubscribeToPeersServer{ServerStream: stream}) } type SubscriptionService_SubscribeToPeersServer interface { @@ -446,7 +463,7 @@ func _SubscriptionService_SubscribeToTelemetryData_Handler(srv interface{}, stre if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SubscriptionServiceServer).SubscribeToTelemetryData(m, &subscriptionServiceSubscribeToTelemetryDataServer{stream}) + return srv.(SubscriptionServiceServer).SubscribeToTelemetryData(m, &subscriptionServiceSubscribeToTelemetryDataServer{ServerStream: stream}) } type SubscriptionService_SubscribeToTelemetryDataServer interface { diff --git a/jagw/topology.pb.go b/jagw/topology.pb.go index efac792..9974af2 100644 --- a/jagw/topology.pb.go +++ b/jagw/topology.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.2 +// protoc v5.27.0 // source: core/topology.proto package jagw @@ -208,36 +208,39 @@ type LsLink struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Key *string `protobuf:"bytes,1,req,name=key" json:"key,omitempty"` - Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` - RouterHash *string `protobuf:"bytes,3,opt,name=router_hash,json=routerHash" json:"router_hash,omitempty"` - RouterIp *string `protobuf:"bytes,4,opt,name=router_ip,json=routerIp" json:"router_ip,omitempty"` - DomainId *int64 `protobuf:"varint,5,opt,name=domain_id,json=domainId" json:"domain_id,omitempty"` - PeerHash *string `protobuf:"bytes,6,opt,name=peer_hash,json=peerHash" json:"peer_hash,omitempty"` - PeerIp *string `protobuf:"bytes,7,opt,name=peer_ip,json=peerIp" json:"peer_ip,omitempty"` - PeerAsn *int32 `protobuf:"varint,8,opt,name=peer_asn,json=peerAsn" json:"peer_asn,omitempty"` - Timestamp *string `protobuf:"bytes,9,opt,name=timestamp" json:"timestamp,omitempty"` - IgpRouterId *string `protobuf:"bytes,10,opt,name=igp_router_id,json=igpRouterId" json:"igp_router_id,omitempty"` - Protocol *string `protobuf:"bytes,11,opt,name=protocol" json:"protocol,omitempty"` - AreaId *string `protobuf:"bytes,12,opt,name=area_id,json=areaId" json:"area_id,omitempty"` - Nexthop *string `protobuf:"bytes,13,opt,name=nexthop" json:"nexthop,omitempty"` - Mtid *MultiTopologyIdentifier `protobuf:"bytes,14,opt,name=mtid" json:"mtid,omitempty"` - LocalLinkId *string `protobuf:"bytes,15,opt,name=local_link_id,json=localLinkId" json:"local_link_id,omitempty"` - RemoteLinkId *string `protobuf:"bytes,16,opt,name=remote_link_id,json=remoteLinkId" json:"remote_link_id,omitempty"` - LocalLinkIp *string `protobuf:"bytes,17,opt,name=local_link_ip,json=localLinkIp" json:"local_link_ip,omitempty"` - RemoteLinkIp *string `protobuf:"bytes,18,opt,name=remote_link_ip,json=remoteLinkIp" json:"remote_link_ip,omitempty"` - IgpMetric *uint32 `protobuf:"varint,19,opt,name=igp_metric,json=igpMetric" json:"igp_metric,omitempty"` - RemoteNodeHash *string `protobuf:"bytes,20,opt,name=remote_node_hash,json=remoteNodeHash" json:"remote_node_hash,omitempty"` - LocalNodeHash *string `protobuf:"bytes,21,opt,name=local_node_hash,json=localNodeHash" json:"local_node_hash,omitempty"` - RemoteIgpRouterId *string `protobuf:"bytes,22,opt,name=remote_igp_router_id,json=remoteIgpRouterId" json:"remote_igp_router_id,omitempty"` - UnidirLinkDelay *uint32 `protobuf:"varint,23,opt,name=unidir_link_delay,json=unidirLinkDelay" json:"unidir_link_delay,omitempty"` - UnidirLinkDelayMinMax []uint32 `protobuf:"varint,24,rep,name=unidir_link_delay_min_max,json=unidirLinkDelayMinMax" json:"unidir_link_delay_min_max,omitempty"` - MaxLinkBwKbps *uint64 `protobuf:"varint,25,opt,name=max_link_bw_kbps,json=maxLinkBwKbps" json:"max_link_bw_kbps,omitempty"` - UnidirDelayVariation *uint32 `protobuf:"varint,26,opt,name=unidir_delay_variation,json=unidirDelayVariation" json:"unidir_delay_variation,omitempty"` - UnidirPacketLoss *float32 `protobuf:"fixed32,27,opt,name=unidir_packet_loss,json=unidirPacketLoss" json:"unidir_packet_loss,omitempty"` - UnidirResidualBw *uint32 `protobuf:"varint,28,opt,name=unidir_residual_bw,json=unidirResidualBw" json:"unidir_residual_bw,omitempty"` - UnidirAvailableBw *uint32 `protobuf:"varint,29,opt,name=unidir_available_bw,json=unidirAvailableBw" json:"unidir_available_bw,omitempty"` - UnidirBwUtilization *uint32 `protobuf:"varint,30,opt,name=unidir_bw_utilization,json=unidirBwUtilization" json:"unidir_bw_utilization,omitempty"` + Key *string `protobuf:"bytes,1,req,name=key" json:"key,omitempty"` + Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` + RouterHash *string `protobuf:"bytes,3,opt,name=router_hash,json=routerHash" json:"router_hash,omitempty"` + RouterIp *string `protobuf:"bytes,4,opt,name=router_ip,json=routerIp" json:"router_ip,omitempty"` + DomainId *int64 `protobuf:"varint,5,opt,name=domain_id,json=domainId" json:"domain_id,omitempty"` + PeerHash *string `protobuf:"bytes,6,opt,name=peer_hash,json=peerHash" json:"peer_hash,omitempty"` + PeerIp *string `protobuf:"bytes,7,opt,name=peer_ip,json=peerIp" json:"peer_ip,omitempty"` + PeerAsn *int32 `protobuf:"varint,8,opt,name=peer_asn,json=peerAsn" json:"peer_asn,omitempty"` + Timestamp *string `protobuf:"bytes,9,opt,name=timestamp" json:"timestamp,omitempty"` + IgpRouterId *string `protobuf:"bytes,10,opt,name=igp_router_id,json=igpRouterId" json:"igp_router_id,omitempty"` + Protocol *string `protobuf:"bytes,11,opt,name=protocol" json:"protocol,omitempty"` + AreaId *string `protobuf:"bytes,12,opt,name=area_id,json=areaId" json:"area_id,omitempty"` + Nexthop *string `protobuf:"bytes,13,opt,name=nexthop" json:"nexthop,omitempty"` + Mtid *MultiTopologyIdentifier `protobuf:"bytes,14,opt,name=mtid" json:"mtid,omitempty"` + LocalLinkId *string `protobuf:"bytes,15,opt,name=local_link_id,json=localLinkId" json:"local_link_id,omitempty"` + RemoteLinkId *string `protobuf:"bytes,16,opt,name=remote_link_id,json=remoteLinkId" json:"remote_link_id,omitempty"` + LocalLinkIp *string `protobuf:"bytes,17,opt,name=local_link_ip,json=localLinkIp" json:"local_link_ip,omitempty"` + RemoteLinkIp *string `protobuf:"bytes,18,opt,name=remote_link_ip,json=remoteLinkIp" json:"remote_link_ip,omitempty"` + IgpMetric *uint32 `protobuf:"varint,19,opt,name=igp_metric,json=igpMetric" json:"igp_metric,omitempty"` + RemoteNodeHash *string `protobuf:"bytes,20,opt,name=remote_node_hash,json=remoteNodeHash" json:"remote_node_hash,omitempty"` + LocalNodeHash *string `protobuf:"bytes,21,opt,name=local_node_hash,json=localNodeHash" json:"local_node_hash,omitempty"` + RemoteIgpRouterId *string `protobuf:"bytes,22,opt,name=remote_igp_router_id,json=remoteIgpRouterId" json:"remote_igp_router_id,omitempty"` + UnidirLinkDelay *uint32 `protobuf:"varint,23,opt,name=unidir_link_delay,json=unidirLinkDelay" json:"unidir_link_delay,omitempty"` + UnidirLinkDelayMinMax []uint32 `protobuf:"varint,24,rep,name=unidir_link_delay_min_max,json=unidirLinkDelayMinMax" json:"unidir_link_delay_min_max,omitempty"` + MaxLinkBwKbps *uint64 `protobuf:"varint,25,opt,name=max_link_bw_kbps,json=maxLinkBwKbps" json:"max_link_bw_kbps,omitempty"` + UnidirDelayVariation *uint32 `protobuf:"varint,26,opt,name=unidir_delay_variation,json=unidirDelayVariation" json:"unidir_delay_variation,omitempty"` + UnidirPacketLoss *float32 `protobuf:"fixed32,27,opt,name=unidir_packet_loss,json=unidirPacketLoss" json:"unidir_packet_loss,omitempty"` + UnidirResidualBw *uint32 `protobuf:"varint,28,opt,name=unidir_residual_bw,json=unidirResidualBw" json:"unidir_residual_bw,omitempty"` + UnidirAvailableBw *uint32 `protobuf:"varint,29,opt,name=unidir_available_bw,json=unidirAvailableBw" json:"unidir_available_bw,omitempty"` + UnidirBwUtilization *uint32 `protobuf:"varint,30,opt,name=unidir_bw_utilization,json=unidirBwUtilization" json:"unidir_bw_utilization,omitempty"` + NormalizedUnidirLinkDelay *float64 `protobuf:"fixed64,31,opt,name=normalized_unidir_link_delay,json=normalizedUnidirLinkDelay" json:"normalized_unidir_link_delay,omitempty"` + NormalizedUnidirDelayVariation *float64 `protobuf:"fixed64,32,opt,name=normalized_unidir_delay_variation,json=normalizedUnidirDelayVariation" json:"normalized_unidir_delay_variation,omitempty"` + NormalizedUnidirPacketLoss *float64 `protobuf:"fixed64,33,opt,name=normalized_unidir_packet_loss,json=normalizedUnidirPacketLoss" json:"normalized_unidir_packet_loss,omitempty"` } func (x *LsLink) Reset() { @@ -482,6 +485,27 @@ func (x *LsLink) GetUnidirBwUtilization() uint32 { return 0 } +func (x *LsLink) GetNormalizedUnidirLinkDelay() float64 { + if x != nil && x.NormalizedUnidirLinkDelay != nil { + return *x.NormalizedUnidirLinkDelay + } + return 0 +} + +func (x *LsLink) GetNormalizedUnidirDelayVariation() float64 { + if x != nil && x.NormalizedUnidirDelayVariation != nil { + return *x.NormalizedUnidirDelayVariation + } + return 0 +} + +func (x *LsLink) GetNormalizedUnidirPacketLoss() float64 { + if x != nil && x.NormalizedUnidirPacketLoss != nil { + return *x.NormalizedUnidirPacketLoss + } + return 0 +} + type LsPrefix struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1147,7 +1171,7 @@ var file_core_topology_proto_rawDesc = []byte{ 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x50, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x21, 0x0a, 0x0d, 0x69, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x5f, 0x72, 0x69, 0x62, 0x5f, 0x69, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0a, 0x69, 0x73, 0x41, 0x64, 0x6a, 0x52, 0x69, 0x62, 0x49, 0x6e, 0x22, 0xd5, 0x08, 0x0a, + 0x52, 0x0a, 0x69, 0x73, 0x41, 0x64, 0x6a, 0x52, 0x69, 0x62, 0x49, 0x6e, 0x22, 0xa4, 0x0a, 0x0a, 0x06, 0x4c, 0x73, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, @@ -1217,110 +1241,123 @@ var file_core_topology_proto_rawDesc = []byte{ 0x12, 0x32, 0x0a, 0x15, 0x75, 0x6e, 0x69, 0x64, 0x69, 0x72, 0x5f, 0x62, 0x77, 0x5f, 0x75, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x64, 0x69, 0x72, 0x42, 0x77, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xe6, 0x04, 0x0a, 0x08, 0x4c, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, - 0x78, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x61, - 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, - 0x48, 0x61, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, - 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, - 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x1b, - 0x0a, 0x09, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x17, 0x0a, 0x07, 0x70, - 0x65, 0x65, 0x72, 0x5f, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x65, - 0x65, 0x72, 0x49, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x61, 0x73, 0x6e, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x65, 0x65, 0x72, 0x41, 0x73, 0x6e, 0x12, - 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, - 0x0d, 0x69, 0x67, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, - 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x17, 0x0a, - 0x07, 0x61, 0x72, 0x65, 0x61, 0x5f, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x61, 0x72, 0x65, 0x61, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, - 0x70, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, - 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x68, - 0x61, 0x73, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x4e, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, 0x6d, 0x74, 0x69, 0x64, - 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6a, 0x61, 0x67, 0x77, 0x2e, 0x4d, 0x75, - 0x6c, 0x74, 0x69, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x49, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x04, 0x6d, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, - 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x72, 0x65, - 0x66, 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6c, 0x65, - 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4c, - 0x65, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x66, 0x69, - 0x78, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x70, 0x72, - 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, - 0x73, 0x50, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x21, 0x0a, 0x0d, 0x69, 0x73, - 0x5f, 0x61, 0x64, 0x6a, 0x5f, 0x72, 0x69, 0x62, 0x5f, 0x69, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0a, 0x69, 0x73, 0x41, 0x64, 0x6a, 0x52, 0x69, 0x62, 0x49, 0x6e, 0x22, 0xd0, 0x04, - 0x0a, 0x09, 0x4c, 0x73, 0x53, 0x72, 0x76, 0x36, 0x53, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, - 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1b, - 0x0a, 0x09, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x65, 0x65, 0x72, - 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x65, - 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x69, 0x70, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x65, 0x65, 0x72, 0x49, 0x70, 0x12, 0x19, - 0x0a, 0x08, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x61, 0x73, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x70, 0x65, 0x65, 0x72, 0x41, 0x73, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0d, 0x69, 0x67, 0x70, 0x5f, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, - 0x69, 0x67, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x61, 0x73, 0x6e, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x73, - 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x18, 0x0a, - 0x07, 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, - 0x31, 0x0a, 0x04, 0x6d, 0x74, 0x69, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, - 0x6a, 0x61, 0x67, 0x77, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, - 0x67, 0x79, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x04, 0x6d, 0x74, - 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x67, 0x70, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, - 0x10, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x69, 0x67, 0x70, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, - 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, - 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x50, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x12, 0x21, 0x0a, 0x0d, 0x69, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x5f, 0x72, 0x69, 0x62, - 0x5f, 0x69, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x41, 0x64, 0x6a, - 0x52, 0x69, 0x62, 0x49, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x72, 0x76, 0x36, 0x5f, 0x73, 0x69, - 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x72, 0x76, 0x36, 0x53, 0x69, 0x64, - 0x22, 0x66, 0x0a, 0x0a, 0x4c, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x45, 0x64, 0x67, 0x65, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0x8f, 0x01, 0x0a, 0x11, 0x4c, 0x73, 0x4e, - 0x6f, 0x64, 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x1e, 0x0a, 0x0b, 0x6c, 0x73, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x03, 0x20, 0x02, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x4b, 0x65, 0x79, - 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x74, 0x69, 0x74, 0x75, 0x64, 0x65, 0x18, 0x04, 0x20, 0x02, - 0x28, 0x01, 0x52, 0x08, 0x6c, 0x61, 0x74, 0x69, 0x74, 0x75, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, - 0x6c, 0x6f, 0x6e, 0x67, 0x69, 0x74, 0x75, 0x64, 0x65, 0x18, 0x05, 0x20, 0x02, 0x28, 0x01, 0x52, - 0x09, 0x6c, 0x6f, 0x6e, 0x67, 0x69, 0x74, 0x75, 0x64, 0x65, 0x22, 0x8f, 0x01, 0x0a, 0x04, 0x50, - 0x65, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, - 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, - 0x5f, 0x62, 0x67, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x42, 0x67, 0x70, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0c, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x67, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x67, 0x70, 0x49, 0x64, 0x42, 0x2e, 0x5a, 0x2c, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6a, 0x61, 0x6c, 0x61, 0x70, - 0x65, 0x6e, 0x6f, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2f, - 0x6a, 0x61, 0x67, 0x77, 0x2d, 0x67, 0x6f, 0x3b, 0x6a, 0x61, 0x67, 0x77, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x1c, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, + 0x65, 0x64, 0x5f, 0x75, 0x6e, 0x69, 0x64, 0x69, 0x72, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x64, + 0x65, 0x6c, 0x61, 0x79, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x01, 0x52, 0x19, 0x6e, 0x6f, 0x72, 0x6d, + 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x55, 0x6e, 0x69, 0x64, 0x69, 0x72, 0x4c, 0x69, 0x6e, 0x6b, + 0x44, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x49, 0x0a, 0x21, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x64, 0x5f, 0x75, 0x6e, 0x69, 0x64, 0x69, 0x72, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x20, 0x20, 0x01, 0x28, 0x01, + 0x52, 0x1e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x55, 0x6e, 0x69, 0x64, + 0x69, 0x72, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x56, 0x61, 0x72, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x41, 0x0a, 0x1d, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x75, + 0x6e, 0x69, 0x64, 0x69, 0x72, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6c, 0x6f, 0x73, + 0x73, 0x18, 0x21, 0x20, 0x01, 0x28, 0x01, 0x52, 0x1a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x64, 0x55, 0x6e, 0x69, 0x64, 0x69, 0x72, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x4c, + 0x6f, 0x73, 0x73, 0x22, 0xe6, 0x04, 0x0a, 0x08, 0x4c, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, + 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x48, + 0x61, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x70, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, 0x70, + 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x1b, 0x0a, + 0x09, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x65, + 0x65, 0x72, 0x5f, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x65, 0x65, + 0x72, 0x49, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x61, 0x73, 0x6e, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x65, 0x65, 0x72, 0x41, 0x73, 0x6e, 0x12, 0x1c, + 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0d, + 0x69, 0x67, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x17, 0x0a, 0x07, + 0x61, 0x72, 0x65, 0x61, 0x5f, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, + 0x72, 0x65, 0x61, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, 0x12, + 0x26, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x68, 0x61, + 0x73, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x4e, + 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, 0x6d, 0x74, 0x69, 0x64, 0x18, + 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6a, 0x61, 0x67, 0x77, 0x2e, 0x4d, 0x75, 0x6c, + 0x74, 0x69, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x66, 0x69, 0x65, 0x72, 0x52, 0x04, 0x6d, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, + 0x65, 0x66, 0x69, 0x78, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, + 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6c, 0x65, 0x6e, + 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4c, 0x65, + 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x70, 0x72, 0x65, + 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, + 0x50, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x21, 0x0a, 0x0d, 0x69, 0x73, 0x5f, + 0x61, 0x64, 0x6a, 0x5f, 0x72, 0x69, 0x62, 0x5f, 0x69, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0a, 0x69, 0x73, 0x41, 0x64, 0x6a, 0x52, 0x69, 0x62, 0x49, 0x6e, 0x22, 0xd0, 0x04, 0x0a, + 0x09, 0x4c, 0x73, 0x53, 0x72, 0x76, 0x36, 0x53, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1b, 0x0a, + 0x09, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x65, 0x65, 0x72, 0x5f, + 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, + 0x48, 0x61, 0x73, 0x68, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x69, 0x70, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x65, 0x65, 0x72, 0x49, 0x70, 0x12, 0x19, 0x0a, + 0x08, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x61, 0x73, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x70, 0x65, 0x65, 0x72, 0x41, 0x73, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0d, 0x69, 0x67, 0x70, 0x5f, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, + 0x67, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x6c, 0x6f, + 0x63, 0x61, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x61, 0x73, 0x6e, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x0c, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x73, 0x6e, + 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x18, 0x0a, 0x07, + 0x6e, 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, + 0x65, 0x78, 0x74, 0x68, 0x6f, 0x70, 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, + 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x31, + 0x0a, 0x04, 0x6d, 0x74, 0x69, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6a, + 0x61, 0x67, 0x77, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, + 0x79, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x04, 0x6d, 0x74, 0x69, + 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x67, 0x70, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x10, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x69, 0x67, 0x70, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x21, + 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x11, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x50, 0x72, 0x65, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x12, 0x21, 0x0a, 0x0d, 0x69, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x5f, 0x72, 0x69, 0x62, 0x5f, + 0x69, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x41, 0x64, 0x6a, 0x52, + 0x69, 0x62, 0x49, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x72, 0x76, 0x36, 0x5f, 0x73, 0x69, 0x64, + 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x72, 0x76, 0x36, 0x53, 0x69, 0x64, 0x22, + 0x66, 0x0a, 0x0a, 0x4c, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x45, 0x64, 0x67, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, + 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0x8f, 0x01, 0x0a, 0x11, 0x4c, 0x73, 0x4e, 0x6f, + 0x64, 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x1e, 0x0a, 0x0b, 0x6c, 0x73, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, + 0x20, 0x02, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x4b, 0x65, 0x79, 0x12, + 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x74, 0x69, 0x74, 0x75, 0x64, 0x65, 0x18, 0x04, 0x20, 0x02, 0x28, + 0x01, 0x52, 0x08, 0x6c, 0x61, 0x74, 0x69, 0x74, 0x75, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, + 0x6f, 0x6e, 0x67, 0x69, 0x74, 0x75, 0x64, 0x65, 0x18, 0x05, 0x20, 0x02, 0x28, 0x01, 0x52, 0x09, + 0x6c, 0x6f, 0x6e, 0x67, 0x69, 0x74, 0x75, 0x64, 0x65, 0x22, 0x8f, 0x01, 0x0a, 0x04, 0x50, 0x65, + 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x68, + 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, + 0x62, 0x67, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, + 0x6d, 0x6f, 0x74, 0x65, 0x42, 0x67, 0x70, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0c, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x5f, 0x62, 0x67, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x67, 0x70, 0x49, 0x64, 0x42, 0x2e, 0x5a, 0x2c, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6a, 0x61, 0x6c, 0x61, 0x70, 0x65, + 0x6e, 0x6f, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2f, 0x6a, + 0x61, 0x67, 0x77, 0x2d, 0x67, 0x6f, 0x3b, 0x6a, 0x61, 0x67, 0x77, } var ( @@ -1336,7 +1373,7 @@ func file_core_topology_proto_rawDescGZIP() []byte { } var file_core_topology_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_core_topology_proto_goTypes = []interface{}{ +var file_core_topology_proto_goTypes = []any{ (*LsNode)(nil), // 0: jagw.LsNode (*LsLink)(nil), // 1: jagw.LsLink (*LsPrefix)(nil), // 2: jagw.LsPrefix @@ -1365,7 +1402,7 @@ func file_core_topology_proto_init() { } file_core_base_proto_init() if !protoimpl.UnsafeEnabled { - file_core_topology_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*LsNode); i { case 0: return &v.state @@ -1377,7 +1414,7 @@ func file_core_topology_proto_init() { return nil } } - file_core_topology_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*LsLink); i { case 0: return &v.state @@ -1389,7 +1426,7 @@ func file_core_topology_proto_init() { return nil } } - file_core_topology_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*LsPrefix); i { case 0: return &v.state @@ -1401,7 +1438,7 @@ func file_core_topology_proto_init() { return nil } } - file_core_topology_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*LsSrv6Sid); i { case 0: return &v.state @@ -1413,7 +1450,7 @@ func file_core_topology_proto_init() { return nil } } - file_core_topology_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*LsNodeEdge); i { case 0: return &v.state @@ -1425,7 +1462,7 @@ func file_core_topology_proto_init() { return nil } } - file_core_topology_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*LsNodeCoordinates); i { case 0: return &v.state @@ -1437,7 +1474,7 @@ func file_core_topology_proto_init() { return nil } } - file_core_topology_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_core_topology_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*Peer); i { case 0: return &v.state From 4fa8da7e9c83c96472b568ff22c53d0266ba1541 Mon Sep 17 00:00:00 2001 From: severindellsperger Date: Thu, 13 Jun 2024 10:12:22 +0200 Subject: [PATCH 2/2] update modules --- go.mod | 13 ++++----- go.sum | 91 +++++++++------------------------------------------------- 2 files changed, 19 insertions(+), 85 deletions(-) diff --git a/go.mod b/go.mod index 1030ec5..e63224b 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,13 @@ module github.com/jalapeno-api-gateway/jagw-go go 1.18 require ( - google.golang.org/grpc v1.51.0 - google.golang.org/protobuf v1.28.1 + google.golang.org/grpc v1.64.0 + google.golang.org/protobuf v1.34.2 ) require ( - github.com/golang/protobuf v1.5.2 // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect - golang.org/x/text v0.4.0 // indirect - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3 // indirect ) diff --git a/go.sum b/go.sum index 345d9c5..b64844b 100644 --- a/go.sum +++ b/go.sum @@ -1,78 +1,13 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= -google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3 h1:9Xyg6I9IWQZhRVfCWjKK+l6kI0jHcPesVlMnT//aHNo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=