diff --git a/go/gosdn/pnd/pnd.pb.go b/go/gosdn/pnd/pnd.pb.go index 2c74f397ecbaaddd596a3783730e4cb306d6e378..814879433821671099054f27eeb838706634bc1d 100644 --- a/go/gosdn/pnd/pnd.pb.go +++ b/go/gosdn/pnd/pnd.pb.go @@ -412,9 +412,9 @@ type GetSbiRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Timestamp in nanoseconds since Epoch. - Sid string `protobuf:"bytes,3,opt,name=sid,proto3" json:"sid,omitempty"` - Pid string `protobuf:"bytes,4,opt,name=pid,proto3" json:"pid,omitempty"` + Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Timestamp in nanoseconds since Epoch. + Sid []string `protobuf:"bytes,3,rep,name=sid,proto3" json:"sid,omitempty"` + Pid string `protobuf:"bytes,4,opt,name=pid,proto3" json:"pid,omitempty"` } func (x *GetSbiRequest) Reset() { @@ -456,11 +456,11 @@ func (x *GetSbiRequest) GetTimestamp() int64 { return 0 } -func (x *GetSbiRequest) GetSid() string { +func (x *GetSbiRequest) GetSid() []string { if x != nil { return x.Sid } - return "" + return nil } func (x *GetSbiRequest) GetPid() string { @@ -2315,7 +2315,7 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{ 0x70, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x53, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x6d, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, diff --git a/go/gosdn/pnd/pnd.pb.gw.go b/go/gosdn/pnd/pnd.pb.gw.go index e942ff6acc406ff3a14adb310e154cee6255f547..2b75200c8fad1fa6fe38831ee7293ad358a82c8b 100644 --- a/go/gosdn/pnd/pnd.pb.gw.go +++ b/go/gosdn/pnd/pnd.pb.gw.go @@ -359,7 +359,7 @@ func request_PndService_GetSbi_0(ctx context.Context, marshaler runtime.Marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "sid") } - protoReq.Sid, err = runtime.String(val) + protoReq.Sid, err = runtime.StringSlice(val, ",") if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sid", err) } @@ -402,7 +402,7 @@ func local_request_PndService_GetSbi_0(ctx context.Context, marshaler runtime.Ma return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "sid") } - protoReq.Sid, err = runtime.String(val) + protoReq.Sid, err = runtime.StringSlice(val, ",") if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sid", err) } diff --git a/openapiv2/gosdn_northbound.swagger.json b/openapiv2/gosdn_northbound.swagger.json index a769928087055130cd117d7f51c59d8490ee805c..0d7b4e604c54b7aa89c6a58b747d24df896d2b45 100644 --- a/openapiv2/gosdn_northbound.swagger.json +++ b/openapiv2/gosdn_northbound.swagger.json @@ -23,14 +23,14 @@ { "name": "AgentManager" }, - { - "name": "CoreService" - }, { "name": "CsbiService" }, { "name": "Collector" + }, + { + "name": "CoreService" } ], "consumes": [ @@ -712,7 +712,12 @@ "name": "sid", "in": "path", "required": true, - "type": "string" + "type": "array", + "items": { + "type": "string" + }, + "collectionFormat": "csv", + "minItems": 1 }, { "name": "timestamp", diff --git a/proto/gosdn/pnd/pnd.proto b/proto/gosdn/pnd/pnd.proto index d7fd3f853cdd1a748c460e5e5addfaefa4140554..6bfb88a3ad442c81a35379effb3981465ae4f575 100644 --- a/proto/gosdn/pnd/pnd.proto +++ b/proto/gosdn/pnd/pnd.proto @@ -134,7 +134,7 @@ message GetSbiListRequest { } message GetSbiRequest { int64 timestamp = 1; // Timestamp in nanoseconds since Epoch. - string sid = 3; + repeated string sid = 3; string pid = 4; }