Skip to content

O
OdysseusProtocol
Commit 5cd44dc2 authored by vicotor's avatar vicotor
Browse files
Options

update protocol

parent 4711d31a
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 58 deletions
baseapi/base/v1/odysseus.proto
View file @ 5cd44dc2
......@@ -22,17 +22,18 @@ enum BillingMethod {
}
message TaskContent {
string task_id = 1;
string task_uuid = 1;
TaskType task_type = 2;
string task_cmd =3;
bytes task_param = 4;
uint64 task_timestamp = 5;
string task_callback = 6;
string task_uid = 7;
string task_fee = 8;
uint64 task_id = 3;
string task_cmd =4;
bytes task_param = 5;
uint64 task_timestamp = 6;
string task_callback = 7;
string task_uid = 8;
string task_fee = 9;
// todo: add workload and container publickey
int64 task_workload = 9;
bytes container_pubkey = 10;
int64 task_workload = 10;
bytes container_pubkey = 11;
}
message TaskResponse {
......
gen/proto/go/base/v1/odysseus.pb.go
View file @ 5cd44dc2
......@@ -79,17 +79,18 @@ func (BillingMethod) EnumDescriptor() ([]byte, []int) {
}
type TaskContent struct {
TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
TaskUuid string `protobuf:"bytes,1,opt,name=task_uuid,json=taskUuid,proto3" json:"task_uuid,omitempty"`
TaskType TaskType `protobuf:"varint,2,opt,name=task_type,json=taskType,proto3,enum=base.v1.TaskType" json:"task_type,omitempty"`
TaskCmd string `protobuf:"bytes,3,opt,name=task_cmd,json=taskCmd,proto3" json:"task_cmd,omitempty"`
TaskParam []byte `protobuf:"bytes,4,opt,name=task_param,json=taskParam,proto3" json:"task_param,omitempty"`
TaskTimestamp uint64 `protobuf:"varint,5,opt,name=task_timestamp,json=taskTimestamp,proto3" json:"task_timestamp,omitempty"`
TaskCallback string `protobuf:"bytes,6,opt,name=task_callback,json=taskCallback,proto3" json:"task_callback,omitempty"`
TaskUid string `protobuf:"bytes,7,opt,name=task_uid,json=taskUid,proto3" json:"task_uid,omitempty"`
TaskFee string `protobuf:"bytes,8,opt,name=task_fee,json=taskFee,proto3" json:"task_fee,omitempty"`
TaskId uint64 `protobuf:"varint,3,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
TaskCmd string `protobuf:"bytes,4,opt,name=task_cmd,json=taskCmd,proto3" json:"task_cmd,omitempty"`
TaskParam []byte `protobuf:"bytes,5,opt,name=task_param,json=taskParam,proto3" json:"task_param,omitempty"`
TaskTimestamp uint64 `protobuf:"varint,6,opt,name=task_timestamp,json=taskTimestamp,proto3" json:"task_timestamp,omitempty"`
TaskCallback string `protobuf:"bytes,7,opt,name=task_callback,json=taskCallback,proto3" json:"task_callback,omitempty"`
TaskUid string `protobuf:"bytes,8,opt,name=task_uid,json=taskUid,proto3" json:"task_uid,omitempty"`
TaskFee string `protobuf:"bytes,9,opt,name=task_fee,json=taskFee,proto3" json:"task_fee,omitempty"`
// todo: add workload and container publickey
TaskWorkload int64 `protobuf:"varint,9,opt,name=task_workload,json=taskWorkload,proto3" json:"task_workload,omitempty"`
ContainerPubkey []byte `protobuf:"bytes,10,opt,name=container_pubkey,json=containerPubkey,proto3" json:"container_pubkey,omitempty"`
TaskWorkload int64 `protobuf:"varint,10,opt,name=task_workload,json=taskWorkload,proto3" json:"task_workload,omitempty"`
ContainerPubkey []byte `protobuf:"bytes,11,opt,name=container_pubkey,json=containerPubkey,proto3" json:"container_pubkey,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -119,9 +120,9 @@ func (m *TaskContent) XXX_DiscardUnknown() {
var xxx_messageInfo_TaskContent proto.InternalMessageInfo
func (m *TaskContent) GetTaskId() string {
func (m *TaskContent) GetTaskUuid() string {
if m != nil {
return m.TaskId
return m.TaskUuid
}
return ""
}
......@@ -133,6 +134,13 @@ func (m *TaskContent) GetTaskType() TaskType {
return TaskType_SystemTask
}
func (m *TaskContent) GetTaskId() uint64 {
if m != nil {
return m.TaskId
}
return 0
}
func (m *TaskContent) GetTaskCmd() string {
if m != nil {
return m.TaskCmd
......@@ -284,42 +292,43 @@ func init() {
func init() { proto.RegisterFile("base/v1/odysseus.proto", fileDescriptor_91b466c680c1fa25) }
var fileDescriptor_91b466c680c1fa25 = []byte{
// 581 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0x51, 0x6f, 0xd3, 0x30,
0x10, 0xc7, 0xe7, 0x74, 0xac, 0x9d, 0xdb, 0xae, 0x9d, 0x11, 0x10, 0x26, 0xc1, 0xaa, 0x21, 0x50,
0x99, 0x44, 0xa2, 0xc0, 0xdb, 0xf6, 0x44, 0x0a, 0x43, 0x43, 0x9a, 0xa8, 0xb2, 0x51, 0x26, 0x34,
0xa9, 0x72, 0x92, 0x5b, 0x16, 0x35, 0x89, 0x23, 0xdb, 0x29, 0xca, 0xb7, 0x41, 0x3c, 0xf2, 0x3d,
0x90, 0x10, 0x1f, 0x63, 0xbc, 0xf1, 0x29, 0x90, 0x9d, 0x34, 0xd3, 0x1e, 0xf6, 0xd4, 0xeb, 0xef,
0x9c, 0xff, 0xf9, 0xfe, 0xe7, 0xc3, 0x0f, 0x7d, 0x2a, 0xc0, 0x5e, 0x3a, 0x36, 0x0b, 0x4b, 0x21,
0xa0, 0x10, 0x56, 0xce, 0x99, 0x64, 0xa4, 0xad, 0xb8, 0xb5, 0x74, 0x76, 0x76, 0x23, 0xc6, 0xa2,
0x04, 0x6c, 0x8d, 0xfd, 0xe2, 0xd2, 0x96, 0x71, 0x0a, 0x42, 0xd2, 0x34, 0xaf, 0x4e, 0xee, 0x34,
0x0a, 0x1c, 0x04, 0x2b, 0x78, 0x00, 0x35, 0x1f, 0x68, 0x1e, 0xb1, 0x88, 0x55, 0x60, 0xef, 0xda,
0xc0, 0xdd, 0x33, 0x2a, 0x16, 0x13, 0x96, 0x49, 0xc8, 0x24, 0x79, 0x84, 0xdb, 0x92, 0x8a, 0xc5,
0x3c, 0x0e, 0x4d, 0x34, 0x42, 0xe3, 0x4d, 0x6f, 0x43, 0xfd, 0x3d, 0x0e, 0x89, 0x85, 0x37, 0x75,
0x42, 0x96, 0x39, 0x98, 0xc6, 0x08, 0x8d, 0xb7, 0x5e, 0x6f, 0x5b, 0xf5, 0x7d, 0x2c, 0xa5, 0x70,
0x56, 0xe6, 0xe0, 0x75, 0x64, 0x1d, 0x91, 0xc7, 0x58, 0xc7, 0xf3, 0x20, 0x0d, 0xcd, 0x96, 0x56,
0xd2, 0xc2, 0x93, 0x34, 0x24, 0x4f, 0x30, 0xd6, 0xa9, 0x9c, 0x72, 0x9a, 0x9a, 0xeb, 0x23, 0x34,
0xee, 0x79, 0x5a, 0x7c, 0xaa, 0x00, 0x79, 0x8e, 0xb7, 0xaa, 0x4a, 0xab, 0x9e, 0xcc, 0x7b, 0x23,
0x34, 0x5e, 0xf7, 0xfa, 0x5a, 0x7b, 0x05, 0xc9, 0x33, 0xdc, 0xaf, 0x0a, 0xd0, 0x24, 0xf1, 0x69,
0xb0, 0x30, 0x37, 0x74, 0x95, 0x9e, 0xae, 0x52, 0xb3, 0xe6, 0x16, 0x45, 0x1c, 0x9a, 0xed, 0x9b,
0x5b, 0x7c, 0x8e, 0xc3, 0x26, 0x75, 0x09, 0x60, 0x76, 0x6e, 0x52, 0x47, 0x00, 0x8d, 0xf4, 0x37,
0xc6, 0x17, 0x09, 0xa3, 0xa1, 0xb9, 0x39, 0x42, 0xe3, 0x56, 0x25, 0xfd, 0xa5, 0x66, 0xe4, 0x25,
0x1e, 0x06, 0x2c, 0x93, 0x34, 0xce, 0x80, 0xcf, 0xf3, 0xc2, 0x5f, 0x40, 0x69, 0x62, 0xdd, 0xcb,
0xa0, 0xe1, 0x53, 0x8d, 0xf7, 0x7e, 0x21, 0xdc, 0x53, 0x16, 0x79, 0x20, 0x72, 0x96, 0x09, 0xb8,
0xdb, 0xe5, 0x5d, 0xdc, 0xd5, 0x09, 0x0e, 0xa2, 0x48, 0xa4, 0xf6, 0xb9, 0xe7, 0x69, 0xb7, 0x3c,
0x4d, 0x6e, 0x35, 0xd4, 0xba, 0xbb, 0xa1, 0xf5, 0xdb, 0x0d, 0xbd, 0xc0, 0x83, 0xaa, 0x9e, 0x98,
0x8b, 0x22, 0x08, 0x00, 0x42, 0xed, 0x69, 0xa7, 0xf2, 0xf4, 0x58, 0x9c, 0x56, 0xb0, 0x99, 0x0c,
0x70, 0xce, 0x78, 0x6d, 0xa8, 0x9e, 0xcc, 0x7b, 0x05, 0xf6, 0x0f, 0x71, 0x67, 0x35, 0x69, 0xb2,
0x85, 0xf1, 0x69, 0x29, 0x24, 0xa4, 0x8a, 0x0c, 0xd7, 0xc8, 0x00, 0x77, 0x27, 0x2c, 0xcd, 0x0b,
0x09, 0x1a, 0x20, 0x75, 0x60, 0x52, 0x08, 0xc9, 0xaa, 0x03, 0xc6, 0xfe, 0x47, 0xdc, 0x77, 0xe3,
0x24, 0x89, 0xb3, 0xe8, 0x04, 0xe4, 0x15, 0x0b, 0xd5, 0x17, 0x35, 0x38, 0xe2, 0x00, 0xc3, 0x35,
0xb2, 0xdd, 0x9c, 0x70, 0x4b, 0x35, 0xe7, 0x21, 0x22, 0x0f, 0xf0, 0x76, 0x83, 0xde, 0x15, 0x9c,
0xca, 0x98, 0x65, 0x43, 0xc3, 0xfd, 0x8e, 0x7e, 0xff, 0x7d, 0x8a, 0x70, 0x37, 0x60, 0xe9, 0xea,
0x0d, 0xba, 0xfd, 0x4f, 0xf5, 0xb2, 0x4c, 0xd5, 0xc3, 0x9e, 0xa2, 0xaf, 0x6f, 0xa3, 0x58, 0x5e,
0x15, 0xbe, 0x15, 0xb0, 0xb4, 0x59, 0xa4, 0x26, 0x78, 0xa5, 0x9f, 0x7f, 0xc0, 0x12, 0x3b, 0x82,
0xac, 0xda, 0x23, 0x3b, 0x62, 0x76, 0xbd, 0x36, 0x87, 0xea, 0x77, 0xe9, 0xfc, 0x30, 0x5a, 0xee,
0xf9, 0xf9, 0x4f, 0xa3, 0xed, 0xaa, 0x1a, 0x33, 0xe7, 0x4f, 0x15, 0x5d, 0xcc, 0x9c, 0x6b, 0xe3,
0x7e, 0x1d, 0x5d, 0x7c, 0x98, 0xba, 0x27, 0x20, 0x69, 0x48, 0x25, 0xfd, 0x67, 0x74, 0x14, 0x3d,
0x38, 0x98, 0x39, 0xfe, 0x86, 0xd6, 0x7c, 0xf3, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x99, 0x4f,
0xa5, 0xcc, 0x03, 0x00, 0x00,
// 601 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcb, 0x6e, 0xd3, 0x4c,
0x14, 0xc7, 0x3b, 0x4e, 0xbf, 0x26, 0x99, 0x24, 0x4d, 0x3a, 0x9f, 0x00, 0x53, 0x04, 0x8d, 0x8a,
0x40, 0xa1, 0x12, 0xb1, 0x02, 0xbb, 0x76, 0x85, 0x03, 0x45, 0x45, 0xaa, 0x88, 0xd2, 0x0b, 0x15,
0xaa, 0x14, 0x4d, 0xec, 0x53, 0xd7, 0x8a, 0xed, 0xb1, 0xe6, 0x52, 0xe4, 0xb7, 0x41, 0x2c, 0x79,
0x0f, 0x24, 0xc4, 0x63, 0xc0, 0x8e, 0x97, 0x00, 0xcd, 0x8c, 0xe3, 0x2a, 0x0b, 0x56, 0x99, 0xfc,
0xe6, 0xef, 0xf3, 0x3f, 0x97, 0x39, 0xf8, 0xee, 0x9c, 0x0a, 0xf0, 0x6e, 0x46, 0x1e, 0x0b, 0x0b,
0x21, 0x40, 0x89, 0x61, 0xce, 0x99, 0x64, 0xa4, 0xae, 0xf9, 0xf0, 0x66, 0xb4, 0xbd, 0x13, 0x31,
0x16, 0x25, 0xe0, 0x19, 0x3c, 0x57, 0x57, 0x9e, 0x8c, 0x53, 0x10, 0x92, 0xa6, 0xb9, 0x55, 0x6e,
0x57, 0x11, 0x38, 0x08, 0xa6, 0x78, 0x00, 0x25, 0xef, 0x1a, 0x1e, 0xb1, 0x88, 0x59, 0xb0, 0xfb,
0xc7, 0xc1, 0xad, 0x53, 0x2a, 0x16, 0x63, 0x96, 0x49, 0xc8, 0x24, 0x79, 0x80, 0x9b, 0x92, 0x8a,
0xc5, 0x4c, 0xa9, 0x38, 0x74, 0x51, 0x1f, 0x0d, 0x9a, 0xd3, 0x86, 0x06, 0x67, 0x2a, 0x0e, 0xc9,
0xb0, 0xbc, 0x94, 0x45, 0x0e, 0xae, 0xd3, 0x47, 0x83, 0xcd, 0x17, 0x5b, 0xc3, 0x32, 0xa7, 0xa1,
0x8e, 0x72, 0x5a, 0xe4, 0x60, 0xf5, 0xfa, 0x44, 0xee, 0xe1, 0xba, 0xd1, 0xc7, 0xa1, 0x5b, 0xeb,
0xa3, 0xc1, 0xfa, 0x74, 0x43, 0xff, 0x3d, 0x0a, 0xc9, 0x7d, 0x6c, 0x44, 0xb3, 0x20, 0x0d, 0xdd,
0x75, 0x63, 0x62, 0x84, 0xe3, 0x34, 0x24, 0x0f, 0x31, 0x36, 0x57, 0x39, 0xe5, 0x34, 0x75, 0xff,
0xeb, 0xa3, 0x41, 0x7b, 0x6a, 0x5c, 0x27, 0x1a, 0x90, 0x27, 0x78, 0xd3, 0xa6, 0xb0, 0x2c, 0xd8,
0xdd, 0x30, 0x91, 0x3b, 0xc6, 0x74, 0x09, 0xc9, 0x63, 0xdc, 0xb1, 0x06, 0x34, 0x49, 0xe6, 0x34,
0x58, 0xb8, 0x75, 0xe3, 0xd2, 0x36, 0x2e, 0x25, 0xab, 0xb2, 0xd0, 0xa5, 0x36, 0x6e, 0xb3, 0x38,
0x8b, 0x6f, 0x13, 0xbc, 0x02, 0x70, 0x9b, 0xb7, 0x57, 0x87, 0x00, 0x55, 0xe8, 0x4f, 0x8c, 0x2f,
0x12, 0x46, 0x43, 0x17, 0xf7, 0xd1, 0xa0, 0x66, 0x43, 0x7f, 0x28, 0x19, 0x79, 0x86, 0x7b, 0x01,
0xcb, 0x24, 0x8d, 0x33, 0xe0, 0xb3, 0x5c, 0xcd, 0x17, 0x50, 0xb8, 0x2d, 0x53, 0x4b, 0xb7, 0xe2,
0x13, 0x83, 0x77, 0xbf, 0x21, 0xdc, 0xd6, 0xbd, 0x9b, 0x82, 0xc8, 0x59, 0x26, 0x56, 0xba, 0x66,
0x07, 0xb0, 0xec, 0xda, 0x0e, 0x6e, 0x99, 0x0b, 0x0e, 0x42, 0x25, 0xd2, 0x0c, 0xa0, 0x3d, 0x35,
0xdd, 0x9a, 0x1a, 0xb2, 0x52, 0x50, 0xed, 0xdf, 0x05, 0xad, 0xaf, 0x16, 0xf4, 0x14, 0x77, 0xad,
0x9f, 0x98, 0x09, 0x15, 0x04, 0x00, 0xa1, 0x69, 0x7b, 0xc3, 0xf6, 0xf4, 0x48, 0x9c, 0x58, 0x58,
0x4d, 0x06, 0x38, 0x67, 0xdc, 0xb4, 0xbd, 0x69, 0x27, 0xf3, 0x46, 0x83, 0xbd, 0x03, 0xdc, 0x58,
0x3e, 0x01, 0xb2, 0x89, 0xf1, 0x49, 0x21, 0x24, 0xa4, 0x9a, 0xf4, 0xd6, 0x48, 0x17, 0xb7, 0xc6,
0x2c, 0xcd, 0x95, 0x04, 0x03, 0x90, 0x16, 0x8c, 0x95, 0x90, 0xcc, 0x0a, 0x9c, 0xbd, 0x77, 0xb8,
0xe3, 0xc7, 0x49, 0x12, 0x67, 0xd1, 0x31, 0xc8, 0x6b, 0x16, 0xea, 0x2f, 0x4a, 0x70, 0xc8, 0x01,
0x7a, 0x6b, 0x64, 0xab, 0x52, 0xf8, 0x85, 0x9e, 0x73, 0x0f, 0x91, 0x3b, 0x78, 0xab, 0x42, 0xaf,
0x15, 0xa7, 0x32, 0x66, 0x59, 0xcf, 0xf1, 0x3f, 0xa3, 0xef, 0xbf, 0x1e, 0x21, 0xdc, 0x0a, 0x58,
0xba, 0x7c, 0x9c, 0x7e, 0xe7, 0x7d, 0xb9, 0x49, 0x13, 0xfd, 0xea, 0x27, 0xe8, 0xe3, 0xab, 0x28,
0x96, 0xd7, 0x6a, 0x3e, 0x0c, 0x58, 0x5a, 0x6d, 0x59, 0x75, 0x78, 0x6e, 0x76, 0x23, 0x60, 0x89,
0x17, 0x41, 0x66, 0x97, 0xcc, 0x8b, 0x98, 0x57, 0xee, 0xd4, 0x81, 0xfe, 0xbd, 0x19, 0x7d, 0x71,
0x6a, 0xfe, 0xc5, 0xc5, 0x57, 0xa7, 0xee, 0x6b, 0x8f, 0xf3, 0xd1, 0x0f, 0x7b, 0xba, 0x3c, 0x1f,
0xfd, 0x74, 0xfe, 0x2f, 0x4f, 0x97, 0x6f, 0x27, 0xfe, 0x31, 0x48, 0x1a, 0x52, 0x49, 0x7f, 0x3b,
0x0d, 0x4d, 0xf7, 0xf7, 0xcf, 0x47, 0xf3, 0x0d, 0x13, 0xf3, 0xe5, 0xdf, 0x00, 0x00, 0x00, 0xff,
0xff, 0xbc, 0x9b, 0x79, 0xf1, 0xe9, 0x03, 0x00, 0x00,
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment