From 583e6ed3e52e879a9e8c3b51efd659ea297e0750 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sun, 25 Oct 2020 10:35:35 +0800 Subject: [PATCH 1/6] agent: types.pb.go is not regenerated When types.proto was relocated, types.pb.go is not regenerated and still references the old location. Signed-off-by: Peng Tao --- .../pkg/agent/protocols/grpc/agent.pb.go | 385 +++++++++--------- .../pkg/agent/protocols/types.pb.go | 78 ++-- 2 files changed, 231 insertions(+), 232 deletions(-) diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.pb.go b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.pb.go index b09becc0c..ac1a0ded7 100644 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.pb.go +++ b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.pb.go @@ -2603,199 +2603,198 @@ func init() { } var fileDescriptor_c1460208c38ccf5e = []byte{ - // 3059 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x1a, 0xcb, 0x72, 0x24, 0x47, - 0xd1, 0xf3, 0x90, 0x34, 0x93, 0x33, 0xa3, 0xd1, 0xb4, 0xb4, 0xda, 0xd9, 0x59, 0x5b, 0xac, 0x7b, - 0xed, 0xb5, 0x8c, 0xb1, 0x64, 0xaf, 0x1d, 0xac, 0x1f, 0x61, 0x36, 0x56, 0x5a, 0x59, 0x92, 0x6d, - 0x59, 0x72, 0x6b, 0x37, 0x4c, 0x40, 0x40, 0x47, 0xab, 0xbb, 0x76, 0x54, 0xd6, 0x74, 0x57, 0xbb, - 0xaa, 0x5a, 0xab, 0x31, 0x04, 0xc1, 0x09, 0x6e, 0x1c, 0xb9, 0xf1, 0x03, 0x04, 0x37, 0x8e, 0x5c, - 0x39, 0x38, 0xe0, 0xc2, 0x91, 0x13, 0x81, 0xf7, 0x13, 0xf8, 0x02, 0xa2, 0x5e, 0xfd, 0x98, 0x97, - 0xb1, 0x42, 0x11, 0x5c, 0x26, 0x3a, 0xb3, 0xb2, 0xf2, 0x55, 0x95, 0x59, 0x99, 0x55, 0x03, 0x9f, - 0xf5, 0x31, 0x3f, 0x4d, 0x4e, 0x36, 0x7c, 0x12, 0x6e, 0x9e, 0x79, 0xdc, 0x7b, 0xdd, 0x27, 0x11, - 0xf7, 0x70, 0x84, 0x28, 0x1b, 0x83, 0x19, 0xf5, 0x37, 0xbd, 0x3e, 0x8a, 0xf8, 0x66, 0x4c, 0x09, - 0x27, 0x3e, 0x19, 0x30, 0xf5, 0xc5, 0x14, 0x7a, 0x43, 0x02, 0x56, 0xb5, 0x4f, 0x63, 0xbf, 0x77, - 0x78, 0x35, 0x8c, 0x89, 0x8f, 0x15, 0xdb, 0xde, 0x2f, 0xaf, 0x86, 0xe1, 0x0c, 0x2e, 0x7a, 0xc6, - 0x59, 0x7f, 0x93, 0x0f, 0x63, 0xc4, 0xd4, 0xaf, 0x96, 0x7e, 0xb3, 0x4f, 0x48, 0x7f, 0x80, 0x14, - 0x97, 0x93, 0xe4, 0xc9, 0x26, 0x0a, 0x63, 0x3e, 0x54, 0x83, 0xf6, 0x1f, 0xca, 0xb0, 0xba, 0x4d, - 0x91, 0xc7, 0xd1, 0xb6, 0xe1, 0xe6, 0xa0, 0x2f, 0x13, 0xc4, 0xb8, 0xf5, 0x22, 0x34, 0x53, 0x09, - 0x2e, 0x0e, 0xba, 0xa5, 0x5b, 0xa5, 0xf5, 0xba, 0xd3, 0x48, 0x71, 0xfb, 0x81, 0x75, 0x1d, 0x16, - 0xd0, 0x05, 0xf2, 0xc5, 0x68, 0x59, 0x8e, 0xce, 0x0b, 0x70, 0x3f, 0xb0, 0xde, 0x84, 0x06, 0xe3, - 0x14, 0x47, 0x7d, 0x37, 0x61, 0x88, 0x76, 0x2b, 0xb7, 0x4a, 0xeb, 0x8d, 0xbb, 0x4b, 0x1b, 0xc2, - 0xbd, 0x1b, 0xc7, 0x72, 0xe0, 0x31, 0x43, 0xd4, 0x01, 0x96, 0x7e, 0x5b, 0x77, 0x60, 0x21, 0x40, - 0xe7, 0xd8, 0x47, 0xac, 0x5b, 0xbd, 0x55, 0x59, 0x6f, 0xdc, 0x6d, 0x2a, 0xf2, 0x87, 0x12, 0xe9, - 0x98, 0x41, 0xeb, 0x55, 0xa8, 0x31, 0x4e, 0xa8, 0xd7, 0x47, 0xac, 0x3b, 0x27, 0x09, 0x5b, 0x86, - 0xaf, 0xc4, 0x3a, 0xe9, 0xb0, 0xf5, 0x3c, 0x54, 0x0e, 0xb7, 0xf7, 0xbb, 0xf3, 0x52, 0x3a, 0x68, - 0xaa, 0x18, 0xf9, 0x8e, 0x40, 0x5b, 0xb7, 0xa1, 0xc5, 0xbc, 0x28, 0x38, 0x21, 0x17, 0x6e, 0x8c, - 0x83, 0x88, 0x75, 0x17, 0x6e, 0x95, 0xd6, 0x6b, 0x4e, 0x53, 0x23, 0x8f, 0x04, 0xce, 0x7e, 0x0f, - 0xae, 0x1d, 0x73, 0x8f, 0xf2, 0x4b, 0x78, 0xc7, 0x7e, 0x0c, 0xab, 0x0e, 0x0a, 0xc9, 0xf9, 0xa5, - 0x5c, 0xdb, 0x85, 0x05, 0x8e, 0x43, 0x44, 0x12, 0x2e, 0x5d, 0xdb, 0x72, 0x0c, 0x68, 0xff, 0xa9, - 0x04, 0xd6, 0xce, 0x05, 0xf2, 0x8f, 0x28, 0xf1, 0x11, 0x63, 0xff, 0xa7, 0xe5, 0x7a, 0x05, 0x16, - 0x62, 0xa5, 0x40, 0xb7, 0x2a, 0xc9, 0xf5, 0x2a, 0x18, 0xad, 0xcc, 0xa8, 0xfd, 0x05, 0xac, 0x1c, - 0xe3, 0x7e, 0xe4, 0x0d, 0xae, 0x50, 0xdf, 0x55, 0x98, 0x67, 0x92, 0xa7, 0x54, 0xb5, 0xe5, 0x68, - 0xc8, 0x3e, 0x02, 0xeb, 0x73, 0x0f, 0xf3, 0xab, 0x93, 0x64, 0xbf, 0x0e, 0xcb, 0x05, 0x8e, 0x2c, - 0x26, 0x11, 0x43, 0x52, 0x01, 0xee, 0xf1, 0x84, 0x49, 0x66, 0x73, 0x8e, 0x86, 0x6c, 0x04, 0x2b, - 0x9f, 0x60, 0x66, 0xc8, 0xd1, 0x77, 0x51, 0x61, 0x15, 0xe6, 0x9f, 0x10, 0x1a, 0x7a, 0xdc, 0x68, - 0xa0, 0x20, 0xcb, 0x82, 0xaa, 0x47, 0xfb, 0xac, 0x5b, 0xb9, 0x55, 0x59, 0xaf, 0x3b, 0xf2, 0x5b, - 0xec, 0xca, 0x11, 0x31, 0x5a, 0xaf, 0x17, 0xa1, 0xa9, 0xfd, 0xee, 0x0e, 0x30, 0xe3, 0x52, 0x4e, - 0xd3, 0x69, 0x68, 0x9c, 0x98, 0x63, 0x13, 0x58, 0x7d, 0x1c, 0x07, 0x97, 0x0c, 0xf8, 0xbb, 0x50, - 0xa7, 0x88, 0x91, 0x84, 0x8a, 0x30, 0x2d, 0xcb, 0x75, 0x5f, 0x51, 0xeb, 0xfe, 0x09, 0x8e, 0x92, - 0x0b, 0xc7, 0x8c, 0x39, 0x19, 0x99, 0x0e, 0x21, 0xce, 0x2e, 0x13, 0x42, 0xef, 0xc1, 0xb5, 0x23, - 0x2f, 0x61, 0x97, 0xd1, 0xd5, 0x7e, 0x5f, 0x84, 0x1f, 0x4b, 0xc2, 0x4b, 0x4d, 0xfe, 0x63, 0x09, - 0x6a, 0xdb, 0x71, 0xf2, 0x98, 0x79, 0x7d, 0x64, 0x7d, 0x0f, 0x1a, 0x9c, 0x70, 0x6f, 0xe0, 0x26, - 0x02, 0x94, 0xe4, 0x55, 0x07, 0x24, 0x4a, 0x11, 0x08, 0xb7, 0x23, 0xea, 0xc7, 0x89, 0xa6, 0x28, - 0xdf, 0xaa, 0xac, 0x57, 0x9d, 0x86, 0xc2, 0x29, 0x92, 0x0d, 0x58, 0x96, 0x63, 0x2e, 0x8e, 0xdc, - 0x33, 0x44, 0x23, 0x34, 0x08, 0x49, 0x80, 0xe4, 0xfe, 0xad, 0x3a, 0x1d, 0x39, 0xb4, 0x1f, 0x7d, - 0x9c, 0x0e, 0x58, 0xdf, 0x87, 0x4e, 0x4a, 0x2f, 0x82, 0x52, 0x52, 0x57, 0x25, 0x75, 0x5b, 0x53, - 0x3f, 0xd6, 0x68, 0xfb, 0x57, 0xb0, 0xf8, 0xe8, 0x94, 0x12, 0xce, 0x07, 0x38, 0xea, 0x3f, 0xf4, - 0xb8, 0x27, 0xb2, 0x47, 0x8c, 0x28, 0x26, 0x01, 0xd3, 0xda, 0x1a, 0xd0, 0x7a, 0x0d, 0x3a, 0x5c, - 0xd1, 0xa2, 0xc0, 0x35, 0x34, 0x65, 0x49, 0xb3, 0x94, 0x0e, 0x1c, 0x69, 0xe2, 0x97, 0x61, 0x31, - 0x23, 0x16, 0xf9, 0x47, 0xeb, 0xdb, 0x4a, 0xb1, 0x8f, 0x70, 0x88, 0xec, 0x73, 0xe9, 0x2b, 0xb9, - 0xc8, 0xd6, 0x6b, 0x50, 0xcf, 0xfc, 0x50, 0x92, 0x3b, 0x64, 0x51, 0xed, 0x10, 0xe3, 0x4e, 0xa7, - 0x96, 0x3a, 0xe5, 0x03, 0x68, 0xf3, 0x54, 0x71, 0x37, 0xf0, 0xb8, 0x57, 0xdc, 0x54, 0x45, 0xab, - 0x9c, 0x45, 0x5e, 0x80, 0xed, 0xf7, 0xa1, 0x7e, 0x84, 0x03, 0xa6, 0x04, 0x77, 0x61, 0xc1, 0x4f, - 0x28, 0x45, 0x11, 0x37, 0x26, 0x6b, 0xd0, 0x5a, 0x81, 0xb9, 0x01, 0x0e, 0x31, 0xd7, 0x66, 0x2a, - 0xc0, 0x26, 0x00, 0x07, 0x28, 0x24, 0x74, 0x28, 0x1d, 0xb6, 0x02, 0x73, 0xf9, 0xc5, 0x55, 0x80, - 0x75, 0x13, 0xea, 0xa1, 0x77, 0x91, 0x2e, 0xaa, 0x18, 0xa9, 0x85, 0xde, 0x85, 0x52, 0xbe, 0x0b, - 0x0b, 0x4f, 0x3c, 0x3c, 0xf0, 0x23, 0xae, 0xbd, 0x62, 0xc0, 0x4c, 0x60, 0x35, 0x2f, 0xf0, 0xaf, - 0x65, 0x68, 0x28, 0x89, 0x4a, 0xe1, 0x15, 0x98, 0xf3, 0x3d, 0xff, 0x34, 0x15, 0x29, 0x01, 0xeb, - 0x8e, 0x51, 0xa4, 0x9c, 0x4f, 0xc2, 0x99, 0xa6, 0x46, 0xb5, 0x4d, 0x00, 0xf6, 0xd4, 0x8b, 0xb5, - 0x6e, 0x95, 0x29, 0xc4, 0x75, 0x41, 0xa3, 0xd4, 0x7d, 0x0b, 0x9a, 0x6a, 0xdf, 0xe9, 0x29, 0xd5, - 0x29, 0x53, 0x1a, 0x8a, 0x4a, 0x4d, 0xba, 0x0d, 0xad, 0x84, 0x21, 0xf7, 0x14, 0x23, 0xea, 0x51, - 0xff, 0x74, 0xd8, 0x9d, 0x53, 0x67, 0x64, 0xc2, 0xd0, 0x9e, 0xc1, 0x59, 0x77, 0x61, 0x4e, 0xa4, - 0x3f, 0xd6, 0x9d, 0x97, 0xc7, 0xf1, 0xf3, 0x79, 0x96, 0xd2, 0xd4, 0x0d, 0xf9, 0xbb, 0x13, 0x71, - 0x3a, 0x74, 0x14, 0x69, 0xef, 0x1d, 0x80, 0x0c, 0x69, 0x2d, 0x41, 0xe5, 0x0c, 0x0d, 0x75, 0x1c, - 0x8a, 0x4f, 0xe1, 0x9c, 0x73, 0x6f, 0x90, 0x18, 0xaf, 0x2b, 0xe0, 0xbd, 0xf2, 0x3b, 0x25, 0xdb, - 0x87, 0xf6, 0xd6, 0xe0, 0x0c, 0x93, 0xdc, 0xf4, 0x15, 0x98, 0x0b, 0xbd, 0x2f, 0x08, 0x35, 0x9e, - 0x94, 0x80, 0xc4, 0xe2, 0x88, 0x50, 0xc3, 0x42, 0x02, 0xd6, 0x22, 0x94, 0x49, 0x2c, 0xfd, 0x55, - 0x77, 0xca, 0x24, 0xce, 0x04, 0x55, 0x73, 0x82, 0xec, 0x7f, 0x55, 0x01, 0x32, 0x29, 0x96, 0x03, - 0x3d, 0x4c, 0x5c, 0x86, 0xa8, 0x28, 0x41, 0xdc, 0x93, 0x21, 0x47, 0xcc, 0xa5, 0xc8, 0x4f, 0x28, - 0xc3, 0xe7, 0x62, 0xfd, 0x84, 0xd9, 0xd7, 0x94, 0xd9, 0x23, 0xba, 0x39, 0xd7, 0x31, 0x39, 0x56, - 0xf3, 0xb6, 0xc4, 0x34, 0xc7, 0xcc, 0xb2, 0xf6, 0xe1, 0x5a, 0xc6, 0x33, 0xc8, 0xb1, 0x2b, 0xcf, - 0x62, 0xb7, 0x9c, 0xb2, 0x0b, 0x32, 0x56, 0x3b, 0xb0, 0x8c, 0x89, 0xfb, 0x65, 0x82, 0x92, 0x02, - 0xa3, 0xca, 0x2c, 0x46, 0x1d, 0x4c, 0x3e, 0x93, 0x13, 0x32, 0x36, 0x47, 0x70, 0x23, 0x67, 0xa5, - 0x08, 0xf7, 0x1c, 0xb3, 0xea, 0x2c, 0x66, 0xab, 0xa9, 0x56, 0x22, 0x1f, 0x64, 0x1c, 0x3f, 0x82, - 0x55, 0x4c, 0xdc, 0xa7, 0x1e, 0xe6, 0xa3, 0xec, 0xe6, 0xbe, 0xc5, 0x48, 0x71, 0xe8, 0x16, 0x79, - 0x29, 0x23, 0x43, 0x44, 0xfb, 0x05, 0x23, 0xe7, 0xbf, 0xc5, 0xc8, 0x03, 0x39, 0x21, 0x63, 0xf3, - 0x00, 0x3a, 0x98, 0x8c, 0x6a, 0xb3, 0x30, 0x8b, 0x49, 0x1b, 0x93, 0xa2, 0x26, 0x5b, 0xd0, 0x61, - 0xc8, 0xe7, 0x84, 0xe6, 0x37, 0x41, 0x6d, 0x16, 0x8b, 0x25, 0x4d, 0x9f, 0xf2, 0xb0, 0x7f, 0x0a, - 0xcd, 0xbd, 0xa4, 0x8f, 0xf8, 0xe0, 0x24, 0x4d, 0x06, 0x57, 0x96, 0x7f, 0xec, 0xff, 0x94, 0xa1, - 0xb1, 0xdd, 0xa7, 0x24, 0x89, 0x0b, 0x39, 0x59, 0x05, 0xe9, 0x68, 0x4e, 0x96, 0x24, 0x32, 0x27, - 0x2b, 0xe2, 0xb7, 0xa1, 0x19, 0xca, 0xd0, 0xd5, 0xf4, 0x2a, 0x0f, 0x75, 0xc6, 0x82, 0xda, 0x69, - 0x84, 0xb9, 0x64, 0xb6, 0x01, 0x10, 0xe3, 0x80, 0xe9, 0x39, 0x2a, 0x1d, 0xb5, 0x75, 0x45, 0x68, - 0x52, 0xb4, 0x53, 0x8f, 0xd3, 0x6c, 0xfd, 0x26, 0x34, 0x4e, 0x84, 0x93, 0xf4, 0x84, 0x42, 0x32, - 0xca, 0xbc, 0xe7, 0xc0, 0x49, 0x16, 0x84, 0x7b, 0xd0, 0x3a, 0x55, 0x2e, 0xd3, 0x93, 0xd4, 0x1e, - 0xba, 0xad, 0x2d, 0xc9, 0xec, 0xdd, 0xc8, 0x7b, 0x56, 0x2d, 0x40, 0xf3, 0x34, 0x87, 0xea, 0x1d, - 0x43, 0x67, 0x8c, 0x64, 0x42, 0x0e, 0x5a, 0xcf, 0xe7, 0xa0, 0xc6, 0x5d, 0x4b, 0x09, 0xca, 0xcf, - 0xcc, 0xe7, 0xa5, 0xdf, 0x95, 0xa1, 0xf9, 0x29, 0xe2, 0x4f, 0x09, 0x3d, 0x53, 0xfa, 0x5a, 0x50, - 0x8d, 0xbc, 0x10, 0x69, 0x8e, 0xf2, 0xdb, 0xba, 0x01, 0x35, 0x7a, 0xa1, 0x12, 0x88, 0x5e, 0xcf, - 0x05, 0x7a, 0x21, 0x13, 0x83, 0xf5, 0x02, 0x00, 0xbd, 0x70, 0x63, 0xcf, 0x3f, 0x43, 0xda, 0x83, - 0x55, 0xa7, 0x4e, 0x2f, 0x8e, 0x14, 0x42, 0x6c, 0x05, 0x7a, 0xe1, 0x22, 0x4a, 0x09, 0x65, 0x3a, - 0x57, 0xd5, 0xe8, 0xc5, 0x8e, 0x84, 0xf5, 0xdc, 0x80, 0x92, 0x38, 0x46, 0x81, 0xcc, 0xd1, 0x72, - 0xee, 0x43, 0x85, 0x10, 0x52, 0xb9, 0x91, 0x3a, 0xaf, 0xa4, 0xf2, 0x4c, 0x2a, 0xcf, 0xa4, 0x2e, - 0xa8, 0x99, 0x3c, 0x2f, 0x95, 0xa7, 0x52, 0x6b, 0x4a, 0x2a, 0xcf, 0x49, 0xe5, 0x99, 0xd4, 0xba, - 0x99, 0xab, 0xa5, 0xda, 0xbf, 0x2d, 0xc1, 0xea, 0x68, 0xe1, 0xa7, 0xcb, 0xd4, 0xb7, 0xa1, 0xe9, - 0xcb, 0xf5, 0x2a, 0xec, 0xc9, 0xce, 0xd8, 0x4a, 0x3a, 0x0d, 0x3f, 0xb7, 0x8d, 0xef, 0x41, 0x2b, - 0x52, 0x0e, 0x4e, 0xb7, 0x66, 0x25, 0x5b, 0x97, 0xbc, 0xef, 0x9d, 0x66, 0x94, 0x83, 0xec, 0x00, - 0xac, 0xcf, 0x29, 0xe6, 0xe8, 0x98, 0x53, 0xe4, 0x85, 0x57, 0xd1, 0x80, 0x58, 0x50, 0x95, 0xd5, - 0x4a, 0x45, 0xd6, 0xd7, 0xf2, 0xdb, 0x7e, 0x05, 0x96, 0x0b, 0x52, 0xb4, 0xad, 0x4b, 0x50, 0x19, - 0xa0, 0x48, 0x72, 0x6f, 0x39, 0xe2, 0xd3, 0xf6, 0xa0, 0xe3, 0x20, 0x2f, 0xb8, 0x3a, 0x6d, 0xb4, - 0x88, 0x4a, 0x26, 0x62, 0x1d, 0xac, 0xbc, 0x08, 0xad, 0x8a, 0xd1, 0xba, 0x94, 0xd3, 0xfa, 0x10, - 0x3a, 0xdb, 0x03, 0xc2, 0xd0, 0x31, 0x0f, 0x70, 0x74, 0x15, 0x1d, 0xd3, 0x2f, 0x60, 0xf9, 0x11, - 0x1f, 0x7e, 0x2e, 0x98, 0x31, 0xfc, 0x15, 0xba, 0x22, 0xfb, 0x28, 0x79, 0x6a, 0xec, 0xa3, 0xe4, - 0xa9, 0x68, 0x96, 0x7c, 0x32, 0x48, 0xc2, 0x48, 0x86, 0x42, 0xcb, 0xd1, 0x90, 0xbd, 0x05, 0x4d, - 0x55, 0x43, 0x1f, 0x90, 0x20, 0x19, 0xa0, 0x89, 0x31, 0xb8, 0x06, 0x10, 0x7b, 0xd4, 0x0b, 0x11, - 0x47, 0x54, 0xed, 0xa1, 0xba, 0x93, 0xc3, 0xd8, 0xbf, 0x2f, 0xc3, 0x8a, 0xba, 0x12, 0x39, 0x56, - 0x37, 0x01, 0xc6, 0x84, 0x1e, 0xd4, 0x4e, 0x09, 0xe3, 0x39, 0x86, 0x29, 0x2c, 0x54, 0x0c, 0x22, - 0xc3, 0x4d, 0x7c, 0x16, 0xee, 0x29, 0x2a, 0xb3, 0xef, 0x29, 0xc6, 0x6e, 0x22, 0xaa, 0xe3, 0x37, - 0x11, 0x22, 0xda, 0x0c, 0x11, 0x56, 0x31, 0x5e, 0x77, 0xea, 0x1a, 0xb3, 0x1f, 0x58, 0x77, 0xa0, - 0xdd, 0x17, 0x5a, 0xba, 0xa7, 0x84, 0x9c, 0xb9, 0xb1, 0xc7, 0x4f, 0x65, 0xa8, 0xd7, 0x9d, 0x96, - 0x44, 0xef, 0x11, 0x72, 0x76, 0xe4, 0xf1, 0x53, 0xeb, 0x5d, 0x58, 0xd4, 0x65, 0x60, 0x28, 0x5d, - 0xc4, 0xf4, 0xe1, 0xa7, 0xa3, 0x28, 0xef, 0x3d, 0xa7, 0x75, 0x96, 0x83, 0x98, 0x7d, 0x1d, 0xae, - 0x3d, 0x44, 0x8c, 0x53, 0x32, 0x2c, 0x3a, 0xc6, 0xfe, 0x11, 0xc0, 0x7e, 0xc4, 0x11, 0x7d, 0xe2, - 0xf9, 0x88, 0x59, 0x6f, 0xe4, 0x21, 0x5d, 0x1c, 0x2d, 0x6d, 0xa8, 0x1b, 0xa9, 0x74, 0xc0, 0xc9, - 0xd1, 0xd8, 0x1b, 0x30, 0xef, 0x90, 0x44, 0xa4, 0xa3, 0x97, 0xcc, 0x97, 0x9e, 0xd7, 0xd4, 0xf3, - 0x24, 0xd2, 0xd1, 0x63, 0xf6, 0x9e, 0x69, 0x61, 0x33, 0x76, 0x7a, 0x89, 0x36, 0xa0, 0x8e, 0x0d, - 0x4e, 0x67, 0x95, 0x71, 0xd1, 0x19, 0x89, 0xfd, 0x3e, 0x2c, 0x2b, 0x4e, 0x8a, 0xb3, 0x61, 0xf3, - 0x12, 0xcc, 0x53, 0xa3, 0x46, 0x29, 0xbb, 0x8a, 0xd2, 0x44, 0x7a, 0x4c, 0xf8, 0x43, 0x74, 0xd4, - 0x99, 0x21, 0xc6, 0x1f, 0xcb, 0xd0, 0x11, 0x03, 0x05, 0x9e, 0xf6, 0x87, 0xd0, 0x7c, 0xe0, 0x1c, - 0x7d, 0x8a, 0x70, 0xff, 0xf4, 0x44, 0x64, 0xcf, 0x1f, 0x16, 0x61, 0x6d, 0xb0, 0xa5, 0xb5, 0xcd, - 0x0d, 0x39, 0x05, 0x3a, 0xfb, 0x23, 0x58, 0x7d, 0x10, 0x04, 0x79, 0x94, 0xd1, 0xfa, 0x0d, 0xa8, - 0x47, 0x39, 0x76, 0xb9, 0x33, 0xab, 0x40, 0x9d, 0x11, 0xd9, 0x3f, 0x83, 0xe5, 0xc3, 0x68, 0x80, - 0x23, 0xb4, 0x7d, 0xf4, 0xf8, 0x00, 0xa5, 0xb9, 0xc8, 0x82, 0xaa, 0xa8, 0xd9, 0x24, 0x8f, 0x9a, - 0x23, 0xbf, 0x45, 0x70, 0x46, 0x27, 0xae, 0x1f, 0x27, 0x4c, 0xdf, 0x47, 0xcd, 0x47, 0x27, 0xdb, - 0x71, 0xc2, 0xc4, 0xe1, 0x22, 0x8a, 0x0b, 0x12, 0x0d, 0x86, 0x32, 0x42, 0x6b, 0xce, 0x82, 0x1f, - 0x27, 0x87, 0xd1, 0x60, 0x68, 0xff, 0x40, 0x76, 0xe0, 0x08, 0x05, 0x8e, 0x17, 0x05, 0x24, 0x7c, - 0x88, 0xce, 0x73, 0x12, 0xd2, 0x6e, 0xcf, 0x64, 0xa2, 0xaf, 0x4b, 0xd0, 0x7c, 0xd0, 0x47, 0x11, - 0x7f, 0x88, 0xb8, 0x87, 0x07, 0xb2, 0xa3, 0x3b, 0x47, 0x94, 0x61, 0x12, 0xe9, 0x70, 0x33, 0xa0, - 0x68, 0xc8, 0x71, 0x84, 0xb9, 0x1b, 0x78, 0x28, 0x24, 0x91, 0xe4, 0x52, 0x73, 0x40, 0xa0, 0x1e, - 0x4a, 0x8c, 0xf5, 0x0a, 0xb4, 0xd5, 0x7d, 0xa1, 0x7b, 0xea, 0x45, 0xc1, 0x40, 0x04, 0xba, 0xba, - 0x3f, 0x59, 0x54, 0xe8, 0x3d, 0x8d, 0xb5, 0x5e, 0x85, 0x25, 0x1d, 0x86, 0x19, 0x65, 0x55, 0x52, - 0xb6, 0x35, 0xbe, 0x40, 0x9a, 0xc4, 0x31, 0xa1, 0x9c, 0xb9, 0x0c, 0xf9, 0x3e, 0x09, 0x63, 0xdd, - 0x0e, 0xb5, 0x0d, 0xfe, 0x58, 0xa1, 0xed, 0x3e, 0x2c, 0xef, 0x0a, 0x3b, 0xb5, 0x25, 0xd9, 0xb6, - 0x5a, 0x0c, 0x51, 0xe8, 0x9e, 0x0c, 0x88, 0x7f, 0xe6, 0x8a, 0xe4, 0xa8, 0x3d, 0x2c, 0x0a, 0xae, - 0x2d, 0x81, 0x3c, 0xc6, 0x5f, 0xc9, 0xce, 0x5f, 0x50, 0x9d, 0x12, 0x1e, 0x0f, 0x92, 0xbe, 0x1b, - 0x53, 0x72, 0x82, 0xb4, 0x89, 0xed, 0x10, 0x85, 0x7b, 0x0a, 0x7f, 0x24, 0xd0, 0xf6, 0x5f, 0x4a, - 0xb0, 0x52, 0x94, 0xa4, 0x53, 0xfd, 0x26, 0xac, 0x14, 0x45, 0xe9, 0xe3, 0x5f, 0x95, 0x97, 0x9d, - 0xbc, 0x40, 0x55, 0x08, 0xdc, 0x83, 0x96, 0xbc, 0x44, 0x76, 0x03, 0xc5, 0xa9, 0x58, 0xf4, 0xe4, - 0xd7, 0xc5, 0x69, 0x7a, 0xf9, 0x55, 0x7a, 0x17, 0x6e, 0x68, 0xf3, 0xdd, 0x71, 0xb5, 0xd5, 0x86, - 0x58, 0xd5, 0x04, 0x07, 0x23, 0xda, 0x7f, 0x02, 0xdd, 0x0c, 0xb5, 0x35, 0x94, 0xc8, 0x6c, 0x33, - 0x2f, 0x8f, 0x18, 0xfb, 0x20, 0x08, 0xa8, 0x8c, 0x92, 0xaa, 0x33, 0x69, 0xc8, 0xbe, 0x0f, 0xd7, - 0x8f, 0x11, 0x57, 0xde, 0xf0, 0xb8, 0xee, 0x44, 0x14, 0xb3, 0x25, 0xa8, 0x1c, 0x23, 0x5f, 0x1a, - 0x5f, 0x71, 0xc4, 0xa7, 0xd8, 0x80, 0x8f, 0x19, 0xf2, 0xa5, 0x95, 0x15, 0x47, 0x7e, 0xdb, 0x7f, - 0x2e, 0xc1, 0x82, 0x4e, 0xce, 0xe2, 0x80, 0x09, 0x28, 0x3e, 0x47, 0x54, 0x6f, 0x3d, 0x0d, 0x59, - 0x2f, 0xc3, 0xa2, 0xfa, 0x72, 0x49, 0xcc, 0x31, 0x49, 0x53, 0x7e, 0x4b, 0x61, 0x0f, 0x15, 0x52, - 0xde, 0x0f, 0xca, 0xeb, 0x2f, 0xdd, 0x69, 0x6a, 0x48, 0x5e, 0xf2, 0x31, 0x11, 0xe1, 0x32, 0xc5, - 0xd7, 0x1d, 0x0d, 0x89, 0xad, 0x6e, 0xf8, 0xcd, 0x49, 0x7e, 0x06, 0x14, 0x5b, 0x3d, 0x24, 0x49, - 0xc4, 0xdd, 0x98, 0xe0, 0x88, 0xeb, 0x9c, 0x0e, 0x12, 0x75, 0x24, 0x30, 0xf6, 0x6f, 0x4a, 0x30, - 0xaf, 0xee, 0xc8, 0x45, 0x6f, 0x9b, 0x9e, 0xac, 0x65, 0x2c, 0xab, 0x14, 0x29, 0x4b, 0x9d, 0xa6, - 0xf2, 0x5b, 0xc4, 0xf1, 0x79, 0xa8, 0xce, 0x07, 0xad, 0xda, 0x79, 0x28, 0x0f, 0x86, 0x97, 0x61, - 0x31, 0x3b, 0xa0, 0xe5, 0xb8, 0x52, 0xb1, 0x95, 0x62, 0x25, 0xd9, 0x54, 0x4d, 0xed, 0x1f, 0x8b, - 0x96, 0x3e, 0xbd, 0x1f, 0x5e, 0x82, 0x4a, 0x92, 0x2a, 0x23, 0x3e, 0x05, 0xa6, 0x9f, 0x1e, 0xed, - 0xe2, 0xd3, 0xba, 0x03, 0x8b, 0x5e, 0x10, 0x60, 0x31, 0xdd, 0x1b, 0xec, 0xe2, 0x20, 0x0d, 0xd2, - 0x22, 0xd6, 0xfe, 0x5b, 0x09, 0xda, 0xdb, 0x24, 0x1e, 0x7e, 0x88, 0x07, 0x28, 0x97, 0x41, 0xa4, - 0x92, 0xfa, 0x64, 0x17, 0xdf, 0xa2, 0x5a, 0x7d, 0x82, 0x07, 0x48, 0x85, 0x96, 0x5a, 0xd9, 0x9a, - 0x40, 0xc8, 0xb0, 0x32, 0x83, 0xe9, 0xb5, 0x5b, 0x4b, 0x0d, 0x1e, 0x90, 0x40, 0xd6, 0xe5, 0x01, - 0xa6, 0x6e, 0x7a, 0xc9, 0xd6, 0x72, 0x16, 0x02, 0x4c, 0xe5, 0x90, 0x36, 0x64, 0x4e, 0xde, 0xf3, - 0xe6, 0x0d, 0x99, 0x57, 0x18, 0x61, 0xc8, 0x2a, 0xcc, 0x93, 0x27, 0x4f, 0x18, 0xe2, 0xb2, 0x82, - 0xae, 0x38, 0x1a, 0x4a, 0xd3, 0x5c, 0x2d, 0x97, 0xe6, 0xae, 0xc1, 0xb2, 0x7c, 0x51, 0x78, 0x44, - 0x3d, 0x1f, 0x47, 0x7d, 0x73, 0x3c, 0xac, 0x80, 0x75, 0xcc, 0x49, 0x3c, 0x8e, 0xdd, 0x45, 0xfc, - 0xf0, 0xf0, 0x60, 0xe7, 0x1c, 0x45, 0xdc, 0x60, 0x5f, 0x87, 0x9a, 0x41, 0xfd, 0x2f, 0x77, 0x99, - 0xcb, 0xd0, 0xd9, 0x45, 0xfc, 0x00, 0x71, 0x8a, 0xfd, 0xf4, 0x38, 0xba, 0x0d, 0x0b, 0x1a, 0x23, - 0x96, 0x34, 0x54, 0x9f, 0x26, 0xcf, 0x6a, 0xf0, 0xee, 0xdf, 0x3b, 0x3a, 0x25, 0xeb, 0xee, 0xde, - 0xda, 0x85, 0xf6, 0xc8, 0x6b, 0x91, 0xa5, 0xaf, 0x7b, 0x26, 0x3f, 0x22, 0xf5, 0x56, 0x37, 0xd4, - 0xeb, 0xd3, 0x86, 0x79, 0x7d, 0xda, 0xd8, 0x09, 0x63, 0x3e, 0xb4, 0x76, 0x60, 0xb1, 0xf8, 0xae, - 0x62, 0xdd, 0x34, 0xd5, 0xd1, 0x84, 0xd7, 0x96, 0xa9, 0x6c, 0x76, 0xa1, 0x3d, 0xf2, 0xc4, 0x62, - 0xf4, 0x99, 0xfc, 0xf2, 0x32, 0x95, 0xd1, 0x7d, 0x68, 0xe4, 0xde, 0x54, 0xac, 0xae, 0x62, 0x32, - 0xfe, 0xcc, 0x32, 0x95, 0xc1, 0x36, 0xb4, 0x0a, 0xcf, 0x1c, 0x56, 0x4f, 0xdb, 0x33, 0xe1, 0xed, - 0x63, 0x2a, 0x93, 0x2d, 0x68, 0xe4, 0x5e, 0x1b, 0x8c, 0x16, 0xe3, 0x4f, 0x1a, 0xbd, 0x1b, 0x13, - 0x46, 0x74, 0xe6, 0xdf, 0x83, 0x56, 0xe1, 0x6d, 0xc0, 0x28, 0x32, 0xe9, 0x5d, 0xa2, 0x77, 0x73, - 0xe2, 0x98, 0xe6, 0xb4, 0x0b, 0xed, 0x91, 0x97, 0x02, 0xe3, 0xdc, 0xc9, 0x0f, 0x08, 0x53, 0xcd, - 0xfa, 0x58, 0x2e, 0x76, 0xae, 0x11, 0xcc, 0x2d, 0xf6, 0xf8, 0xbb, 0x40, 0xef, 0xf9, 0xc9, 0x83, - 0x5a, 0xab, 0x1d, 0x58, 0x2c, 0x3e, 0x09, 0x18, 0x66, 0x13, 0x1f, 0x0a, 0x66, 0xef, 0x9c, 0xc2, - 0xeb, 0x40, 0xb6, 0x73, 0x26, 0x3d, 0x1a, 0x4c, 0x65, 0xf4, 0x00, 0x40, 0xb7, 0x7d, 0x01, 0x8e, - 0xd2, 0x25, 0x1b, 0x6b, 0x37, 0xd3, 0x25, 0x9b, 0xd0, 0x22, 0xde, 0x07, 0x50, 0xdd, 0x5a, 0x40, - 0x12, 0x6e, 0x5d, 0x37, 0x6a, 0x8c, 0xb4, 0x88, 0xbd, 0xee, 0xf8, 0xc0, 0x18, 0x03, 0x44, 0xe9, - 0x65, 0x18, 0x7c, 0x00, 0x90, 0x75, 0x81, 0x86, 0xc1, 0x58, 0x5f, 0x38, 0xc3, 0x07, 0xcd, 0x7c, - 0xcf, 0x67, 0x69, 0x5b, 0x27, 0xf4, 0x81, 0x33, 0x58, 0xb4, 0x47, 0x6a, 0xfa, 0xe2, 0x66, 0x1b, - 0x2d, 0xf5, 0x7b, 0x63, 0x75, 0xbd, 0x75, 0x0f, 0x9a, 0xf9, 0x62, 0xde, 0x68, 0x31, 0xa1, 0xc0, - 0xef, 0x15, 0x0a, 0x7a, 0xeb, 0x3e, 0x2c, 0x16, 0x0b, 0x79, 0x2b, 0x17, 0x17, 0x63, 0xe5, 0x7d, - 0x4f, 0x5f, 0x53, 0xe5, 0xc8, 0xdf, 0x02, 0xc8, 0x0a, 0x7e, 0xe3, 0xbe, 0xb1, 0x16, 0x60, 0x44, - 0xea, 0x2e, 0xb4, 0x47, 0x0a, 0x79, 0x63, 0xf1, 0xe4, 0xfa, 0x7e, 0x96, 0xf7, 0xf3, 0x27, 0x8a, - 0xb1, 0x7b, 0xc2, 0x29, 0x33, 0x2b, 0xfd, 0xe5, 0x4e, 0x1f, 0xb3, 0x8b, 0xc7, 0x0f, 0xa4, 0xa9, - 0x0c, 0xde, 0x06, 0xc8, 0xce, 0x18, 0xe3, 0x81, 0xb1, 0x53, 0xa7, 0xd7, 0x32, 0xd7, 0x88, 0x8a, - 0x6e, 0x1b, 0x5a, 0x85, 0x4e, 0xdb, 0xe4, 0xaa, 0x49, 0xed, 0xf7, 0xac, 0xa3, 0xa4, 0xd8, 0x96, - 0x9a, 0xd5, 0x9b, 0xd8, 0xac, 0xce, 0xf2, 0x62, 0xbe, 0x17, 0x32, 0x5e, 0x9c, 0xd0, 0x1f, 0x7d, - 0x4b, 0x4e, 0xc9, 0xf7, 0x3b, 0xb9, 0x9c, 0x32, 0xa1, 0x0d, 0x9a, 0xca, 0x68, 0x0f, 0xda, 0xbb, - 0xa6, 0x94, 0xd5, 0x65, 0xb6, 0x56, 0x67, 0x42, 0x5b, 0xd1, 0xeb, 0x4d, 0x1a, 0xd2, 0x81, 0xfd, - 0x31, 0x74, 0xc6, 0x4a, 0x6c, 0x6b, 0x2d, 0xbd, 0xcc, 0x9d, 0x58, 0x7b, 0x4f, 0x55, 0x6b, 0x1f, - 0x96, 0x46, 0x2b, 0x6c, 0xeb, 0x05, 0xbd, 0x55, 0x26, 0x57, 0xde, 0x53, 0x59, 0xbd, 0x0b, 0x35, - 0x53, 0xd1, 0x59, 0xfa, 0xd2, 0x7c, 0xa4, 0xc2, 0x9b, 0x3a, 0xf5, 0x1e, 0x34, 0x72, 0x35, 0x91, - 0xd9, 0xab, 0xe3, 0x65, 0x52, 0x4f, 0xdf, 0x71, 0x1b, 0xf4, 0xd6, 0xc5, 0xd7, 0xdf, 0xac, 0x3d, - 0xf7, 0xcf, 0x6f, 0xd6, 0x9e, 0xfb, 0xf5, 0xb3, 0xb5, 0xd2, 0xd7, 0xcf, 0xd6, 0x4a, 0xff, 0x78, - 0xb6, 0x56, 0xfa, 0xf7, 0xb3, 0xb5, 0xd2, 0x4f, 0x7e, 0xfe, 0x1d, 0xff, 0xa0, 0x43, 0x93, 0x88, - 0xe3, 0x10, 0x6d, 0x9e, 0x63, 0xca, 0x73, 0x43, 0xf1, 0x59, 0x7f, 0xec, 0xbf, 0x3b, 0x42, 0x85, - 0x93, 0x79, 0x09, 0xbf, 0xf5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x3f, 0x35, 0x13, 0xb3, - 0x24, 0x00, 0x00, + // 3046 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x3a, 0x4b, 0x6f, 0x1c, 0xc7, + 0xd1, 0xde, 0x07, 0xc9, 0xdd, 0xda, 0x17, 0x77, 0x48, 0x51, 0xab, 0x95, 0xcd, 0x4f, 0x1e, 0xd9, + 0x32, 0xfd, 0xf9, 0xf3, 0xca, 0x96, 0x8d, 0x4f, 0x7e, 0xc0, 0x9f, 0x20, 0x52, 0x34, 0x49, 0xdb, + 0xb4, 0xe8, 0xa1, 0x04, 0x7f, 0x48, 0x90, 0x0c, 0x86, 0x33, 0xad, 0xdd, 0x36, 0x77, 0xa6, 0xc7, + 0xdd, 0x3d, 0x14, 0xd7, 0x01, 0x82, 0x9c, 0x92, 0x5b, 0x8e, 0xb9, 0xe5, 0x0f, 0x04, 0xb9, 0xe5, + 0x98, 0x6b, 0x0e, 0x46, 0x72, 0xc9, 0x31, 0xa7, 0x20, 0xd6, 0x4f, 0xc8, 0x2f, 0x08, 0xfa, 0x35, + 0x8f, 0x7d, 0xd0, 0xb1, 0x40, 0x20, 0x97, 0xc5, 0x54, 0x75, 0x75, 0xbd, 0xba, 0xab, 0xba, 0xaa, + 0x7b, 0xe1, 0x8b, 0x21, 0xe6, 0xa3, 0xe4, 0x64, 0xe0, 0x93, 0xf0, 0xf6, 0xa9, 0xc7, 0xbd, 0x37, + 0x7d, 0x12, 0x71, 0x0f, 0x47, 0x88, 0xb2, 0x19, 0x98, 0x51, 0xff, 0xb6, 0x37, 0x44, 0x11, 0xbf, + 0x1d, 0x53, 0xc2, 0x89, 0x4f, 0xc6, 0x4c, 0x7d, 0x31, 0x85, 0x1e, 0x48, 0xc0, 0xaa, 0x0e, 0x69, + 0xec, 0xf7, 0xeb, 0xc4, 0xc7, 0x0a, 0xd1, 0x6f, 0xf0, 0x49, 0x8c, 0x98, 0x06, 0xae, 0x0f, 0x09, + 0x19, 0x8e, 0x91, 0x9a, 0x78, 0x92, 0x3c, 0xb9, 0x8d, 0xc2, 0x98, 0x4f, 0xd4, 0xa0, 0xfd, 0xdb, + 0x32, 0x6c, 0xec, 0x50, 0xe4, 0x71, 0xb4, 0x63, 0xc4, 0x3a, 0xe8, 0xeb, 0x04, 0x31, 0x6e, 0xbd, + 0x0c, 0xcd, 0x54, 0x15, 0x17, 0x07, 0xbd, 0xd2, 0x8d, 0xd2, 0x56, 0xdd, 0x69, 0xa4, 0xb8, 0x83, + 0xc0, 0xba, 0x0a, 0x2b, 0xe8, 0x1c, 0xf9, 0x62, 0xb4, 0x2c, 0x47, 0x97, 0x05, 0x78, 0x10, 0x58, + 0x6f, 0x43, 0x83, 0x71, 0x8a, 0xa3, 0xa1, 0x9b, 0x30, 0x44, 0x7b, 0x95, 0x1b, 0xa5, 0xad, 0xc6, + 0x9d, 0xd5, 0x81, 0xd0, 0x73, 0x70, 0x2c, 0x07, 0x1e, 0x33, 0x44, 0x1d, 0x60, 0xe9, 0xb7, 0x75, + 0x0b, 0x56, 0x02, 0x74, 0x86, 0x7d, 0xc4, 0x7a, 0xd5, 0x1b, 0x95, 0xad, 0xc6, 0x9d, 0xa6, 0x22, + 0x7f, 0x20, 0x91, 0x8e, 0x19, 0xb4, 0x5e, 0x87, 0x1a, 0xe3, 0x84, 0x7a, 0x43, 0xc4, 0x7a, 0x4b, + 0x92, 0xb0, 0x65, 0xf8, 0x4a, 0xac, 0x93, 0x0e, 0x5b, 0x2f, 0x42, 0xe5, 0xe1, 0xce, 0x41, 0x6f, + 0x59, 0x4a, 0x07, 0x4d, 0x15, 0x23, 0xdf, 0x11, 0x68, 0xeb, 0x26, 0xb4, 0x98, 0x17, 0x05, 0x27, + 0xe4, 0xdc, 0x8d, 0x71, 0x10, 0xb1, 0xde, 0xca, 0x8d, 0xd2, 0x56, 0xcd, 0x69, 0x6a, 0xe4, 0x91, + 0xc0, 0xd9, 0x1f, 0xc0, 0x95, 0x63, 0xee, 0x51, 0xfe, 0x1c, 0xde, 0xb1, 0x1f, 0xc3, 0x86, 0x83, + 0x42, 0x72, 0xf6, 0x5c, 0xae, 0xed, 0xc1, 0x0a, 0xc7, 0x21, 0x22, 0x09, 0x97, 0xae, 0x6d, 0x39, + 0x06, 0xb4, 0x7f, 0x5f, 0x02, 0x6b, 0xf7, 0x1c, 0xf9, 0x47, 0x94, 0xf8, 0x88, 0xb1, 0xff, 0xd0, + 0x72, 0xbd, 0x06, 0x2b, 0xb1, 0x52, 0xa0, 0x57, 0x95, 0xe4, 0x7a, 0x15, 0x8c, 0x56, 0x66, 0xd4, + 0xfe, 0x0a, 0xd6, 0x8f, 0xf1, 0x30, 0xf2, 0xc6, 0x97, 0xa8, 0xef, 0x06, 0x2c, 0x33, 0xc9, 0x53, + 0xaa, 0xda, 0x72, 0x34, 0x64, 0x1f, 0x81, 0xf5, 0xa5, 0x87, 0xf9, 0xe5, 0x49, 0xb2, 0xdf, 0x84, + 0xb5, 0x02, 0x47, 0x16, 0x93, 0x88, 0x21, 0xa9, 0x00, 0xf7, 0x78, 0xc2, 0x24, 0xb3, 0x25, 0x47, + 0x43, 0x36, 0x82, 0xf5, 0xcf, 0x30, 0x33, 0xe4, 0xe8, 0x87, 0xa8, 0xb0, 0x01, 0xcb, 0x4f, 0x08, + 0x0d, 0x3d, 0x6e, 0x34, 0x50, 0x90, 0x65, 0x41, 0xd5, 0xa3, 0x43, 0xd6, 0xab, 0xdc, 0xa8, 0x6c, + 0xd5, 0x1d, 0xf9, 0x2d, 0x76, 0xe5, 0x94, 0x18, 0xad, 0xd7, 0xcb, 0xd0, 0xd4, 0x7e, 0x77, 0xc7, + 0x98, 0x71, 0x29, 0xa7, 0xe9, 0x34, 0x34, 0x4e, 0xcc, 0xb1, 0x09, 0x6c, 0x3c, 0x8e, 0x83, 0xe7, + 0x0c, 0xf8, 0x3b, 0x50, 0xa7, 0x88, 0x91, 0x84, 0x8a, 0x30, 0x2d, 0xcb, 0x75, 0x5f, 0x57, 0xeb, + 0xfe, 0x19, 0x8e, 0x92, 0x73, 0xc7, 0x8c, 0x39, 0x19, 0x99, 0x0e, 0x21, 0xce, 0x9e, 0x27, 0x84, + 0x3e, 0x80, 0x2b, 0x47, 0x5e, 0xc2, 0x9e, 0x47, 0x57, 0xfb, 0x43, 0x11, 0x7e, 0x2c, 0x09, 0x9f, + 0x6b, 0xf2, 0xef, 0x4a, 0x50, 0xdb, 0x89, 0x93, 0xc7, 0xcc, 0x1b, 0x22, 0xeb, 0xbf, 0xa0, 0xc1, + 0x09, 0xf7, 0xc6, 0x6e, 0x22, 0x40, 0x49, 0x5e, 0x75, 0x40, 0xa2, 0x14, 0x81, 0x70, 0x3b, 0xa2, + 0x7e, 0x9c, 0x68, 0x8a, 0xf2, 0x8d, 0xca, 0x56, 0xd5, 0x69, 0x28, 0x9c, 0x22, 0x19, 0xc0, 0x9a, + 0x1c, 0x73, 0x71, 0xe4, 0x9e, 0x22, 0x1a, 0xa1, 0x71, 0x48, 0x02, 0x24, 0xf7, 0x6f, 0xd5, 0xe9, + 0xca, 0xa1, 0x83, 0xe8, 0xd3, 0x74, 0xc0, 0xfa, 0x6f, 0xe8, 0xa6, 0xf4, 0x22, 0x28, 0x25, 0x75, + 0x55, 0x52, 0x77, 0x34, 0xf5, 0x63, 0x8d, 0xb6, 0x7f, 0x0e, 0xed, 0x47, 0x23, 0x4a, 0x38, 0x1f, + 0xe3, 0x68, 0xf8, 0xc0, 0xe3, 0x9e, 0xc8, 0x1e, 0x31, 0xa2, 0x98, 0x04, 0x4c, 0x6b, 0x6b, 0x40, + 0xeb, 0x0d, 0xe8, 0x72, 0x45, 0x8b, 0x02, 0xd7, 0xd0, 0x94, 0x25, 0xcd, 0x6a, 0x3a, 0x70, 0xa4, + 0x89, 0x5f, 0x85, 0x76, 0x46, 0x2c, 0xf2, 0x8f, 0xd6, 0xb7, 0x95, 0x62, 0x1f, 0xe1, 0x10, 0xd9, + 0x67, 0xd2, 0x57, 0x72, 0x91, 0xad, 0x37, 0xa0, 0x9e, 0xf9, 0xa1, 0x24, 0x77, 0x48, 0x5b, 0xed, + 0x10, 0xe3, 0x4e, 0xa7, 0x96, 0x3a, 0xe5, 0x23, 0xe8, 0xf0, 0x54, 0x71, 0x37, 0xf0, 0xb8, 0x57, + 0xdc, 0x54, 0x45, 0xab, 0x9c, 0x36, 0x2f, 0xc0, 0xf6, 0x87, 0x50, 0x3f, 0xc2, 0x01, 0x53, 0x82, + 0x7b, 0xb0, 0xe2, 0x27, 0x94, 0xa2, 0x88, 0x1b, 0x93, 0x35, 0x68, 0xad, 0xc3, 0xd2, 0x18, 0x87, + 0x98, 0x6b, 0x33, 0x15, 0x60, 0x13, 0x80, 0x43, 0x14, 0x12, 0x3a, 0x91, 0x0e, 0x5b, 0x87, 0xa5, + 0xfc, 0xe2, 0x2a, 0xc0, 0xba, 0x0e, 0xf5, 0xd0, 0x3b, 0x4f, 0x17, 0x55, 0x8c, 0xd4, 0x42, 0xef, + 0x5c, 0x29, 0xdf, 0x83, 0x95, 0x27, 0x1e, 0x1e, 0xfb, 0x11, 0xd7, 0x5e, 0x31, 0x60, 0x26, 0xb0, + 0x9a, 0x17, 0xf8, 0xa7, 0x32, 0x34, 0x94, 0x44, 0xa5, 0xf0, 0x3a, 0x2c, 0xf9, 0x9e, 0x3f, 0x4a, + 0x45, 0x4a, 0xc0, 0xba, 0x65, 0x14, 0x29, 0xe7, 0x93, 0x70, 0xa6, 0xa9, 0x51, 0xed, 0x36, 0x00, + 0x7b, 0xea, 0xc5, 0x5a, 0xb7, 0xca, 0x02, 0xe2, 0xba, 0xa0, 0x51, 0xea, 0xbe, 0x03, 0x4d, 0xb5, + 0xef, 0xf4, 0x94, 0xea, 0x82, 0x29, 0x0d, 0x45, 0xa5, 0x26, 0xdd, 0x84, 0x56, 0xc2, 0x90, 0x3b, + 0xc2, 0x88, 0x7a, 0xd4, 0x1f, 0x4d, 0x7a, 0x4b, 0xea, 0x8c, 0x4c, 0x18, 0xda, 0x37, 0x38, 0xeb, + 0x0e, 0x2c, 0x89, 0xf4, 0xc7, 0x7a, 0xcb, 0xf2, 0x38, 0x7e, 0x31, 0xcf, 0x52, 0x9a, 0x3a, 0x90, + 0xbf, 0xbb, 0x11, 0xa7, 0x13, 0x47, 0x91, 0xf6, 0xdf, 0x03, 0xc8, 0x90, 0xd6, 0x2a, 0x54, 0x4e, + 0xd1, 0x44, 0xc7, 0xa1, 0xf8, 0x14, 0xce, 0x39, 0xf3, 0xc6, 0x89, 0xf1, 0xba, 0x02, 0x3e, 0x28, + 0xbf, 0x57, 0xb2, 0x7d, 0xe8, 0x6c, 0x8f, 0x4f, 0x31, 0xc9, 0x4d, 0x5f, 0x87, 0xa5, 0xd0, 0xfb, + 0x8a, 0x50, 0xe3, 0x49, 0x09, 0x48, 0x2c, 0x8e, 0x08, 0x35, 0x2c, 0x24, 0x60, 0xb5, 0xa1, 0x4c, + 0x62, 0xe9, 0xaf, 0xba, 0x53, 0x26, 0x71, 0x26, 0xa8, 0x9a, 0x13, 0x64, 0xff, 0xbd, 0x0a, 0x90, + 0x49, 0xb1, 0x1c, 0xe8, 0x63, 0xe2, 0x32, 0x44, 0x45, 0x09, 0xe2, 0x9e, 0x4c, 0x38, 0x62, 0x2e, + 0x45, 0x7e, 0x42, 0x19, 0x3e, 0x13, 0xeb, 0x27, 0xcc, 0xbe, 0xa2, 0xcc, 0x9e, 0xd2, 0xcd, 0xb9, + 0x8a, 0xc9, 0xb1, 0x9a, 0xb7, 0x2d, 0xa6, 0x39, 0x66, 0x96, 0x75, 0x00, 0x57, 0x32, 0x9e, 0x41, + 0x8e, 0x5d, 0xf9, 0x22, 0x76, 0x6b, 0x29, 0xbb, 0x20, 0x63, 0xb5, 0x0b, 0x6b, 0x98, 0xb8, 0x5f, + 0x27, 0x28, 0x29, 0x30, 0xaa, 0x5c, 0xc4, 0xa8, 0x8b, 0xc9, 0x17, 0x72, 0x42, 0xc6, 0xe6, 0x08, + 0xae, 0xe5, 0xac, 0x14, 0xe1, 0x9e, 0x63, 0x56, 0xbd, 0x88, 0xd9, 0x46, 0xaa, 0x95, 0xc8, 0x07, + 0x19, 0xc7, 0x4f, 0x60, 0x03, 0x13, 0xf7, 0xa9, 0x87, 0xf9, 0x34, 0xbb, 0xa5, 0xef, 0x31, 0x52, + 0x1c, 0xba, 0x45, 0x5e, 0xca, 0xc8, 0x10, 0xd1, 0x61, 0xc1, 0xc8, 0xe5, 0xef, 0x31, 0xf2, 0x50, + 0x4e, 0xc8, 0xd8, 0xdc, 0x87, 0x2e, 0x26, 0xd3, 0xda, 0xac, 0x5c, 0xc4, 0xa4, 0x83, 0x49, 0x51, + 0x93, 0x6d, 0xe8, 0x32, 0xe4, 0x73, 0x42, 0xf3, 0x9b, 0xa0, 0x76, 0x11, 0x8b, 0x55, 0x4d, 0x9f, + 0xf2, 0xb0, 0x7f, 0x0c, 0xcd, 0xfd, 0x64, 0x88, 0xf8, 0xf8, 0x24, 0x4d, 0x06, 0x97, 0x96, 0x7f, + 0xec, 0x7f, 0x96, 0xa1, 0xb1, 0x33, 0xa4, 0x24, 0x89, 0x0b, 0x39, 0x59, 0x05, 0xe9, 0x74, 0x4e, + 0x96, 0x24, 0x32, 0x27, 0x2b, 0xe2, 0x77, 0xa1, 0x19, 0xca, 0xd0, 0xd5, 0xf4, 0x2a, 0x0f, 0x75, + 0x67, 0x82, 0xda, 0x69, 0x84, 0xb9, 0x64, 0x36, 0x00, 0x88, 0x71, 0xc0, 0xf4, 0x1c, 0x95, 0x8e, + 0x3a, 0xba, 0x22, 0x34, 0x29, 0xda, 0xa9, 0xc7, 0x69, 0xb6, 0x7e, 0x1b, 0x1a, 0x27, 0xc2, 0x49, + 0x7a, 0x42, 0x21, 0x19, 0x65, 0xde, 0x73, 0xe0, 0x24, 0x0b, 0xc2, 0x7d, 0x68, 0x8d, 0x94, 0xcb, + 0xf4, 0x24, 0xb5, 0x87, 0x6e, 0x6a, 0x4b, 0x32, 0x7b, 0x07, 0x79, 0xcf, 0xaa, 0x05, 0x68, 0x8e, + 0x72, 0xa8, 0xfe, 0x31, 0x74, 0x67, 0x48, 0xe6, 0xe4, 0xa0, 0xad, 0x7c, 0x0e, 0x6a, 0xdc, 0xb1, + 0x94, 0xa0, 0xfc, 0xcc, 0x7c, 0x5e, 0xfa, 0x75, 0x19, 0x9a, 0x9f, 0x23, 0xfe, 0x94, 0xd0, 0x53, + 0xa5, 0xaf, 0x05, 0xd5, 0xc8, 0x0b, 0x91, 0xe6, 0x28, 0xbf, 0xad, 0x6b, 0x50, 0xa3, 0xe7, 0x2a, + 0x81, 0xe8, 0xf5, 0x5c, 0xa1, 0xe7, 0x32, 0x31, 0x58, 0x2f, 0x01, 0xd0, 0x73, 0x37, 0xf6, 0xfc, + 0x53, 0xa4, 0x3d, 0x58, 0x75, 0xea, 0xf4, 0xfc, 0x48, 0x21, 0xc4, 0x56, 0xa0, 0xe7, 0x2e, 0xa2, + 0x94, 0x50, 0xa6, 0x73, 0x55, 0x8d, 0x9e, 0xef, 0x4a, 0x58, 0xcf, 0x0d, 0x28, 0x89, 0x63, 0x14, + 0xc8, 0x1c, 0x2d, 0xe7, 0x3e, 0x50, 0x08, 0x21, 0x95, 0x1b, 0xa9, 0xcb, 0x4a, 0x2a, 0xcf, 0xa4, + 0xf2, 0x4c, 0xea, 0x8a, 0x9a, 0xc9, 0xf3, 0x52, 0x79, 0x2a, 0xb5, 0xa6, 0xa4, 0xf2, 0x9c, 0x54, + 0x9e, 0x49, 0xad, 0x9b, 0xb9, 0x5a, 0xaa, 0xfd, 0xab, 0x12, 0x6c, 0x4c, 0x17, 0x7e, 0xba, 0x4c, + 0x7d, 0x17, 0x9a, 0xbe, 0x5c, 0xaf, 0xc2, 0x9e, 0xec, 0xce, 0xac, 0xa4, 0xd3, 0xf0, 0x73, 0xdb, + 0xf8, 0x2e, 0xb4, 0x22, 0xe5, 0xe0, 0x74, 0x6b, 0x56, 0xb2, 0x75, 0xc9, 0xfb, 0xde, 0x69, 0x46, + 0x39, 0xc8, 0x0e, 0xc0, 0xfa, 0x92, 0x62, 0x8e, 0x8e, 0x39, 0x45, 0x5e, 0x78, 0x19, 0x0d, 0x88, + 0x05, 0x55, 0x59, 0xad, 0x54, 0x64, 0x7d, 0x2d, 0xbf, 0xed, 0xd7, 0x60, 0xad, 0x20, 0x45, 0xdb, + 0xba, 0x0a, 0x95, 0x31, 0x8a, 0x24, 0xf7, 0x96, 0x23, 0x3e, 0x6d, 0x0f, 0xba, 0x0e, 0xf2, 0x82, + 0xcb, 0xd3, 0x46, 0x8b, 0xa8, 0x64, 0x22, 0xb6, 0xc0, 0xca, 0x8b, 0xd0, 0xaa, 0x18, 0xad, 0x4b, + 0x39, 0xad, 0x1f, 0x42, 0x77, 0x67, 0x4c, 0x18, 0x3a, 0xe6, 0x01, 0x8e, 0x2e, 0xa3, 0x63, 0xfa, + 0x19, 0xac, 0x3d, 0xe2, 0x93, 0x2f, 0x05, 0x33, 0x86, 0xbf, 0x41, 0x97, 0x64, 0x1f, 0x25, 0x4f, + 0x8d, 0x7d, 0x94, 0x3c, 0x15, 0xcd, 0x92, 0x4f, 0xc6, 0x49, 0x18, 0xc9, 0x50, 0x68, 0x39, 0x1a, + 0xb2, 0xb7, 0xa1, 0xa9, 0x6a, 0xe8, 0x43, 0x12, 0x24, 0x63, 0x34, 0x37, 0x06, 0x37, 0x01, 0x62, + 0x8f, 0x7a, 0x21, 0xe2, 0x88, 0xaa, 0x3d, 0x54, 0x77, 0x72, 0x18, 0xfb, 0x37, 0x65, 0x58, 0x57, + 0x57, 0x22, 0xc7, 0xea, 0x26, 0xc0, 0x98, 0xd0, 0x87, 0xda, 0x88, 0x30, 0x9e, 0x63, 0x98, 0xc2, + 0x42, 0xc5, 0x20, 0x32, 0xdc, 0xc4, 0x67, 0xe1, 0x9e, 0xa2, 0x72, 0xf1, 0x3d, 0xc5, 0xcc, 0x4d, + 0x44, 0x75, 0xf6, 0x26, 0x42, 0x44, 0x9b, 0x21, 0xc2, 0x2a, 0xc6, 0xeb, 0x4e, 0x5d, 0x63, 0x0e, + 0x02, 0xeb, 0x16, 0x74, 0x86, 0x42, 0x4b, 0x77, 0x44, 0xc8, 0xa9, 0x1b, 0x7b, 0x7c, 0x24, 0x43, + 0xbd, 0xee, 0xb4, 0x24, 0x7a, 0x9f, 0x90, 0xd3, 0x23, 0x8f, 0x8f, 0xac, 0xf7, 0xa1, 0xad, 0xcb, + 0xc0, 0x50, 0xba, 0x88, 0xe9, 0xc3, 0x4f, 0x47, 0x51, 0xde, 0x7b, 0x4e, 0xeb, 0x34, 0x07, 0x31, + 0xfb, 0x2a, 0x5c, 0x79, 0x80, 0x18, 0xa7, 0x64, 0x52, 0x74, 0x8c, 0xfd, 0x7f, 0x00, 0x07, 0x11, + 0x47, 0xf4, 0x89, 0xe7, 0x23, 0x66, 0xbd, 0x95, 0x87, 0x74, 0x71, 0xb4, 0x3a, 0x50, 0x37, 0x52, + 0xe9, 0x80, 0x93, 0xa3, 0xb1, 0x07, 0xb0, 0xec, 0x90, 0x44, 0xa4, 0xa3, 0x57, 0xcc, 0x97, 0x9e, + 0xd7, 0xd4, 0xf3, 0x24, 0xd2, 0xd1, 0x63, 0xf6, 0xbe, 0x69, 0x61, 0x33, 0x76, 0x7a, 0x89, 0x06, + 0x50, 0xc7, 0x06, 0xa7, 0xb3, 0xca, 0xac, 0xe8, 0x8c, 0xc4, 0xfe, 0x10, 0xd6, 0x14, 0x27, 0xc5, + 0xd9, 0xb0, 0x79, 0x05, 0x96, 0xa9, 0x51, 0xa3, 0x94, 0x5d, 0x45, 0x69, 0x22, 0x3d, 0x26, 0xfc, + 0x21, 0x3a, 0xea, 0xcc, 0x10, 0xe3, 0x8f, 0x35, 0xe8, 0x8a, 0x81, 0x02, 0x4f, 0xfb, 0x63, 0x68, + 0xde, 0x77, 0x8e, 0x3e, 0x47, 0x78, 0x38, 0x3a, 0x11, 0xd9, 0xf3, 0x7f, 0x8b, 0xb0, 0x36, 0xd8, + 0xd2, 0xda, 0xe6, 0x86, 0x9c, 0x02, 0x9d, 0xfd, 0x09, 0x6c, 0xdc, 0x0f, 0x82, 0x3c, 0xca, 0x68, + 0xfd, 0x16, 0xd4, 0xa3, 0x1c, 0xbb, 0xdc, 0x99, 0x55, 0xa0, 0xce, 0x88, 0xec, 0x9f, 0xc0, 0xda, + 0xc3, 0x68, 0x8c, 0x23, 0xb4, 0x73, 0xf4, 0xf8, 0x10, 0xa5, 0xb9, 0xc8, 0x82, 0xaa, 0xa8, 0xd9, + 0x24, 0x8f, 0x9a, 0x23, 0xbf, 0x45, 0x70, 0x46, 0x27, 0xae, 0x1f, 0x27, 0x4c, 0xdf, 0x47, 0x2d, + 0x47, 0x27, 0x3b, 0x71, 0xc2, 0xc4, 0xe1, 0x22, 0x8a, 0x0b, 0x12, 0x8d, 0x27, 0x32, 0x42, 0x6b, + 0xce, 0x8a, 0x1f, 0x27, 0x0f, 0xa3, 0xf1, 0xc4, 0xfe, 0x1f, 0xd9, 0x81, 0x23, 0x14, 0x38, 0x5e, + 0x14, 0x90, 0xf0, 0x01, 0x3a, 0xcb, 0x49, 0x48, 0xbb, 0x3d, 0x93, 0x89, 0xbe, 0x2d, 0x41, 0xf3, + 0xfe, 0x10, 0x45, 0xfc, 0x01, 0xe2, 0x1e, 0x1e, 0xcb, 0x8e, 0xee, 0x0c, 0x51, 0x86, 0x49, 0xa4, + 0xc3, 0xcd, 0x80, 0xa2, 0x21, 0xc7, 0x11, 0xe6, 0x6e, 0xe0, 0xa1, 0x90, 0x44, 0x92, 0x4b, 0xcd, + 0x01, 0x81, 0x7a, 0x20, 0x31, 0xd6, 0x6b, 0xd0, 0x51, 0xf7, 0x85, 0xee, 0xc8, 0x8b, 0x82, 0xb1, + 0x08, 0x74, 0x75, 0x7f, 0xd2, 0x56, 0xe8, 0x7d, 0x8d, 0xb5, 0x5e, 0x87, 0x55, 0x1d, 0x86, 0x19, + 0x65, 0x55, 0x52, 0x76, 0x34, 0xbe, 0x40, 0x9a, 0xc4, 0x31, 0xa1, 0x9c, 0xb9, 0x0c, 0xf9, 0x3e, + 0x09, 0x63, 0xdd, 0x0e, 0x75, 0x0c, 0xfe, 0x58, 0xa1, 0xed, 0x21, 0xac, 0xed, 0x09, 0x3b, 0xb5, + 0x25, 0xd9, 0xb6, 0x6a, 0x87, 0x28, 0x74, 0x4f, 0xc6, 0xc4, 0x3f, 0x75, 0x45, 0x72, 0xd4, 0x1e, + 0x16, 0x05, 0xd7, 0xb6, 0x40, 0x1e, 0xe3, 0x6f, 0x64, 0xe7, 0x2f, 0xa8, 0x46, 0x84, 0xc7, 0xe3, + 0x64, 0xe8, 0xc6, 0x94, 0x9c, 0x20, 0x6d, 0x62, 0x27, 0x44, 0xe1, 0xbe, 0xc2, 0x1f, 0x09, 0xb4, + 0xfd, 0xc7, 0x12, 0xac, 0x17, 0x25, 0xe9, 0x54, 0x7f, 0x1b, 0xd6, 0x8b, 0xa2, 0xf4, 0xf1, 0xaf, + 0xca, 0xcb, 0x6e, 0x5e, 0xa0, 0x2a, 0x04, 0xee, 0x42, 0x4b, 0x5e, 0x29, 0xbb, 0x81, 0xe2, 0x54, + 0x2c, 0x7a, 0xf2, 0xeb, 0xe2, 0x34, 0xbd, 0xfc, 0x2a, 0xbd, 0x0f, 0xd7, 0xb4, 0xf9, 0xee, 0xac, + 0xda, 0x6a, 0x43, 0x6c, 0x68, 0x82, 0xc3, 0x29, 0xed, 0x3f, 0x83, 0x5e, 0x86, 0xda, 0x9e, 0x48, + 0x64, 0xb6, 0x99, 0xd7, 0xa6, 0x8c, 0xbd, 0x1f, 0x04, 0x54, 0x46, 0x49, 0xd5, 0x99, 0x37, 0x64, + 0xdf, 0x83, 0xab, 0xc7, 0x88, 0x2b, 0x6f, 0x78, 0x5c, 0x77, 0x22, 0x8a, 0xd9, 0x2a, 0x54, 0x8e, + 0x91, 0x2f, 0x8d, 0xaf, 0x38, 0xe2, 0x53, 0x6c, 0xc0, 0xc7, 0x0c, 0xf9, 0xd2, 0xca, 0x8a, 0x23, + 0xbf, 0xed, 0x3f, 0x94, 0x60, 0x45, 0x27, 0x67, 0x71, 0xc0, 0x04, 0x14, 0x9f, 0x21, 0xaa, 0xb7, + 0x9e, 0x86, 0xac, 0x57, 0xa1, 0xad, 0xbe, 0x5c, 0x12, 0x73, 0x4c, 0xd2, 0x94, 0xdf, 0x52, 0xd8, + 0x87, 0x0a, 0x29, 0xef, 0x07, 0xe5, 0xf5, 0x97, 0xee, 0x34, 0x35, 0x24, 0x2f, 0xf9, 0x98, 0x88, + 0x70, 0x99, 0xe2, 0xeb, 0x8e, 0x86, 0xc4, 0x56, 0x37, 0xfc, 0x96, 0x24, 0x3f, 0x03, 0x8a, 0xad, + 0x1e, 0x92, 0x24, 0xe2, 0x6e, 0x4c, 0x70, 0xc4, 0x75, 0x4e, 0x07, 0x89, 0x3a, 0x12, 0x18, 0xfb, + 0x97, 0x25, 0x58, 0x56, 0x77, 0xe4, 0xa2, 0xb7, 0x4d, 0x4f, 0xd6, 0x32, 0x96, 0x55, 0x8a, 0x94, + 0xa5, 0x4e, 0x53, 0xf9, 0x2d, 0xe2, 0xf8, 0x2c, 0x54, 0xe7, 0x83, 0x56, 0xed, 0x2c, 0x94, 0x07, + 0xc3, 0xab, 0xd0, 0xce, 0x0e, 0x68, 0x39, 0xae, 0x54, 0x6c, 0xa5, 0x58, 0x49, 0xb6, 0x50, 0x53, + 0xfb, 0xff, 0x45, 0x4b, 0x9f, 0xde, 0x0f, 0xaf, 0x42, 0x25, 0x49, 0x95, 0x11, 0x9f, 0x02, 0x33, + 0x4c, 0x8f, 0x76, 0xf1, 0x69, 0xdd, 0x82, 0xb6, 0x17, 0x04, 0x58, 0x4c, 0xf7, 0xc6, 0x7b, 0x38, + 0x48, 0x83, 0xb4, 0x88, 0xb5, 0xff, 0x5c, 0x82, 0xce, 0x0e, 0x89, 0x27, 0x1f, 0xe3, 0x31, 0xca, + 0x65, 0x10, 0xa9, 0xa4, 0x3e, 0xd9, 0xc5, 0xb7, 0xa8, 0x56, 0x9f, 0xe0, 0x31, 0x52, 0xa1, 0xa5, + 0x56, 0xb6, 0x26, 0x10, 0x32, 0xac, 0xcc, 0x60, 0x7a, 0xed, 0xd6, 0x52, 0x83, 0x87, 0x24, 0x90, + 0x75, 0x79, 0x80, 0xa9, 0x9b, 0x5e, 0xb2, 0xb5, 0x9c, 0x95, 0x00, 0x53, 0x39, 0xa4, 0x0d, 0x59, + 0x92, 0xf7, 0xbc, 0x79, 0x43, 0x96, 0x15, 0x46, 0x18, 0xb2, 0x01, 0xcb, 0xe4, 0xc9, 0x13, 0x86, + 0xb8, 0xac, 0xa0, 0x2b, 0x8e, 0x86, 0xd2, 0x34, 0x57, 0xcb, 0xa5, 0xb9, 0x2b, 0xb0, 0x26, 0x5f, + 0x14, 0x1e, 0x51, 0xcf, 0xc7, 0xd1, 0xd0, 0x1c, 0x0f, 0xeb, 0x60, 0x1d, 0x73, 0x12, 0xcf, 0x62, + 0xf7, 0x10, 0x7f, 0xf8, 0xf0, 0x70, 0xf7, 0x0c, 0x45, 0xdc, 0x60, 0xdf, 0x84, 0x9a, 0x41, 0xfd, + 0x3b, 0x77, 0x99, 0x6b, 0xd0, 0xdd, 0x43, 0xfc, 0x10, 0x71, 0x8a, 0xfd, 0xf4, 0x38, 0xba, 0x09, + 0x2b, 0x1a, 0x23, 0x96, 0x34, 0x54, 0x9f, 0x26, 0xcf, 0x6a, 0xf0, 0xce, 0x5f, 0xba, 0x3a, 0x25, + 0xeb, 0xee, 0xde, 0xda, 0x83, 0xce, 0xd4, 0x6b, 0x91, 0xa5, 0xaf, 0x7b, 0xe6, 0x3f, 0x22, 0xf5, + 0x37, 0x06, 0xea, 0xf5, 0x69, 0x60, 0x5e, 0x9f, 0x06, 0xbb, 0x61, 0xcc, 0x27, 0xd6, 0x2e, 0xb4, + 0x8b, 0xef, 0x2a, 0xd6, 0x75, 0x53, 0x1d, 0xcd, 0x79, 0x6d, 0x59, 0xc8, 0x66, 0x0f, 0x3a, 0x53, + 0x4f, 0x2c, 0x46, 0x9f, 0xf9, 0x2f, 0x2f, 0x0b, 0x19, 0xdd, 0x83, 0x46, 0xee, 0x4d, 0xc5, 0xea, + 0x29, 0x26, 0xb3, 0xcf, 0x2c, 0x0b, 0x19, 0xec, 0x40, 0xab, 0xf0, 0xcc, 0x61, 0xf5, 0xb5, 0x3d, + 0x73, 0xde, 0x3e, 0x16, 0x32, 0xd9, 0x86, 0x46, 0xee, 0xb5, 0xc1, 0x68, 0x31, 0xfb, 0xa4, 0xd1, + 0xbf, 0x36, 0x67, 0x44, 0x67, 0xfe, 0x7d, 0x68, 0x15, 0xde, 0x06, 0x8c, 0x22, 0xf3, 0xde, 0x25, + 0xfa, 0xd7, 0xe7, 0x8e, 0x69, 0x4e, 0x7b, 0xd0, 0x99, 0x7a, 0x29, 0x30, 0xce, 0x9d, 0xff, 0x80, + 0xb0, 0xd0, 0xac, 0x4f, 0xe5, 0x62, 0xe7, 0x1a, 0xc1, 0xdc, 0x62, 0xcf, 0xbe, 0x0b, 0xf4, 0x5f, + 0x9c, 0x3f, 0xa8, 0xb5, 0xda, 0x85, 0x76, 0xf1, 0x49, 0xc0, 0x30, 0x9b, 0xfb, 0x50, 0x70, 0xf1, + 0xce, 0x29, 0xbc, 0x0e, 0x64, 0x3b, 0x67, 0xde, 0xa3, 0xc1, 0x42, 0x46, 0xf7, 0x01, 0x74, 0xdb, + 0x17, 0xe0, 0x28, 0x5d, 0xb2, 0x99, 0x76, 0x33, 0x5d, 0xb2, 0x39, 0x2d, 0xe2, 0x3d, 0x00, 0xd5, + 0xad, 0x05, 0x24, 0xe1, 0xd6, 0x55, 0xa3, 0xc6, 0x54, 0x8b, 0xd8, 0xef, 0xcd, 0x0e, 0xcc, 0x30, + 0x40, 0x94, 0x3e, 0x0f, 0x83, 0x8f, 0x00, 0xb2, 0x2e, 0xd0, 0x30, 0x98, 0xe9, 0x0b, 0x2f, 0xf0, + 0x41, 0x33, 0xdf, 0xf3, 0x59, 0xda, 0xd6, 0x39, 0x7d, 0xe0, 0x05, 0x2c, 0x3a, 0x53, 0x35, 0x7d, + 0x71, 0xb3, 0x4d, 0x97, 0xfa, 0xfd, 0x99, 0xba, 0xde, 0xba, 0x0b, 0xcd, 0x7c, 0x31, 0x6f, 0xb4, + 0x98, 0x53, 0xe0, 0xf7, 0x0b, 0x05, 0xbd, 0x75, 0x0f, 0xda, 0xc5, 0x42, 0xde, 0xca, 0xc5, 0xc5, + 0x4c, 0x79, 0xdf, 0xd7, 0xd7, 0x54, 0x39, 0xf2, 0x77, 0x00, 0xb2, 0x82, 0xdf, 0xb8, 0x6f, 0xa6, + 0x05, 0x98, 0x92, 0xba, 0x07, 0x9d, 0xa9, 0x42, 0xde, 0x58, 0x3c, 0xbf, 0xbe, 0xbf, 0xc8, 0xfb, + 0xf9, 0x13, 0xc5, 0xd8, 0x3d, 0xe7, 0x94, 0xb9, 0x28, 0xfd, 0xe5, 0x4e, 0x1f, 0xb3, 0x8b, 0x67, + 0x0f, 0xa4, 0x85, 0x0c, 0xde, 0x05, 0xc8, 0xce, 0x18, 0xe3, 0x81, 0x99, 0x53, 0xa7, 0xdf, 0x32, + 0xd7, 0x88, 0x8a, 0x6e, 0x07, 0x5a, 0x85, 0x4e, 0xdb, 0xe4, 0xaa, 0x79, 0xed, 0xf7, 0x45, 0x47, + 0x49, 0xb1, 0x2d, 0x35, 0xab, 0x37, 0xb7, 0x59, 0xbd, 0xc8, 0x8b, 0xf9, 0x5e, 0xc8, 0x78, 0x71, + 0x4e, 0x7f, 0xf4, 0x3d, 0x39, 0x25, 0xdf, 0xef, 0xe4, 0x72, 0xca, 0x9c, 0x36, 0x68, 0x21, 0xa3, + 0x7d, 0xe8, 0xec, 0x99, 0x52, 0x56, 0x97, 0xd9, 0x5a, 0x9d, 0x39, 0x6d, 0x45, 0xbf, 0x3f, 0x6f, + 0x48, 0x07, 0xf6, 0xa7, 0xd0, 0x9d, 0x29, 0xb1, 0xad, 0xcd, 0xf4, 0x32, 0x77, 0x6e, 0xed, 0xbd, + 0x50, 0xad, 0x03, 0x58, 0x9d, 0xae, 0xb0, 0xad, 0x97, 0xf4, 0x56, 0x99, 0x5f, 0x79, 0x2f, 0x64, + 0xf5, 0x3e, 0xd4, 0x4c, 0x45, 0x67, 0xe9, 0x4b, 0xf3, 0xa9, 0x0a, 0x6f, 0xe1, 0xd4, 0xbb, 0xd0, + 0xc8, 0xd5, 0x44, 0x66, 0xaf, 0xce, 0x96, 0x49, 0x7d, 0x7d, 0xc7, 0x6d, 0xd0, 0xdb, 0xe7, 0xdf, + 0x7e, 0xb7, 0xf9, 0xc2, 0xdf, 0xbe, 0xdb, 0x7c, 0xe1, 0x17, 0xcf, 0x36, 0x4b, 0xdf, 0x3e, 0xdb, + 0x2c, 0xfd, 0xf5, 0xd9, 0x66, 0xe9, 0x1f, 0xcf, 0x36, 0x4b, 0x3f, 0xfa, 0xe9, 0x0f, 0xfc, 0x4f, + 0x0e, 0x4d, 0x22, 0x8e, 0x43, 0x74, 0xfb, 0x0c, 0x53, 0x9e, 0x1b, 0x8a, 0x4f, 0x87, 0x33, 0x7f, + 0xd7, 0x11, 0x2a, 0x9c, 0x2c, 0x4b, 0xf8, 0x9d, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x9e, + 0x0b, 0x82, 0xfc, 0x23, 0x00, 0x00, } func (m *CreateContainerRequest) Marshal() (dAtA []byte, err error) { diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/types.pb.go b/src/runtime/virtcontainers/pkg/agent/protocols/types.pb.go index 68f4733e5..eab7caa59 100644 --- a/src/runtime/virtcontainers/pkg/agent/protocols/types.pb.go +++ b/src/runtime/virtcontainers/pkg/agent/protocols/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/kata-containers/kata-containers/src/agent/protocols/protos/github.com/kata-containers/agent/pkg/types/types.proto +// source: github.com/kata-containers/kata-containers/src/agent/protocols/protos/types.proto package protocols @@ -46,7 +46,7 @@ func (x IPFamily) String() string { } func (IPFamily) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7ff1368e5fd1198e, []int{0} + return fileDescriptor_b0c68e5b9fabcd81, []int{0} } type IPAddress struct { @@ -61,7 +61,7 @@ type IPAddress struct { func (m *IPAddress) Reset() { *m = IPAddress{} } func (*IPAddress) ProtoMessage() {} func (*IPAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_7ff1368e5fd1198e, []int{0} + return fileDescriptor_b0c68e5b9fabcd81, []int{0} } func (m *IPAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,7 +114,7 @@ type Interface struct { func (m *Interface) Reset() { *m = Interface{} } func (*Interface) ProtoMessage() {} func (*Interface) Descriptor() ([]byte, []int) { - return fileDescriptor_7ff1368e5fd1198e, []int{1} + return fileDescriptor_b0c68e5b9fabcd81, []int{1} } func (m *Interface) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -157,7 +157,7 @@ type Route struct { func (m *Route) Reset() { *m = Route{} } func (*Route) ProtoMessage() {} func (*Route) Descriptor() ([]byte, []int) { - return fileDescriptor_7ff1368e5fd1198e, []int{2} + return fileDescriptor_b0c68e5b9fabcd81, []int{2} } func (m *Route) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -200,7 +200,7 @@ type ARPNeighbor struct { func (m *ARPNeighbor) Reset() { *m = ARPNeighbor{} } func (*ARPNeighbor) ProtoMessage() {} func (*ARPNeighbor) Descriptor() ([]byte, []int) { - return fileDescriptor_7ff1368e5fd1198e, []int{3} + return fileDescriptor_b0c68e5b9fabcd81, []int{3} } func (m *ARPNeighbor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -238,41 +238,41 @@ func init() { } func init() { - proto.RegisterFile("github.com/kata-containers/kata-containers/src/agent/protocols/protos/github.com/kata-containers/agent/pkg/types/types.proto", fileDescriptor_7ff1368e5fd1198e) + proto.RegisterFile("github.com/kata-containers/kata-containers/src/agent/protocols/protos/types.proto", fileDescriptor_b0c68e5b9fabcd81) } -var fileDescriptor_7ff1368e5fd1198e = []byte{ - // 479 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x8b, 0xd3, 0x40, - 0x18, 0xde, 0x69, 0x9a, 0x6c, 0x33, 0x65, 0xb5, 0x0c, 0xb2, 0x0c, 0x0a, 0x21, 0xf4, 0x62, 0x10, - 0x6c, 0xa0, 0x8a, 0xf7, 0xf5, 0xb0, 0xd0, 0x8b, 0x94, 0xb9, 0xe9, 0x45, 0xa6, 0xd3, 0x69, 0x1a, - 0x9a, 0x64, 0xca, 0xcc, 0xa4, 0xa5, 0xe8, 0xc1, 0x3f, 0xe2, 0xff, 0xd9, 0xa3, 0x47, 0x8f, 0xbb, - 0xfd, 0x25, 0x32, 0x1f, 0x2d, 0x71, 0x15, 0xc1, 0x4b, 0xfb, 0x3c, 0xef, 0xc7, 0xbc, 0xcf, 0xfb, - 0x64, 0x06, 0x7e, 0x2d, 0x4a, 0xbd, 0x6e, 0x17, 0x13, 0x26, 0xea, 0x7c, 0x43, 0x35, 0x7d, 0xcd, - 0x44, 0xa3, 0x69, 0xd9, 0x70, 0xa9, 0xfe, 0xe0, 0x4a, 0xb2, 0x9c, 0x16, 0xbc, 0xd1, 0xf9, 0x56, - 0x0a, 0x2d, 0x98, 0xa8, 0x94, 0x43, 0x2a, 0xff, 0xc7, 0x29, 0xbe, 0x63, 0x53, 0xe4, 0xfa, 0xb0, - 0xe5, 0xca, 0xfd, 0x4e, 0x6c, 0x1f, 0x0a, 0x2d, 0x19, 0x2f, 0x60, 0x3c, 0x9b, 0xdf, 0x2c, 0x97, - 0x92, 0x2b, 0x85, 0x5e, 0xc2, 0x68, 0x45, 0xeb, 0xb2, 0x3a, 0x60, 0x90, 0x82, 0xec, 0xc9, 0xf4, - 0xe9, 0xc4, 0x75, 0xcc, 0xe6, 0xb7, 0x36, 0x4c, 0x7c, 0x1a, 0x61, 0x78, 0x49, 0x5d, 0x0f, 0xee, - 0xa5, 0x20, 0x8b, 0xc9, 0x89, 0x22, 0x04, 0xfb, 0x35, 0x55, 0x1b, 0x1c, 0xd8, 0xb0, 0xc5, 0xe3, - 0x7b, 0x00, 0xe3, 0x59, 0xa3, 0xb9, 0x5c, 0x51, 0xc6, 0xd1, 0x35, 0x8c, 0x96, 0x7c, 0x57, 0x32, - 0x6e, 0x87, 0xc4, 0xc4, 0x33, 0xd3, 0xd9, 0xd0, 0x9a, 0xfb, 0x03, 0x2d, 0x46, 0x53, 0x38, 0x3c, - 0xab, 0xe3, 0x0a, 0x07, 0x69, 0x90, 0x0d, 0xa7, 0xa3, 0xb3, 0x2a, 0x9f, 0x21, 0xdd, 0x22, 0x34, - 0x82, 0x41, 0xad, 0x5b, 0xdc, 0x4f, 0x41, 0xd6, 0x27, 0x06, 0x9a, 0x89, 0xeb, 0xbd, 0x29, 0xc0, - 0xa1, 0x9b, 0xe8, 0x98, 0xd9, 0x62, 0xcb, 0x4a, 0x9b, 0x88, 0xdc, 0x16, 0x9e, 0x1a, 0x2d, 0x66, - 0x06, 0xbe, 0x74, 0x5a, 0x0c, 0x46, 0x2f, 0x60, 0x2c, 0xe9, 0xfe, 0xf3, 0xaa, 0xa2, 0x85, 0xc2, - 0x83, 0x14, 0x64, 0x57, 0x64, 0x20, 0xe9, 0xfe, 0xd6, 0xf0, 0xf1, 0x17, 0x18, 0x12, 0xd1, 0x6a, - 0xbb, 0xc5, 0x92, 0x2b, 0xed, 0x77, 0xb3, 0xd8, 0xcc, 0x29, 0xa8, 0xe6, 0x7b, 0x7a, 0x38, 0xb9, - 0xe5, 0x69, 0xc7, 0x8b, 0xe0, 0x37, 0x2f, 0xae, 0x61, 0xa4, 0x44, 0x2b, 0x19, 0xb7, 0x6b, 0xc4, - 0xc4, 0x33, 0xf4, 0x0c, 0x86, 0x8a, 0x89, 0x2d, 0xb7, 0x8b, 0x5c, 0x11, 0x47, 0xc6, 0xdf, 0x01, - 0x1c, 0xde, 0x90, 0xf9, 0x07, 0x5e, 0x16, 0xeb, 0x85, 0x90, 0xc6, 0x35, 0x2d, 0xce, 0x96, 0x58, - 0x29, 0x7f, 0x75, 0xad, 0x53, 0xd4, 0x51, 0xd2, 0x7b, 0xac, 0xa4, 0xaa, 0xcc, 0xc7, 0x3d, 0x29, - 0x74, 0xcc, 0x2a, 0xd1, 0x54, 0x3b, 0x81, 0x21, 0x71, 0xc4, 0x44, 0x9d, 0x3f, 0xa1, 0x8b, 0x5a, - 0xf2, 0xea, 0x39, 0x1c, 0x9c, 0x6e, 0x10, 0x8a, 0x60, 0x6f, 0xf7, 0x76, 0x74, 0x61, 0xff, 0xdf, - 0x8d, 0xc0, 0x7b, 0x75, 0xf7, 0x90, 0x5c, 0xfc, 0x7c, 0x48, 0x2e, 0xbe, 0x1d, 0x13, 0x70, 0x77, - 0x4c, 0xc0, 0x8f, 0x63, 0x02, 0xee, 0x8f, 0x09, 0xf8, 0xf4, 0xf1, 0x3f, 0x9f, 0x87, 0x6c, 0x1b, - 0x5d, 0xd6, 0x3c, 0xdf, 0x95, 0x52, 0x77, 0x52, 0xe6, 0xf6, 0x3f, 0x7a, 0x39, 0x8b, 0xc8, 0xc2, - 0x37, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xa3, 0xa6, 0x4f, 0x82, 0x03, 0x00, 0x00, +var fileDescriptor_b0c68e5b9fabcd81 = []byte{ + // 470 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x8f, 0xda, 0x30, + 0x14, 0xc7, 0x31, 0x21, 0x39, 0x62, 0x74, 0x2d, 0xb2, 0xaa, 0x93, 0xd5, 0x4a, 0x51, 0xc4, 0xd2, + 0xa8, 0x52, 0x89, 0x44, 0xab, 0xee, 0xd7, 0xe1, 0x24, 0x96, 0x8a, 0x7a, 0x6b, 0x97, 0xca, 0x18, + 0x13, 0x22, 0x92, 0x38, 0xb2, 0x1d, 0x10, 0xea, 0xd2, 0x2f, 0xd2, 0xef, 0x73, 0x63, 0xc7, 0x8e, + 0x77, 0x7c, 0x92, 0xca, 0x76, 0x40, 0x29, 0xed, 0x72, 0x13, 0xff, 0xdf, 0x7b, 0x36, 0xef, 0xff, + 0xfe, 0x18, 0xf8, 0x39, 0xcb, 0xf5, 0xa6, 0x59, 0x4e, 0x99, 0x28, 0xd3, 0x2d, 0xd5, 0xf4, 0x2d, + 0x13, 0x95, 0xa6, 0x79, 0xc5, 0xa5, 0xfa, 0x87, 0x95, 0x64, 0x29, 0xcd, 0x78, 0xa5, 0xd3, 0x5a, + 0x0a, 0x2d, 0x98, 0x28, 0x94, 0x53, 0x2a, 0xd5, 0x87, 0x9a, 0xab, 0xa9, 0x05, 0xe4, 0x5b, 0x98, + 0x2c, 0x61, 0x38, 0x5f, 0xdc, 0xae, 0x56, 0x92, 0x2b, 0x85, 0x5e, 0xc3, 0x60, 0x4d, 0xcb, 0xbc, + 0x38, 0x60, 0x10, 0x83, 0xe4, 0xd9, 0xec, 0xf9, 0xd4, 0xdd, 0x98, 0x2f, 0xee, 0x6c, 0x99, 0xb4, + 0x6d, 0x84, 0xe1, 0x15, 0x75, 0x77, 0x70, 0x3f, 0x06, 0x49, 0x48, 0x4e, 0x88, 0x10, 0x1c, 0x94, + 0x54, 0x6d, 0xb1, 0x67, 0xcb, 0x56, 0x4f, 0x1e, 0x00, 0x0c, 0xe7, 0x95, 0xe6, 0x72, 0x4d, 0x19, + 0x47, 0x37, 0x30, 0x58, 0xf1, 0x5d, 0xce, 0xb8, 0x1d, 0x12, 0x92, 0x96, 0xcc, 0xcd, 0x8a, 0x96, + 0xbc, 0xfd, 0x42, 0xab, 0xd1, 0x0c, 0x8e, 0xce, 0xee, 0xb8, 0xc2, 0x5e, 0xec, 0x25, 0xa3, 0xd9, + 0xf8, 0xec, 0xaa, 0xed, 0x90, 0xee, 0x21, 0x34, 0x86, 0x5e, 0xa9, 0x1b, 0x3c, 0x88, 0x41, 0x32, + 0x20, 0x46, 0x9a, 0x89, 0x9b, 0xbd, 0x39, 0x80, 0x7d, 0x37, 0xd1, 0x91, 0xd9, 0xa2, 0x66, 0xb9, + 0x6d, 0x04, 0x6e, 0x8b, 0x16, 0x8d, 0x17, 0x33, 0x03, 0x5f, 0x39, 0x2f, 0x46, 0xa3, 0x57, 0x30, + 0x94, 0x74, 0xff, 0x6d, 0x5d, 0xd0, 0x4c, 0xe1, 0x61, 0x0c, 0x92, 0x6b, 0x32, 0x94, 0x74, 0x7f, + 0x67, 0x78, 0xf2, 0x1d, 0xfa, 0x44, 0x34, 0xda, 0x6e, 0xb1, 0xe2, 0x4a, 0xb7, 0xbb, 0x59, 0x6d, + 0xe6, 0x64, 0x54, 0xf3, 0x3d, 0x3d, 0x9c, 0xd2, 0x6a, 0xb1, 0x93, 0x85, 0xf7, 0x57, 0x16, 0x37, + 0x30, 0x50, 0xa2, 0x91, 0x8c, 0xdb, 0x35, 0x42, 0xd2, 0x12, 0x7a, 0x01, 0x7d, 0xc5, 0x44, 0xcd, + 0xed, 0x22, 0xd7, 0xc4, 0xc1, 0xe4, 0x27, 0x80, 0xa3, 0x5b, 0xb2, 0xf8, 0xc4, 0xf3, 0x6c, 0xb3, + 0x14, 0xd2, 0xa4, 0xa6, 0xc5, 0x39, 0x12, 0x6b, 0xe5, 0xbf, 0xa9, 0x75, 0x0e, 0x75, 0x9c, 0xf4, + 0x2f, 0x9d, 0x14, 0x85, 0xf9, 0x71, 0x4f, 0x0e, 0x1d, 0x59, 0x27, 0x9a, 0x6a, 0x67, 0xd0, 0x27, + 0x0e, 0x4c, 0xd5, 0xe5, 0xe3, 0xbb, 0xaa, 0x85, 0x37, 0x2f, 0xe1, 0xf0, 0xf4, 0x82, 0x50, 0x00, + 0xfb, 0xbb, 0xf7, 0xe3, 0x9e, 0xfd, 0xfc, 0x30, 0x06, 0x1f, 0xd5, 0xfd, 0x63, 0xd4, 0xfb, 0xfd, + 0x18, 0xf5, 0x7e, 0x1c, 0x23, 0x70, 0x7f, 0x8c, 0xc0, 0xaf, 0x63, 0x04, 0x1e, 0x8e, 0x11, 0xf8, + 0xfa, 0xe5, 0x89, 0x6f, 0x5e, 0x36, 0x95, 0xce, 0x4b, 0x9e, 0xee, 0x72, 0xa9, 0x3b, 0xad, 0x7a, + 0x9b, 0x5d, 0xfe, 0x1d, 0x96, 0x81, 0x95, 0xef, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x11, 0x62, + 0xe9, 0x09, 0x57, 0x03, 0x00, 0x00, } func (m *IPAddress) Marshal() (dAtA []byte, err error) { From 54e23c8302e7216fea579a18778505c0441fade0 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sun, 25 Oct 2020 10:44:53 +0800 Subject: [PATCH 2/6] agent: move gogo.proto out of the github.com namespance To follow the same namespace scope as other proto files. Signed-off-by: Peng Tao --- .../gogo/protobuf/gogoproto/gogo.proto | 0 src/agent/protocols/protos/health.proto | 2 +- src/agent/protocols/protos/oci.proto | 2 +- .../pkg/agent/protocols/grpc/health.pb.go | 52 ++-- .../pkg/agent/protocols/grpc/health.proto | 2 +- .../pkg/agent/protocols/grpc/oci.pb.go | 264 +++++++++--------- .../pkg/agent/protocols/grpc/oci.proto | 2 +- 7 files changed, 162 insertions(+), 162 deletions(-) rename src/agent/protocols/protos/{github.com => }/gogo/protobuf/gogoproto/gogo.proto (100%) diff --git a/src/agent/protocols/protos/github.com/gogo/protobuf/gogoproto/gogo.proto b/src/agent/protocols/protos/gogo/protobuf/gogoproto/gogo.proto similarity index 100% rename from src/agent/protocols/protos/github.com/gogo/protobuf/gogoproto/gogo.proto rename to src/agent/protocols/protos/gogo/protobuf/gogoproto/gogo.proto diff --git a/src/agent/protocols/protos/health.proto b/src/agent/protocols/protos/health.proto index c550d6313..190632ed4 100644 --- a/src/agent/protocols/protos/health.proto +++ b/src/agent/protocols/protos/health.proto @@ -11,7 +11,7 @@ option go_package = "github.com/kata-containers/kata-containers/src/runtime/virt package grpc; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.equal_all) = true; option (gogoproto.populate_all) = true; diff --git a/src/agent/protocols/protos/oci.proto b/src/agent/protocols/protos/oci.proto index b55e3299c..de7631210 100644 --- a/src/agent/protocols/protos/oci.proto +++ b/src/agent/protocols/protos/oci.proto @@ -11,7 +11,7 @@ option go_package = "github.com/kata-containers/kata-containers/src/runtime/virt package grpc; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogo/protobuf/gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; option (gogoproto.equal_all) = true; diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.pb.go b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.pb.go index 739c79ad1..931605fb6 100644 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.pb.go +++ b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.pb.go @@ -186,32 +186,32 @@ func init() { } var fileDescriptor_c2419073415b3fbc = []byte{ - // 393 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x31, 0x4f, 0xfa, 0x40, - 0x1c, 0xe5, 0xc8, 0xff, 0x0f, 0xf1, 0x00, 0x25, 0xa7, 0x03, 0x32, 0x5c, 0xb4, 0x0e, 0xb2, 0xd0, - 0x26, 0x98, 0x98, 0xe8, 0x62, 0xa2, 0x31, 0x6a, 0x4c, 0x4a, 0x52, 0x14, 0x13, 0x07, 0x48, 0x69, - 0xce, 0xb6, 0x01, 0x7a, 0xf5, 0xee, 0xca, 0xe2, 0xe2, 0xe8, 0xec, 0xa7, 0xf0, 0x23, 0x38, 0x3a, - 0x32, 0x3a, 0x3a, 0x4a, 0x3f, 0x85, 0xa3, 0xe9, 0x5d, 0x31, 0x10, 0x70, 0x70, 0xbb, 0xf7, 0x7e, - 0xef, 0xdd, 0xef, 0xbd, 0xcb, 0x41, 0xcb, 0xf5, 0x85, 0x17, 0xf5, 0x74, 0x87, 0x0e, 0x8d, 0xbe, - 0x2d, 0xec, 0xba, 0x43, 0x03, 0x61, 0xfb, 0x01, 0x61, 0x7c, 0x01, 0x73, 0xe6, 0x18, 0xb6, 0x4b, - 0x02, 0x61, 0x84, 0x8c, 0x0a, 0xea, 0xd0, 0x01, 0x57, 0x27, 0x6e, 0x78, 0xc4, 0x1e, 0x08, 0x4f, - 0x97, 0x08, 0xfd, 0x73, 0x59, 0xe8, 0x54, 0xeb, 0x33, 0x37, 0xbb, 0xd4, 0xa5, 0x4a, 0xda, 0x8b, - 0xee, 0x24, 0x92, 0x40, 0x9e, 0x94, 0x49, 0xab, 0xc1, 0xe2, 0x89, 0x47, 0x9c, 0xbe, 0x45, 0xee, - 0x23, 0xc2, 0x05, 0xaa, 0xc0, 0x3c, 0x27, 0x6c, 0xe4, 0x3b, 0xa4, 0x02, 0xb6, 0x40, 0x6d, 0xc5, - 0x9a, 0x42, 0xed, 0x19, 0xc0, 0xf5, 0x73, 0xb9, 0x2f, 0x35, 0xf0, 0x90, 0x06, 0x9c, 0xa0, 0x23, - 0x98, 0xe3, 0xc2, 0x16, 0x11, 0x97, 0x86, 0xd5, 0xc6, 0xae, 0x9e, 0xe4, 0xd0, 0x97, 0x48, 0xf5, - 0x56, 0x72, 0x55, 0xe0, 0xb6, 0xa4, 0xdc, 0x4a, 0x6d, 0xda, 0x21, 0x2c, 0xcd, 0x0d, 0x50, 0x01, - 0xe6, 0xaf, 0xcd, 0x4b, 0xb3, 0x79, 0x63, 0x96, 0x33, 0x09, 0x68, 0x9d, 0x5a, 0xed, 0x0b, 0xf3, - 0xac, 0x0c, 0xd0, 0x1a, 0x2c, 0x98, 0xcd, 0xab, 0xee, 0x94, 0xc8, 0x6a, 0x1d, 0xb8, 0xd1, 0x26, - 0x8c, 0xfb, 0x34, 0x98, 0x0f, 0xb5, 0x0d, 0x8b, 0x49, 0x8a, 0xee, 0x48, 0x0d, 0xd3, 0x2e, 0x85, - 0x84, 0x4b, 0xf5, 0x68, 0x07, 0x96, 0xe4, 0xab, 0xfe, 0x68, 0xb2, 0x52, 0x53, 0x94, 0x64, 0x2a, - 0x6a, 0x3c, 0xc0, 0x9c, 0x2a, 0x82, 0xf6, 0xe1, 0x7f, 0xb9, 0x02, 0x21, 0xd5, 0x6f, 0xf6, 0xd5, - 0xaa, 0x9b, 0xbf, 0x76, 0x46, 0x07, 0x30, 0x3f, 0xdd, 0xb8, 0xcc, 0x59, 0x55, 0xdc, 0xb2, 0x12, - 0xc7, 0x4f, 0x60, 0x3c, 0xc1, 0x99, 0x8f, 0x09, 0xce, 0x7c, 0x4d, 0x30, 0x78, 0x8c, 0x31, 0x78, - 0x89, 0x31, 0x78, 0x8d, 0x31, 0x78, 0x8b, 0x31, 0x18, 0xc7, 0x18, 0xbc, 0xc7, 0x18, 0x7c, 0xc6, - 0x18, 0xdc, 0x76, 0xfe, 0xf8, 0x9f, 0x58, 0x14, 0x08, 0x7f, 0x48, 0x8c, 0x91, 0xcf, 0xc4, 0xcc, - 0x28, 0xec, 0xbb, 0x0b, 0x5f, 0x2d, 0xc9, 0xd7, 0xcb, 0x49, 0xbc, 0xf7, 0x1d, 0x00, 0x00, 0xff, - 0xff, 0x4d, 0x7b, 0xf1, 0xc9, 0xb8, 0x02, 0x00, 0x00, + // 390 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x31, 0x4f, 0xc2, 0x40, + 0x18, 0xe5, 0x88, 0x42, 0x3c, 0x40, 0xc9, 0xe9, 0x80, 0x0c, 0x17, 0xad, 0x83, 0x2c, 0xb6, 0x09, + 0x26, 0x26, 0xba, 0x98, 0x68, 0x8c, 0x1a, 0x93, 0x92, 0x14, 0xc5, 0xc4, 0x01, 0x52, 0x9a, 0xb3, + 0x6d, 0x80, 0x5e, 0xbd, 0xbb, 0xb2, 0xb8, 0x38, 0x3a, 0xfb, 0x2b, 0xfc, 0x09, 0x8e, 0x8e, 0x8c, + 0x8e, 0x8e, 0xd2, 0x5f, 0xe1, 0x68, 0x7a, 0x57, 0x0c, 0x04, 0x1c, 0xdc, 0xee, 0x7d, 0xef, 0xbd, + 0x7b, 0xdf, 0xbb, 0x1c, 0xb4, 0x5c, 0x5f, 0x78, 0x51, 0x57, 0x77, 0xe8, 0xc0, 0xe8, 0xd9, 0xc2, + 0xde, 0x73, 0x68, 0x20, 0x6c, 0x3f, 0x20, 0x8c, 0xcf, 0x61, 0xce, 0x1c, 0xc3, 0x76, 0x49, 0x20, + 0x8c, 0x90, 0x51, 0x41, 0x1d, 0xda, 0xe7, 0xea, 0xc4, 0x0d, 0x8f, 0xd8, 0x7d, 0xe1, 0xe9, 0x12, + 0xa1, 0x25, 0x97, 0x85, 0x4e, 0x55, 0x73, 0xa9, 0x4b, 0x15, 0xdf, 0x8d, 0xee, 0x8d, 0x04, 0x49, + 0x20, 0x4f, 0x4a, 0xa9, 0xd5, 0x60, 0xf1, 0xd4, 0x23, 0x4e, 0xcf, 0x22, 0x0f, 0x11, 0xe1, 0x02, + 0x55, 0x60, 0x9e, 0x13, 0x36, 0xf4, 0x1d, 0x52, 0x01, 0x5b, 0xa0, 0xb6, 0x62, 0x4d, 0xa0, 0xf6, + 0x02, 0xe0, 0xfa, 0x85, 0x0c, 0x49, 0x0d, 0x3c, 0xa4, 0x01, 0x27, 0xe8, 0x18, 0xe6, 0xb8, 0xb0, + 0x45, 0xc4, 0xa5, 0x61, 0xb5, 0xbe, 0xab, 0x27, 0xe1, 0xfa, 0x02, 0xa9, 0xde, 0x4c, 0xae, 0x0a, + 0xdc, 0xa6, 0x94, 0x5b, 0xa9, 0x4d, 0x3b, 0x82, 0xa5, 0x19, 0x02, 0x15, 0x60, 0xfe, 0xc6, 0xbc, + 0x32, 0x1b, 0xb7, 0x66, 0x39, 0x93, 0x80, 0xe6, 0x99, 0xd5, 0xba, 0x34, 0xcf, 0xcb, 0x00, 0xad, + 0xc1, 0x82, 0xd9, 0xb8, 0xee, 0x4c, 0x06, 0x59, 0xad, 0x0d, 0x37, 0x5a, 0x84, 0x71, 0x9f, 0x06, + 0xb3, 0x4b, 0x6d, 0xc3, 0x62, 0xb2, 0x45, 0x67, 0xa8, 0xc8, 0xb4, 0x4b, 0x21, 0x99, 0xa5, 0x7a, + 0xb4, 0x03, 0x4b, 0xf2, 0x29, 0x7f, 0x35, 0x59, 0xa9, 0x29, 0xca, 0x61, 0x2a, 0xaa, 0x3f, 0xc2, + 0x9c, 0x2a, 0x82, 0x0e, 0xe0, 0xb2, 0x8c, 0x40, 0x48, 0xf5, 0x9b, 0x7e, 0xb5, 0xea, 0xe6, 0x9f, + 0x9d, 0xd1, 0x21, 0xcc, 0x4f, 0x12, 0x17, 0x39, 0xab, 0x6a, 0xb6, 0xa8, 0xc4, 0xc9, 0x33, 0x18, + 0x8d, 0x71, 0xe6, 0x73, 0x8c, 0x33, 0xdf, 0x63, 0x0c, 0x9e, 0x62, 0x0c, 0x5e, 0x63, 0x0c, 0xde, + 0x62, 0x0c, 0xde, 0x63, 0x0c, 0x46, 0x31, 0x06, 0x1f, 0x31, 0x06, 0x5f, 0x31, 0x06, 0x77, 0xed, + 0x7f, 0x7e, 0x22, 0x16, 0x05, 0xc2, 0x1f, 0x10, 0x63, 0xe8, 0x33, 0x31, 0x45, 0x85, 0x3d, 0x77, + 0xee, 0x7f, 0x25, 0xfb, 0x75, 0x73, 0x12, 0xef, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x19, 0x6c, + 0x8a, 0xb5, 0xad, 0x02, 0x00, 0x00, } func (this *CheckRequest) Equal(that interface{}) bool { diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto index effdbaaea..4aa7514bd 100644 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto +++ b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto @@ -8,7 +8,7 @@ syntax = "proto3"; package grpc; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.equal_all) = true; option (gogoproto.populate_all) = true; diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.pb.go b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.pb.go index 1c60cf603..6f508edb6 100644 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.pb.go +++ b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.pb.go @@ -1509,139 +1509,139 @@ func init() { } var fileDescriptor_e42fef2823778fc8 = []byte{ - // 2099 bytes of a gzipped FileDescriptorProto + // 2097 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x18, 0x4b, 0x73, 0x1b, 0x49, - 0x39, 0x23, 0xc9, 0xb2, 0xd4, 0x8a, 0xf3, 0xe8, 0xcd, 0x66, 0x87, 0xb0, 0xa5, 0xf5, 0x0e, 0x29, - 0x30, 0x90, 0xb5, 0x8b, 0x84, 0xc7, 0xb2, 0x3c, 0xaa, 0x64, 0x3b, 0x89, 0x55, 0x1b, 0x47, 0xa2, - 0x65, 0x6f, 0x60, 0x0f, 0x5b, 0xd5, 0x1e, 0xb5, 0xa5, 0x5e, 0x8f, 0xa6, 0xa7, 0xba, 0x5b, 0x76, - 0xcc, 0x09, 0x6e, 0x1c, 0xa9, 0xe2, 0x17, 0x70, 0x02, 0xfe, 0x01, 0xc5, 0x89, 0x1b, 0x29, 0x4e, - 0x1c, 0xa9, 0xa2, 0x0a, 0x88, 0xef, 0xdc, 0x39, 0x52, 0x5f, 0x3f, 0x46, 0x2d, 0xc9, 0x81, 0x0d, - 0x7b, 0x52, 0x7f, 0xcf, 0xee, 0xef, 0xfd, 0x8d, 0x50, 0x6f, 0xc4, 0xf5, 0x78, 0x7a, 0xb4, 0x99, - 0x8a, 0xc9, 0xd6, 0x09, 0xd5, 0xf4, 0xbd, 0x54, 0xe4, 0x9a, 0xf2, 0x9c, 0x49, 0xb5, 0x04, 0x2b, - 0x99, 0x6e, 0xd1, 0x11, 0xcb, 0xf5, 0x56, 0x21, 0x85, 0x16, 0xa9, 0xc8, 0x94, 0x3d, 0xa9, 0x2d, - 0x91, 0xf2, 0x4d, 0x73, 0xc4, 0xb5, 0x91, 0x2c, 0xd2, 0x3b, 0xef, 0x05, 0x6a, 0x47, 0x62, 0x24, - 0x2c, 0xdf, 0xd1, 0xf4, 0xd8, 0x40, 0x06, 0x30, 0x27, 0x2b, 0x74, 0xa7, 0x3d, 0x12, 0x62, 0x94, - 0xb1, 0x19, 0xd7, 0x99, 0xa4, 0x45, 0xc1, 0xa4, 0xb2, 0xf4, 0xe4, 0x4f, 0x55, 0x54, 0x1b, 0x14, - 0x2c, 0xc5, 0x31, 0x5a, 0xfd, 0x88, 0x49, 0xc5, 0x45, 0x1e, 0x47, 0xeb, 0xd1, 0x46, 0x93, 0x78, - 0x10, 0x7f, 0x05, 0xad, 0xf6, 0xa5, 0x48, 0x99, 0x52, 0x71, 0x65, 0x3d, 0xda, 0x68, 0xdd, 0x5f, - 0xdb, 0x84, 0x97, 0x6c, 0x3a, 0x24, 0xf1, 0x54, 0xdc, 0x46, 0x35, 0x22, 0x84, 0x8e, 0xab, 0x86, - 0x0b, 0x59, 0x2e, 0xc0, 0x10, 0x83, 0xc7, 0x77, 0x50, 0x63, 0x4f, 0x28, 0x9d, 0xd3, 0x09, 0x8b, - 0x6b, 0xe6, 0x8e, 0x12, 0xc6, 0x5f, 0x45, 0xf5, 0x7d, 0x31, 0xcd, 0xb5, 0x8a, 0x57, 0xd6, 0xab, - 0x1b, 0xad, 0xfb, 0x2d, 0x2b, 0x6d, 0x70, 0xdb, 0xb5, 0x17, 0x7f, 0x7f, 0xe7, 0x0a, 0x71, 0x0c, - 0xf8, 0x5d, 0xb4, 0xb2, 0x27, 0xc4, 0x89, 0x8a, 0xeb, 0xe6, 0x1e, 0xc7, 0x69, 0x50, 0xc4, 0x52, - 0xf0, 0x0f, 0x50, 0xab, 0x93, 0xe7, 0x42, 0x53, 0xcd, 0x45, 0xae, 0xe2, 0x55, 0xa3, 0xf2, 0x8b, - 0x96, 0x11, 0xac, 0xdd, 0x0c, 0xa8, 0x0f, 0x73, 0x2d, 0xcf, 0x49, 0xc8, 0x0f, 0x37, 0x3c, 0xe1, - 0xf9, 0xf4, 0x79, 0xdc, 0x08, 0x6f, 0x30, 0x28, 0x62, 0x29, 0xe0, 0x94, 0x81, 0xc8, 0xa8, 0xe4, - 0x2a, 0x6e, 0x86, 0x4e, 0x71, 0x48, 0xe2, 0xa9, 0xc0, 0xf8, 0x8c, 0xe7, 0x43, 0x71, 0xa6, 0x62, - 0x14, 0x32, 0x3a, 0x24, 0xf1, 0xd4, 0x3b, 0x3f, 0x44, 0x37, 0x16, 0x5f, 0x85, 0x6f, 0xa0, 0xea, - 0x09, 0x3b, 0x77, 0x01, 0x81, 0x23, 0xbe, 0x85, 0x56, 0x4e, 0x69, 0x36, 0x65, 0x26, 0x14, 0x4d, - 0x62, 0x81, 0x0f, 0x2a, 0xef, 0x47, 0xc9, 0x1f, 0xaa, 0x65, 0x9c, 0xc0, 0xd3, 0x07, 0x4c, 0x4e, - 0x78, 0x4e, 0x33, 0x23, 0xdc, 0x20, 0x25, 0x8c, 0xbf, 0x8e, 0x5a, 0x3b, 0x22, 0x57, 0x22, 0x63, - 0x03, 0xfe, 0x53, 0xe6, 0x42, 0xda, 0xb4, 0x8f, 0xda, 0x16, 0xcf, 0x49, 0x48, 0xc5, 0x77, 0x51, - 0xed, 0x50, 0x31, 0x39, 0x1f, 0x52, 0xc0, 0xb8, 0x98, 0x18, 0x2a, 0xc6, 0xa8, 0xd6, 0x91, 0x23, - 0x15, 0xd7, 0xd6, 0xab, 0x1b, 0x4d, 0x62, 0xce, 0xf0, 0xf4, 0x87, 0xf9, 0xa9, 0x89, 0x66, 0x93, - 0xc0, 0x11, 0x30, 0x3b, 0x67, 0x43, 0x13, 0xb5, 0x26, 0x81, 0x23, 0xfe, 0x1e, 0xba, 0xba, 0x43, - 0x0b, 0x7a, 0xc4, 0x33, 0xae, 0x39, 0x83, 0x38, 0xc1, 0x2d, 0x6f, 0x05, 0xee, 0x0e, 0xc9, 0x64, - 0x8e, 0x19, 0x7f, 0x03, 0xad, 0x92, 0x8c, 0x4f, 0xb8, 0x56, 0x71, 0xc3, 0xc4, 0xf7, 0xa6, 0x4b, - 0xcb, 0xde, 0xa0, 0xfb, 0x63, 0x4b, 0x71, 0x8f, 0xf4, 0x7c, 0x78, 0x03, 0x5d, 0x7f, 0x2a, 0x9e, - 0xb2, 0xb3, 0xbe, 0xe4, 0xa7, 0x3c, 0x63, 0x23, 0x66, 0x83, 0xd7, 0x20, 0x8b, 0x68, 0xe0, 0xec, - 0x14, 0x05, 0x95, 0x13, 0x21, 0xfb, 0x52, 0x1c, 0xf3, 0x8c, 0x99, 0xe8, 0x35, 0xc9, 0x22, 0x1a, - 0xaf, 0xa3, 0x56, 0xaf, 0xb7, 0x3f, 0x48, 0x85, 0x64, 0x9d, 0xe1, 0xa7, 0x71, 0x6b, 0x3d, 0xda, - 0xa8, 0x92, 0x10, 0x85, 0x13, 0x74, 0x75, 0xc0, 0x32, 0xb0, 0xe6, 0x09, 0x3d, 0x62, 0x59, 0x7c, - 0xd5, 0x28, 0x9a, 0xc3, 0x25, 0x0f, 0x50, 0x75, 0x5b, 0x3c, 0xc7, 0xb7, 0x51, 0x7d, 0x8f, 0xf1, - 0xd1, 0x58, 0x9b, 0xa8, 0xad, 0x11, 0x07, 0x41, 0xd4, 0x9f, 0xf1, 0xa1, 0x1e, 0x9b, 0x68, 0xad, - 0x11, 0x0b, 0x24, 0xb9, 0x0d, 0x0e, 0x38, 0xf6, 0xb0, 0xbb, 0xeb, 0x44, 0xe0, 0x08, 0x98, 0xc7, - 0xdd, 0x5d, 0xc7, 0x0d, 0x47, 0xfc, 0x65, 0x74, 0xad, 0x33, 0x1c, 0x72, 0xc8, 0x2d, 0x9a, 0x3d, - 0xe6, 0x43, 0x15, 0x57, 0xd7, 0xab, 0x1b, 0x6b, 0x64, 0x01, 0x0b, 0x99, 0x03, 0x3a, 0xc3, 0x1a, - 0xf5, 0x70, 0xf2, 0x9b, 0x08, 0xdd, 0x5c, 0x8a, 0x0a, 0x48, 0x6c, 0x8b, 0x69, 0x3e, 0xe4, 0xf9, - 0x28, 0x8e, 0x4c, 0xb4, 0x4b, 0x18, 0xbf, 0x8d, 0x9a, 0x0f, 0x8f, 0x8f, 0x59, 0xaa, 0xf9, 0x29, - 0x64, 0x1a, 0x10, 0x67, 0x08, 0x70, 0x5d, 0x37, 0x1f, 0x33, 0xc9, 0x35, 0x3d, 0xca, 0x98, 0x79, - 0x50, 0x93, 0x84, 0x28, 0x90, 0xef, 0x43, 0xde, 0x6a, 0xcd, 0x86, 0x2e, 0xbb, 0x66, 0x08, 0x68, - 0x59, 0x9d, 0xc9, 0x11, 0x67, 0xb9, 0x76, 0x69, 0xe6, 0xc1, 0xa4, 0x8b, 0x5a, 0x41, 0x1a, 0x40, - 0x7e, 0x1e, 0x9c, 0x17, 0xcc, 0xd5, 0x91, 0x39, 0x03, 0x6e, 0x8f, 0xca, 0xa1, 0xf1, 0x51, 0x8d, - 0x98, 0x33, 0xe0, 0x06, 0xe2, 0xd8, 0x36, 0xb0, 0x1a, 0x31, 0xe7, 0x44, 0xa0, 0x15, 0xd3, 0x77, - 0xe0, 0xb5, 0x43, 0xa6, 0x34, 0xcf, 0x4d, 0x81, 0x3a, 0x5d, 0x21, 0x0a, 0xa2, 0xa7, 0xc4, 0x54, - 0xa6, 0xbe, 0x38, 0x1d, 0x04, 0x6a, 0x35, 0x5c, 0x5f, 0xb5, 0xd7, 0xc3, 0x19, 0xde, 0x2e, 0x0a, - 0xdb, 0x9d, 0xac, 0x5d, 0x1e, 0x4c, 0xbe, 0x6d, 0xbb, 0x28, 0x48, 0xf5, 0xa9, 0x1e, 0xfb, 0x47, - 0xc3, 0x19, 0x7c, 0x4d, 0x18, 0x1d, 0x8a, 0x3c, 0x3b, 0x37, 0x77, 0x34, 0x48, 0x09, 0x27, 0xbf, - 0x8a, 0x5c, 0x5f, 0xc4, 0xf7, 0x50, 0xa3, 0x2f, 0x99, 0xd2, 0x54, 0x6a, 0x13, 0x91, 0xb2, 0x70, - 0x81, 0xec, 0x6a, 0xa2, 0xe4, 0xc0, 0x9b, 0xa8, 0xd9, 0x17, 0x4a, 0x5b, 0xf6, 0xca, 0x2b, 0xd8, - 0x67, 0x2c, 0x46, 0xbb, 0x01, 0x44, 0x61, 0x42, 0x76, 0xb9, 0x76, 0xc7, 0x91, 0x7c, 0x8c, 0x6a, - 0x80, 0xbf, 0xd4, 0x1a, 0xdf, 0x36, 0x2a, 0xcb, 0x6d, 0xa3, 0x3a, 0x6b, 0x1b, 0x31, 0x5a, 0x3d, - 0xe0, 0x13, 0x26, 0xa6, 0xda, 0x24, 0x64, 0x95, 0x78, 0x30, 0xf9, 0xdd, 0x8a, 0xeb, 0xd3, 0xf8, - 0xfb, 0xa8, 0x75, 0xd8, 0xdd, 0xdd, 0xa7, 0x45, 0xc1, 0xf3, 0x91, 0x72, 0x46, 0xdf, 0x0a, 0xfa, - 0x48, 0x49, 0x74, 0x0f, 0x0c, 0xd9, 0x41, 0xfa, 0x71, 0x20, 0x5d, 0xf9, 0xdf, 0xd2, 0x01, 0x3b, - 0xde, 0x42, 0xf5, 0xc1, 0xb9, 0x4a, 0x75, 0xe6, 0xbc, 0x11, 0xb6, 0xaf, 0x4d, 0x4b, 0xb1, 0x23, - 0xc6, 0xb1, 0xe1, 0xfb, 0xa8, 0x49, 0x98, 0x4d, 0x0d, 0x65, 0x4c, 0x9a, 0xbf, 0xac, 0xa4, 0x91, - 0x19, 0x1b, 0x24, 0xdf, 0xce, 0x48, 0x8a, 0x69, 0xa1, 0x8c, 0x17, 0x57, 0x6c, 0xf2, 0x05, 0x28, - 0xfc, 0x01, 0x42, 0x4f, 0xe9, 0x84, 0xa9, 0x82, 0x82, 0xda, 0xfa, 0x92, 0x0d, 0x25, 0xd1, 0xd9, - 0x10, 0x70, 0x43, 0x2b, 0xdd, 0x65, 0xa7, 0x3c, 0x65, 0x7e, 0x54, 0xde, 0x0c, 0x04, 0x2d, 0xc5, - 0xb7, 0x52, 0xc7, 0x87, 0xef, 0xa1, 0xd5, 0x01, 0x4b, 0x53, 0x31, 0x29, 0xdc, 0x90, 0xc4, 0x81, - 0x88, 0xa3, 0x10, 0xcf, 0x82, 0xef, 0xa1, 0x9b, 0x90, 0xd3, 0xc7, 0xaa, 0x2f, 0x45, 0x41, 0x47, - 0xb6, 0x82, 0x9a, 0xc6, 0x88, 0x65, 0x02, 0x18, 0xbb, 0x4f, 0xd5, 0x09, 0x1b, 0x82, 0x61, 0x30, - 0x36, 0x4d, 0x5f, 0x08, 0x50, 0xf8, 0x2e, 0x5a, 0xf3, 0x79, 0x6f, 0x79, 0x5a, 0x86, 0x67, 0x1e, - 0x89, 0xdb, 0x08, 0x99, 0xd2, 0x0d, 0xdb, 0x6e, 0x80, 0xc1, 0x5b, 0xa8, 0xd1, 0xcd, 0x35, 0xcb, - 0xc8, 0x50, 0xc7, 0x6b, 0xc6, 0x88, 0x37, 0xc2, 0xa0, 0x3b, 0x12, 0x29, 0x99, 0xee, 0x7c, 0x17, - 0xb5, 0x82, 0x80, 0xbe, 0xd6, 0x74, 0x7e, 0xa7, 0x5c, 0x03, 0x80, 0x69, 0x38, 0x9d, 0x4c, 0xbc, - 0xa0, 0x05, 0x80, 0xc1, 0xaf, 0x0c, 0x97, 0x33, 0x7c, 0x82, 0xae, 0xcd, 0x27, 0xa3, 0x99, 0x16, - 0x42, 0xe9, 0xb2, 0xf5, 0x3b, 0xc8, 0x24, 0x8b, 0xdf, 0x2d, 0xcb, 0x29, 0x10, 0xa2, 0x4c, 0xa3, - 0x83, 0xe1, 0x5f, 0x35, 0x24, 0x73, 0x4e, 0xde, 0x77, 0xfa, 0xcb, 0xbc, 0x78, 0x55, 0xdb, 0x34, - 0x19, 0x58, 0x99, 0xd5, 0x71, 0xf2, 0xeb, 0x08, 0xb5, 0x82, 0x54, 0x79, 0x55, 0xad, 0x1b, 0x5d, - 0x95, 0x40, 0xd7, 0x2d, 0xb4, 0xb2, 0x4f, 0x3f, 0x15, 0x76, 0xbb, 0xa8, 0x12, 0x0b, 0x18, 0x2c, - 0xcf, 0x85, 0x74, 0xd5, 0x6e, 0x01, 0xe8, 0x7c, 0x8f, 0x78, 0xc6, 0xf6, 0xc5, 0x90, 0x99, 0xec, - 0x5f, 0x23, 0x25, 0xec, 0xe7, 0x5f, 0x7d, 0x69, 0xfe, 0xad, 0x96, 0xf3, 0x2f, 0xf9, 0x47, 0xc5, - 0x99, 0x37, 0xab, 0xa9, 0xef, 0xcc, 0xb2, 0x3e, 0x5a, 0xaa, 0x5c, 0x4b, 0xb1, 0x05, 0xb6, 0x98, - 0xfb, 0xb0, 0xab, 0xb2, 0x89, 0x90, 0xe7, 0x6e, 0x79, 0x0a, 0xab, 0xc5, 0x12, 0x88, 0x63, 0xc0, - 0xeb, 0xa8, 0xba, 0xd3, 0x3f, 0x74, 0xeb, 0xd3, 0xb5, 0x70, 0xb1, 0xe9, 0x1f, 0x12, 0x20, 0xe1, - 0x2f, 0xa1, 0x5a, 0x1f, 0xc6, 0xb1, 0x6d, 0x04, 0xd7, 0x03, 0x16, 0x40, 0x13, 0x43, 0x84, 0x6a, - 0xdb, 0xce, 0x44, 0x7a, 0xd2, 0xed, 0x19, 0xe3, 0xe7, 0xab, 0xcd, 0x51, 0x88, 0x67, 0xc1, 0x8f, - 0xd0, 0xb5, 0xbd, 0xe9, 0x88, 0x15, 0x74, 0xc4, 0x9e, 0xd8, 0x05, 0xc9, 0xb6, 0x83, 0x38, 0x10, - 0x9a, 0x63, 0x70, 0x06, 0x2e, 0x48, 0xc1, 0xad, 0x4f, 0x99, 0x3e, 0x13, 0xf2, 0xc4, 0x6d, 0x66, - 0xe1, 0xad, 0x8e, 0x42, 0x3c, 0x4b, 0xf2, 0x37, 0x9f, 0x05, 0xce, 0xf4, 0x5b, 0xd0, 0x9c, 0x27, - 0xdc, 0xae, 0x32, 0x55, 0x62, 0x01, 0xc8, 0x4d, 0xc2, 0x14, 0x93, 0xa7, 0xb6, 0x07, 0x54, 0xec, - 0xba, 0x14, 0xa0, 0x4c, 0x6e, 0x9e, 0xd1, 0xc2, 0x25, 0x85, 0x39, 0x43, 0xa6, 0x7f, 0xc8, 0x64, - 0xce, 0x32, 0x97, 0x14, 0x0e, 0x82, 0xfd, 0xc0, 0x9e, 0x0e, 0x76, 0xfa, 0xc6, 0x33, 0x55, 0x32, - 0x43, 0x40, 0xfd, 0x83, 0x74, 0xc1, 0x73, 0xf8, 0x76, 0xa9, 0x9b, 0xa1, 0x1e, 0x60, 0xf0, 0xd7, - 0xd0, 0x8d, 0x5d, 0xae, 0x60, 0xd1, 0xe8, 0xf5, 0xf6, 0x3f, 0xe4, 0x59, 0xc6, 0xa4, 0x31, 0xb4, - 0x41, 0x96, 0xf0, 0xc9, 0x9f, 0x23, 0xd4, 0xf0, 0x81, 0x83, 0xe7, 0x0c, 0xc6, 0x54, 0x9a, 0xc4, - 0x01, 0xa5, 0x0e, 0x02, 0x93, 0x7f, 0x34, 0x15, 0x9a, 0x3a, 0xb3, 0x2c, 0x00, 0xdc, 0x7d, 0x26, - 0xb9, 0x18, 0xba, 0xbd, 0xc2, 0x41, 0xb0, 0x63, 0x12, 0x46, 0x33, 0xcd, 0x27, 0x8c, 0x4c, 0x73, - 0xf8, 0x71, 0xd6, 0x2d, 0xa2, 0x61, 0x79, 0xf3, 0x28, 0xa7, 0x69, 0xc5, 0x68, 0x5a, 0xc0, 0x82, - 0xeb, 0x76, 0x8a, 0xa9, 0x72, 0x2b, 0xb6, 0x39, 0x03, 0x6e, 0x9f, 0x4d, 0xec, 0x6e, 0xdd, 0x24, - 0xe6, 0x9c, 0x9c, 0xb9, 0x3d, 0xee, 0x99, 0xd9, 0x2e, 0x5d, 0xd5, 0x96, 0xd5, 0x18, 0x5d, 0x5a, - 0x8d, 0x95, 0xb0, 0x1a, 0x6f, 0xa3, 0xba, 0x95, 0x75, 0x1d, 0xc4, 0x41, 0xe0, 0xf1, 0x27, 0x8c, - 0x1e, 0x3b, 0x5a, 0xcd, 0xd0, 0x02, 0x4c, 0x72, 0x88, 0xde, 0x30, 0x17, 0x1f, 0x8c, 0xa5, 0xd0, - 0x3a, 0x63, 0xff, 0xc7, 0xd5, 0x18, 0xd5, 0x08, 0xd5, 0xcc, 0xef, 0x68, 0x70, 0x4e, 0xfe, 0x55, - 0x45, 0x57, 0xc3, 0x52, 0x08, 0xde, 0x17, 0xfd, 0x97, 0xf7, 0x55, 0x16, 0xdf, 0x87, 0x3b, 0xe8, - 0x6a, 0xe8, 0x93, 0x4b, 0x26, 0x7a, 0x48, 0x76, 0x65, 0x33, 0x27, 0x82, 0x0f, 0xd1, 0x9b, 0xde, - 0x3a, 0x98, 0x46, 0xdb, 0x85, 0x72, 0xba, 0x6a, 0x46, 0xd7, 0x17, 0x02, 0x5d, 0xf3, 0x5e, 0x70, - 0xda, 0x2e, 0x97, 0xc6, 0xcf, 0xd0, 0x6d, 0x4f, 0x78, 0x26, 0xb9, 0x66, 0x33, 0xbd, 0x2b, 0x9f, - 0x4d, 0xef, 0x2b, 0xc4, 0x43, 0xc5, 0x70, 0x63, 0xb7, 0xd7, 0x1f, 0x38, 0xc5, 0xf5, 0xd7, 0x54, - 0x3c, 0x2f, 0x8e, 0x7f, 0x82, 0xde, 0x9a, 0xbb, 0x32, 0xd0, 0xbc, 0xfa, 0xd9, 0x34, 0xbf, 0x4a, - 0x3e, 0x79, 0x17, 0x35, 0xcb, 0x0e, 0x79, 0x79, 0x9f, 0x49, 0x7e, 0xee, 0xbf, 0x55, 0xc2, 0x46, - 0x0e, 0xbc, 0x9d, 0x2c, 0x13, 0x67, 0xee, 0xa3, 0xd8, 0x02, 0x9f, 0x7b, 0x36, 0xdd, 0x46, 0xf5, - 0x4e, 0x6a, 0xfe, 0x1f, 0xb1, 0x7b, 0x99, 0x83, 0x92, 0xcc, 0x65, 0xa5, 0xeb, 0x90, 0xb0, 0xc9, - 0xee, 0x64, 0x54, 0xa9, 0x72, 0x60, 0x7b, 0x10, 0x6f, 0x23, 0xd4, 0x97, 0x5c, 0x48, 0xfb, 0x19, - 0x6c, 0x17, 0xd0, 0xb7, 0x17, 0x76, 0x11, 0x79, 0x4c, 0x53, 0xe6, 0xb8, 0xce, 0xfd, 0x12, 0x37, - 0x93, 0x4a, 0x1e, 0x21, 0xbc, 0xdc, 0xd9, 0x61, 0x6e, 0xf6, 0xe9, 0x88, 0x29, 0x98, 0xf6, 0x76, - 0x1e, 0x97, 0xf0, 0xcc, 0x73, 0xf6, 0x1b, 0xc8, 0x79, 0x6e, 0x0f, 0xdd, 0xbe, 0xfc, 0x4e, 0xf0, - 0x13, 0x2c, 0x07, 0x7e, 0xae, 0xc3, 0xd9, 0xe8, 0x77, 0x74, 0x57, 0x4f, 0x25, 0x9c, 0xfc, 0x32, - 0x72, 0x0e, 0xf0, 0x6b, 0xe0, 0x5d, 0xb4, 0xb6, 0xcb, 0x8e, 0xe9, 0x34, 0xd3, 0x9d, 0x34, 0xf8, - 0x88, 0x9a, 0x47, 0x02, 0x57, 0x47, 0xa6, 0x63, 0xae, 0x59, 0xaa, 0xa7, 0x92, 0xf9, 0xef, 0x83, - 0x79, 0x24, 0xfe, 0x26, 0x6a, 0xc0, 0x2e, 0x46, 0xb3, 0x4c, 0xb9, 0x32, 0x9d, 0xdb, 0x40, 0x2d, - 0xc9, 0x7f, 0x8e, 0x78, 0xce, 0x84, 0xa3, 0xeb, 0xe1, 0x8b, 0x3a, 0x72, 0x04, 0x5e, 0xe8, 0xe6, - 0x43, 0xf6, 0xdc, 0xf5, 0x72, 0x0b, 0x00, 0xf6, 0xa3, 0x72, 0x93, 0xab, 0x11, 0x0b, 0x80, 0xb5, - 0xe6, 0x70, 0x70, 0x26, 0x5c, 0x03, 0x2a, 0x61, 0x7c, 0x0d, 0x55, 0x7a, 0x85, 0xfb, 0x66, 0xae, - 0xf4, 0x8a, 0x64, 0xe2, 0x8d, 0xb7, 0x77, 0x83, 0x46, 0xb3, 0x5a, 0xb9, 0x8f, 0x64, 0x0b, 0xd8, - 0xdc, 0x29, 0x47, 0xa1, 0xc9, 0x1d, 0xe3, 0x84, 0x2d, 0xf7, 0x6d, 0x64, 0x4d, 0x7b, 0x73, 0x79, - 0xb9, 0xee, 0x48, 0xff, 0x35, 0x62, 0x18, 0x93, 0x6f, 0xa1, 0xb5, 0xb9, 0xb5, 0x15, 0xdc, 0xf8, - 0xe4, 0xc1, 0x0e, 0x4d, 0xc7, 0x6c, 0x90, 0x8e, 0xd9, 0x84, 0x7a, 0x67, 0xcf, 0x21, 0xb7, 0x7f, - 0x11, 0xbd, 0x78, 0xd9, 0xbe, 0xf2, 0xd7, 0x97, 0xed, 0x2b, 0xff, 0x7e, 0xd9, 0x8e, 0x7e, 0x76, - 0xd1, 0x8e, 0x7e, 0x7b, 0xd1, 0x8e, 0x7e, 0x7f, 0xd1, 0x8e, 0xfe, 0x78, 0xd1, 0x8e, 0x5e, 0x5c, - 0xb4, 0xa3, 0xbf, 0x5c, 0xb4, 0xa3, 0x7f, 0x5e, 0xb4, 0xa3, 0x8f, 0x3f, 0x79, 0xcd, 0x3f, 0x34, - 0xa5, 0x9d, 0x5e, 0x5b, 0xa7, 0x5c, 0xea, 0x80, 0x54, 0x9c, 0x8c, 0x96, 0xfe, 0xeb, 0x04, 0xeb, - 0x8e, 0xea, 0x06, 0x7e, 0xf0, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x19, 0xc3, 0xc2, 0x39, - 0x15, 0x00, 0x00, + 0x79, 0x47, 0x92, 0x65, 0xa9, 0x15, 0xe7, 0xd1, 0x9b, 0xcd, 0x0e, 0x61, 0x4b, 0xeb, 0x1d, 0x52, + 0x60, 0x20, 0xd8, 0x45, 0xc2, 0x63, 0x59, 0x1e, 0x55, 0xb2, 0x9d, 0xc4, 0xaa, 0x8d, 0x23, 0xd1, + 0xb2, 0x37, 0xb0, 0x87, 0xad, 0x6a, 0x8f, 0xda, 0x52, 0xaf, 0x47, 0xd3, 0x53, 0xdd, 0x2d, 0x3b, + 0xe6, 0x04, 0x37, 0x8e, 0x54, 0xf1, 0x0b, 0x38, 0x01, 0xff, 0x80, 0xe2, 0xc4, 0x8d, 0x14, 0x27, + 0x8e, 0x54, 0x51, 0x05, 0xc4, 0x77, 0xee, 0x1c, 0xa9, 0xaf, 0x1f, 0xa3, 0x96, 0x64, 0xc3, 0x06, + 0x4e, 0xea, 0xef, 0xd9, 0xfd, 0xbd, 0xbf, 0x11, 0xea, 0x8d, 0xb8, 0x1e, 0x4f, 0x8f, 0x36, 0x53, + 0x31, 0xd9, 0x3a, 0xa1, 0x9a, 0x7e, 0x2d, 0x15, 0xb9, 0xa6, 0x3c, 0x67, 0x52, 0x2d, 0xc1, 0x4a, + 0xa6, 0x5b, 0x74, 0xc4, 0x72, 0xbd, 0x55, 0x48, 0xa1, 0x45, 0x2a, 0x32, 0x65, 0x4f, 0x6a, 0x4b, + 0xa4, 0x7c, 0xd3, 0x1c, 0x71, 0x6d, 0x24, 0x8b, 0xf4, 0x6e, 0x32, 0x12, 0x23, 0x61, 0x89, 0x47, + 0xd3, 0xe3, 0x2d, 0x80, 0x0c, 0x60, 0x4e, 0x96, 0xf3, 0x6e, 0x7b, 0x24, 0xc4, 0x28, 0x63, 0x33, + 0xae, 0x33, 0x49, 0x8b, 0x82, 0x49, 0x65, 0xe9, 0xc9, 0x1f, 0xab, 0xa8, 0x36, 0x28, 0x58, 0x8a, + 0x63, 0xb4, 0xfa, 0x11, 0x93, 0x8a, 0x8b, 0x3c, 0x8e, 0xd6, 0xa3, 0x8d, 0x26, 0xf1, 0x20, 0xfe, + 0x12, 0x5a, 0xed, 0x4b, 0x91, 0x32, 0xa5, 0xe2, 0xca, 0x7a, 0xb4, 0xd1, 0x7a, 0xb0, 0xb6, 0x09, + 0xd7, 0x6f, 0x3a, 0x24, 0xf1, 0x54, 0xdc, 0x46, 0x35, 0x22, 0x84, 0x8e, 0xab, 0x86, 0x0b, 0x59, + 0x2e, 0xc0, 0x10, 0x83, 0xc7, 0x77, 0x51, 0x63, 0x4f, 0x28, 0x9d, 0xd3, 0x09, 0x8b, 0x6b, 0xe6, + 0x8e, 0x12, 0xc6, 0x5f, 0x46, 0xf5, 0x7d, 0x31, 0xcd, 0xb5, 0x8a, 0x57, 0xd6, 0xab, 0x1b, 0xad, + 0x07, 0x2d, 0x2b, 0x6d, 0x70, 0xdb, 0xb5, 0x97, 0x7f, 0x7b, 0xf7, 0x0d, 0xe2, 0x18, 0xf0, 0x7b, + 0x68, 0x65, 0x4f, 0x88, 0x13, 0x15, 0xd7, 0xcd, 0x3d, 0x8e, 0xd3, 0xa0, 0x88, 0xa5, 0xe0, 0xef, + 0xa3, 0x56, 0x27, 0xcf, 0x85, 0xa6, 0x9a, 0x8b, 0x5c, 0xc5, 0xab, 0x46, 0xe5, 0xe7, 0x2d, 0x23, + 0x58, 0xbb, 0x19, 0x50, 0x1f, 0xe5, 0x5a, 0x9e, 0x93, 0x90, 0x1f, 0x6e, 0x78, 0xca, 0xf3, 0xe9, + 0x8b, 0xb8, 0x11, 0xde, 0x60, 0x50, 0xc4, 0x52, 0xc0, 0x29, 0x03, 0x91, 0x51, 0xc9, 0x55, 0xdc, + 0x0c, 0x9d, 0xe2, 0x90, 0xc4, 0x53, 0x81, 0xf1, 0x39, 0xcf, 0x87, 0xe2, 0x4c, 0xc5, 0x28, 0x64, + 0x74, 0x48, 0xe2, 0xa9, 0x77, 0x7f, 0x80, 0x6e, 0x2e, 0xbe, 0x0a, 0xdf, 0x44, 0xd5, 0x13, 0x76, + 0xee, 0x02, 0x02, 0x47, 0x7c, 0x1b, 0xad, 0x9c, 0xd2, 0x6c, 0xca, 0x4c, 0x28, 0x9a, 0xc4, 0x02, + 0x1f, 0x54, 0xde, 0x8f, 0x92, 0xdf, 0x57, 0xcb, 0x38, 0x81, 0xa7, 0x0f, 0x98, 0x9c, 0xf0, 0x9c, + 0x66, 0x46, 0xb8, 0x41, 0x4a, 0x18, 0x7f, 0x15, 0xb5, 0x76, 0x44, 0xae, 0x44, 0xc6, 0x06, 0xfc, + 0x27, 0xcc, 0x85, 0xb4, 0x69, 0x1f, 0xb5, 0x2d, 0x5e, 0x90, 0x90, 0x8a, 0xef, 0xa1, 0xda, 0xa1, + 0x62, 0x72, 0x3e, 0xa4, 0x80, 0x71, 0x31, 0x31, 0x54, 0x8c, 0x51, 0xad, 0x23, 0x47, 0x2a, 0xae, + 0xad, 0x57, 0x37, 0x9a, 0xc4, 0x9c, 0xe1, 0xe9, 0x8f, 0xf2, 0x53, 0x13, 0xcd, 0x26, 0x81, 0x23, + 0x60, 0x76, 0xce, 0x86, 0x26, 0x6a, 0x4d, 0x02, 0x47, 0xfc, 0x5d, 0x74, 0x6d, 0x87, 0x16, 0xf4, + 0x88, 0x67, 0x5c, 0x73, 0x06, 0x71, 0x82, 0x5b, 0xde, 0x0e, 0xdc, 0x1d, 0x92, 0xc9, 0x1c, 0x33, + 0xfe, 0x3a, 0x5a, 0x25, 0x19, 0x9f, 0x70, 0xad, 0xe2, 0x86, 0x89, 0xef, 0x2d, 0x97, 0x96, 0xbd, + 0x41, 0xf7, 0x47, 0x96, 0xe2, 0x1e, 0xe9, 0xf9, 0xf0, 0x06, 0xba, 0xf1, 0x4c, 0x3c, 0x63, 0x67, + 0x7d, 0xc9, 0x4f, 0x79, 0xc6, 0x46, 0xcc, 0x06, 0xaf, 0x41, 0x16, 0xd1, 0xc0, 0xd9, 0x29, 0x0a, + 0x2a, 0x27, 0x42, 0xf6, 0xa5, 0x38, 0xe6, 0x19, 0x33, 0xd1, 0x6b, 0x92, 0x45, 0x34, 0x5e, 0x47, + 0xad, 0x5e, 0x6f, 0x7f, 0x90, 0x0a, 0xc9, 0x3a, 0xc3, 0x4f, 0xe3, 0xd6, 0x7a, 0xb4, 0x51, 0x25, + 0x21, 0x0a, 0x27, 0xe8, 0xda, 0x80, 0x65, 0x60, 0xcd, 0x53, 0x7a, 0xc4, 0xb2, 0xf8, 0x9a, 0x51, + 0x34, 0x87, 0x4b, 0x1e, 0xa2, 0xea, 0xb6, 0x78, 0x81, 0xef, 0xa0, 0xfa, 0x1e, 0xe3, 0xa3, 0xb1, + 0x36, 0x51, 0x5b, 0x23, 0x0e, 0x82, 0xa8, 0x3f, 0xe7, 0x43, 0x3d, 0x36, 0xd1, 0x5a, 0x23, 0x16, + 0x48, 0x72, 0x1b, 0x1c, 0x70, 0xec, 0x61, 0x77, 0xd7, 0x89, 0xc0, 0x11, 0x30, 0x4f, 0xba, 0xbb, + 0x8e, 0x1b, 0x8e, 0xf8, 0x8b, 0xe8, 0x7a, 0x67, 0x38, 0xe4, 0x90, 0x5b, 0x34, 0x7b, 0xc2, 0x87, + 0x2a, 0xae, 0xae, 0x57, 0x37, 0xd6, 0xc8, 0x02, 0x16, 0x32, 0x07, 0x74, 0x86, 0x35, 0xea, 0xe1, + 0xe4, 0xd7, 0x11, 0xba, 0xb5, 0x14, 0x15, 0x90, 0xd8, 0x16, 0xd3, 0x7c, 0xc8, 0xf3, 0x51, 0x1c, + 0x99, 0x68, 0x97, 0x30, 0x7e, 0x07, 0x35, 0x1f, 0x1d, 0x1f, 0xb3, 0x54, 0xf3, 0x53, 0xc8, 0x34, + 0x20, 0xce, 0x10, 0xe0, 0xba, 0x6e, 0x3e, 0x66, 0x92, 0x6b, 0x7a, 0x94, 0x31, 0xf3, 0xa0, 0x26, + 0x09, 0x51, 0x20, 0xdf, 0x87, 0xbc, 0xd5, 0x9a, 0x0d, 0x5d, 0x76, 0xcd, 0x10, 0xd0, 0xb2, 0x3a, + 0x93, 0x23, 0xce, 0x72, 0xed, 0xd2, 0xcc, 0x83, 0x49, 0x17, 0xb5, 0x82, 0x34, 0x80, 0xfc, 0x3c, + 0x38, 0x2f, 0x98, 0xab, 0x23, 0x73, 0x06, 0xdc, 0x1e, 0x95, 0x43, 0xe3, 0xa3, 0x1a, 0x31, 0x67, + 0xc0, 0x0d, 0xc4, 0xb1, 0x6d, 0x60, 0x35, 0x62, 0xce, 0x89, 0x40, 0x2b, 0xa6, 0xef, 0xc0, 0x6b, + 0x87, 0x4c, 0x69, 0x9e, 0x9b, 0x02, 0x75, 0xba, 0x42, 0x14, 0x44, 0x4f, 0x89, 0xa9, 0x4c, 0x7d, + 0x71, 0x3a, 0x08, 0xd4, 0x6a, 0xb8, 0xbe, 0x6a, 0xaf, 0x87, 0x33, 0xbc, 0x5d, 0x14, 0xb6, 0x3b, + 0x59, 0xbb, 0x3c, 0x98, 0x7c, 0xcb, 0x76, 0x51, 0x90, 0xea, 0x53, 0x3d, 0xf6, 0x8f, 0x86, 0x33, + 0xf8, 0x9a, 0x30, 0x3a, 0x14, 0x79, 0x76, 0x6e, 0xee, 0x68, 0x90, 0x12, 0x4e, 0x7e, 0x19, 0xb9, + 0xbe, 0x88, 0xef, 0xa3, 0x46, 0x5f, 0x32, 0xa5, 0xa9, 0xd4, 0x26, 0x22, 0x65, 0xe1, 0x02, 0xd9, + 0xd5, 0x44, 0xc9, 0x81, 0x37, 0x51, 0xb3, 0x2f, 0x94, 0xb6, 0xec, 0x95, 0x2b, 0xd8, 0x67, 0x2c, + 0x46, 0xbb, 0x01, 0x44, 0x61, 0x42, 0x76, 0xb9, 0x76, 0xc7, 0x91, 0x7c, 0x8c, 0x6a, 0x80, 0xbf, + 0xd4, 0x1a, 0xdf, 0x36, 0x2a, 0xcb, 0x6d, 0xa3, 0x3a, 0x6b, 0x1b, 0x31, 0x5a, 0x3d, 0xe0, 0x13, + 0x26, 0xa6, 0xda, 0x24, 0x64, 0x95, 0x78, 0x30, 0xf9, 0xed, 0x8a, 0xeb, 0xd3, 0xf8, 0x7b, 0xa8, + 0x75, 0xd8, 0xdd, 0xdd, 0xa7, 0x45, 0xc1, 0xf3, 0x91, 0x72, 0x46, 0xdf, 0x0e, 0xfa, 0x48, 0x49, + 0x74, 0x0f, 0x0c, 0xd9, 0x41, 0xfa, 0x49, 0x20, 0x5d, 0xf9, 0xef, 0xd2, 0x01, 0x3b, 0xde, 0x42, + 0xf5, 0xc1, 0xb9, 0x4a, 0x75, 0xe6, 0xbc, 0x11, 0xb6, 0xaf, 0x4d, 0x4b, 0xb1, 0x23, 0xc6, 0xb1, + 0xe1, 0x07, 0xa8, 0x49, 0x98, 0x4d, 0x0d, 0x65, 0x4c, 0x9a, 0xbf, 0xac, 0xa4, 0x91, 0x19, 0x1b, + 0x24, 0xdf, 0xce, 0x48, 0x8a, 0x69, 0xa1, 0x8c, 0x17, 0x57, 0x6c, 0xf2, 0x05, 0x28, 0xfc, 0x01, + 0x42, 0xcf, 0xe8, 0x84, 0xa9, 0x82, 0x82, 0xda, 0xfa, 0x92, 0x0d, 0x25, 0xd1, 0xd9, 0x10, 0x70, + 0x43, 0x2b, 0xdd, 0x65, 0xa7, 0x3c, 0x65, 0x7e, 0x54, 0xde, 0x0a, 0x04, 0x2d, 0xc5, 0xb7, 0x52, + 0xc7, 0x87, 0xef, 0xa3, 0xd5, 0x01, 0x4b, 0x53, 0x31, 0x29, 0xdc, 0x90, 0xc4, 0x81, 0x88, 0xa3, + 0x10, 0xcf, 0x82, 0xef, 0xa3, 0x5b, 0x90, 0xd3, 0xc7, 0xaa, 0x2f, 0x45, 0x41, 0x47, 0xb6, 0x82, + 0x9a, 0xc6, 0x88, 0x65, 0x02, 0x18, 0xbb, 0x4f, 0xd5, 0x09, 0x1b, 0x82, 0x61, 0x30, 0x36, 0x4d, + 0x5f, 0x08, 0x50, 0xf8, 0x1e, 0x5a, 0xf3, 0x79, 0x6f, 0x79, 0x5a, 0x86, 0x67, 0x1e, 0x89, 0xdb, + 0x08, 0x99, 0xd2, 0x0d, 0xdb, 0x6e, 0x80, 0xc1, 0x5b, 0xa8, 0xd1, 0xcd, 0x35, 0xcb, 0xc8, 0x50, + 0xc7, 0x6b, 0xc6, 0x88, 0x37, 0xc3, 0xa0, 0x3b, 0x12, 0x29, 0x99, 0xee, 0x7e, 0x07, 0xb5, 0x82, + 0x80, 0xbe, 0xd6, 0x74, 0x7e, 0xb7, 0x5c, 0x03, 0x80, 0x69, 0x38, 0x9d, 0x4c, 0xbc, 0xa0, 0x05, + 0x80, 0xc1, 0xaf, 0x0c, 0x97, 0x33, 0x7c, 0x82, 0xae, 0xcf, 0x27, 0xa3, 0x99, 0x16, 0x42, 0xe9, + 0xb2, 0xf5, 0x3b, 0xc8, 0x24, 0x8b, 0x5f, 0x28, 0xcb, 0x29, 0x10, 0xa2, 0x4c, 0xa3, 0x83, 0xe1, + 0x5f, 0x35, 0x24, 0x73, 0x4e, 0xde, 0x77, 0xfa, 0xcb, 0xbc, 0xb8, 0xaa, 0x6d, 0x9a, 0x0c, 0xac, + 0xcc, 0xea, 0x38, 0xf9, 0x55, 0x84, 0x5a, 0x41, 0xaa, 0x5c, 0x55, 0xeb, 0x46, 0x57, 0x25, 0xd0, + 0x75, 0x1b, 0xad, 0xec, 0xd3, 0x4f, 0x85, 0xdd, 0x2e, 0xaa, 0xc4, 0x02, 0x06, 0xcb, 0x73, 0x21, + 0x5d, 0xb5, 0x5b, 0x00, 0x3a, 0xdf, 0x63, 0x9e, 0xb1, 0x7d, 0x31, 0x64, 0x26, 0xfb, 0xd7, 0x48, + 0x09, 0xfb, 0xf9, 0x57, 0x5f, 0x9a, 0x7f, 0xab, 0xe5, 0xfc, 0x4b, 0xfe, 0x5e, 0x71, 0xe6, 0xcd, + 0x6a, 0xea, 0xdb, 0xb3, 0xac, 0x8f, 0x96, 0x2a, 0xd7, 0x52, 0x6c, 0x81, 0x2d, 0xe6, 0x3e, 0xec, + 0xaa, 0x6c, 0x22, 0xe4, 0xb9, 0x5b, 0x9e, 0xc2, 0x6a, 0xb1, 0x04, 0xe2, 0x18, 0xf0, 0x3a, 0xaa, + 0xee, 0xf4, 0x0f, 0xdd, 0xfa, 0x74, 0x3d, 0x5c, 0x6c, 0xfa, 0x87, 0x04, 0x48, 0xf8, 0x0b, 0xa8, + 0xd6, 0x87, 0x71, 0x6c, 0x1b, 0xc1, 0x8d, 0x80, 0x05, 0xd0, 0xc4, 0x10, 0xa1, 0xda, 0xb6, 0x33, + 0x91, 0x9e, 0x74, 0x7b, 0xc6, 0xf8, 0xf9, 0x6a, 0x73, 0x14, 0xe2, 0x59, 0xf0, 0x63, 0x74, 0x7d, + 0x6f, 0x3a, 0x62, 0x05, 0x1d, 0xb1, 0xa7, 0x76, 0x41, 0xb2, 0xed, 0x20, 0x0e, 0x84, 0xe6, 0x18, + 0x9c, 0x81, 0x0b, 0x52, 0x70, 0xeb, 0x33, 0xa6, 0xcf, 0x84, 0x3c, 0x71, 0x9b, 0x59, 0x78, 0xab, + 0xa3, 0x10, 0xcf, 0x92, 0xfc, 0xd5, 0x67, 0x81, 0x33, 0xfd, 0x36, 0x34, 0xe7, 0x09, 0xb7, 0xab, + 0x4c, 0x95, 0x58, 0x00, 0x72, 0x93, 0x30, 0xc5, 0xe4, 0xa9, 0xed, 0x01, 0x15, 0xbb, 0x2e, 0x05, + 0x28, 0x93, 0x9b, 0x67, 0xb4, 0x70, 0x49, 0x61, 0xce, 0x90, 0xe9, 0x1f, 0x32, 0x99, 0xb3, 0xcc, + 0x25, 0x85, 0x83, 0x60, 0x3f, 0xb0, 0xa7, 0x83, 0x9d, 0xbe, 0xf1, 0x4c, 0x95, 0xcc, 0x10, 0x50, + 0xff, 0x20, 0x5d, 0xf0, 0x1c, 0xbe, 0x5d, 0xea, 0x66, 0xa8, 0x07, 0x18, 0xfc, 0x15, 0x74, 0x73, + 0x97, 0x2b, 0x58, 0x34, 0x7a, 0xbd, 0xfd, 0x0f, 0x79, 0x96, 0x31, 0x69, 0x0c, 0x6d, 0x90, 0x25, + 0x7c, 0xf2, 0xa7, 0x08, 0x35, 0x7c, 0xe0, 0xe0, 0x39, 0x83, 0x31, 0x95, 0x26, 0x71, 0x40, 0xa9, + 0x83, 0xc0, 0xe4, 0x1f, 0x4e, 0x85, 0xa6, 0xce, 0x2c, 0x0b, 0x00, 0x77, 0x9f, 0x49, 0x2e, 0x86, + 0x6e, 0xaf, 0x70, 0x10, 0xec, 0x98, 0x84, 0xd1, 0x4c, 0xf3, 0x09, 0x23, 0xd3, 0x1c, 0x7e, 0x9c, + 0x75, 0x8b, 0x68, 0x58, 0xde, 0x3c, 0xca, 0x69, 0x5a, 0x31, 0x9a, 0x16, 0xb0, 0xe0, 0xba, 0x9d, + 0x62, 0xaa, 0xdc, 0x8a, 0x6d, 0xce, 0x80, 0xdb, 0x67, 0x13, 0xbb, 0x5b, 0x37, 0x89, 0x39, 0x27, + 0x67, 0x6e, 0x8f, 0x7b, 0x6e, 0xb6, 0x4b, 0x57, 0xb5, 0x65, 0x35, 0x46, 0x97, 0x56, 0x63, 0x25, + 0xac, 0xc6, 0x3b, 0xa8, 0x6e, 0x65, 0x5d, 0x07, 0x71, 0x10, 0x78, 0xfc, 0x29, 0xa3, 0xc7, 0x8e, + 0x56, 0x33, 0xb4, 0x00, 0x93, 0x1c, 0xa2, 0x37, 0xcd, 0xc5, 0x07, 0x63, 0x29, 0xb4, 0xce, 0xd8, + 0xff, 0x70, 0x35, 0x46, 0x35, 0x42, 0x35, 0xf3, 0x3b, 0x1a, 0x9c, 0x93, 0x7f, 0x56, 0xd1, 0xb5, + 0xb0, 0x14, 0x82, 0xf7, 0x45, 0xff, 0xe1, 0x7d, 0x95, 0xc5, 0xf7, 0xe1, 0x0e, 0xba, 0x16, 0xfa, + 0xe4, 0x92, 0x89, 0x1e, 0x92, 0x5d, 0xd9, 0xcc, 0x89, 0xe0, 0x43, 0xf4, 0x96, 0xb7, 0x0e, 0xa6, + 0xd1, 0x76, 0xa1, 0x9c, 0xae, 0x9a, 0xd1, 0xf5, 0xb9, 0x40, 0xd7, 0xbc, 0x17, 0x9c, 0xb6, 0xcb, + 0xa5, 0xf1, 0x73, 0x74, 0xc7, 0x13, 0x9e, 0x4b, 0xae, 0xd9, 0x4c, 0xef, 0xca, 0x67, 0xd3, 0x7b, + 0x85, 0x78, 0xa8, 0x18, 0x6e, 0xec, 0xf6, 0xfa, 0x03, 0xa7, 0xb8, 0xfe, 0x9a, 0x8a, 0xe7, 0xc5, + 0xf1, 0x8f, 0xd1, 0xdb, 0x73, 0x57, 0x06, 0x9a, 0x57, 0x3f, 0x9b, 0xe6, 0xab, 0xe4, 0x93, 0xf7, + 0x50, 0xb3, 0xec, 0x90, 0x97, 0xf7, 0x99, 0xe4, 0x67, 0xfe, 0x5b, 0x25, 0x6c, 0xe4, 0xc0, 0xdb, + 0xc9, 0x32, 0x71, 0xe6, 0x3e, 0x8a, 0x2d, 0xf0, 0x7f, 0xcf, 0xa6, 0x3b, 0xa8, 0xde, 0x49, 0xcd, + 0xff, 0x23, 0x76, 0x2f, 0x73, 0x50, 0x92, 0xb9, 0xac, 0x74, 0x1d, 0x12, 0x36, 0xd9, 0x9d, 0x8c, + 0x2a, 0x55, 0x0e, 0x6c, 0x0f, 0xe2, 0x6d, 0x84, 0xfa, 0x92, 0x0b, 0x69, 0x3f, 0x83, 0xed, 0x02, + 0xfa, 0xce, 0xc2, 0x2e, 0x22, 0x8f, 0x69, 0xca, 0x1c, 0xd7, 0xb9, 0x5f, 0xe2, 0x66, 0x52, 0xc9, + 0x63, 0x84, 0x97, 0x3b, 0x3b, 0xcc, 0xcd, 0x3e, 0x1d, 0x31, 0x05, 0xd3, 0xde, 0xce, 0xe3, 0x12, + 0x9e, 0x79, 0xce, 0x7e, 0x03, 0x39, 0xcf, 0xed, 0xa1, 0x3b, 0x97, 0xdf, 0x09, 0x7e, 0x82, 0xe5, + 0xc0, 0xcf, 0x75, 0x38, 0x1b, 0xfd, 0x8e, 0xee, 0xea, 0xa9, 0x84, 0x93, 0x5f, 0x44, 0xce, 0x01, + 0x7e, 0x0d, 0xbc, 0x87, 0xd6, 0x76, 0xd9, 0x31, 0x9d, 0x66, 0xba, 0x93, 0x06, 0x1f, 0x51, 0xf3, + 0x48, 0xe0, 0xea, 0xc8, 0x74, 0xcc, 0x35, 0x4b, 0xf5, 0x54, 0x32, 0xff, 0x7d, 0x30, 0x8f, 0xc4, + 0xdf, 0x40, 0x0d, 0xd8, 0xc5, 0x68, 0x96, 0x29, 0x57, 0xa6, 0x73, 0x1b, 0xa8, 0x25, 0xf9, 0xcf, + 0x11, 0xcf, 0x99, 0x70, 0x74, 0x23, 0x7c, 0x51, 0x47, 0x8e, 0xc0, 0x0b, 0xdd, 0x7c, 0xc8, 0x5e, + 0xb8, 0x5e, 0x6e, 0x01, 0xc0, 0x7e, 0x54, 0x6e, 0x72, 0x35, 0x62, 0x01, 0xb0, 0xd6, 0x1c, 0x0e, + 0xce, 0x84, 0x6b, 0x40, 0x25, 0x8c, 0xaf, 0xa3, 0x4a, 0xaf, 0x70, 0xdf, 0xcc, 0x95, 0x5e, 0x91, + 0x4c, 0xbc, 0xf1, 0xf6, 0x6e, 0xd0, 0x68, 0x56, 0x2b, 0xf7, 0x91, 0x6c, 0x01, 0x9b, 0x3b, 0xe5, + 0x28, 0x34, 0xb9, 0x63, 0x9c, 0xb0, 0xe5, 0xbe, 0x8d, 0xac, 0x69, 0x6f, 0x2d, 0x2f, 0xd7, 0x1d, + 0xe9, 0xbf, 0x46, 0x0c, 0x63, 0xf2, 0x4d, 0xb4, 0x36, 0xb7, 0xb6, 0x82, 0x1b, 0x9f, 0x3e, 0xdc, + 0xa1, 0xe9, 0x98, 0x0d, 0xd2, 0x31, 0x9b, 0x50, 0xef, 0xec, 0x39, 0xe4, 0xf6, 0xcf, 0xa3, 0x97, + 0xaf, 0xda, 0x6f, 0xfc, 0xe5, 0x55, 0xfb, 0x8d, 0x7f, 0xbd, 0x6a, 0x47, 0x3f, 0xbd, 0x68, 0x47, + 0xbf, 0xb9, 0x68, 0x47, 0xbf, 0xbb, 0x68, 0x47, 0x7f, 0xb8, 0x68, 0x47, 0x2f, 0x2f, 0xda, 0xd1, + 0x9f, 0x2f, 0xda, 0xd1, 0x3f, 0x2e, 0xda, 0xd1, 0xc7, 0x9f, 0xbc, 0xe6, 0xbf, 0x98, 0xd2, 0x4e, + 0xaf, 0xad, 0x53, 0x2e, 0x75, 0x40, 0x2a, 0x4e, 0x46, 0x4b, 0x7f, 0x70, 0x82, 0x75, 0x47, 0x75, + 0x03, 0x3f, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x91, 0x6f, 0x54, 0xfe, 0x2e, 0x15, 0x00, + 0x00, } func (this *Spec) Equal(that interface{}) bool { diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto index 0353f3ad4..9c68d1b98 100644 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto +++ b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto @@ -8,7 +8,7 @@ syntax = "proto3"; package grpc; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogo/protobuf/gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; option (gogoproto.equal_all) = true; From b31666181872ca6b999e4134da1fcfb292492c6c Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sun, 25 Oct 2020 10:52:20 +0800 Subject: [PATCH 3/6] runtime: remove the unused proto files These are moved to the agent and no longer needed. Fixes: #1028 Signed-off-by: Peng Tao --- .../pkg/agent/protocols/grpc/agent.proto | 496 ------------------ .../pkg/agent/protocols/grpc/health.proto | 39 -- .../pkg/agent/protocols/grpc/oci.proto | 462 ---------------- .../pkg/agent/protocols/types.proto | 48 -- 4 files changed, 1045 deletions(-) delete mode 100644 src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.proto delete mode 100644 src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto delete mode 100644 src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto delete mode 100644 src/runtime/virtcontainers/pkg/agent/protocols/types.proto diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.proto b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.proto deleted file mode 100644 index 426268d19..000000000 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.proto +++ /dev/null @@ -1,496 +0,0 @@ -// -// Copyright 2017 HyperHQ Inc. -// -// SPDX-License-Identifier: Apache-2.0 -// - -syntax = "proto3"; - -package grpc; - -import "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto"; -import "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/types.proto"; -import "google/protobuf/empty.proto"; - -// unstable -service AgentService { - // execution - rpc CreateContainer(CreateContainerRequest) returns (google.protobuf.Empty); - rpc StartContainer(StartContainerRequest) returns (google.protobuf.Empty); - - // RemoveContainer will tear down an existing container by forcibly terminating - // all processes running inside that container and releasing all internal - // resources associated with it. - // RemoveContainer will wait for all processes termination before returning. - // If any process can not be killed or if it can not be killed after - // the RemoveContainerRequest timeout, RemoveContainer will return an error. - rpc RemoveContainer(RemoveContainerRequest) returns (google.protobuf.Empty); - rpc ExecProcess(ExecProcessRequest) returns (google.protobuf.Empty); - rpc SignalProcess(SignalProcessRequest) returns (google.protobuf.Empty); - rpc WaitProcess(WaitProcessRequest) returns (WaitProcessResponse); // wait & reap like waitpid(2) - rpc ListProcesses(ListProcessesRequest) returns (ListProcessesResponse); - rpc UpdateContainer(UpdateContainerRequest) returns (google.protobuf.Empty); - rpc StatsContainer(StatsContainerRequest) returns (StatsContainerResponse); - rpc PauseContainer(PauseContainerRequest) returns (google.protobuf.Empty); - rpc ResumeContainer(ResumeContainerRequest) returns (google.protobuf.Empty); - - // stdio - rpc WriteStdin(WriteStreamRequest) returns (WriteStreamResponse); - rpc ReadStdout(ReadStreamRequest) returns (ReadStreamResponse); - rpc ReadStderr(ReadStreamRequest) returns (ReadStreamResponse); - rpc CloseStdin(CloseStdinRequest) returns (google.protobuf.Empty); - rpc TtyWinResize(TtyWinResizeRequest) returns (google.protobuf.Empty); - - // networking - rpc UpdateInterface(UpdateInterfaceRequest) returns (types.Interface); - rpc UpdateRoutes(UpdateRoutesRequest) returns (Routes); - rpc ListInterfaces(ListInterfacesRequest) returns(Interfaces); - rpc ListRoutes(ListRoutesRequest) returns (Routes); - - // tracing - rpc StartTracing(StartTracingRequest) returns (google.protobuf.Empty); - rpc StopTracing(StopTracingRequest) returns (google.protobuf.Empty); - - // misc (TODO: some rpcs can be replaced by hyperstart-exec) - rpc CreateSandbox(CreateSandboxRequest) returns (google.protobuf.Empty); - rpc DestroySandbox(DestroySandboxRequest) returns (google.protobuf.Empty); - rpc OnlineCPUMem(OnlineCPUMemRequest) returns (google.protobuf.Empty); - rpc ReseedRandomDev(ReseedRandomDevRequest) returns (google.protobuf.Empty); - rpc GetGuestDetails(GuestDetailsRequest) returns (GuestDetailsResponse); - rpc MemHotplugByProbe(MemHotplugByProbeRequest) returns (google.protobuf.Empty); - rpc SetGuestDateTime(SetGuestDateTimeRequest) returns (google.protobuf.Empty); - rpc CopyFile(CopyFileRequest) returns (google.protobuf.Empty); -} - -message CreateContainerRequest { - string container_id = 1; - string exec_id = 2; - StringUser string_user = 3; - repeated Device devices = 4; - repeated Storage storages = 5; - Spec OCI = 6; - - // This field is used to indicate if the container needs to join - // sandbox shared pid ns or create a new namespace. This field is - // meant to override the NEWPID config settings in the OCI spec. - // The agent would receive an OCI spec with PID namespace cleared - // out altogether and not just the pid ns path. - bool sandbox_pidns = 7; -} - -message StartContainerRequest { - string container_id = 1; -} - -message RemoveContainerRequest { - string container_id = 1; - - // RemoveContainer will return an error if - // it could not kill some container processes - // after timeout seconds. - // Setting timeout to 0 means RemoveContainer will - // wait for ever. - uint32 timeout = 2; -} - -message ExecProcessRequest { - string container_id = 1; - string exec_id = 2; - StringUser string_user = 3; - Process process = 4; -} - -message SignalProcessRequest { - string container_id = 1; - - // Special case for SignalProcess(): exec_id can be empty(""), - // which means to send the signal to all the processes including their descendants. - // Other APIs with exec_id should treat empty exec_id as an invalid request. - string exec_id = 2; - uint32 signal = 3; -} - -message WaitProcessRequest { - string container_id = 1; - string exec_id = 2; -} - -message WaitProcessResponse { - int32 status = 1; -} - -// ListProcessesRequest contains the options used to list running processes inside the container -message ListProcessesRequest { - string container_id = 1; - string format = 2; - repeated string args = 3; -} - -// ListProcessesResponse represents the list of running processes inside the container -message ListProcessesResponse { - bytes process_list = 1; -} - -message UpdateContainerRequest { - string container_id = 1; - LinuxResources resources = 2; -} - -message StatsContainerRequest { - string container_id = 1; -} - -message PauseContainerRequest { - string container_id = 1; -} - -message ResumeContainerRequest { - string container_id = 1; -} - -message CpuUsage { - uint64 total_usage = 1; - repeated uint64 percpu_usage = 2; - uint64 usage_in_kernelmode = 3; - uint64 usage_in_usermode = 4; -} - -message ThrottlingData { - uint64 periods = 1; - uint64 throttled_periods = 2; - uint64 throttled_time = 3; -} - -message CpuStats { - CpuUsage cpu_usage = 1; - ThrottlingData throttling_data = 2; -} - -message PidsStats { - uint64 current = 1; - uint64 limit = 2; -} - -message MemoryData { - uint64 usage = 1; - uint64 max_usage = 2; - uint64 failcnt = 3; - uint64 limit = 4; -} - -message MemoryStats { - uint64 cache = 1; - MemoryData usage = 2; - MemoryData swap_usage = 3; - MemoryData kernel_usage = 4; - bool use_hierarchy = 5; - map stats = 6; -} - - -message BlkioStatsEntry { - uint64 major = 1; - uint64 minor = 2; - string op = 3; - uint64 value = 4; -} - -message BlkioStats { - repeated BlkioStatsEntry io_service_bytes_recursive = 1; // number of bytes transferred to and from the block device - repeated BlkioStatsEntry io_serviced_recursive = 2; - repeated BlkioStatsEntry io_queued_recursive = 3; - repeated BlkioStatsEntry io_service_time_recursive = 4; - repeated BlkioStatsEntry io_wait_time_recursive = 5; - repeated BlkioStatsEntry io_merged_recursive = 6; - repeated BlkioStatsEntry io_time_recursive = 7; - repeated BlkioStatsEntry sectors_recursive = 8; -} - -message HugetlbStats { - uint64 usage = 1; - uint64 max_usage = 2; - uint64 failcnt = 3; -} - -message CgroupStats { - CpuStats cpu_stats = 1; - MemoryStats memory_stats = 2; - PidsStats pids_stats = 3; - BlkioStats blkio_stats = 4; - map hugetlb_stats = 5; // the map is in the format "size of hugepage: stats of the hugepage" - -} - -message NetworkStats { - string name = 1; - uint64 rx_bytes = 2; - uint64 rx_packets = 3; - uint64 rx_errors = 4; - uint64 rx_dropped = 5; - uint64 tx_bytes = 6; - uint64 tx_packets = 7; - uint64 tx_errors = 8; - uint64 tx_dropped = 9; -} - -message StatsContainerResponse { - CgroupStats cgroup_stats = 1; - repeated NetworkStats network_stats = 2; -} - -message WriteStreamRequest { - string container_id = 1; - string exec_id = 2; - bytes data = 3; -} - -message WriteStreamResponse { - uint32 len = 1; -} - -message ReadStreamRequest { - string container_id = 1; - string exec_id = 2; - uint32 len = 3; -} - -message ReadStreamResponse { - bytes data = 1; -} - -message CloseStdinRequest { - string container_id = 1; - string exec_id = 2; -} - -message TtyWinResizeRequest { - string container_id = 1; - string exec_id = 2; - uint32 row = 3; - uint32 column = 4; -} - -message KernelModule { - // This field is the name of the kernel module. - string name = 1; - // This field are the parameters for the kernel module which are - // whitespace-delimited key=value pairs passed to modprobe(8). - repeated string parameters = 2; -} - -message CreateSandboxRequest { - string hostname = 1; - repeated string dns = 2; - repeated Storage storages = 3; - - // This field means that a pause process needs to be created by the - // agent. This pid namespace of the pause process will be treated as - // a shared pid namespace. All containers created will join this shared - // pid namespace. - bool sandbox_pidns = 4; - // SandboxId identifies which sandbox is using the agent. We allow only - // one sandbox per agent and implicitly require that CreateSandbox is - // called before other sandbox/network calls. - string sandbox_id = 5; - // This field, if non-empty, designates an absolute path to a directory - // that the agent will search for OCI hooks to run within the guest. - string guest_hook_path = 6; - // This field is the list of kernel modules to be loaded in the guest kernel. - repeated KernelModule kernel_modules = 7; -} - -message DestroySandboxRequest { -} - -message Interfaces { - repeated types.Interface Interfaces = 1; -} - -message Routes { - repeated types.Route Routes = 1; -} - -message UpdateInterfaceRequest { - types.Interface interface = 1; -} - -message UpdateRoutesRequest { - Routes routes = 1; -} - -message ListInterfacesRequest { -} - -message ListRoutesRequest { -} - -message OnlineCPUMemRequest { - // Wait specifies if the caller waits for the agent to online all resources. - // If true the agent returns once all resources have been connected, otherwise all - // resources are connected asynchronously and the agent returns immediately. - bool wait = 1; - - // NbCpus specifies the number of CPUs that were added and the agent has to online. - uint32 nb_cpus = 2; - - // CpuOnly specifies whether only online CPU or not. - bool cpu_only = 3; -} - -message ReseedRandomDevRequest { - // Data specifies the random data used to reseed the guest crng. - bytes data = 2; -} - -// AgentDetails provides information to the client about the running agent. -message AgentDetails { - // Semantic version of agent (see https://semver.org). - string version = 1; - - // Set if the agent is running as PID 1. - bool init_daemon = 2; - - // List of available device handlers. - repeated string device_handlers = 3; - - // List of available storage handlers. - repeated string storage_handlers = 4; - - // Set only if the agent is built with seccomp support and the guest - // environment supports seccomp. - bool supports_seccomp = 5; -} - -message GuestDetailsRequest { - // MemBlockSize asks server to return the system memory block size that can be used - // for memory hotplug alignment. Typically the server returns what's in - // /sys/devices/system/memory/block_size_bytes. - bool mem_block_size = 1; - - // MemoryHotplugProbe asks server to return whether guest kernel supports memory hotplug - // via probeinterface. Typically the server will check if the path - // /sys/devices/system/memory/probe exists. - bool mem_hotplug_probe = 2; -} - -message GuestDetailsResponse { - // MemBlockSizeBytes returns the system memory block size in bytes. - uint64 mem_block_size_bytes = 1; - - AgentDetails agent_details = 2; - - bool support_mem_hotplug_probe = 3; -} - -message MemHotplugByProbeRequest { - // server needs to send the value of memHotplugProbeAddr into file /sys/devices/system/memory/probe, - // in order to notify the guest kernel about hot-add memory event - repeated uint64 memHotplugProbeAddr = 1; -} - -message SetGuestDateTimeRequest { - // Sec the second since the Epoch. - int64 Sec = 1; - // Usec the microseconds portion of time since the Epoch. - int64 Usec = 2; -} - -// Storage represents both the rootfs of the container, and any volume that -// could have been defined through the Mount list of the OCI specification. -message Storage { - // Driver is used to define the way the storage is passed through the - // virtual machine. It can be "9p", "blk", or something else, but for - // all cases, this will define if some extra steps are required before - // this storage gets mounted into the container. - string driver = 1; - // DriverOptions allows the caller to define a list of options such - // as block sizes, numbers of luns, ... which are very specific to - // every device and cannot be generalized through extra fields. - repeated string driver_options = 2; - // Source can be anything representing the source of the storage. This - // will be handled by the proper handler based on the Driver used. - // For instance, it can be a very simple path if the caller knows the - // name of device inside the VM, or it can be some sort of identifier - // to let the agent find the device inside the VM. - string source = 3; - // Fstype represents the filesystem that needs to be used to mount the - // storage inside the VM. For instance, it could be "xfs" for block - // device, "9p" for shared filesystem, or "tmpfs" for shared /dev/shm. - string fstype = 4; - // Options describes the additional options that might be needed to - // mount properly the storage filesytem. - repeated string options = 5; - // MountPoint refers to the path where the storage should be mounted - // inside the VM. - string mount_point = 6; -} - -// Device represents only the devices that could have been defined through the -// Linux Device list of the OCI specification. -message Device { - // Id can be used to identify the device inside the VM. Some devices - // might not need it to be identified on the VM, and will rely on the - // provided VmPath instead. - string id = 1; - // Type defines the type of device described. This can be "blk", - // "scsi", "vfio", ... - // Particularly, this should be used to trigger the use of the - // appropriate device handler. - string type = 2; - // VmPath can be used by the caller to provide directly the path of - // the device as it will appear inside the VM. For some devices, the - // device id or the list of options passed might not be enough to find - // the device. In those cases, the caller should predict and provide - // this vm_path. - string vm_path = 3; - // ContainerPath defines the path where the device should be found inside - // the container. This path should match the path of the device from - // the device list listed inside the OCI spec. This is used in order - // to identify the right device in the spec and update it with the - // right options such as major/minor numbers as they appear inside - // the VM for instance. Note that an empty ctr_path should be used - // to make sure the device handler inside the agent is called, but - // no spec update needs to be performed. This has to happen for the - // case of rootfs, when a device has to be waited for after it has - // been hotplugged. An equivalent Storage entry should be defined if - // any mount needs to be performed afterwards. - string container_path = 4; - // Options allows the caller to define a list of options such as block - // sizes, numbers of luns, ... which are very specific to every device - // and cannot be generalized through extra fields. - repeated string options = 5; -} - -message StringUser { - string uid = 1; - string gid = 2; - repeated string additionalGids = 3; -} - -message CopyFileRequest { - // Path is the destination file in the guest. It must be absolute, - // canonical and below /run. - string path = 1; - // FileSize is the expected file size, for security reasons write operations - // are made in a temporary file, once it has the expected size, it's moved - // to the destination path. - int64 file_size = 2; - // FileMode is the file mode. - uint32 file_mode = 3; - // DirMode is the mode for the parent directories of destination path. - uint32 dir_mode = 4; - // Uid is the numeric user id. - int32 uid = 5; - // Gid is the numeric group id. - int32 gid = 6; - // Offset for the next write operation. - int64 offset = 7; - // Data to write in the destination file. - bytes data = 8; -} - -message StartTracingRequest { -} - -message StopTracingRequest { -} diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto deleted file mode 100644 index 4aa7514bd..000000000 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/health.proto +++ /dev/null @@ -1,39 +0,0 @@ -// -// Copyright 2017 HyperHQ Inc. -// -// SPDX-License-Identifier: Apache-2.0 -// - -syntax = "proto3"; - -package grpc; - -import "gogo/protobuf/gogoproto/gogo.proto"; - -option (gogoproto.equal_all) = true; -option (gogoproto.populate_all) = true; -option (gogoproto.testgen_all) = true; -option (gogoproto.benchgen_all) = true; - -message CheckRequest { - string service = 1; -} - -message HealthCheckResponse { - enum ServingStatus { - UNKNOWN = 0; - SERVING = 1; - NOT_SERVING = 2; - } - ServingStatus status = 1; -} - -message VersionCheckResponse { - string grpc_version = 1; - string agent_version = 2; -} - -service Health { - rpc Check(CheckRequest) returns (HealthCheckResponse); - rpc Version(CheckRequest) returns (VersionCheckResponse); -} diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto b/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto deleted file mode 100644 index 9c68d1b98..000000000 --- a/src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.proto +++ /dev/null @@ -1,462 +0,0 @@ -// -// Copyright (c) 2017 Intel Corporation -// -// SPDX-License-Identifier: Apache-2.0 -// - -syntax = "proto3"; - -package grpc; - -import "gogo/protobuf/gogoproto/gogo.proto"; -import "google/protobuf/wrappers.proto"; - -option (gogoproto.equal_all) = true; -option (gogoproto.populate_all) = true; -option (gogoproto.testgen_all) = true; -option (gogoproto.benchgen_all) = true; - -message Spec { - // Version of the Open Container Initiative Runtime Specification with which the bundle complies. - string Version = 1; - - // Process configures the container process. - Process Process = 2; - - // Root configures the container's root filesystem. - Root Root = 3; - - // Hostname configures the container's hostname. - string Hostname = 4; - - // Mounts configures additional mounts (on top of Root). - repeated Mount Mounts = 5 [(gogoproto.nullable) = false]; - - // Hooks configures callbacks for container lifecycle events. - Hooks Hooks = 6; - - // Annotations contains arbitrary metadata for the container. - map Annotations = 7; - - // Linux is platform-specific configuration for Linux based containers. - Linux Linux = 8; - - // Solaris is platform-specific configuration for Solaris based containers. - Solaris Solaris = 9; - // Windows is platform-specific configuration for Windows based containers. - Windows Windows = 10; -} - -message Process { - // Terminal creates an interactive terminal for the container. - bool Terminal = 1; - - // ConsoleSize specifies the size of the console. - Box ConsoleSize = 2; - - // User specifies user information for the process. - User User = 3 [(gogoproto.nullable) = false]; - - // Args specifies the binary and arguments for the application to execute. - repeated string Args = 4; - - // Env populates the process environment for the process. - repeated string Env = 5; - - // Cwd is the current working directory for the process and must be - // relative to the container's root. - string Cwd = 6; - - // Capabilities are Linux capabilities that are kept for the process. - LinuxCapabilities Capabilities = 7; - - // Rlimits specifies rlimit options to apply to the process. - repeated POSIXRlimit Rlimits = 8 [(gogoproto.nullable) = false]; - - // NoNewPrivileges controls whether additional privileges could be gained by processes in the container. - bool NoNewPrivileges = 9; - - // ApparmorProfile specifies the apparmor profile for the container. - string ApparmorProfile = 10; - - // Specify an oom_score_adj for the container. - int64 OOMScoreAdj = 11; - - // SelinuxLabel specifies the selinux context that the container process is run as. - string SelinuxLabel = 12; -} - -message Box { - // Height is the vertical dimension of a box. - uint32 Height = 1; - - // Width is the horizontal dimension of a box. - uint32 Width = 2; -} - -message User { - // UID is the user id. - uint32 UID = 1; - - // GID is the group id. - uint32 GID = 2; - - // AdditionalGids are additional group ids set for the container's process. - repeated uint32 AdditionalGids = 3; - - // Username is the user name. - string Username = 4; -} - -message LinuxCapabilities { - // Bounding is the set of capabilities checked by the kernel. - repeated string Bounding = 1; - - // Effective is the set of capabilities checked by the kernel. - repeated string Effective = 2; - - // Inheritable is the capabilities preserved across execve. - repeated string Inheritable = 3; - - // Permitted is the limiting superset for effective capabilities. - repeated string Permitted = 4; - - // Ambient is the ambient set of capabilities that are kept. - repeated string Ambient = 5; -} - -message POSIXRlimit { - // Type of the rlimit to set - string Type = 1; - - // Hard is the hard limit for the specified type - uint64 Hard = 2; - - // Soft is the soft limit for the specified type - uint64 Soft = 3; -} - -message Mount { - // destination is the path inside the container expect when it starts with "tmp:/" - string destination = 1; - - // source is the path inside the container expect when it starts with "vm:/dev/" or "tmp:/" - // the path which starts with "vm:/dev/" refers the guest vm's "/dev", - // especially, "vm:/dev/hostfs/" refers to the shared filesystem. - // "tmp:/" is a temporary directory which is used for temporary mounts. - string source = 2; - string type = 3; - repeated string options = 4; -} - -message Root { - // Path is the absolute path to the container's root filesystem. - string Path = 1; - - // Readonly makes the root filesystem for the container readonly before the process is executed. - bool Readonly = 2; -} - -message Hooks { - // Prestart is a list of hooks to be run before the container process is executed. - repeated Hook Prestart = 1 [(gogoproto.nullable) = false]; - - // Poststart is a list of hooks to be run after the container process is started. - repeated Hook Poststart = 2 [(gogoproto.nullable) = false]; - - // Poststop is a list of hooks to be run after the container process exits. - repeated Hook Poststop = 3 [(gogoproto.nullable) = false]; -} - -message Hook { - string Path = 1; - repeated string Args = 2; - repeated string Env = 3; - int64 Timeout = 4; -} - -message Linux { - // UIDMapping specifies user mappings for supporting user namespaces. - repeated LinuxIDMapping UIDMappings = 1 [(gogoproto.nullable) = false]; - - // GIDMapping specifies group mappings for supporting user namespaces. - repeated LinuxIDMapping GIDMappings = 2 [(gogoproto.nullable) = false]; - - // Sysctl are a set of key value pairs that are set for the container on start - map Sysctl = 3; - - // Resources contain cgroup information for handling resource constraints - // for the container - LinuxResources Resources = 4; - - // CgroupsPath specifies the path to cgroups that are created and/or joined by the container. - // The path is expected to be relative to the cgroups mountpoint. - // If resources are specified, the cgroups at CgroupsPath will be updated based on resources. - string CgroupsPath = 5; - - // Namespaces contains the namespaces that are created and/or joined by the container - repeated LinuxNamespace Namespaces = 6 [(gogoproto.nullable) = false]; - - // Devices are a list of device nodes that are created for the container - repeated LinuxDevice Devices = 7 [(gogoproto.nullable) = false]; - - // Seccomp specifies the seccomp security settings for the container. - LinuxSeccomp Seccomp = 8; - - // RootfsPropagation is the rootfs mount propagation mode for the container. - string RootfsPropagation = 9; - - // MaskedPaths masks over the provided paths inside the container. - repeated string MaskedPaths = 10; - - // ReadonlyPaths sets the provided paths as RO inside the container. - repeated string ReadonlyPaths = 11; - - // MountLabel specifies the selinux context for the mounts in the container. - string MountLabel = 12; - - // IntelRdt contains Intel Resource Director Technology (RDT) information - // for handling resource constraints (e.g., L3 cache) for the container - LinuxIntelRdt IntelRdt = 13; -} - -message Windows { - // Dummy string, never used. - string dummy = 1; -} - -message Solaris { - // Dummy string, never used. - string dummy = 1; -} - -message LinuxIDMapping { - // HostID is the starting UID/GID on the host to be mapped to 'ContainerID' - uint32 HostID = 1; - - // ContainerID is the starting UID/GID in the container - uint32 ContainerID = 2; - - // Size is the number of IDs to be mapped - uint32 Size = 3; -} - -message LinuxNamespace { - // Type is the type of namespace - string Type = 1; - - // Path is a path to an existing namespace persisted on disk that can be joined - // and is of the same type - string Path = 2; -} - -message LinuxDevice { - // Path to the device. - string Path = 1; - - // Device type, block, char, etc. - string Type = 2; - - // Major is the device's major number. - int64 Major = 3; - - // Minor is the device's minor number. - int64 Minor = 4; - - // FileMode permission bits for the device. - uint32 FileMode = 5; - - // UID of the device. - uint32 UID = 6; - - // Gid of the device. - uint32 GID = 7; -} - -message LinuxResources { - // Devices configures the device whitelist. - repeated LinuxDeviceCgroup Devices = 1 [(gogoproto.nullable) = false]; - - // Memory restriction configuration - LinuxMemory Memory = 2; - - // CPU resource restriction configuration - LinuxCPU CPU = 3; - - // Task resource restriction configuration. - LinuxPids Pids = 4; - - // BlockIO restriction configuration - LinuxBlockIO BlockIO = 5; - - // Hugetlb limit (in bytes) - repeated LinuxHugepageLimit HugepageLimits = 6 [(gogoproto.nullable) = false]; - - // Network restriction configuration - LinuxNetwork Network = 7; -} - -message LinuxMemory { - // Memory limit (in bytes). - int64 Limit = 1; - - // Memory reservation or soft_limit (in bytes). - int64 Reservation = 2; - - // Total memory limit (memory + swap). - int64 Swap = 3; - - // Kernel memory limit (in bytes). - int64 Kernel = 4; - - // Kernel memory limit for tcp (in bytes) - int64 KernelTCP = 5; - - // How aggressive the kernel will swap memory pages. - uint64 Swappiness = 6; - - // DisableOOMKiller disables the OOM killer for out of memory conditions - bool DisableOOMKiller = 7; -} - -message LinuxCPU { - // CPU shares (relative weight (ratio) vs. other cgroups with cpu shares). - uint64 Shares = 1; - - // CPU hardcap limit (in usecs). Allowed cpu time in a given period. - int64 Quota = 2; - - // CPU period to be used for hardcapping (in usecs). - uint64 Period = 3; - - // How much time realtime scheduling may use (in usecs). - int64 RealtimeRuntime = 4; - - // CPU period to be used for realtime scheduling (in usecs). - uint64 RealtimePeriod = 5; - - // CPUs to use within the cpuset. Default is to use any CPU available. - string Cpus = 6; - - // List of memory nodes in the cpuset. Default is to use any available memory node. - string Mems = 7; -} - -message LinuxWeightDevice { - // Major is the device's major number. - int64 Major = 1; - - // Minor is the device's minor number. - int64 Minor = 2; - - // Weight is the bandwidth rate for the device. - uint32 Weight = 3; - - // LeafWeight is the bandwidth rate for the device while competing with the cgroup's child cgroups, CFQ scheduler only - uint32 LeafWeight = 4; -} - -message LinuxThrottleDevice { - // Major is the device's major number. - int64 Major = 1; - - // Minor is the device's minor number. - int64 Minor = 2; - - // Rate is the IO rate limit per cgroup per device - uint64 Rate = 3; -} - -message LinuxBlockIO { - // Specifies per cgroup weight - uint32 Weight = 1; - - // Specifies tasks' weight in the given cgroup while competing with the cgroup's child cgroups, CFQ scheduler only - uint32 LeafWeight = 2; - - // Weight per cgroup per device, can override BlkioWeight - repeated LinuxWeightDevice WeightDevice = 3 [(gogoproto.nullable) = false]; - - // IO read rate limit per cgroup per device, bytes per second - repeated LinuxThrottleDevice ThrottleReadBpsDevice = 4 [(gogoproto.nullable) = false]; - - // IO write rate limit per cgroup per device, bytes per second - repeated LinuxThrottleDevice ThrottleWriteBpsDevice = 5 [(gogoproto.nullable) = false]; - - // IO read rate limit per cgroup per device, IO per second - repeated LinuxThrottleDevice ThrottleReadIOPSDevice = 6 [(gogoproto.nullable) = false]; - - // IO write rate limit per cgroup per device, IO per second - repeated LinuxThrottleDevice ThrottleWriteIOPSDevice = 7 [(gogoproto.nullable) = false]; -} - -message LinuxPids { - // Maximum number of PIDs. Default is "no limit". - int64 Limit = 1; -} - -message LinuxDeviceCgroup { - // Allow or deny - bool Allow = 1; - - // Device type, block, char, etc. - string Type = 2; - - // Major is the device's major number. - int64 Major = 3; - - // Minor is the device's minor number. - int64 Minor = 4; - - // Cgroup access permissions format, rwm. - string Access = 5; -} - -message LinuxNetwork { - // Set class identifier for container's network packets - uint32 ClassID = 1; - - // Set priority of network traffic for container - repeated LinuxInterfacePriority Priorities = 2 [(gogoproto.nullable) = false]; -} - -message LinuxHugepageLimit { - // Pagesize is the hugepage size - string Pagesize = 1; - - // Limit is the limit of "hugepagesize" hugetlb usage - uint64 Limit = 2; -} - -message LinuxInterfacePriority { - // Name is the name of the network interface - string Name = 1; - - // Priority for the interface - uint32 Priority = 2; -} - -message LinuxSeccomp { - string DefaultAction = 1; - repeated string Architectures = 2; - repeated LinuxSyscall Syscalls = 3 [(gogoproto.nullable) = false]; -} - -message LinuxSeccompArg { - uint64 Index = 1; - uint64 Value = 2; - uint64 ValueTwo = 3; - string Op = 4; -} - -message LinuxSyscall { - repeated string Names = 1; - string Action = 2; - repeated LinuxSeccompArg Args = 3 [(gogoproto.nullable) = false]; -} - -message LinuxIntelRdt { - // The schema for L3 cache id and capacity bitmask (CBM) - // Format: "L3:=;=;..." - string L3CacheSchema = 1; -} diff --git a/src/runtime/virtcontainers/pkg/agent/protocols/types.proto b/src/runtime/virtcontainers/pkg/agent/protocols/types.proto deleted file mode 100644 index f6856e1e3..000000000 --- a/src/runtime/virtcontainers/pkg/agent/protocols/types.proto +++ /dev/null @@ -1,48 +0,0 @@ -// -// Copyright 2018 Intel Corporation. -// -// SPDX-License-Identifier: Apache-2.0 -// - -syntax = "proto3"; - -package types; - -enum IPFamily { - v4 = 0; - v6 = 1; -} - -message IPAddress { - IPFamily family = 1; - string address = 2; - string mask = 3; -} - -message Interface { - string device = 1; - string name = 2; - repeated IPAddress IPAddresses = 3; - uint64 mtu = 4; - string hwAddr = 5; - - // pciAddr is the PCI address in the format "bridgeAddr/deviceAddr". - // Here, bridgeAddr is the address at which the bridge is attached on the root bus, - // while deviceAddr is the address at which the network device is attached on the bridge. - string pciAddr = 6; - - // Type defines the type of interface described by this structure. - // The expected values are the one that are defined by the netlink - // library, regarding each type of link. Here is a non exhaustive - // list: "veth", "macvtap", "vlan", "macvlan", "tap", ... - string type = 7; - uint32 raw_flags = 8; -} - -message Route { - string dest = 1; - string gateway = 2; - string device = 3; - string source = 4; - uint32 scope = 5; -} From 837343f08ac730b72b3e6aebe1e8a5b40432e802 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sun, 25 Oct 2020 10:58:27 +0800 Subject: [PATCH 4/6] agent-ctl: update cargo.lock Just compiling would show that the cargo.lock file is not updated. Signed-off-by: Peng Tao --- tools/agent-ctl/Cargo.lock | 308 +++++++++++++++++++++++++++++++++++-- 1 file changed, 293 insertions(+), 15 deletions(-) diff --git a/tools/agent-ctl/Cargo.lock b/tools/agent-ctl/Cargo.lock index 1d37399fa..e0b5af69c 100644 --- a/tools/agent-ctl/Cargo.lock +++ b/tools/agent-ctl/Cargo.lock @@ -1,5 +1,20 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "addr2line" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" + [[package]] name = "aho-corasick" version = "0.7.13" @@ -59,6 +74,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +[[package]] +name = "backtrace" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" +dependencies = [ + "addr2line", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.11.0" @@ -88,6 +117,16 @@ version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "iovec", +] + [[package]] name = "caps" version = "0.3.4" @@ -111,6 +150,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "cgroups" version = "0.1.1-alpha.0" @@ -171,10 +216,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] +[[package]] +name = "derive-new" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.33", +] + [[package]] name = "dirs" version = "3.0.1" @@ -195,6 +251,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + [[package]] name = "errno" version = "0.2.5" @@ -225,6 +287,21 @@ dependencies = [ "version_check", ] +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", +] + +[[package]] +name = "fixedbitset" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" + [[package]] name = "futures" version = "0.1.29" @@ -243,11 +320,26 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] +[[package]] +name = "gimli" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" + +[[package]] +name = "heck" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "hermit-abi" version = "0.1.14" @@ -269,6 +361,24 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.6" @@ -318,7 +428,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -344,6 +454,22 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +[[package]] +name = "miniz_oxide" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "multimap" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04b9f127583ed176e163fb9ec6f3e793b87e21deedd5734a69386a18a0151" + [[package]] name = "nix" version = "0.16.1" @@ -352,7 +478,7 @@ checksum = "dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -365,7 +491,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -378,7 +504,7 @@ checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", ] @@ -401,6 +527,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "object" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" + [[package]] name = "oci" version = "0.1.0" @@ -430,6 +562,15 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "petgraph" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" +dependencies = [ + "fixedbitset", +] + [[package]] name = "ppv-lite86" version = "0.2.8" @@ -446,13 +587,74 @@ dependencies = [ "nix 0.18.0", ] +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + [[package]] name = "proc-macro2" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" dependencies = [ - "unicode-xid", + "unicode-xid 0.2.1", +] + +[[package]] +name = "prost" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d14b1c185652833d24aaad41c5832b0be5616a590227c1fbff57c616754b23" +dependencies = [ + "byteorder", + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb788126ea840817128183f8f603dce02cb7aea25c2a0b764359d8e20010702e" +dependencies = [ + "bytes", + "heck", + "itertools", + "log", + "multimap", + "petgraph", + "prost", + "prost-types", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e7dc378b94ac374644181a2247cebf59a6ec1c88b49ac77f3a94b86b79d0e11" +dependencies = [ + "failure", + "itertools", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "prost-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de482a366941c8d56d19b650fac09ca08508f2a696119ee7513ad590c8bac6f" +dependencies = [ + "bytes", + "prost", ] [[package]] @@ -487,6 +689,16 @@ dependencies = [ "futures", "protobuf", "ttrpc", + "ttrpc-codegen", +] + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", ] [[package]] @@ -495,7 +707,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.18", ] [[package]] @@ -595,6 +807,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rustc-demangle" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" + [[package]] name = "rustjail" version = "0.1.0" @@ -658,9 +876,9 @@ version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.33", ] [[package]] @@ -727,15 +945,26 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + [[package]] name = "syn" version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", + "proc-macro2 1.0.18", + "quote 1.0.7", + "unicode-xid 0.2.1", ] [[package]] @@ -750,7 +979,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand", "redox_syscall", @@ -799,12 +1028,51 @@ dependencies = [ "protobuf-codegen-pure", ] +[[package]] +name = "ttrpc-codegen" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e8844d7a8351fa833bea811f826401bec020b233e60a7c0a8f313f764ce5a5" +dependencies = [ + "protobuf", + "protobuf-codegen", + "protobuf-codegen-pure", + "ttrpc-compiler", +] + +[[package]] +name = "ttrpc-compiler" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d290e64bdb994926d102f2983cc6550ece0778c8430253dc2de4e71cbf5285d9" +dependencies = [ + "derive-new", + "prost", + "prost-build", + "prost-types", + "protobuf", + "protobuf-codegen", + "tempfile", +] + +[[package]] +name = "unicode-segmentation" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + [[package]] name = "unicode-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + [[package]] name = "unicode-xid" version = "0.2.1" @@ -835,6 +1103,16 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "which" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" +dependencies = [ + "failure", + "libc", +] + [[package]] name = "winapi" version = "0.3.8" From 6e9ca457326a96ade5c6a6dd22fc5bc28b162281 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sun, 25 Oct 2020 11:06:49 +0800 Subject: [PATCH 5/6] agent: generate proto files properly Need to generate all protos. Depends-on: github.com/kata-containers/tests#3006 Signed-off-by: Peng Tao --- src/agent/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/agent/Makefile b/src/agent/Makefile index 92fbcdf02..e33802037 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile @@ -25,11 +25,6 @@ export VERSION_COMMIT := $(if $(COMMIT),$(VERSION)-$(COMMIT),$(VERSION)) BUILD_TYPE = release -# set proto file to generate -ifdef proto - PROTO_FILE=${proto} -endif - ARCH = $(shell uname -m) LIBC ?= musl ifneq ($(LIBC),musl) @@ -175,4 +170,4 @@ help: show-summary optimize generate-protocols: - protocols/hack/update-generated-proto.sh "${PROTO_FILE}" + protocols/hack/update-generated-proto.sh all From 0896ce80a4f97a14e8e355c0a47b1160fb4879af Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Mon, 26 Oct 2020 15:57:01 +0800 Subject: [PATCH 6/6] agent: update proto file copyright Now that it is Ant Group... Signed-off-by: Peng Tao --- src/agent/protocols/protos/health.proto | 4 ++-- src/agent/protocols/protos/oci.proto | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/agent/protocols/protos/health.proto b/src/agent/protocols/protos/health.proto index 190632ed4..e8a660159 100644 --- a/src/agent/protocols/protos/health.proto +++ b/src/agent/protocols/protos/health.proto @@ -1,6 +1,6 @@ // -// Copyright 2017 HyperHQ Inc. -// Copyright (c) 2019 Ant Financial +// Copyright (c) 2017 HyperHQ Inc. +// Copyright (c) 2019-2020 Ant Group // // SPDX-License-Identifier: Apache-2.0 // diff --git a/src/agent/protocols/protos/oci.proto b/src/agent/protocols/protos/oci.proto index de7631210..8fbf19f81 100644 --- a/src/agent/protocols/protos/oci.proto +++ b/src/agent/protocols/protos/oci.proto @@ -1,6 +1,6 @@ // // Copyright (c) 2017 Intel Corporation -// Copyright (c) 2019 Ant Financial +// Copyright (c) 2019-2020 Ant Group // // SPDX-License-Identifier: Apache-2.0 //