diff --git a/api/v1/service_manage/request.proto b/api/v1/service_manage/request.proto index 88b63489..d9868c02 100644 --- a/api/v1/service_manage/request.proto +++ b/api/v1/service_manage/request.proto @@ -25,6 +25,8 @@ message DiscoverRequest { reserved 7 to 11; NAMESPACES = 12; FAULT_DETECTOR = 13; + reserved 14 to 99; + LANE = 100; } DiscoverRequestType type = 1; diff --git a/api/v1/service_manage/response.proto b/api/v1/service_manage/response.proto index 03bfaa89..868b95a8 100644 --- a/api/v1/service_manage/response.proto +++ b/api/v1/service_manage/response.proto @@ -15,6 +15,7 @@ import "configrelease.proto"; import "fault_detector.proto"; import "auth.proto"; import "contract.proto"; +import "lane.proto"; option go_package = "github.com/polarismesh/specification/source/go/api/v1/service_manage"; option java_package = "com.tencent.polaris.specification.api.v1.service.manage"; @@ -73,7 +74,7 @@ message BatchQueryResponse { repeated UserGroup userGroups = 19; repeated AuthStrategy authStrategies = 20; repeated Client clients = 21; - + repeated google.protobuf.Any data = 22; Summary summary = 23; } @@ -94,6 +95,8 @@ message DiscoverResponse { reserved "MESH", "MESH_CONFIG", "FLUX_DBREFRESH", "FLUX_SDK", "FLUX_SERVER"; NAMESPACES = 12; FAULT_DETECTOR = 13; + reserved 14 to 99; + LANE = 100; } DiscoverResponseType type = 3; @@ -107,14 +110,9 @@ message DiscoverResponse { FaultDetector faultDetector = 11; reserved 12 to 20; Service aliasFor = 21; + repeated LaneGroup lanes = 22; } +message OptionSwitch { map options = 1; } -message OptionSwitch { - map options = 1; -} - -message InstanceLabels { - map labels = 1; -} - +message InstanceLabels { map labels = 1; } diff --git a/api/v1/traffic_manage/lane.proto b/api/v1/traffic_manage/lane.proto index 7a879cc4..ac09b95e 100644 --- a/api/v1/traffic_manage/lane.proto +++ b/api/v1/traffic_manage/lane.proto @@ -13,20 +13,12 @@ option java_outer_classname = "LaneProto"; // 流量入口 message TrafficEntry { // 标记流量入口类型 - // type == "polarismesh.cn/gateway/tse-gateway, 则 selector 为 - // TSEGatewaySelector type == "polarismesh.cn/gateway/spring-cloud-gateway", - // 则 selector 为 ServiceGatewaySelector type == "polarismesh.cn/service, 则 - // selector 为 ServiceSelector + // type == "polarismesh.cn/gateway/spring-cloud-gateway", 则 selector 为 ServiceGatewaySelector + // type == "polarismesh.cn/service, 则 selector 为 ServiceSelector string type = 1; google.protobuf.Any selector = 2; } -// 网关入口定义 -message TSEGatewaySelector { - string instance_id = 1; - repeated string services = 2; -} - // 微服务网关入口定义 message ServiceGatewaySelector { string namespace = 1; @@ -54,11 +46,15 @@ message LaneGroup { // 在泳道组内的服务列表信息 repeated DestinationGroup destinations = 4; // 泳道组描述信息 + string revision = 7; + // 泳道组描述信息 string description = 8; // 泳道组的创建时间 string ctime = 9; // 泳道组的更新时间 string mtime = 10; + // 泳道组内的流量入口信息 + repeated LaneRule rules = 11; } // TrafficMatchRule 流量匹配规则 @@ -81,33 +77,29 @@ message LaneRule { string name = 2; // 所属泳道组的名称 string group_name = 3; - // 泳道入口 - repeated TrafficEntry traffic_entries = 4; // 流量匹配规则 - TrafficMatchRule traffic_match_rule = 5; + TrafficMatchRule traffic_match_rule = 4; // 保存这个泳道的默认实例标签 - string default_label_value = 6; - // 在泳道内的服务 - repeated DestinationGroup destinations = 7; + string default_label_value = 5; // 泳道规则是否启用 - bool enable = 8; + bool enable = 6; enum LaneMatchMode { // 严格匹配模式 STRICT = 0; // 宽松匹配模式 PERMISSIVE = 1; } - LaneMatchMode match_mode = 9; + LaneMatchMode match_mode = 7; // revision routing version - string revision = 10; + string revision = 8; // ctime create time of the rules - string ctime = 11; + string ctime = 9; // mtime modify time of the rules - string mtime = 12; + string mtime = 10; // etime enable time of the rules - string etime = 13; + string etime = 11; // priority rules priority - uint32 priority = 14; + uint32 priority = 12; // description simple description rules - string description = 15; + string description = 13; } \ No newline at end of file diff --git a/source/go/api/v1/service_manage/request.pb.go b/source/go/api/v1/service_manage/request.pb.go index 56fcfcd9..4b91fa4a 100644 --- a/source/go/api/v1/service_manage/request.pb.go +++ b/source/go/api/v1/service_manage/request.pb.go @@ -30,18 +30,20 @@ const ( DiscoverRequest_SERVICES DiscoverRequest_DiscoverRequestType = 6 DiscoverRequest_NAMESPACES DiscoverRequest_DiscoverRequestType = 12 DiscoverRequest_FAULT_DETECTOR DiscoverRequest_DiscoverRequestType = 13 + DiscoverRequest_LANE DiscoverRequest_DiscoverRequestType = 100 ) var DiscoverRequest_DiscoverRequestType_name = map[int32]string{ - 0: "UNKNOWN", - 1: "INSTANCE", - 2: "CLUSTER", - 3: "ROUTING", - 4: "RATE_LIMIT", - 5: "CIRCUIT_BREAKER", - 6: "SERVICES", - 12: "NAMESPACES", - 13: "FAULT_DETECTOR", + 0: "UNKNOWN", + 1: "INSTANCE", + 2: "CLUSTER", + 3: "ROUTING", + 4: "RATE_LIMIT", + 5: "CIRCUIT_BREAKER", + 6: "SERVICES", + 12: "NAMESPACES", + 13: "FAULT_DETECTOR", + 100: "LANE", } var DiscoverRequest_DiscoverRequestType_value = map[string]int32{ "UNKNOWN": 0, @@ -53,13 +55,14 @@ var DiscoverRequest_DiscoverRequestType_value = map[string]int32{ "SERVICES": 6, "NAMESPACES": 12, "FAULT_DETECTOR": 13, + "LANE": 100, } func (x DiscoverRequest_DiscoverRequestType) String() string { return proto.EnumName(DiscoverRequest_DiscoverRequestType_name, int32(x)) } func (DiscoverRequest_DiscoverRequestType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_request_f23b60a9b726ff3e, []int{1, 0} + return fileDescriptor_request_e3c7c74833c22ef4, []int{1, 0} } type DiscoverFilter struct { @@ -73,7 +76,7 @@ func (m *DiscoverFilter) Reset() { *m = DiscoverFilter{} } func (m *DiscoverFilter) String() string { return proto.CompactTextString(m) } func (*DiscoverFilter) ProtoMessage() {} func (*DiscoverFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_request_f23b60a9b726ff3e, []int{0} + return fileDescriptor_request_e3c7c74833c22ef4, []int{0} } func (m *DiscoverFilter) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DiscoverFilter.Unmarshal(m, b) @@ -113,7 +116,7 @@ func (m *DiscoverRequest) Reset() { *m = DiscoverRequest{} } func (m *DiscoverRequest) String() string { return proto.CompactTextString(m) } func (*DiscoverRequest) ProtoMessage() {} func (*DiscoverRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_request_f23b60a9b726ff3e, []int{1} + return fileDescriptor_request_e3c7c74833c22ef4, []int{1} } func (m *DiscoverRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DiscoverRequest.Unmarshal(m, b) @@ -160,35 +163,36 @@ func init() { proto.RegisterEnum("v1.DiscoverRequest_DiscoverRequestType", DiscoverRequest_DiscoverRequestType_name, DiscoverRequest_DiscoverRequestType_value) } -func init() { proto.RegisterFile("request.proto", fileDescriptor_request_f23b60a9b726ff3e) } - -var fileDescriptor_request_f23b60a9b726ff3e = []byte{ - // 427 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x6f, 0xda, 0x30, - 0x14, 0xc7, 0x17, 0x4a, 0x01, 0x19, 0x48, 0x2d, 0x73, 0x41, 0x3d, 0x4c, 0x15, 0xd2, 0xb4, 0x6a, - 0x87, 0x64, 0x74, 0x87, 0x1d, 0x76, 0x0a, 0xc1, 0xdd, 0xb2, 0xd2, 0x50, 0x39, 0xce, 0x26, 0xed, - 0x82, 0x5c, 0xcb, 0x03, 0x4b, 0x10, 0x67, 0xb6, 0x89, 0xc4, 0x87, 0xd8, 0xe7, 0xd8, 0xe7, 0xd9, - 0x37, 0x9a, 0x4c, 0x82, 0xb4, 0x56, 0x3d, 0x3e, 0xff, 0xff, 0xff, 0xdf, 0x7b, 0x4f, 0xcf, 0x60, - 0xa8, 0xc5, 0xaf, 0xbd, 0x30, 0x36, 0x28, 0xb5, 0xb2, 0x0a, 0xb5, 0xaa, 0xe9, 0xe5, 0xd0, 0x08, - 0x5d, 0x49, 0x2e, 0xea, 0xa7, 0x4b, 0x9f, 0xab, 0xc2, 0x6a, 0xc6, 0x1b, 0xcb, 0x64, 0x06, 0xfc, - 0xb9, 0x34, 0x5c, 0x55, 0x42, 0xdf, 0xca, 0xad, 0x15, 0x1a, 0xbd, 0x07, 0xa3, 0x65, 0xb1, 0x3d, - 0x7c, 0x11, 0x6c, 0x6b, 0x37, 0x87, 0xa4, 0x30, 0x96, 0x15, 0x5c, 0x8c, 0xbd, 0x2b, 0xef, 0xba, - 0x47, 0x5e, 0x92, 0x26, 0x7f, 0x5b, 0xe0, 0xe2, 0x04, 0x21, 0xf5, 0x00, 0xe8, 0x13, 0x68, 0xdb, - 0x43, 0x59, 0xc7, 0xfc, 0x9b, 0xb7, 0x41, 0x35, 0x0d, 0x9e, 0x59, 0x9e, 0xd7, 0xf4, 0x50, 0x0a, - 0x72, 0x0c, 0xa1, 0x37, 0xa0, 0xdb, 0x4c, 0x3d, 0x6e, 0x5d, 0x79, 0xd7, 0xfd, 0x9b, 0xbe, 0xcb, - 0x67, 0xf5, 0x13, 0x39, 0x69, 0xe8, 0x1d, 0xe8, 0xd4, 0x33, 0x8f, 0x5f, 0x1f, 0x5d, 0xe8, 0xff, - 0x2e, 0xb5, 0x42, 0x1a, 0xc7, 0xe4, 0x8f, 0x07, 0x46, 0x2f, 0x34, 0x44, 0x7d, 0xd0, 0xcd, 0xd3, - 0xbb, 0x74, 0xf9, 0x3d, 0x85, 0xaf, 0xd0, 0x00, 0xf4, 0x92, 0x34, 0xa3, 0x51, 0x1a, 0x63, 0xe8, - 0x39, 0x29, 0x5e, 0xe4, 0x19, 0xc5, 0x04, 0xb6, 0x5c, 0x41, 0x96, 0x39, 0x4d, 0xd2, 0xcf, 0xf0, - 0x0c, 0xf9, 0x00, 0x90, 0x88, 0xe2, 0xd5, 0x22, 0xb9, 0x4f, 0x28, 0x6c, 0xa3, 0x11, 0xb8, 0x88, - 0x13, 0x12, 0xe7, 0x09, 0x5d, 0xcd, 0x08, 0x8e, 0xee, 0x30, 0x81, 0xe7, 0x0e, 0x96, 0x61, 0xf2, - 0x2d, 0x89, 0x71, 0x06, 0x3b, 0x2e, 0x92, 0x46, 0xf7, 0x38, 0x7b, 0x88, 0x5c, 0x3d, 0x40, 0x08, - 0xf8, 0xb7, 0x51, 0xbe, 0xa0, 0xab, 0x39, 0xa6, 0x38, 0xa6, 0x4b, 0x02, 0x87, 0x93, 0x76, 0xaf, - 0x0b, 0xfb, 0x5f, 0xdb, 0xbd, 0x33, 0x78, 0x3e, 0xfb, 0xed, 0x81, 0x8f, 0x5c, 0xed, 0x02, 0x2b, - 0x0a, 0x2e, 0x0a, 0x1b, 0x94, 0x6a, 0xcb, 0xb4, 0x34, 0x81, 0x29, 0x05, 0x97, 0x3f, 0x25, 0x67, - 0x56, 0xaa, 0x22, 0x60, 0xa5, 0x74, 0x3b, 0x9f, 0x4e, 0xbc, 0x63, 0x05, 0x5b, 0x8b, 0xd9, 0xa0, - 0x59, 0xf0, 0xc1, 0x5d, 0xf8, 0xc7, 0x7c, 0x2d, 0xed, 0x66, 0xff, 0x18, 0x70, 0xb5, 0x0b, 0x1b, - 0xca, 0x4e, 0x98, 0x4d, 0xf8, 0x84, 0x14, 0x1a, 0xb5, 0xd7, 0x5c, 0x84, 0x6b, 0x15, 0xb2, 0x52, - 0x86, 0xd5, 0x34, 0x6c, 0x98, 0xab, 0x9a, 0xf9, 0xd8, 0x39, 0x7e, 0x97, 0x0f, 0xff, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x98, 0x9f, 0xa5, 0xa4, 0x62, 0x02, 0x00, 0x00, +func init() { proto.RegisterFile("request.proto", fileDescriptor_request_e3c7c74833c22ef4) } + +var fileDescriptor_request_e3c7c74833c22ef4 = []byte{ + // 439 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x6f, 0xd3, 0x30, + 0x14, 0xc7, 0x49, 0x97, 0xb5, 0x91, 0xdb, 0x66, 0x96, 0x7b, 0xa9, 0x76, 0x40, 0x53, 0x24, 0xc4, + 0xc4, 0x21, 0xa1, 0xe3, 0xc0, 0x81, 0x53, 0x9a, 0x7a, 0x10, 0xd6, 0xa5, 0x93, 0xe3, 0x80, 0xc4, + 0xa5, 0xf2, 0x8c, 0x69, 0x2d, 0xb5, 0x71, 0x48, 0xdc, 0x48, 0xf9, 0x10, 0x7c, 0x1e, 0x3e, 0x0f, + 0xdf, 0x04, 0xb9, 0x49, 0x25, 0x98, 0x76, 0x7c, 0xef, 0xff, 0xff, 0xff, 0xde, 0x4b, 0x9e, 0xc1, + 0xb8, 0x14, 0x3f, 0x0f, 0xa2, 0xd2, 0x7e, 0x51, 0x2a, 0xad, 0x50, 0xaf, 0x9e, 0x5d, 0x8e, 0x2b, + 0x51, 0xd6, 0x92, 0x8b, 0xb6, 0x75, 0xe9, 0x72, 0x95, 0xeb, 0x92, 0xf1, 0xce, 0xe2, 0xcd, 0x81, + 0xbb, 0x90, 0x15, 0x57, 0xb5, 0x28, 0x6f, 0xe5, 0x4e, 0x8b, 0x12, 0xbd, 0x05, 0x93, 0x55, 0xbe, + 0x6b, 0x3e, 0x09, 0xb6, 0xd3, 0xdb, 0x26, 0xce, 0x2b, 0xcd, 0x72, 0x2e, 0xa6, 0xd6, 0x95, 0x75, + 0xed, 0x90, 0xe7, 0x24, 0xef, 0x4f, 0x0f, 0x5c, 0x9c, 0x20, 0xa4, 0x5d, 0x00, 0x7d, 0x00, 0xb6, + 0x6e, 0x8a, 0x36, 0xe6, 0xde, 0xbc, 0xf6, 0xeb, 0x99, 0xff, 0xc4, 0xf2, 0xb4, 0xa6, 0x4d, 0x21, + 0xc8, 0x31, 0x84, 0x5e, 0x81, 0x41, 0xb7, 0xf5, 0xb4, 0x77, 0x65, 0x5d, 0x0f, 0x6f, 0x86, 0x26, + 0x9f, 0xb6, 0x2d, 0x72, 0xd2, 0xd0, 0x1b, 0xd0, 0x6f, 0x77, 0x9e, 0xbe, 0x3c, 0xba, 0xd0, 0xbf, + 0x53, 0x5a, 0x85, 0x74, 0x0e, 0xef, 0xb7, 0x05, 0x26, 0xcf, 0x0c, 0x44, 0x43, 0x30, 0xc8, 0x92, + 0xbb, 0x64, 0xf5, 0x35, 0x81, 0x2f, 0xd0, 0x08, 0x38, 0x71, 0x92, 0xd2, 0x30, 0x89, 0x30, 0xb4, + 0x8c, 0x14, 0x2d, 0xb3, 0x94, 0x62, 0x02, 0x7b, 0xa6, 0x20, 0xab, 0x8c, 0xc6, 0xc9, 0x47, 0x78, + 0x86, 0x5c, 0x00, 0x48, 0x48, 0xf1, 0x7a, 0x19, 0xdf, 0xc7, 0x14, 0xda, 0x68, 0x02, 0x2e, 0xa2, + 0x98, 0x44, 0x59, 0x4c, 0xd7, 0x73, 0x82, 0xc3, 0x3b, 0x4c, 0xe0, 0xb9, 0x81, 0xa5, 0x98, 0x7c, + 0x89, 0x23, 0x9c, 0xc2, 0xbe, 0x89, 0x24, 0xe1, 0x3d, 0x4e, 0x1f, 0x42, 0x53, 0x8f, 0x10, 0x02, + 0xee, 0x6d, 0x98, 0x2d, 0xe9, 0x7a, 0x81, 0x29, 0x8e, 0xe8, 0x8a, 0xc0, 0x31, 0x72, 0x80, 0xbd, + 0x0c, 0x13, 0x0c, 0xbf, 0x7b, 0xb6, 0x33, 0x80, 0x43, 0xcf, 0x76, 0x5c, 0xc8, 0x3f, 0xdb, 0xce, + 0x19, 0x3c, 0x9f, 0xff, 0xb2, 0xc0, 0x7b, 0xae, 0xf6, 0xbe, 0x16, 0x39, 0x17, 0xb9, 0xf6, 0x0b, + 0xb5, 0x63, 0xa5, 0xac, 0xfc, 0xaa, 0x10, 0x5c, 0xfe, 0x90, 0x9c, 0x69, 0xa9, 0x72, 0x9f, 0x15, + 0xd2, 0xfc, 0x83, 0xd3, 0xc9, 0xf7, 0x2c, 0x67, 0x1b, 0x31, 0x1f, 0x75, 0x1f, 0xfc, 0x60, 0x2e, + 0xfe, 0x6d, 0xb1, 0x91, 0x7a, 0x7b, 0x78, 0xf4, 0xb9, 0xda, 0x07, 0x1d, 0x65, 0x2f, 0xaa, 0x6d, + 0xf0, 0x1f, 0x29, 0xa8, 0xd4, 0xa1, 0xe4, 0x22, 0xd8, 0xa8, 0x80, 0x15, 0x32, 0xa8, 0x67, 0x41, + 0xc7, 0x5c, 0xb7, 0xcc, 0xc7, 0xfe, 0xf1, 0xf9, 0xbc, 0xfb, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xea, + 0x5c, 0x0d, 0x87, 0x72, 0x02, 0x00, 0x00, } diff --git a/source/go/api/v1/service_manage/response.pb.go b/source/go/api/v1/service_manage/response.pb.go index 0dfbaccd..f3a7ecf3 100644 --- a/source/go/api/v1/service_manage/response.pb.go +++ b/source/go/api/v1/service_manage/response.pb.go @@ -36,18 +36,20 @@ const ( DiscoverResponse_SERVICES DiscoverResponse_DiscoverResponseType = 6 DiscoverResponse_NAMESPACES DiscoverResponse_DiscoverResponseType = 12 DiscoverResponse_FAULT_DETECTOR DiscoverResponse_DiscoverResponseType = 13 + DiscoverResponse_LANE DiscoverResponse_DiscoverResponseType = 100 ) var DiscoverResponse_DiscoverResponseType_name = map[int32]string{ - 0: "UNKNOWN", - 1: "INSTANCE", - 2: "CLUSTER", - 3: "ROUTING", - 4: "RATE_LIMIT", - 5: "CIRCUIT_BREAKER", - 6: "SERVICES", - 12: "NAMESPACES", - 13: "FAULT_DETECTOR", + 0: "UNKNOWN", + 1: "INSTANCE", + 2: "CLUSTER", + 3: "ROUTING", + 4: "RATE_LIMIT", + 5: "CIRCUIT_BREAKER", + 6: "SERVICES", + 12: "NAMESPACES", + 13: "FAULT_DETECTOR", + 100: "LANE", } var DiscoverResponse_DiscoverResponseType_value = map[string]int32{ "UNKNOWN": 0, @@ -59,13 +61,14 @@ var DiscoverResponse_DiscoverResponseType_value = map[string]int32{ "SERVICES": 6, "NAMESPACES": 12, "FAULT_DETECTOR": 13, + "LANE": 100, } func (x DiscoverResponse_DiscoverResponseType) String() string { return proto.EnumName(DiscoverResponse_DiscoverResponseType_name, int32(x)) } func (DiscoverResponse_DiscoverResponseType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{3, 0} + return fileDescriptor_response_4c25fa54242d5154, []int{3, 0} } type Response struct { @@ -101,7 +104,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{0} + return fileDescriptor_response_4c25fa54242d5154, []int{0} } func (m *Response) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Response.Unmarshal(m, b) @@ -296,7 +299,7 @@ func (m *BatchWriteResponse) Reset() { *m = BatchWriteResponse{} } func (m *BatchWriteResponse) String() string { return proto.CompactTextString(m) } func (*BatchWriteResponse) ProtoMessage() {} func (*BatchWriteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{1} + return fileDescriptor_response_4c25fa54242d5154, []int{1} } func (m *BatchWriteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BatchWriteResponse.Unmarshal(m, b) @@ -371,7 +374,7 @@ func (m *BatchQueryResponse) Reset() { *m = BatchQueryResponse{} } func (m *BatchQueryResponse) String() string { return proto.CompactTextString(m) } func (*BatchQueryResponse) ProtoMessage() {} func (*BatchQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{2} + return fileDescriptor_response_4c25fa54242d5154, []int{2} } func (m *BatchQueryResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BatchQueryResponse.Unmarshal(m, b) @@ -523,6 +526,7 @@ type DiscoverResponse struct { Namespaces []*model.Namespace `protobuf:"bytes,10,rep,name=namespaces,proto3" json:"namespaces,omitempty"` FaultDetector *fault_tolerance.FaultDetector `protobuf:"bytes,11,opt,name=faultDetector,proto3" json:"faultDetector,omitempty"` AliasFor *Service `protobuf:"bytes,21,opt,name=aliasFor,proto3" json:"aliasFor,omitempty"` + Lanes []*traffic_manage.LaneGroup `protobuf:"bytes,22,rep,name=lanes,proto3" json:"lanes,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -532,7 +536,7 @@ func (m *DiscoverResponse) Reset() { *m = DiscoverResponse{} } func (m *DiscoverResponse) String() string { return proto.CompactTextString(m) } func (*DiscoverResponse) ProtoMessage() {} func (*DiscoverResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{3} + return fileDescriptor_response_4c25fa54242d5154, []int{3} } func (m *DiscoverResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DiscoverResponse.Unmarshal(m, b) @@ -636,6 +640,13 @@ func (m *DiscoverResponse) GetAliasFor() *Service { return nil } +func (m *DiscoverResponse) GetLanes() []*traffic_manage.LaneGroup { + if m != nil { + return m.Lanes + } + return nil +} + type OptionSwitch struct { Options map[string]string `protobuf:"bytes,1,rep,name=options,proto3" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -647,7 +658,7 @@ func (m *OptionSwitch) Reset() { *m = OptionSwitch{} } func (m *OptionSwitch) String() string { return proto.CompactTextString(m) } func (*OptionSwitch) ProtoMessage() {} func (*OptionSwitch) Descriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{4} + return fileDescriptor_response_4c25fa54242d5154, []int{4} } func (m *OptionSwitch) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OptionSwitch.Unmarshal(m, b) @@ -685,7 +696,7 @@ func (m *InstanceLabels) Reset() { *m = InstanceLabels{} } func (m *InstanceLabels) String() string { return proto.CompactTextString(m) } func (*InstanceLabels) ProtoMessage() {} func (*InstanceLabels) Descriptor() ([]byte, []int) { - return fileDescriptor_response_73c9d1794e5a83a7, []int{5} + return fileDescriptor_response_4c25fa54242d5154, []int{5} } func (m *InstanceLabels) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InstanceLabels.Unmarshal(m, b) @@ -724,96 +735,98 @@ func init() { proto.RegisterEnum("v1.DiscoverResponse_DiscoverResponseType", DiscoverResponse_DiscoverResponseType_name, DiscoverResponse_DiscoverResponseType_value) } -func init() { proto.RegisterFile("response.proto", fileDescriptor_response_73c9d1794e5a83a7) } - -var fileDescriptor_response_73c9d1794e5a83a7 = []byte{ - // 1399 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x6e, 0xdb, 0xc6, - 0x12, 0x3e, 0xb2, 0xf5, 0x3b, 0x92, 0x15, 0x9d, 0xb5, 0x9c, 0xb3, 0xd1, 0x49, 0x8c, 0x40, 0xc8, - 0xc9, 0x71, 0x1d, 0x54, 0x8a, 0x9d, 0xa0, 0x0e, 0x02, 0xe4, 0x42, 0x96, 0xa9, 0x54, 0x8d, 0x2c, - 0xa7, 0x2b, 0x29, 0x29, 0x7a, 0x23, 0xd0, 0xf4, 0x5a, 0x5e, 0x84, 0x22, 0x05, 0x2e, 0xe9, 0x40, - 0xbd, 0x2d, 0xd0, 0xcb, 0xde, 0xf4, 0x45, 0xfa, 0x02, 0x7d, 0x8d, 0x3e, 0x40, 0x9f, 0xa4, 0xd8, - 0xe5, 0x92, 0x4b, 0xca, 0xae, 0x92, 0xab, 0xdc, 0xd8, 0xdc, 0xf9, 0xbe, 0x19, 0xee, 0xcc, 0xce, - 0x7e, 0x1c, 0x41, 0xd5, 0xa3, 0x7c, 0xe1, 0x3a, 0x9c, 0xb6, 0x16, 0x9e, 0xeb, 0xbb, 0x68, 0xe3, - 0xfa, 0xa0, 0xb1, 0x3b, 0x73, 0xdd, 0x99, 0x4d, 0xdb, 0xd2, 0x72, 0x1e, 0x5c, 0xb6, 0x3f, 0x7a, - 0xe6, 0x62, 0x41, 0x3d, 0x1e, 0x72, 0x1a, 0xf7, 0x56, 0x71, 0xd3, 0x59, 0x2a, 0xe8, 0x8e, 0x63, - 0xce, 0x29, 0x5f, 0x98, 0x96, 0x8a, 0xd7, 0xd8, 0xe2, 0xd4, 0xbb, 0x66, 0x7a, 0xe9, 0xb9, 0x81, - 0xcf, 0x9c, 0x59, 0x44, 0xf7, 0x4c, 0x9f, 0xda, 0x6c, 0xce, 0x7c, 0x65, 0xa8, 0x5b, 0xcc, 0xb3, - 0x02, 0xe6, 0x9f, 0x7b, 0xd4, 0xfc, 0x40, 0x3d, 0x65, 0x2d, 0xcf, 0xdd, 0x0b, 0x6a, 0xab, 0x45, - 0xc5, 0xb2, 0x19, 0x75, 0x22, 0x87, 0x6d, 0xcb, 0x75, 0x2e, 0xd9, 0xcc, 0xa3, 0x36, 0x35, 0xa3, - 0x24, 0x1a, 0xf5, 0x4b, 0x33, 0xb0, 0xfd, 0xe9, 0x05, 0xf5, 0xa9, 0xe5, 0xbb, 0x51, 0x14, 0x30, - 0x03, 0xff, 0x4a, 0x3d, 0x57, 0x2d, 0xd7, 0xf1, 0x3d, 0xd3, 0x52, 0x61, 0x9a, 0xbf, 0x94, 0xa0, - 0x48, 0x54, 0x25, 0xd0, 0x53, 0xc8, 0x5a, 0xee, 0x05, 0xc5, 0x99, 0x87, 0x99, 0xbd, 0xf2, 0xe1, - 0xfd, 0x56, 0x98, 0x6e, 0x2b, 0x4a, 0xb7, 0x35, 0xe9, 0x3b, 0xfe, 0xb3, 0xc3, 0x77, 0xa6, 0x1d, - 0x50, 0x22, 0x99, 0xc2, 0x83, 0x39, 0x97, 0x2e, 0xde, 0xf8, 0x07, 0x8f, 0x91, 0xef, 0x31, 0x67, - 0xa6, 0x3c, 0x04, 0x13, 0x35, 0x21, 0x1f, 0xe6, 0x81, 0x37, 0xa5, 0x0f, 0xb4, 0xae, 0x0f, 0x5a, - 0x5d, 0x69, 0x21, 0x0a, 0x41, 0x4f, 0xa0, 0x14, 0x97, 0x13, 0x67, 0x25, 0x6d, 0x4b, 0xd0, 0x86, - 0x91, 0x91, 0x68, 0x1c, 0xfd, 0x0f, 0x0a, 0xaa, 0xd4, 0x38, 0x27, 0xa9, 0x65, 0x41, 0x1d, 0x85, - 0x26, 0x12, 0x61, 0x68, 0x0f, 0x8a, 0xcc, 0xe1, 0xbe, 0xe9, 0x58, 0x14, 0xe7, 0x25, 0xaf, 0x22, - 0x78, 0x7d, 0x65, 0x23, 0x31, 0x2a, 0x02, 0xaa, 0xc3, 0xc2, 0x05, 0x1d, 0x90, 0x84, 0x26, 0x12, - 0x61, 0xe8, 0x31, 0xe4, 0x4c, 0x9b, 0x99, 0x1c, 0x17, 0x25, 0xa9, 0x96, 0x78, 0x6b, 0x47, 0xd8, - 0x49, 0x08, 0xa3, 0xc7, 0x50, 0x12, 0x87, 0x3d, 0x10, 0x87, 0x8d, 0x4b, 0x92, 0x5b, 0x94, 0x01, - 0x03, 0x9b, 0x12, 0x0d, 0xa1, 0x97, 0x50, 0x55, 0x3d, 0x70, 0x1c, 0xf6, 0x00, 0x06, 0x49, 0x46, - 0xb2, 0x40, 0x29, 0x84, 0xac, 0x30, 0xd1, 0x11, 0x6c, 0x85, 0xed, 0x40, 0xc2, 0x76, 0xc0, 0x65, - 0xe9, 0xfa, 0x6f, 0xe9, 0x9a, 0x04, 0x48, 0x9a, 0x87, 0xee, 0x43, 0x36, 0xe0, 0xd4, 0xc3, 0xdb, - 0x7a, 0x5f, 0x13, 0x4e, 0x3d, 0x22, 0xad, 0xe2, 0x1c, 0xc4, 0xff, 0xd7, 0x9e, 0x1b, 0x2c, 0x70, - 0x5d, 0x9f, 0xc3, 0x24, 0x32, 0x12, 0x8d, 0xa3, 0xe7, 0x50, 0x11, 0x7d, 0x36, 0xf2, 0x45, 0x4a, - 0xb3, 0x25, 0xde, 0xd1, 0x65, 0xe9, 0x24, 0xec, 0x24, 0xc5, 0x42, 0x07, 0x50, 0xf4, 0xa8, 0x6d, - 0xfa, 0xcc, 0x75, 0xf0, 0x5d, 0xe9, 0xb1, 0x93, 0x7e, 0x83, 0x02, 0x49, 0x4c, 0x13, 0xc9, 0xda, - 0xee, 0x8c, 0x39, 0x51, 0xdb, 0xe2, 0xff, 0xe8, 0x64, 0x07, 0x49, 0x80, 0xa4, 0x79, 0xa8, 0x07, - 0x68, 0xee, 0x5e, 0xb0, 0xcb, 0x65, 0x72, 0x3f, 0x18, 0x4b, 0xef, 0xbb, 0xc2, 0xfb, 0xf4, 0x06, - 0x4a, 0x6e, 0xf1, 0x40, 0xaf, 0xe0, 0x4e, 0x68, 0x8d, 0x77, 0x89, 0xef, 0xc9, 0x20, 0xdb, 0x3a, - 0x88, 0x4e, 0x60, 0x95, 0x8b, 0x9e, 0x41, 0xc9, 0xa3, 0xdc, 0x0d, 0x3c, 0x8b, 0x72, 0xdc, 0xd0, - 0x39, 0xc7, 0xef, 0x8c, 0x40, 0xa2, 0x79, 0xa2, 0xba, 0xee, 0x42, 0xa4, 0x3f, 0xfa, 0xc8, 0x7c, - 0xeb, 0x0a, 0xff, 0x57, 0x57, 0xf7, 0x2c, 0x61, 0x27, 0x29, 0x96, 0xe8, 0xa9, 0xa8, 0xad, 0x07, - 0xe6, 0x39, 0xb5, 0x39, 0xbe, 0xaf, 0x7b, 0xaa, 0x9f, 0x42, 0xc8, 0x0a, 0x13, 0xed, 0x41, 0xf6, - 0xc2, 0xf4, 0x4d, 0xfc, 0x40, 0x7a, 0xd4, 0x6f, 0x5c, 0xed, 0x8e, 0xb3, 0x24, 0x92, 0x21, 0xea, - 0xa1, 0x6e, 0x59, 0x57, 0x89, 0x0b, 0xde, 0xd5, 0xf5, 0x18, 0xa5, 0x21, 0xb2, 0xca, 0xfd, 0x2e, - 0x5b, 0xac, 0xd4, 0xb6, 0x9b, 0x7f, 0x66, 0x00, 0x1d, 0x9b, 0xbe, 0x75, 0xf5, 0xde, 0x63, 0x3e, - 0xfd, 0xa2, 0x92, 0xf4, 0x14, 0xb2, 0x9c, 0xfd, 0x44, 0x95, 0x20, 0x7d, 0xe2, 0x1d, 0x82, 0x89, - 0xf6, 0xe5, 0x11, 0xca, 0x1d, 0x72, 0x9c, 0x7d, 0xb8, 0x19, 0xa9, 0x49, 0xdc, 0x79, 0x1a, 0x6e, - 0xfe, 0x9e, 0x57, 0x89, 0x7d, 0x1f, 0x50, 0x6f, 0xf9, 0x45, 0x13, 0x7b, 0x0e, 0x79, 0x73, 0xee, - 0x06, 0xb1, 0xd6, 0xae, 0x7f, 0x8b, 0xe2, 0xc6, 0xe5, 0xc8, 0x7e, 0x76, 0x39, 0xbe, 0x06, 0x88, - 0xf5, 0x98, 0xe3, 0x9c, 0xac, 0xc7, 0x8a, 0x60, 0x27, 0x08, 0xe8, 0xff, 0x50, 0x54, 0x3d, 0xc0, - 0x71, 0x5e, 0x92, 0x53, 0x92, 0x1d, 0x83, 0xa2, 0xcc, 0x51, 0x53, 0x72, 0x5c, 0xd0, 0x65, 0x8e, - 0x45, 0x5b, 0xc3, 0x22, 0xa8, 0x52, 0x66, 0xa1, 0xc8, 0x9b, 0xab, 0xb2, 0x1d, 0x83, 0x68, 0x1f, - 0x0a, 0x52, 0x98, 0x29, 0xc7, 0x25, 0xc9, 0xbb, 0xa9, 0xdc, 0x11, 0x01, 0xed, 0x01, 0xc4, 0x02, - 0xcd, 0x31, 0x48, 0xba, 0x16, 0xef, 0x04, 0x86, 0x0c, 0x40, 0xa1, 0xb2, 0xbe, 0x67, 0xfe, 0xd5, - 0x28, 0xca, 0xae, 0x2c, 0x3d, 0x76, 0xb4, 0x0c, 0x27, 0x50, 0x72, 0x8b, 0x03, 0xda, 0x85, 0x9c, - 0x50, 0x54, 0x8e, 0x91, 0x7e, 0x97, 0x14, 0xe4, 0xd0, 0x2c, 0x2a, 0x1d, 0x2b, 0x2e, 0xc7, 0xdb, - 0xba, 0xd2, 0x5a, 0x6f, 0x12, 0x04, 0xf4, 0x02, 0xaa, 0x09, 0xb5, 0x65, 0x94, 0xe3, 0xba, 0x4e, - 0x39, 0xa5, 0x73, 0x2b, 0x3c, 0xf4, 0x08, 0x0a, 0xe1, 0xc7, 0x98, 0xe3, 0x1d, 0xe9, 0x92, 0xfc, - 0x4e, 0x47, 0x50, 0xac, 0x11, 0x77, 0x25, 0x65, 0x9d, 0x46, 0x88, 0xaf, 0x74, 0x30, 0x9f, 0x9b, - 0xde, 0x52, 0xc9, 0x75, 0x78, 0xe4, 0xa1, 0x89, 0x44, 0x98, 0xd4, 0x02, 0xd4, 0xfc, 0x23, 0x0f, - 0xb5, 0x13, 0xc6, 0x2d, 0xf7, 0x9a, 0x7a, 0x5f, 0xf4, 0xc2, 0xbc, 0x82, 0xac, 0xbf, 0x5c, 0x84, - 0x4a, 0x50, 0x3d, 0xfc, 0x4a, 0x6c, 0x71, 0x75, 0x1f, 0x37, 0x0c, 0xe3, 0xe5, 0x82, 0x12, 0xe9, - 0x96, 0x1c, 0x45, 0xb2, 0x6b, 0x46, 0x91, 0x54, 0x5b, 0xe7, 0xd6, 0xb7, 0x75, 0x62, 0x18, 0xc9, - 0xaf, 0x19, 0x46, 0x9e, 0x24, 0x87, 0x8c, 0x82, 0xfe, 0x52, 0x93, 0xc8, 0xb8, 0x7e, 0xd2, 0x28, - 0x7e, 0xf6, 0xa4, 0x91, 0xbc, 0xbb, 0xa5, 0x75, 0x77, 0x37, 0xad, 0x09, 0xf0, 0x29, 0x4d, 0x38, - 0x82, 0x2d, 0x39, 0xbb, 0x9e, 0xa8, 0xd1, 0x35, 0x39, 0xc1, 0xf4, 0x92, 0x00, 0x49, 0xf3, 0xc4, - 0x86, 0xe4, 0x6d, 0xed, 0xb9, 0x9e, 0x1a, 0x39, 0xd2, 0x1b, 0x8a, 0xc0, 0xe6, 0x5f, 0x19, 0xa8, - 0xdf, 0x76, 0x76, 0xa8, 0x0c, 0x85, 0xc9, 0xf0, 0xcd, 0xf0, 0xec, 0xfd, 0xb0, 0xf6, 0x2f, 0x54, - 0x81, 0x62, 0x7f, 0x38, 0x1a, 0x77, 0x86, 0x5d, 0xa3, 0x96, 0x11, 0x50, 0x77, 0x30, 0x19, 0x8d, - 0x0d, 0x52, 0xdb, 0x10, 0x0b, 0x72, 0x36, 0x19, 0xf7, 0x87, 0xaf, 0x6b, 0x9b, 0xa8, 0x0a, 0x40, - 0x3a, 0x63, 0x63, 0x3a, 0xe8, 0x9f, 0xf6, 0xc7, 0xb5, 0x2c, 0xda, 0x86, 0x3b, 0xdd, 0x3e, 0xe9, - 0x4e, 0xfa, 0xe3, 0xe9, 0x31, 0x31, 0x3a, 0x6f, 0x0c, 0x52, 0xcb, 0x89, 0x60, 0x23, 0x83, 0xbc, - 0xeb, 0x77, 0x8d, 0x51, 0x2d, 0x2f, 0x5c, 0x86, 0x9d, 0x53, 0x63, 0xf4, 0xb6, 0x23, 0xd6, 0x15, - 0x84, 0xa0, 0xda, 0xeb, 0x4c, 0x06, 0xe3, 0xe9, 0x89, 0x31, 0x36, 0xba, 0xe3, 0x33, 0x52, 0xdb, - 0x6a, 0x66, 0x8b, 0x85, 0x5a, 0x79, 0x3f, 0x7b, 0x6a, 0x8c, 0xbe, 0xdd, 0x2f, 0x8b, 0xbf, 0xd3, - 0xee, 0xd9, 0xb0, 0xd7, 0x7f, 0xbd, 0x5f, 0xed, 0x0d, 0x26, 0x3f, 0x4c, 0x4f, 0x8e, 0x89, 0xd1, - 0x23, 0x02, 0x2c, 0xca, 0xf5, 0xe8, 0xe4, 0xcd, 0x7e, 0x39, 0x7c, 0x32, 0xc8, 0x3b, 0x83, 0xc8, - 0xfb, 0xb3, 0xd3, 0xfc, 0x39, 0x03, 0x95, 0xe4, 0x54, 0x80, 0x8e, 0xa0, 0x10, 0xce, 0x05, 0x1c, - 0x67, 0xe4, 0x49, 0x3c, 0x58, 0x1d, 0x1c, 0xd4, 0x82, 0x1b, 0x8e, 0x2f, 0xee, 0xa3, 0x62, 0x37, - 0x5e, 0x46, 0x81, 0x42, 0x00, 0xd5, 0x60, 0xf3, 0x03, 0x5d, 0xca, 0x3b, 0x58, 0x22, 0xe2, 0x11, - 0xd5, 0x21, 0x77, 0x2d, 0x6e, 0x90, 0xbc, 0x65, 0x25, 0x12, 0x2e, 0x5e, 0x6e, 0xbc, 0xc8, 0x34, - 0x7f, 0xcb, 0x40, 0x35, 0x3d, 0x63, 0xa0, 0x6f, 0x20, 0x6f, 0x87, 0x73, 0x48, 0xb8, 0x8d, 0xdd, - 0x9b, 0x73, 0x48, 0x2b, 0xfc, 0x17, 0xee, 0x43, 0xb1, 0x1b, 0x7d, 0x28, 0x27, 0xcc, 0xb7, 0xec, - 0xe2, 0x51, 0x72, 0x17, 0xe5, 0xc3, 0xaa, 0x9a, 0xa7, 0x98, 0x33, 0x1b, 0x30, 0xee, 0x27, 0x76, - 0x75, 0xfc, 0x6b, 0x06, 0x8e, 0x2c, 0x77, 0xde, 0xf2, 0xa9, 0x63, 0xc9, 0x5f, 0x53, 0xae, 0x6d, - 0x7a, 0x8c, 0xb7, 0xf8, 0x82, 0x5a, 0xec, 0x92, 0x59, 0x72, 0xc6, 0x6c, 0x99, 0x0b, 0x26, 0x42, - 0x44, 0xbf, 0xe1, 0xe6, 0xa6, 0x63, 0xce, 0xe8, 0xf1, 0x56, 0xd4, 0x37, 0x6f, 0x85, 0x84, 0xfc, - 0x78, 0x32, 0x63, 0xfe, 0x55, 0x70, 0xde, 0xb2, 0xdc, 0x79, 0x5b, 0x85, 0x99, 0x53, 0x7e, 0xd5, - 0x4e, 0x85, 0x6a, 0x87, 0x13, 0x5c, 0x7b, 0xe6, 0xb6, 0xcd, 0x05, 0x6b, 0x5f, 0x1f, 0xb4, 0x55, - 0xd0, 0x69, 0x18, 0xf4, 0x3c, 0x2f, 0xf5, 0xe8, 0xd9, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe2, - 0x7d, 0x7d, 0x6f, 0x91, 0x0e, 0x00, 0x00, +func init() { proto.RegisterFile("response.proto", fileDescriptor_response_4c25fa54242d5154) } + +var fileDescriptor_response_4c25fa54242d5154 = []byte{ + // 1428 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x52, 0x1b, 0x47, + 0x10, 0x8e, 0x60, 0xf5, 0xd7, 0x02, 0x79, 0x33, 0x80, 0x33, 0x26, 0x36, 0xe5, 0x52, 0x1c, 0x87, + 0xe0, 0x8a, 0x64, 0xb0, 0x2b, 0xb8, 0x5c, 0xe5, 0x83, 0x10, 0x8b, 0xa3, 0x58, 0x08, 0x67, 0x24, + 0xd9, 0xa9, 0x5c, 0xa8, 0x65, 0x19, 0xc4, 0x94, 0x57, 0xbb, 0xaa, 0x9d, 0x5d, 0x5c, 0xca, 0x35, + 0x55, 0x39, 0xe6, 0x92, 0x17, 0xc9, 0xd3, 0xe4, 0x41, 0xfc, 0x04, 0xa9, 0xf9, 0xd9, 0x3f, 0x41, + 0x64, 0x9f, 0x7c, 0x01, 0x6d, 0x7f, 0x5f, 0xf7, 0x76, 0xf7, 0xf4, 0x7c, 0x6a, 0x41, 0x3d, 0xa0, + 0x7c, 0xea, 0x7b, 0x9c, 0x36, 0xa7, 0x81, 0x1f, 0xfa, 0x68, 0xe9, 0x6a, 0x77, 0x73, 0x6b, 0xec, + 0xfb, 0x63, 0x97, 0xb6, 0xa4, 0xe5, 0x2c, 0xba, 0x68, 0xbd, 0x0f, 0xec, 0xe9, 0x94, 0x06, 0x5c, + 0x71, 0x36, 0xef, 0xcc, 0xe3, 0xb6, 0x37, 0xd3, 0xd0, 0x2d, 0xcf, 0x9e, 0x50, 0x3e, 0xb5, 0x1d, + 0x1d, 0x6f, 0x73, 0x95, 0xd3, 0xe0, 0x8a, 0xa5, 0x8f, 0x81, 0x1f, 0x85, 0xcc, 0x1b, 0xc7, 0xf4, + 0xc0, 0x0e, 0xa9, 0xcb, 0x26, 0x2c, 0xd4, 0x86, 0x75, 0x87, 0x05, 0x4e, 0xc4, 0xc2, 0xb3, 0x80, + 0xda, 0xef, 0x68, 0xa0, 0xad, 0xb5, 0x89, 0x7f, 0x4e, 0x5d, 0xfd, 0xb0, 0xe2, 0xb8, 0x8c, 0x7a, + 0xb1, 0xc3, 0x9a, 0xe3, 0x7b, 0x17, 0x6c, 0x1c, 0x50, 0x97, 0xda, 0x71, 0x11, 0x9b, 0xeb, 0x17, + 0x76, 0xe4, 0x86, 0xa7, 0xe7, 0x34, 0xa4, 0x4e, 0xe8, 0xc7, 0x51, 0xc0, 0x8e, 0xc2, 0x4b, 0xfd, + 0xb9, 0xee, 0xf8, 0x5e, 0x18, 0xd8, 0x4e, 0x1c, 0x06, 0x5c, 0xdb, 0xd3, 0xde, 0x8d, 0x3f, 0xab, + 0x50, 0x21, 0xba, 0x2b, 0xe8, 0x31, 0x18, 0x8e, 0x7f, 0x4e, 0x71, 0xe1, 0x7e, 0x61, 0xbb, 0xb6, + 0x77, 0xb7, 0xa9, 0x4a, 0x6f, 0xc6, 0xa5, 0x37, 0x47, 0x5d, 0x2f, 0x7c, 0xb2, 0xf7, 0xc6, 0x76, + 0x23, 0x4a, 0x24, 0x53, 0x78, 0x30, 0xef, 0xc2, 0xc7, 0x4b, 0xff, 0xe3, 0x31, 0x08, 0x03, 0xe6, + 0x8d, 0xb5, 0x87, 0x60, 0xa2, 0x06, 0x94, 0x54, 0x4d, 0x78, 0x59, 0xfa, 0x40, 0xf3, 0x6a, 0xb7, + 0xd9, 0x91, 0x16, 0xa2, 0x11, 0xf4, 0x08, 0xaa, 0x49, 0x6b, 0xb1, 0x21, 0x69, 0xab, 0x82, 0xd6, + 0x8f, 0x8d, 0x24, 0xc5, 0xd1, 0xb7, 0x50, 0xd6, 0x6d, 0xc7, 0x45, 0x49, 0xad, 0x09, 0xea, 0x40, + 0x99, 0x48, 0x8c, 0xa1, 0x6d, 0xa8, 0x30, 0x8f, 0x87, 0xb6, 0xe7, 0x50, 0x5c, 0x92, 0xbc, 0x15, + 0xc1, 0xeb, 0x6a, 0x1b, 0x49, 0x50, 0x11, 0x50, 0x1f, 0x1c, 0x2e, 0xa7, 0x01, 0x89, 0x32, 0x91, + 0x18, 0x43, 0x0f, 0xa1, 0x68, 0xbb, 0xcc, 0xe6, 0xb8, 0x22, 0x49, 0x66, 0xe6, 0xad, 0x6d, 0x61, + 0x27, 0x0a, 0x46, 0x0f, 0xa1, 0x2a, 0x0e, 0xbe, 0x27, 0x0e, 0x1e, 0x57, 0x25, 0xb7, 0x22, 0x03, + 0x46, 0x2e, 0x25, 0x29, 0x84, 0x9e, 0x43, 0x5d, 0xcf, 0xc3, 0x81, 0x9a, 0x07, 0x0c, 0x92, 0x8c, + 0x64, 0x83, 0x72, 0x08, 0x99, 0x63, 0xa2, 0x7d, 0x58, 0x55, 0xa3, 0x41, 0xd4, 0x68, 0xe0, 0x9a, + 0x74, 0xfd, 0x52, 0xba, 0x66, 0x01, 0x92, 0xe7, 0xa1, 0xbb, 0x60, 0x44, 0x9c, 0x06, 0x78, 0x2d, + 0xcd, 0x6b, 0xc4, 0x69, 0x40, 0xa4, 0x55, 0x9c, 0x83, 0xf8, 0xff, 0x32, 0xf0, 0xa3, 0x29, 0x5e, + 0x4f, 0xcf, 0x61, 0x14, 0x1b, 0x49, 0x8a, 0xa3, 0xa7, 0xb0, 0x22, 0x66, 0x6e, 0x10, 0x8a, 0x92, + 0xc6, 0x33, 0xbc, 0x91, 0xb6, 0xa5, 0x9d, 0xb1, 0x93, 0x1c, 0x0b, 0xed, 0x42, 0x25, 0xa0, 0xae, + 0x1d, 0x32, 0xdf, 0xc3, 0xb7, 0xa5, 0xc7, 0x46, 0xfe, 0x0d, 0x1a, 0x24, 0x09, 0x4d, 0x14, 0xeb, + 0xfa, 0x63, 0xe6, 0xc5, 0x63, 0x8b, 0xbf, 0x4a, 0x8b, 0xed, 0x65, 0x01, 0x92, 0xe7, 0xa1, 0x23, + 0x40, 0x13, 0xff, 0x9c, 0x5d, 0xcc, 0xb2, 0xf9, 0x60, 0x2c, 0xbd, 0x6f, 0x0b, 0xef, 0xe3, 0x6b, + 0x28, 0xb9, 0xc1, 0x03, 0xbd, 0x80, 0x5b, 0xca, 0x9a, 0x64, 0x89, 0xef, 0xc8, 0x20, 0x6b, 0x69, + 0x90, 0xb4, 0x80, 0x79, 0x2e, 0x7a, 0x02, 0xd5, 0x80, 0x72, 0x3f, 0x0a, 0x1c, 0xca, 0xf1, 0x66, + 0x5a, 0x73, 0xf2, 0xce, 0x18, 0x24, 0x29, 0x4f, 0x74, 0xd7, 0x9f, 0x8a, 0xf2, 0x07, 0xef, 0x59, + 0xe8, 0x5c, 0xe2, 0xaf, 0xd3, 0xee, 0x9e, 0x64, 0xec, 0x24, 0xc7, 0x12, 0x33, 0x15, 0x8f, 0x75, + 0xcf, 0x3e, 0xa3, 0x2e, 0xc7, 0x77, 0xd3, 0x99, 0xea, 0xe6, 0x10, 0x32, 0xc7, 0x44, 0xdb, 0x60, + 0x9c, 0xdb, 0xa1, 0x8d, 0xef, 0x49, 0x8f, 0xf5, 0x6b, 0x57, 0xbb, 0xed, 0xcd, 0x88, 0x64, 0x88, + 0x7e, 0xe8, 0x5b, 0xd6, 0xd1, 0x42, 0x83, 0xb7, 0xd2, 0x7e, 0x0c, 0xf2, 0x10, 0x99, 0xe7, 0xfe, + 0x6c, 0x54, 0x56, 0xcc, 0xb5, 0xc6, 0xbf, 0x05, 0x40, 0x07, 0x76, 0xe8, 0x5c, 0xbe, 0x0d, 0x58, + 0x48, 0x3f, 0xab, 0x24, 0x3d, 0x06, 0x83, 0xb3, 0xdf, 0xa9, 0x16, 0xa4, 0x8f, 0xbc, 0x43, 0x30, + 0xd1, 0x8e, 0x3c, 0x42, 0x99, 0x21, 0xc7, 0xc6, 0xfd, 0xe5, 0x58, 0x4d, 0x92, 0xc9, 0x4b, 0xe1, + 0xc6, 0x3f, 0x25, 0x5d, 0xd8, 0x2f, 0x11, 0x0d, 0x66, 0x9f, 0xb5, 0xb0, 0xa7, 0x50, 0xb2, 0x27, + 0x7e, 0x94, 0x68, 0xed, 0xe2, 0xb7, 0x68, 0x6e, 0xd2, 0x0e, 0xe3, 0x93, 0xdb, 0xf1, 0x03, 0x40, + 0xa2, 0xc7, 0x1c, 0x17, 0x65, 0x3f, 0xe6, 0x04, 0x3b, 0x43, 0x40, 0xdf, 0x41, 0x45, 0xcf, 0x00, + 0xc7, 0x25, 0x49, 0xce, 0x49, 0x76, 0x02, 0x8a, 0x36, 0xc7, 0x43, 0xc9, 0x71, 0x39, 0x6d, 0x73, + 0x22, 0xda, 0x29, 0x2c, 0x82, 0x6a, 0x65, 0x16, 0x8a, 0xbc, 0x3c, 0x2f, 0xdb, 0x09, 0x88, 0x76, + 0xa0, 0x2c, 0x85, 0x99, 0x72, 0x5c, 0x95, 0xbc, 0xeb, 0xca, 0x1d, 0x13, 0xd0, 0x36, 0x40, 0x22, + 0xd0, 0x1c, 0x83, 0xa4, 0xa7, 0xe2, 0x9d, 0xc1, 0x90, 0x05, 0x48, 0x29, 0xeb, 0x5b, 0x16, 0x5e, + 0x0e, 0xe2, 0xea, 0x6a, 0xd2, 0x63, 0x23, 0x95, 0xe1, 0x0c, 0x4a, 0x6e, 0x70, 0x40, 0x5b, 0x50, + 0x14, 0x8a, 0xca, 0x31, 0x4a, 0xdf, 0x25, 0x05, 0x59, 0x99, 0x45, 0xa7, 0x13, 0xc5, 0xe5, 0x78, + 0x2d, 0xed, 0x74, 0xaa, 0x37, 0x19, 0x02, 0x7a, 0x06, 0xf5, 0x8c, 0xda, 0x32, 0xca, 0xf1, 0x7a, + 0x5a, 0x72, 0x4e, 0xe7, 0xe6, 0x78, 0xe8, 0x01, 0x94, 0xd5, 0x97, 0x31, 0xc7, 0x1b, 0xd2, 0x25, + 0xfb, 0x3d, 0x1d, 0x43, 0x89, 0x46, 0xdc, 0x96, 0x94, 0x45, 0x1a, 0x21, 0xbe, 0xa5, 0xa3, 0xc9, + 0xc4, 0x0e, 0x66, 0x5a, 0xae, 0xd5, 0x91, 0x2b, 0x13, 0x89, 0x31, 0xa9, 0x05, 0xa8, 0xf1, 0xa1, + 0x04, 0xe6, 0x21, 0xe3, 0x8e, 0x7f, 0x45, 0x83, 0xcf, 0x7a, 0x61, 0x5e, 0x80, 0x11, 0xce, 0xa6, + 0x4a, 0x09, 0xea, 0x7b, 0xdf, 0x8b, 0x14, 0xe7, 0xf3, 0xb8, 0x66, 0x18, 0xce, 0xa6, 0x94, 0x48, + 0xb7, 0xec, 0x2a, 0x62, 0x2c, 0x58, 0x45, 0x72, 0x63, 0x5d, 0x5c, 0x3c, 0xd6, 0x99, 0x65, 0xa4, + 0xb4, 0x60, 0x19, 0x79, 0x94, 0x5d, 0x32, 0xca, 0xe9, 0x37, 0x35, 0x89, 0x8d, 0x8b, 0x37, 0x8d, + 0xca, 0x27, 0x6f, 0x1a, 0xd9, 0xbb, 0x5b, 0x5d, 0x74, 0x77, 0xf3, 0x9a, 0x00, 0x1f, 0xd3, 0x84, + 0x7d, 0x58, 0x95, 0x7b, 0xec, 0xa1, 0x5e, 0x63, 0xb3, 0x1b, 0xcc, 0x51, 0x16, 0x20, 0x79, 0x9e, + 0x48, 0x48, 0xde, 0xd6, 0x23, 0x3f, 0xd0, 0x2b, 0x47, 0x3e, 0xa1, 0x18, 0x44, 0xdf, 0x40, 0x51, + 0xec, 0xbd, 0x5c, 0x0f, 0xab, 0xcc, 0xa5, 0x67, 0x7b, 0x54, 0xdd, 0x1a, 0x85, 0x35, 0x3e, 0x14, + 0x60, 0xfd, 0xa6, 0x03, 0x46, 0x35, 0x28, 0x8f, 0xfa, 0xaf, 0xfa, 0x27, 0x6f, 0xfb, 0xe6, 0x17, + 0x68, 0x05, 0x2a, 0xdd, 0xfe, 0x60, 0xd8, 0xee, 0x77, 0x2c, 0xb3, 0x20, 0xa0, 0x4e, 0x6f, 0x34, + 0x18, 0x5a, 0xc4, 0x5c, 0x12, 0x0f, 0xe4, 0x64, 0x34, 0xec, 0xf6, 0x5f, 0x9a, 0xcb, 0xa8, 0x0e, + 0x40, 0xda, 0x43, 0xeb, 0xb4, 0xd7, 0x3d, 0xee, 0x0e, 0x4d, 0x03, 0xad, 0xc1, 0xad, 0x4e, 0x97, + 0x74, 0x46, 0xdd, 0xe1, 0xe9, 0x01, 0xb1, 0xda, 0xaf, 0x2c, 0x62, 0x16, 0x45, 0xb0, 0x81, 0x45, + 0xde, 0x74, 0x3b, 0xd6, 0xc0, 0x2c, 0x09, 0x97, 0x7e, 0xfb, 0xd8, 0x1a, 0xbc, 0x6e, 0x8b, 0xe7, + 0x15, 0x84, 0xa0, 0x7e, 0xd4, 0x1e, 0xf5, 0x86, 0xa7, 0x87, 0xd6, 0xd0, 0xea, 0x0c, 0x4f, 0x88, + 0xb9, 0x8a, 0x2a, 0x60, 0xf4, 0xda, 0x7d, 0xcb, 0x3c, 0x6f, 0x18, 0x95, 0xb2, 0x59, 0x6b, 0x18, + 0x95, 0xba, 0xe9, 0xec, 0x18, 0xc7, 0xd6, 0xe0, 0xa7, 0x9d, 0x9a, 0xf8, 0x7b, 0xda, 0x39, 0xe9, + 0x1f, 0x75, 0x5f, 0xee, 0xd4, 0x8f, 0x7a, 0xa3, 0x5f, 0x4f, 0x0f, 0x0f, 0x88, 0x75, 0x44, 0x04, + 0x58, 0x91, 0xcf, 0x83, 0xc3, 0x57, 0x3b, 0x35, 0xf5, 0xc9, 0x22, 0x6f, 0x2c, 0x22, 0x2f, 0xdd, + 0x46, 0xe3, 0x8f, 0x02, 0xac, 0x64, 0x57, 0x09, 0xb4, 0x0f, 0x65, 0xb5, 0x4c, 0x70, 0x5c, 0x90, + 0x2d, 0xbb, 0x37, 0xbf, 0x6d, 0xe8, 0x07, 0x6e, 0x79, 0xa1, 0xb8, 0xc4, 0x9a, 0xbd, 0xf9, 0x3c, + 0x0e, 0xa4, 0x00, 0x64, 0xc2, 0xf2, 0x3b, 0x3a, 0x93, 0x17, 0xb7, 0x4a, 0xc4, 0x47, 0xb4, 0x0e, + 0xc5, 0x2b, 0x71, 0xed, 0xe4, 0xd5, 0xac, 0x12, 0xf5, 0xf0, 0x7c, 0xe9, 0x59, 0xa1, 0xf1, 0x77, + 0x01, 0xea, 0xf9, 0xc5, 0x04, 0xfd, 0x08, 0x25, 0x57, 0x2d, 0x2f, 0x2a, 0x8d, 0xad, 0xeb, 0xcb, + 0x4b, 0x53, 0xfd, 0x53, 0x79, 0x68, 0xf6, 0x66, 0x17, 0x6a, 0x19, 0xf3, 0x0d, 0x59, 0x3c, 0xc8, + 0x66, 0x51, 0xdb, 0xab, 0xeb, 0x25, 0x8c, 0x79, 0xe3, 0x1e, 0xe3, 0x61, 0x26, 0xab, 0x83, 0xbf, + 0x0a, 0xb0, 0xef, 0xf8, 0x93, 0x66, 0x48, 0x3d, 0x47, 0xfe, 0x1c, 0xf3, 0x5d, 0x3b, 0x60, 0xbc, + 0xc9, 0xa7, 0xd4, 0x61, 0x17, 0xcc, 0x91, 0x8b, 0x69, 0xd3, 0x9e, 0x32, 0x11, 0x22, 0xfe, 0x11, + 0x38, 0xb1, 0x3d, 0x7b, 0x4c, 0x0f, 0x56, 0xe3, 0x39, 0x7a, 0x2d, 0x74, 0xe7, 0xb7, 0xc3, 0x31, + 0x0b, 0x2f, 0xa3, 0xb3, 0xa6, 0xe3, 0x4f, 0x5a, 0x3a, 0xcc, 0x84, 0xf2, 0xcb, 0x56, 0x2e, 0x54, + 0x4b, 0xad, 0x7d, 0xad, 0xb1, 0xdf, 0xb2, 0xa7, 0xac, 0x75, 0xb5, 0xdb, 0xd2, 0x41, 0x4f, 0x55, + 0xd0, 0xb3, 0x92, 0x14, 0xb1, 0x27, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x68, 0x3d, 0x0e, 0x26, + 0xd2, 0x0e, 0x00, 0x00, } diff --git a/source/go/api/v1/traffic_manage/lane.pb.go b/source/go/api/v1/traffic_manage/lane.pb.go index b243ac18..689c571e 100644 --- a/source/go/api/v1/traffic_manage/lane.pb.go +++ b/source/go/api/v1/traffic_manage/lane.pb.go @@ -43,7 +43,7 @@ func (x TrafficMatchRule_TrafficMatchMode) String() string { return proto.EnumName(TrafficMatchRule_TrafficMatchMode_name, int32(x)) } func (TrafficMatchRule_TrafficMatchMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{5, 0} + return fileDescriptor_lane_3097fe36f56fba0e, []int{4, 0} } type LaneRule_LaneMatchMode int32 @@ -68,16 +68,14 @@ func (x LaneRule_LaneMatchMode) String() string { return proto.EnumName(LaneRule_LaneMatchMode_name, int32(x)) } func (LaneRule_LaneMatchMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{6, 0} + return fileDescriptor_lane_3097fe36f56fba0e, []int{5, 0} } // 流量入口 type TrafficEntry struct { // 标记流量入口类型 - // type == "polarismesh.cn/gateway/tse-gateway, 则 selector 为 - // TSEGatewaySelector type == "polarismesh.cn/gateway/spring-cloud-gateway", - // 则 selector 为 ServiceGatewaySelector type == "polarismesh.cn/service, 则 - // selector 为 ServiceSelector + // type == "polarismesh.cn/gateway/spring-cloud-gateway", 则 selector 为 ServiceGatewaySelector + // type == "polarismesh.cn/service, 则 selector 为 ServiceSelector Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` Selector *anypb.Any `protobuf:"bytes,2,opt,name=selector,proto3" json:"selector,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -89,7 +87,7 @@ func (m *TrafficEntry) Reset() { *m = TrafficEntry{} } func (m *TrafficEntry) String() string { return proto.CompactTextString(m) } func (*TrafficEntry) ProtoMessage() {} func (*TrafficEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{0} + return fileDescriptor_lane_3097fe36f56fba0e, []int{0} } func (m *TrafficEntry) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TrafficEntry.Unmarshal(m, b) @@ -123,53 +121,6 @@ func (m *TrafficEntry) GetSelector() *anypb.Any { return nil } -// 网关入口定义 -type TSEGatewaySelector struct { - InstanceId string `protobuf:"bytes,1,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"` - Services []string `protobuf:"bytes,2,rep,name=services,proto3" json:"services,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *TSEGatewaySelector) Reset() { *m = TSEGatewaySelector{} } -func (m *TSEGatewaySelector) String() string { return proto.CompactTextString(m) } -func (*TSEGatewaySelector) ProtoMessage() {} -func (*TSEGatewaySelector) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{1} -} -func (m *TSEGatewaySelector) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_TSEGatewaySelector.Unmarshal(m, b) -} -func (m *TSEGatewaySelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_TSEGatewaySelector.Marshal(b, m, deterministic) -} -func (dst *TSEGatewaySelector) XXX_Merge(src proto.Message) { - xxx_messageInfo_TSEGatewaySelector.Merge(dst, src) -} -func (m *TSEGatewaySelector) XXX_Size() int { - return xxx_messageInfo_TSEGatewaySelector.Size(m) -} -func (m *TSEGatewaySelector) XXX_DiscardUnknown() { - xxx_messageInfo_TSEGatewaySelector.DiscardUnknown(m) -} - -var xxx_messageInfo_TSEGatewaySelector proto.InternalMessageInfo - -func (m *TSEGatewaySelector) GetInstanceId() string { - if m != nil { - return m.InstanceId - } - return "" -} - -func (m *TSEGatewaySelector) GetServices() []string { - if m != nil { - return m.Services - } - return nil -} - // 微服务网关入口定义 type ServiceGatewaySelector struct { Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` @@ -185,7 +136,7 @@ func (m *ServiceGatewaySelector) Reset() { *m = ServiceGatewaySelector{} func (m *ServiceGatewaySelector) String() string { return proto.CompactTextString(m) } func (*ServiceGatewaySelector) ProtoMessage() {} func (*ServiceGatewaySelector) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{2} + return fileDescriptor_lane_3097fe36f56fba0e, []int{1} } func (m *ServiceGatewaySelector) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceGatewaySelector.Unmarshal(m, b) @@ -241,7 +192,7 @@ func (m *ServiceSelector) Reset() { *m = ServiceSelector{} } func (m *ServiceSelector) String() string { return proto.CompactTextString(m) } func (*ServiceSelector) ProtoMessage() {} func (*ServiceSelector) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{3} + return fileDescriptor_lane_3097fe36f56fba0e, []int{2} } func (m *ServiceSelector) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceSelector.Unmarshal(m, b) @@ -293,21 +244,25 @@ type LaneGroup struct { // 在泳道组内的服务列表信息 Destinations []*DestinationGroup `protobuf:"bytes,4,rep,name=destinations,proto3" json:"destinations,omitempty"` // 泳道组描述信息 + Revision string `protobuf:"bytes,7,opt,name=revision,proto3" json:"revision,omitempty"` + // 泳道组描述信息 Description string `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"` // 泳道组的创建时间 Ctime string `protobuf:"bytes,9,opt,name=ctime,proto3" json:"ctime,omitempty"` // 泳道组的更新时间 - Mtime string `protobuf:"bytes,10,opt,name=mtime,proto3" json:"mtime,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Mtime string `protobuf:"bytes,10,opt,name=mtime,proto3" json:"mtime,omitempty"` + // 泳道组内的流量入口信息 + Rules []*LaneRule `protobuf:"bytes,11,rep,name=rules,proto3" json:"rules,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LaneGroup) Reset() { *m = LaneGroup{} } func (m *LaneGroup) String() string { return proto.CompactTextString(m) } func (*LaneGroup) ProtoMessage() {} func (*LaneGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{4} + return fileDescriptor_lane_3097fe36f56fba0e, []int{3} } func (m *LaneGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LaneGroup.Unmarshal(m, b) @@ -355,6 +310,13 @@ func (m *LaneGroup) GetDestinations() []*DestinationGroup { return nil } +func (m *LaneGroup) GetRevision() string { + if m != nil { + return m.Revision + } + return "" +} + func (m *LaneGroup) GetDescription() string { if m != nil { return m.Description @@ -376,6 +338,13 @@ func (m *LaneGroup) GetMtime() string { return "" } +func (m *LaneGroup) GetRules() []*LaneRule { + if m != nil { + return m.Rules + } + return nil +} + // TrafficMatchRule 流量匹配规则 type TrafficMatchRule struct { // 流量匹配规则，判断哪些流量需要进入泳道 @@ -390,7 +359,7 @@ func (m *TrafficMatchRule) Reset() { *m = TrafficMatchRule{} } func (m *TrafficMatchRule) String() string { return proto.CompactTextString(m) } func (*TrafficMatchRule) ProtoMessage() {} func (*TrafficMatchRule) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{5} + return fileDescriptor_lane_3097fe36f56fba0e, []int{4} } func (m *TrafficMatchRule) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TrafficMatchRule.Unmarshal(m, b) @@ -430,29 +399,25 @@ type LaneRule struct { Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // 所属泳道组的名称 GroupName string `protobuf:"bytes,3,opt,name=group_name,json=groupName,proto3" json:"group_name,omitempty"` - // 泳道入口 - TrafficEntries []*TrafficEntry `protobuf:"bytes,4,rep,name=traffic_entries,json=trafficEntries,proto3" json:"traffic_entries,omitempty"` // 流量匹配规则 - TrafficMatchRule *TrafficMatchRule `protobuf:"bytes,5,opt,name=traffic_match_rule,json=trafficMatchRule,proto3" json:"traffic_match_rule,omitempty"` + TrafficMatchRule *TrafficMatchRule `protobuf:"bytes,4,opt,name=traffic_match_rule,json=trafficMatchRule,proto3" json:"traffic_match_rule,omitempty"` // 保存这个泳道的默认实例标签 - DefaultLabelValue string `protobuf:"bytes,6,opt,name=default_label_value,json=defaultLabelValue,proto3" json:"default_label_value,omitempty"` - // 在泳道内的服务 - Destinations []*DestinationGroup `protobuf:"bytes,7,rep,name=destinations,proto3" json:"destinations,omitempty"` + DefaultLabelValue string `protobuf:"bytes,5,opt,name=default_label_value,json=defaultLabelValue,proto3" json:"default_label_value,omitempty"` // 泳道规则是否启用 - Enable bool `protobuf:"varint,8,opt,name=enable,proto3" json:"enable,omitempty"` - MatchMode LaneRule_LaneMatchMode `protobuf:"varint,9,opt,name=match_mode,json=matchMode,proto3,enum=v1.LaneRule_LaneMatchMode" json:"match_mode,omitempty"` + Enable bool `protobuf:"varint,6,opt,name=enable,proto3" json:"enable,omitempty"` + MatchMode LaneRule_LaneMatchMode `protobuf:"varint,7,opt,name=match_mode,json=matchMode,proto3,enum=v1.LaneRule_LaneMatchMode" json:"match_mode,omitempty"` // revision routing version - Revision string `protobuf:"bytes,10,opt,name=revision,proto3" json:"revision,omitempty"` + Revision string `protobuf:"bytes,8,opt,name=revision,proto3" json:"revision,omitempty"` // ctime create time of the rules - Ctime string `protobuf:"bytes,11,opt,name=ctime,proto3" json:"ctime,omitempty"` + Ctime string `protobuf:"bytes,9,opt,name=ctime,proto3" json:"ctime,omitempty"` // mtime modify time of the rules - Mtime string `protobuf:"bytes,12,opt,name=mtime,proto3" json:"mtime,omitempty"` + Mtime string `protobuf:"bytes,10,opt,name=mtime,proto3" json:"mtime,omitempty"` // etime enable time of the rules - Etime string `protobuf:"bytes,13,opt,name=etime,proto3" json:"etime,omitempty"` + Etime string `protobuf:"bytes,11,opt,name=etime,proto3" json:"etime,omitempty"` // priority rules priority - Priority uint32 `protobuf:"varint,14,opt,name=priority,proto3" json:"priority,omitempty"` + Priority uint32 `protobuf:"varint,12,opt,name=priority,proto3" json:"priority,omitempty"` // description simple description rules - Description string `protobuf:"bytes,15,opt,name=description,proto3" json:"description,omitempty"` + Description string `protobuf:"bytes,13,opt,name=description,proto3" json:"description,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -462,7 +427,7 @@ func (m *LaneRule) Reset() { *m = LaneRule{} } func (m *LaneRule) String() string { return proto.CompactTextString(m) } func (*LaneRule) ProtoMessage() {} func (*LaneRule) Descriptor() ([]byte, []int) { - return fileDescriptor_lane_6a2ed5787090ff03, []int{6} + return fileDescriptor_lane_3097fe36f56fba0e, []int{5} } func (m *LaneRule) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LaneRule.Unmarshal(m, b) @@ -503,13 +468,6 @@ func (m *LaneRule) GetGroupName() string { return "" } -func (m *LaneRule) GetTrafficEntries() []*TrafficEntry { - if m != nil { - return m.TrafficEntries - } - return nil -} - func (m *LaneRule) GetTrafficMatchRule() *TrafficMatchRule { if m != nil { return m.TrafficMatchRule @@ -524,13 +482,6 @@ func (m *LaneRule) GetDefaultLabelValue() string { return "" } -func (m *LaneRule) GetDestinations() []*DestinationGroup { - if m != nil { - return m.Destinations - } - return nil -} - func (m *LaneRule) GetEnable() bool { if m != nil { return m.Enable @@ -589,7 +540,6 @@ func (m *LaneRule) GetDescription() string { func init() { proto.RegisterType((*TrafficEntry)(nil), "v1.TrafficEntry") - proto.RegisterType((*TSEGatewaySelector)(nil), "v1.TSEGatewaySelector") proto.RegisterType((*ServiceGatewaySelector)(nil), "v1.ServiceGatewaySelector") proto.RegisterMapType((map[string]*model.MatchString)(nil), "v1.ServiceGatewaySelector.LabelsEntry") proto.RegisterType((*ServiceSelector)(nil), "v1.ServiceSelector") @@ -601,59 +551,57 @@ func init() { proto.RegisterEnum("v1.LaneRule_LaneMatchMode", LaneRule_LaneMatchMode_name, LaneRule_LaneMatchMode_value) } -func init() { proto.RegisterFile("lane.proto", fileDescriptor_lane_6a2ed5787090ff03) } - -var fileDescriptor_lane_6a2ed5787090ff03 = []byte{ - // 816 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x0e, 0x25, 0x5b, 0xb6, 0x46, 0xb6, 0xcc, 0x6e, 0x8d, 0x80, 0x15, 0x5a, 0x44, 0x60, 0x91, - 0x42, 0x68, 0x51, 0xb2, 0x76, 0x0f, 0x49, 0x7a, 0x28, 0x10, 0xc7, 0x46, 0xe0, 0x22, 0x4e, 0xd3, - 0xa5, 0x90, 0x43, 0x2f, 0xc2, 0x8a, 0x1c, 0xd1, 0x8b, 0x92, 0xbb, 0xc4, 0x72, 0xa9, 0x42, 0xaf, - 0xd0, 0x57, 0xe9, 0xbb, 0xf4, 0xd0, 0x73, 0x6f, 0x7d, 0x91, 0x62, 0x97, 0xa4, 0x7e, 0x1c, 0x17, - 0x30, 0x50, 0xa0, 0xb7, 0x9d, 0x6f, 0x66, 0x67, 0xbe, 0x99, 0xf9, 0xb8, 0x04, 0xc8, 0x98, 0xc0, - 0xa0, 0x50, 0x52, 0x4b, 0xd2, 0x59, 0x9e, 0x8d, 0x3e, 0x49, 0xa5, 0x4c, 0x33, 0x0c, 0x2d, 0x32, - 0xaf, 0x16, 0x21, 0x13, 0xab, 0xda, 0x3d, 0x1a, 0xe4, 0x32, 0xc1, 0xac, 0x31, 0x8e, 0x95, 0xac, - 0x34, 0x17, 0x69, 0x6d, 0xfa, 0x53, 0x38, 0x9a, 0x2a, 0xb6, 0x58, 0xf0, 0xf8, 0x4a, 0x68, 0xb5, - 0x22, 0x04, 0xf6, 0xf4, 0xaa, 0x40, 0xcf, 0x19, 0x3b, 0x93, 0x3e, 0xb5, 0x67, 0xf2, 0x0d, 0x1c, - 0x96, 0x98, 0x61, 0xac, 0xa5, 0xf2, 0x3a, 0x63, 0x67, 0x32, 0x38, 0x3f, 0x0d, 0xea, 0x6a, 0x41, - 0x5b, 0x2d, 0x78, 0x29, 0x56, 0x74, 0x1d, 0xe5, 0xff, 0x04, 0x64, 0x1a, 0x5d, 0xbd, 0x66, 0x1a, - 0x7f, 0x65, 0xab, 0xa8, 0x41, 0xc9, 0x13, 0x18, 0x70, 0x51, 0x6a, 0x26, 0x62, 0x9c, 0xf1, 0xa4, - 0x29, 0x01, 0x2d, 0x74, 0x9d, 0x90, 0x91, 0x29, 0xa4, 0x96, 0x3c, 0xc6, 0xd2, 0xeb, 0x8c, 0xbb, - 0x93, 0x3e, 0x5d, 0xdb, 0xfe, 0x5f, 0x0e, 0x3c, 0x8e, 0x6a, 0xe3, 0x6e, 0xde, 0x4f, 0xa1, 0x2f, - 0x58, 0x8e, 0x65, 0xc1, 0xe2, 0x96, 0xf8, 0x06, 0x20, 0x1e, 0x1c, 0x34, 0x49, 0x2c, 0xf9, 0x3e, - 0x6d, 0x4d, 0xf2, 0x3d, 0xf4, 0x32, 0x36, 0xc7, 0xac, 0xf4, 0xba, 0xe3, 0xee, 0x64, 0x70, 0xfe, - 0x45, 0xb0, 0x3c, 0x0b, 0xee, 0xaf, 0x11, 0xbc, 0xb1, 0x81, 0x76, 0x46, 0xb4, 0xb9, 0x35, 0xfa, - 0x01, 0x06, 0x5b, 0x30, 0x71, 0xa1, 0xfb, 0x0b, 0xae, 0x1a, 0x02, 0xe6, 0x48, 0x9e, 0xc2, 0xfe, - 0x92, 0x65, 0x15, 0x36, 0x53, 0x3b, 0x31, 0xf9, 0x6f, 0x98, 0x8e, 0x6f, 0x23, 0xad, 0xb8, 0x48, - 0x69, 0xed, 0xfd, 0xae, 0xf3, 0xdc, 0xf1, 0xff, 0x70, 0xe0, 0xa4, 0x29, 0xfd, 0x9f, 0xfb, 0x7a, - 0x76, 0xa7, 0xaf, 0x27, 0x5b, 0x7d, 0xfd, 0x6f, 0x0d, 0xfd, 0xed, 0x40, 0xff, 0x0d, 0x13, 0xf8, - 0x5a, 0xc9, 0xaa, 0x20, 0x43, 0xe8, 0xac, 0x37, 0xde, 0xe1, 0x89, 0x91, 0x99, 0xe9, 0xa4, 0x61, - 0x6e, 0xcf, 0xe4, 0x4b, 0x38, 0x40, 0xa1, 0x15, 0xc7, 0x96, 0xb7, 0x6b, 0xd2, 0x6f, 0xab, 0x93, - 0xb6, 0x01, 0xe4, 0x39, 0x1c, 0x25, 0x58, 0x6a, 0x2e, 0x98, 0xe6, 0x52, 0x94, 0xde, 0x9e, 0xbd, - 0x70, 0x6a, 0x2e, 0x5c, 0x6e, 0x70, 0x5b, 0x9b, 0xee, 0x44, 0x92, 0x31, 0x0c, 0x12, 0x2c, 0x63, - 0xc5, 0x0b, 0x63, 0x7b, 0x87, 0x96, 0xc0, 0x36, 0x44, 0x4e, 0x61, 0x3f, 0xd6, 0x3c, 0x47, 0xaf, - 0x6f, 0x7d, 0xb5, 0x61, 0xd0, 0xdc, 0xa2, 0x50, 0xa3, 0xd6, 0xf0, 0x7f, 0x77, 0xc0, 0x6d, 0x18, - 0xda, 0x39, 0xd0, 0x2a, 0x43, 0xf2, 0x35, 0xf4, 0x99, 0x4a, 0xab, 0x1c, 0x85, 0x6e, 0x99, 0xd9, - 0x49, 0x45, 0xb2, 0x52, 0x31, 0xd6, 0x71, 0x9b, 0x08, 0xf2, 0x0a, 0xfa, 0xb9, 0xc1, 0x6e, 0x64, - 0x82, 0xde, 0x70, 0xec, 0x4c, 0x86, 0xe7, 0x4f, 0xb7, 0x3a, 0x5f, 0xe7, 0xdd, 0x01, 0x4c, 0x30, - 0xdd, 0xdc, 0xf3, 0x3f, 0xdf, 0xe5, 0x61, 0x30, 0x72, 0x00, 0xdd, 0x97, 0x6f, 0x2f, 0xdd, 0x47, - 0xa4, 0x07, 0x9d, 0x1f, 0xa9, 0xeb, 0xf8, 0x7f, 0xee, 0xc1, 0xa1, 0xd9, 0x89, 0x65, 0xf9, 0x90, - 0x95, 0x7c, 0x06, 0x90, 0x9a, 0x19, 0xce, 0xac, 0xa7, 0x5b, 0x4b, 0xd0, 0x22, 0x6f, 0x8d, 0xfb, - 0x05, 0x9c, 0xe8, 0xba, 0xe8, 0xac, 0xdd, 0xdc, 0xde, 0xbf, 0x6c, 0x6e, 0xa8, 0x37, 0x96, 0x59, - 0xe0, 0x05, 0x90, 0xf6, 0xaa, 0x6d, 0x62, 0xa6, 0xaa, 0x0c, 0xbd, 0xfd, 0xe6, 0x75, 0xb9, 0xa7, - 0x7b, 0xea, 0xea, 0xbb, 0x73, 0x0e, 0xe0, 0xe3, 0x04, 0x17, 0xac, 0xca, 0xf4, 0xcc, 0x0a, 0x78, - 0x56, 0x6b, 0xb3, 0x67, 0x69, 0x7e, 0xd4, 0xb8, 0xac, 0xa0, 0xdf, 0x1b, 0xc7, 0x07, 0xa2, 0x39, - 0x78, 0xb0, 0x68, 0x1e, 0x43, 0x0f, 0x05, 0x9b, 0x67, 0x68, 0xf5, 0x72, 0x48, 0x1b, 0x8b, 0xbc, - 0x00, 0xa8, 0xd9, 0x9b, 0x17, 0xd6, 0xea, 0x65, 0x78, 0x3e, 0x32, 0xf9, 0xda, 0x29, 0xdb, 0xc3, - 0x7d, 0x0b, 0x33, 0x6f, 0x9d, 0xc2, 0x25, 0x2f, 0x8d, 0x08, 0x6b, 0x49, 0xad, 0xed, 0x8d, 0x02, - 0x07, 0xf7, 0x2a, 0xf0, 0x68, 0x4b, 0x81, 0x06, 0x45, 0x8b, 0x1e, 0xd7, 0xa8, 0x35, 0x4c, 0xf6, - 0x42, 0x71, 0xa9, 0xb8, 0x5e, 0x59, 0x49, 0x1d, 0xd3, 0xb5, 0x7d, 0xf7, 0x0b, 0x38, 0xf9, 0xe0, - 0x0b, 0xf0, 0xbf, 0x82, 0xe3, 0x1d, 0xde, 0x04, 0xa0, 0x17, 0x4d, 0xe9, 0xf5, 0xab, 0xa9, 0xfb, - 0x88, 0x0c, 0x01, 0xde, 0x5d, 0xd1, 0x9b, 0xeb, 0x28, 0xba, 0x7e, 0x7f, 0xe5, 0x3a, 0x17, 0xbf, - 0x39, 0xf0, 0x2c, 0x96, 0x79, 0xa0, 0x51, 0xc4, 0x28, 0x74, 0x50, 0xc8, 0x8c, 0x29, 0x5e, 0x06, - 0x65, 0x81, 0x31, 0x5f, 0xf0, 0xd8, 0x8e, 0x30, 0x60, 0x05, 0x37, 0x73, 0x69, 0x76, 0x18, 0xe4, - 0x4c, 0xb0, 0x14, 0x2f, 0xec, 0x0b, 0xf1, 0xce, 0xfc, 0x43, 0x7e, 0xbe, 0x4c, 0xb9, 0xbe, 0xad, - 0xe6, 0x41, 0x2c, 0xf3, 0xb0, 0x49, 0x91, 0x63, 0x79, 0x1b, 0xee, 0xa4, 0x09, 0x4b, 0xfb, 0x09, - 0x85, 0xa9, 0x0c, 0x59, 0xc1, 0xc3, 0xe5, 0x59, 0xb8, 0x11, 0x91, 0x49, 0x38, 0xef, 0xd9, 0x1f, - 0xd2, 0xb7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x21, 0x5c, 0xdc, 0x1e, 0x07, 0x00, 0x00, +func init() { proto.RegisterFile("lane.proto", fileDescriptor_lane_3097fe36f56fba0e) } + +var fileDescriptor_lane_3097fe36f56fba0e = []byte{ + // 777 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x8e, 0xe3, 0x44, + 0x10, 0x5e, 0x27, 0x93, 0xbf, 0xca, 0xcf, 0x9a, 0x26, 0x5a, 0x99, 0x08, 0x44, 0x64, 0xb4, 0x28, + 0x02, 0x61, 0x33, 0xe1, 0xb0, 0x0b, 0x07, 0xa4, 0x9d, 0x9d, 0xd1, 0x6a, 0xd0, 0xce, 0xb2, 0xea, + 0x44, 0x7b, 0xe0, 0x12, 0x75, 0x9c, 0x8a, 0xa7, 0x85, 0xdd, 0x6d, 0xb5, 0xdb, 0x41, 0x79, 0x05, + 0x5e, 0x83, 0x23, 0xef, 0xc2, 0x13, 0xc0, 0xbb, 0xa0, 0x6e, 0x3b, 0xbf, 0xcc, 0x01, 0x84, 0xb4, + 0xb7, 0xae, 0xef, 0xab, 0xae, 0xaa, 0xaf, 0xfa, 0x8b, 0x03, 0x90, 0x30, 0x81, 0x41, 0xa6, 0xa4, + 0x96, 0xa4, 0xb6, 0xb9, 0x1c, 0x7d, 0x14, 0x4b, 0x19, 0x27, 0x18, 0x5a, 0x64, 0x59, 0xac, 0x43, + 0x26, 0xb6, 0x25, 0x3d, 0xea, 0xa6, 0x72, 0x85, 0x49, 0x15, 0xf4, 0x95, 0x2c, 0x34, 0x17, 0x71, + 0x19, 0xfa, 0x73, 0xe8, 0xcd, 0x15, 0x5b, 0xaf, 0x79, 0x74, 0x23, 0xb4, 0xda, 0x12, 0x02, 0x17, + 0x7a, 0x9b, 0xa1, 0xe7, 0x8c, 0x9d, 0x49, 0x87, 0xda, 0x33, 0xf9, 0x1a, 0xda, 0x39, 0x26, 0x18, + 0x69, 0xa9, 0xbc, 0xda, 0xd8, 0x99, 0x74, 0xa7, 0xc3, 0xa0, 0xec, 0x16, 0xec, 0xba, 0x05, 0x2f, + 0xc4, 0x96, 0xee, 0xb3, 0xfc, 0x3f, 0x1d, 0x78, 0x32, 0x43, 0xb5, 0xe1, 0x11, 0xbe, 0x62, 0x1a, + 0x7f, 0x61, 0xdb, 0x59, 0x45, 0x91, 0x8f, 0xa1, 0x23, 0x58, 0x8a, 0x79, 0xc6, 0xa2, 0x5d, 0x97, + 0x03, 0x40, 0x3c, 0x68, 0xe5, 0xe5, 0x3d, 0xdb, 0xa9, 0x43, 0x77, 0x21, 0xf9, 0x1e, 0x9a, 0x09, + 0x5b, 0x62, 0x92, 0x7b, 0xf5, 0x71, 0x7d, 0xd2, 0x9d, 0x7e, 0x1e, 0x6c, 0x2e, 0x83, 0x87, 0x7b, + 0x04, 0xaf, 0x6d, 0xa2, 0x15, 0x44, 0xab, 0x5b, 0xa3, 0x1f, 0xa0, 0x7b, 0x04, 0x13, 0x17, 0xea, + 0x3f, 0xe3, 0xb6, 0x1a, 0xc0, 0x1c, 0xc9, 0x53, 0x68, 0x6c, 0x58, 0x52, 0x60, 0x25, 0xf1, 0xb1, + 0xa9, 0x7f, 0xc7, 0x74, 0x74, 0x3f, 0xd3, 0x8a, 0x8b, 0x98, 0x96, 0xec, 0x77, 0xb5, 0xe7, 0x8e, + 0xff, 0x87, 0x03, 0x8f, 0xab, 0xd6, 0xff, 0x5b, 0xd7, 0xb3, 0x33, 0x5d, 0x9f, 0x1e, 0xe9, 0x7a, + 0x6f, 0x82, 0x7e, 0xab, 0x41, 0xe7, 0x35, 0x13, 0xf8, 0x4a, 0xc9, 0x22, 0x23, 0x03, 0xa8, 0xf1, + 0x55, 0x55, 0xa9, 0xc6, 0x57, 0xc6, 0x13, 0x46, 0x49, 0x35, 0xb9, 0x3d, 0x93, 0x2f, 0xa0, 0x85, + 0x42, 0x2b, 0x8e, 0xbb, 0xb9, 0x5d, 0x53, 0xfe, 0xd8, 0x4a, 0x74, 0x97, 0x40, 0x9e, 0x43, 0x6f, + 0x85, 0xb9, 0xe6, 0x82, 0x69, 0x2e, 0x45, 0xee, 0x5d, 0xd8, 0x0b, 0x43, 0x73, 0xe1, 0xfa, 0x80, + 0xdb, 0xde, 0xf4, 0x24, 0x93, 0x8c, 0xa0, 0xad, 0x70, 0xc3, 0x73, 0x2e, 0x85, 0xd7, 0xb2, 0xdd, + 0xf7, 0x31, 0x19, 0x43, 0x77, 0x85, 0x79, 0xa4, 0x78, 0x66, 0x72, 0xbd, 0xb6, 0xa5, 0x8f, 0x21, + 0x32, 0x84, 0x46, 0xa4, 0x79, 0x8a, 0x5e, 0xc7, 0x72, 0x65, 0x60, 0xd0, 0xd4, 0xa2, 0x50, 0xa2, + 0x36, 0x20, 0x3e, 0x34, 0x54, 0x91, 0x60, 0xee, 0x75, 0xed, 0x70, 0x3d, 0x33, 0x9c, 0xd9, 0x08, + 0x2d, 0x12, 0xa4, 0x25, 0xe5, 0xff, 0xee, 0x80, 0x5b, 0x29, 0xb4, 0x7b, 0x34, 0x1c, 0xf9, 0x0a, + 0x3a, 0x4c, 0xc5, 0x45, 0x8a, 0x42, 0xef, 0x94, 0xd9, 0x4d, 0xcf, 0x64, 0xa1, 0x22, 0x2c, 0xf3, + 0x0e, 0x19, 0xe4, 0x25, 0x74, 0x52, 0x83, 0xdd, 0xc9, 0x15, 0x7a, 0x83, 0xb1, 0x33, 0x19, 0x4c, + 0x9f, 0x1e, 0x6d, 0x6e, 0x5f, 0xf7, 0x04, 0x30, 0xc9, 0xf4, 0x70, 0xcf, 0xff, 0xec, 0x74, 0x0e, + 0x83, 0x91, 0x16, 0xd4, 0x5f, 0xbc, 0xb9, 0x76, 0x1f, 0x91, 0x26, 0xd4, 0x7e, 0xa4, 0xae, 0xe3, + 0xff, 0x55, 0x87, 0xf6, 0x4e, 0xc1, 0xbf, 0x7a, 0xd2, 0x4f, 0x00, 0x62, 0xf3, 0x06, 0x0b, 0xcb, + 0xd4, 0x4b, 0x0b, 0x5b, 0xe4, 0x8d, 0xa1, 0xaf, 0x80, 0xe8, 0xb2, 0xe9, 0xc2, 0x4e, 0xb2, 0x30, + 0x4b, 0xf1, 0x2e, 0xaa, 0xef, 0xc1, 0x03, 0x12, 0xa8, 0xab, 0xcf, 0x97, 0x15, 0xc0, 0x87, 0x2b, + 0x5c, 0xb3, 0x22, 0xd1, 0x0b, 0xeb, 0xe2, 0x45, 0x69, 0xd0, 0x86, 0xed, 0xf5, 0x41, 0x45, 0x59, + 0x57, 0xbf, 0x33, 0x04, 0x79, 0x02, 0x4d, 0x14, 0x6c, 0x99, 0xa0, 0xd7, 0x1c, 0x3b, 0x93, 0x36, + 0xad, 0x22, 0xf2, 0x2d, 0x40, 0x39, 0x83, 0xf9, 0xb2, 0x59, 0x67, 0x0c, 0xa6, 0xa3, 0xe3, 0x27, + 0xb3, 0x87, 0x87, 0x76, 0x77, 0x62, 0xa9, 0xf6, 0x99, 0xa5, 0xfe, 0x8b, 0x61, 0x86, 0xd0, 0x40, + 0x8b, 0x76, 0x4b, 0xd4, 0x06, 0xa6, 0x7a, 0xa6, 0xb8, 0x54, 0x5c, 0x6f, 0xbd, 0xde, 0xd8, 0x99, + 0xf4, 0xe9, 0x3e, 0x3e, 0x37, 0x6c, 0xff, 0x1f, 0x86, 0xf5, 0xbf, 0x84, 0xfe, 0xc9, 0xdc, 0x04, + 0xa0, 0x39, 0x9b, 0xd3, 0xdb, 0x97, 0x73, 0xf7, 0x11, 0x19, 0x00, 0xbc, 0xbd, 0xa1, 0x77, 0xb7, + 0xb3, 0xd9, 0xed, 0xbb, 0x1b, 0xd7, 0xb9, 0xfa, 0xd5, 0x81, 0x67, 0x91, 0x4c, 0x03, 0x8d, 0x22, + 0x42, 0xa1, 0x83, 0x4c, 0x26, 0x4c, 0xf1, 0x3c, 0xc8, 0x33, 0x8c, 0xf8, 0x9a, 0x47, 0xf6, 0x27, + 0x14, 0xb0, 0x8c, 0x9b, 0xbd, 0x54, 0x2f, 0x11, 0xa4, 0x4c, 0xb0, 0x18, 0xaf, 0xec, 0x8f, 0xfd, + 0xad, 0xf9, 0x76, 0xff, 0x74, 0x1d, 0x73, 0x7d, 0x5f, 0x2c, 0x83, 0x48, 0xa6, 0x61, 0x55, 0x22, + 0xc5, 0xfc, 0x3e, 0x3c, 0x29, 0x13, 0xe6, 0xd6, 0xcd, 0x61, 0x2c, 0x43, 0x96, 0xf1, 0x70, 0x73, + 0x19, 0x1e, 0xac, 0x60, 0x0a, 0x2e, 0x9b, 0xf6, 0x8f, 0xe0, 0x9b, 0xbf, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x78, 0xdc, 0xc3, 0x0b, 0x96, 0x06, 0x00, 0x00, }