From c5dd438c8506f96f62c4e85f48b9925d142a8b23 Mon Sep 17 00:00:00 2001 From: wenjlu-lgy Date: Tue, 26 Mar 2024 10:48:23 +0800 Subject: [PATCH 01/13] gpu grpc change for aks hybrid --- go.mod | 2 +- go.sum | 5 +- .../moc_cloudagent_virtualmachine.pb.go | 229 +++++++------ .../moc_cloudagent_virtualmachine.proto | 1 + rpc/common/moc_common_computecommon.pb.go | 318 +++++++++--------- rpc/common/moc_common_computecommon.proto | 14 +- rpc/common/moc_common_nodeinfo.pb.go | 119 ++++--- rpc/common/moc_common_nodeinfo.proto | 5 +- .../moc_nodeagent_virtualmachine.pb.go | 225 +++++++------ .../moc_nodeagent_virtualmachine.proto | 1 + 10 files changed, 481 insertions(+), 438 deletions(-) diff --git a/go.mod b/go.mod index 0f3ac0f4..16d941b5 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( require ( golang.org/x/net v0.22.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect ) replace ( diff --git a/go.sum b/go.sum index de9ca589..caed87d8 100644 --- a/go.sum +++ b/go.sum @@ -1505,8 +1505,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 h1:IR+hp6ypxjH24bkMfEJ0yHR21+gwPWdV+/IBrPQyn3k= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= @@ -1528,7 +1528,6 @@ google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go b/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go index 2fcc6009..8369cfa4 100644 --- a/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go +++ b/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go @@ -697,6 +697,7 @@ type HardwareConfiguration struct { VMSize common.VirtualMachineSizeType `protobuf:"varint,1,opt,name=VMSize,proto3,enum=moc.VirtualMachineSizeType" json:"VMSize,omitempty"` CustomSize *common.VirtualMachineCustomSize `protobuf:"bytes,2,opt,name=customSize,proto3" json:"customSize,omitempty"` DynamicMemoryConfiguration *common.DynamicMemoryConfiguration `protobuf:"bytes,3,opt,name=dynamicMemoryConfiguration,proto3" json:"dynamicMemoryConfiguration,omitempty"` + GpuList []*common.Gpu `protobuf:"bytes,4,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -748,6 +749,13 @@ func (m *HardwareConfiguration) GetDynamicMemoryConfiguration() *common.DynamicM return nil } +func (m *HardwareConfiguration) GetGpuList() []*common.Gpu { + if m != nil { + return m.GpuList + } + return nil +} + type UefiSettings struct { SecureBootEnabled bool `protobuf:"varint,1,opt,name=secureBootEnabled,proto3" json:"secureBootEnabled,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1331,116 +1339,117 @@ func init() { } var fileDescriptor_a65ab853cd24c92b = []byte{ - // 1739 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xdd, 0x6e, 0xe3, 0xc6, - 0xf5, 0x0f, 0x65, 0x5b, 0xb6, 0x8e, 0x3f, 0xd6, 0x9e, 0xb5, 0xbd, 0xfc, 0xfb, 0xef, 0x75, 0x0c, - 0x6e, 0x10, 0x38, 0xdb, 0x44, 0x4a, 0x9d, 0xed, 0x36, 0x28, 0x52, 0x04, 0xb2, 0xa5, 0xc4, 0x46, - 0x6c, 0x59, 0x1d, 0x69, 0x77, 0x01, 0xa3, 0xc0, 0x66, 0x4c, 0x8e, 0xe5, 0x81, 0x45, 0x0e, 0x3b, - 0x33, 0xb4, 0xa2, 0xa2, 0x37, 0xcd, 0x55, 0x8b, 0x5e, 0xf4, 0x11, 0xfa, 0x12, 0x6d, 0xef, 0x7a, - 0xd1, 0xfb, 0x3e, 0x47, 0xaf, 0x0a, 0xf4, 0x15, 0x8a, 0x19, 0x52, 0x12, 0x29, 0x91, 0x86, 0x17, - 0x68, 0x2e, 0x7a, 0x25, 0xf1, 0x9c, 0xf3, 0xfb, 0xcd, 0x99, 0x33, 0xe7, 0x63, 0x06, 0x9e, 0xf9, - 0xdc, 0x7d, 0xeb, 0xf6, 0x79, 0xe4, 0x91, 0x1e, 0x0d, 0xd4, 0xdb, 0x3b, 0x26, 0x54, 0x44, 0xfa, - 0x3e, 0x71, 0x6f, 0x58, 0x40, 0xab, 0xa1, 0xe0, 0x8a, 0xa3, 0x6d, 0x9f, 0xbb, 0xd5, 0x89, 0x51, - 0xd5, 0xe5, 0x7e, 0x18, 0x29, 0xba, 0xb3, 0xd7, 0xe3, 0xbc, 0xd7, 0xa7, 0x35, 0x63, 0x75, 0x15, - 0x5d, 0xd7, 0x06, 0x82, 0x84, 0x21, 0x15, 0x32, 0xc6, 0xed, 0x3c, 0x31, 0xe4, 0xdc, 0xf7, 0x79, - 0x90, 0xfc, 0x24, 0x8a, 0xbd, 0xac, 0x42, 0x93, 0xa5, 0xf5, 0xce, 0x9f, 0x2c, 0xd8, 0x7a, 0x1d, - 0x7b, 0x72, 0x1e, 0x7b, 0x82, 0xe9, 0xaf, 0x22, 0x2a, 0x15, 0x6a, 0xc3, 0xa3, 0xac, 0x42, 0xda, - 0xd6, 0xfe, 0xdc, 0xc1, 0xf2, 0xe1, 0x87, 0xd5, 0x7c, 0x27, 0xab, 0x53, 0x3c, 0xd3, 0x70, 0xf4, - 0x02, 0x56, 0x2f, 0x42, 0x2a, 0x88, 0x62, 0x3c, 0xe8, 0x0e, 0x43, 0x6a, 0x97, 0xf6, 0xad, 0x83, - 0xb5, 0xc3, 0x35, 0xc3, 0x37, 0xd6, 0xe0, 0xac, 0x91, 0xf3, 0x67, 0x0b, 0xb6, 0xa7, 0x3d, 0x94, - 0x21, 0x0f, 0x24, 0xfd, 0x01, 0x5c, 0x3c, 0x84, 0x32, 0xa6, 0x32, 0xea, 0x2b, 0xe3, 0xdb, 0xf2, - 0xe1, 0x4e, 0x35, 0x0e, 0x7c, 0x75, 0x14, 0xf8, 0xea, 0x11, 0xe7, 0xfd, 0xd7, 0xa4, 0x1f, 0x51, - 0x9c, 0x58, 0xa2, 0x4d, 0x58, 0x68, 0x0a, 0xc1, 0x85, 0x3d, 0xb7, 0x6f, 0x1d, 0x54, 0x70, 0xfc, - 0xe1, 0x54, 0x61, 0xa5, 0xd3, 0x39, 0x69, 0x47, 0x57, 0x7d, 0xe6, 0x7e, 0x43, 0x87, 0x68, 0x0f, - 0x16, 0x6f, 0xe9, 0xd0, 0x23, 0x8a, 0xd8, 0x96, 0xb6, 0x3b, 0x9a, 0xff, 0xdd, 0x5f, 0x6c, 0x0b, - 0x8f, 0x84, 0x8e, 0x03, 0xf3, 0x0d, 0x26, 0x6f, 0xd1, 0x0e, 0x2c, 0x79, 0x4c, 0xde, 0x06, 0xc4, - 0xa7, 0xb1, 0x21, 0x1e, 0x7f, 0x3b, 0xff, 0xb4, 0x60, 0xb3, 0xa3, 0xb8, 0x20, 0x3d, 0x7a, 0xcc, - 0x83, 0x6b, 0xd6, 0x8b, 0xe2, 0x38, 0xa1, 0x17, 0x50, 0xe6, 0x52, 0x9b, 0x19, 0xc8, 0xf2, 0xe1, - 0x6e, 0xd1, 0xfe, 0xf5, 0x12, 0x38, 0xb1, 0x45, 0x3f, 0x83, 0x8a, 0x5e, 0x5a, 0xff, 0x97, 0x76, - 0xc9, 0x04, 0xee, 0x7e, 0xe0, 0xc4, 0x1c, 0x7d, 0x08, 0x6b, 0xcc, 0x27, 0x3d, 0x8a, 0xe9, 0x35, - 0x15, 0x34, 0x70, 0x69, 0xb2, 0xfb, 0x29, 0x29, 0x7a, 0x01, 0x5b, 0x77, 0x7e, 0xec, 0xec, 0x31, - 0x0f, 0x14, 0x61, 0x01, 0x15, 0x2d, 0xbd, 0xb7, 0x79, 0x63, 0x9e, 0xaf, 0x74, 0xbe, 0x82, 0xf5, - 0x16, 0x55, 0x03, 0x2e, 0x6e, 0x4f, 0x03, 0x45, 0xc5, 0x35, 0x71, 0x29, 0x3a, 0x84, 0xcd, 0x60, - 0x4a, 0xd6, 0x9a, 0x04, 0x29, 0x57, 0xe7, 0x7c, 0x0b, 0x9b, 0x09, 0x4f, 0x36, 0x5e, 0x27, 0x00, - 0x6c, 0x64, 0x38, 0xca, 0x99, 0x83, 0xa2, 0xad, 0x4f, 0x7b, 0x82, 0x53, 0x58, 0xe7, 0x7b, 0x0b, - 0x36, 0x5e, 0x49, 0x2a, 0xb2, 0xfc, 0xfb, 0xb0, 0x14, 0x49, 0x2a, 0x26, 0x87, 0x98, 0x9c, 0xf6, - 0x58, 0xaa, 0x2d, 0x42, 0x22, 0xe5, 0x80, 0x0b, 0xcf, 0xa4, 0xda, 0xd8, 0x62, 0x24, 0x45, 0x1f, - 0xc5, 0x1c, 0x4a, 0x17, 0xca, 0x9c, 0x29, 0x94, 0x55, 0xe3, 0xa1, 0x5e, 0x4d, 0x17, 0x06, 0x1e, - 0xab, 0x75, 0xb8, 0x70, 0xa3, 0x9d, 0x75, 0x61, 0x0f, 0xc0, 0x63, 0x92, 0x5c, 0xf5, 0x29, 0x6e, - 0xb4, 0x8d, 0x13, 0x4b, 0x38, 0x25, 0x41, 0x08, 0xe6, 0x43, 0x2e, 0xe2, 0x3c, 0x5f, 0xc5, 0xe6, - 0xbf, 0x73, 0x09, 0xe8, 0x8c, 0x05, 0xd1, 0x77, 0x59, 0xa6, 0x06, 0x3c, 0x4d, 0x70, 0xed, 0xc4, - 0xb7, 0x7a, 0xa4, 0x6e, 0x68, 0xa0, 0x98, 0x6b, 0x0c, 0x12, 0xf2, 0xfb, 0x8d, 0x9c, 0xdf, 0x97, - 0x60, 0xf3, 0x0d, 0x0b, 0x3c, 0x3e, 0x90, 0x59, 0xfa, 0x97, 0xb0, 0x4d, 0x03, 0x0d, 0xac, 0x47, - 0x8a, 0xfb, 0x44, 0x31, 0xf7, 0x55, 0xe8, 0x11, 0x65, 0xce, 0x45, 0xf3, 0x16, 0x68, 0x75, 0xa1, - 0x28, 0xe6, 0xd3, 0x4b, 0x1e, 0xc4, 0x8d, 0xa4, 0x82, 0xc7, 0xdf, 0xa8, 0x3b, 0x1b, 0x10, 0x13, - 0xc3, 0x7b, 0x4e, 0x79, 0xda, 0x1e, 0xcf, 0x86, 0xf4, 0x6b, 0x40, 0x6f, 0x58, 0x80, 0xcf, 0xb3, - 0xbc, 0xf3, 0x86, 0xf7, 0x89, 0xe1, 0x9d, 0x55, 0xe3, 0x1c, 0x88, 0xf3, 0x8f, 0x05, 0xd8, 0x4d, - 0x9a, 0x5c, 0xd0, 0xeb, 0x0c, 0xa5, 0xa2, 0x7e, 0x76, 0x25, 0x07, 0x56, 0x12, 0xbf, 0x44, 0x2a, - 0xc7, 0x33, 0x32, 0x74, 0x01, 0xab, 0xc4, 0xf3, 0x59, 0xc0, 0xa4, 0x12, 0x44, 0x71, 0x91, 0x74, - 0xac, 0x8f, 0x8a, 0x36, 0x38, 0x93, 0xa5, 0x38, 0x8b, 0x47, 0x5f, 0xc2, 0x82, 0xce, 0x28, 0x69, - 0xcf, 0x99, 0x7a, 0x78, 0x07, 0xa2, 0x18, 0x87, 0x3e, 0x00, 0x70, 0x23, 0xa9, 0xb8, 0xdf, 0xd0, - 0x5d, 0x6e, 0x3e, 0x95, 0xd5, 0x29, 0x39, 0x6a, 0x00, 0x84, 0xa6, 0x2b, 0xde, 0xd2, 0xa1, 0xb4, - 0x17, 0xcc, 0x5a, 0x1f, 0x14, 0xad, 0x95, 0x6e, 0xa1, 0x38, 0x85, 0x43, 0x9f, 0xea, 0x8e, 0x67, - 0x6a, 0xa3, 0x6c, 0x6a, 0xc3, 0x4e, 0x0f, 0x91, 0x51, 0x50, 0x4d, 0x99, 0x24, 0x76, 0xe8, 0x17, - 0xb0, 0xc1, 0xe5, 0x11, 0xe7, 0x4a, 0xef, 0x37, 0x6c, 0x06, 0x3d, 0x16, 0x50, 0x7b, 0xd1, 0x80, - 0x9f, 0xe5, 0x81, 0xa7, 0x4c, 0xf1, 0x2c, 0x1a, 0x5d, 0x02, 0xea, 0xcf, 0xd4, 0x8b, 0xbd, 0x64, - 0xce, 0xe1, 0x79, 0xd1, 0x96, 0x66, 0x2b, 0x0c, 0xe7, 0xb0, 0xa0, 0x6f, 0x61, 0x73, 0x90, 0x53, - 0x2e, 0x76, 0xc5, 0xb0, 0x7f, 0x5c, 0xc4, 0x9e, 0x57, 0x62, 0x38, 0x97, 0x49, 0xa7, 0x73, 0x28, - 0xf8, 0x77, 0xc3, 0x2c, 0x3f, 0xa4, 0xd2, 0xb9, 0x3d, 0xa3, 0xc6, 0x39, 0x10, 0xe7, 0x5f, 0x16, - 0x6c, 0x9d, 0x10, 0xe1, 0x0d, 0x88, 0x98, 0x9a, 0x4b, 0x9f, 0x41, 0xf9, 0xf5, 0x79, 0x87, 0xfd, - 0x3a, 0xce, 0xe0, 0xb5, 0xc3, 0xff, 0x37, 0xb4, 0xd9, 0xa1, 0xab, 0xd5, 0xf1, 0x41, 0xc5, 0xa6, - 0xe8, 0xe7, 0xa3, 0x34, 0x32, 0xc0, 0x38, 0xab, 0x9f, 0xe6, 0x00, 0x8f, 0xc7, 0x46, 0x38, 0x05, - 0x40, 0x6f, 0x61, 0xc7, 0x1b, 0x06, 0xc4, 0x67, 0xee, 0x39, 0xf5, 0xb9, 0x18, 0xe6, 0x75, 0x81, - 0xf7, 0x0d, 0x5d, 0xa3, 0xd0, 0x0c, 0xdf, 0x43, 0xe1, 0x7c, 0x01, 0x2b, 0xaf, 0xe8, 0x35, 0xeb, - 0x50, 0xa5, 0x93, 0x45, 0xa2, 0x8f, 0x61, 0x43, 0x52, 0x37, 0x12, 0x54, 0xa7, 0x47, 0xd3, 0x34, - 0x2b, 0x2f, 0xe9, 0x5d, 0xb3, 0x0a, 0xe7, 0xaf, 0x16, 0x6c, 0x75, 0xb4, 0x94, 0xa9, 0x2c, 0x2f, - 0xda, 0x85, 0x4a, 0xdc, 0xea, 0xba, 0xed, 0xf3, 0x04, 0x3f, 0x11, 0xa0, 0x13, 0x58, 0x89, 0x52, - 0xab, 0x26, 0x71, 0x29, 0x2c, 0x9c, 0xb4, 0x87, 0x38, 0x83, 0x44, 0x3f, 0x81, 0x15, 0x99, 0x38, - 0xd0, 0x9d, 0x0c, 0x97, 0x0d, 0xc3, 0xd4, 0x49, 0x29, 0x70, 0xc6, 0xcc, 0x39, 0x03, 0xbb, 0x7e, - 0x47, 0x58, 0x9f, 0x5c, 0xb1, 0x3e, 0x53, 0xc3, 0x0e, 0x55, 0x93, 0x29, 0xbf, 0x0b, 0x95, 0x9e, - 0xe0, 0x51, 0x98, 0x6a, 0x56, 0x13, 0x81, 0x1e, 0x35, 0x66, 0x12, 0xc6, 0x5d, 0xda, 0xfc, 0x77, - 0xfe, 0xb0, 0x04, 0x6b, 0xd9, 0xe3, 0x1c, 0x9b, 0x59, 0x13, 0x33, 0xb4, 0x06, 0x25, 0x96, 0x0c, - 0x48, 0x5c, 0x62, 0x1e, 0xfa, 0x0a, 0x16, 0x65, 0x7c, 0x01, 0x4a, 0x4e, 0xb2, 0xb0, 0x10, 0xf2, - 0xee, 0x49, 0x78, 0x04, 0x46, 0x0d, 0x28, 0x71, 0x99, 0xb4, 0xee, 0x17, 0x45, 0x14, 0xf7, 0xb5, - 0x68, 0x5c, 0xe2, 0x52, 0x7b, 0x93, 0x5c, 0x3b, 0xec, 0x85, 0xfb, 0xbd, 0xc9, 0xbb, 0x85, 0xe0, - 0x11, 0x58, 0x8f, 0xb2, 0x80, 0x7b, 0xf1, 0x75, 0xa6, 0x1c, 0x8f, 0xb2, 0xd1, 0x77, 0x36, 0xb4, - 0x8b, 0xd3, 0xa1, 0x7d, 0x06, 0x65, 0xa9, 0x88, 0x8a, 0x64, 0xd2, 0x75, 0x96, 0xe3, 0x53, 0x34, - 0x22, 0x9c, 0xa8, 0xf4, 0x34, 0xe9, 0xf3, 0x78, 0x0c, 0x1b, 0x96, 0x4a, 0x3c, 0x4d, 0xd2, 0x32, - 0xf4, 0x39, 0x3c, 0x49, 0xe6, 0xf7, 0x09, 0xeb, 0xdd, 0xa4, 0x0f, 0xda, 0x74, 0x84, 0x25, 0x5c, - 0xa4, 0x46, 0x2f, 0xa1, 0x7c, 0x67, 0x3a, 0xad, 0xbd, 0x6c, 0x12, 0x69, 0xaf, 0xf0, 0xee, 0x7d, - 0x1e, 0x97, 0x79, 0x6c, 0x8d, 0x4e, 0x61, 0xe9, 0x26, 0x69, 0x1a, 0xf6, 0x8a, 0x71, 0xfe, 0x93, - 0x22, 0x64, 0x6e, 0x73, 0xc1, 0x63, 0xb8, 0xae, 0x40, 0xd2, 0xef, 0xf3, 0x01, 0xf5, 0x2e, 0x06, - 0xfa, 0x0a, 0xc9, 0x3d, 0x2a, 0xed, 0xd5, 0xfd, 0xb9, 0x83, 0x0a, 0x9e, 0x55, 0xa0, 0x1a, 0x40, - 0xc8, 0x07, 0x54, 0xe8, 0x28, 0x51, 0x7b, 0xcd, 0x38, 0xfd, 0x28, 0xee, 0x77, 0x63, 0x31, 0x4e, - 0x99, 0x68, 0x4f, 0x47, 0x95, 0x60, 0x3f, 0xba, 0xdf, 0xd3, 0xdc, 0xca, 0xc6, 0x63, 0x38, 0x7a, - 0x0a, 0xf3, 0x8a, 0xf4, 0xa4, 0xbd, 0x6e, 0x68, 0x2a, 0x86, 0xa6, 0x4b, 0x7a, 0x12, 0x1b, 0x31, - 0xfa, 0x02, 0xa0, 0xa7, 0x1f, 0x5f, 0x75, 0x4d, 0x6a, 0x6f, 0xa4, 0xee, 0xf2, 0x5f, 0x8f, 0xc5, - 0x59, 0xea, 0x94, 0x3d, 0xfa, 0x25, 0x6c, 0x4f, 0xbe, 0x4e, 0x03, 0xa9, 0x48, 0xe0, 0xd2, 0xd7, - 0x8c, 0x0e, 0x6c, 0x94, 0x6a, 0x16, 0xd9, 0xaa, 0x9b, 0xb1, 0xc5, 0x05, 0x1c, 0xe8, 0x12, 0x1e, - 0x91, 0x6c, 0xfd, 0xdb, 0x8f, 0x0d, 0xed, 0xa7, 0x45, 0xc1, 0x28, 0x6a, 0x17, 0x78, 0x9a, 0xc8, - 0xf9, 0x63, 0x09, 0xf6, 0xb2, 0x7e, 0x4d, 0x9e, 0x83, 0x3f, 0xd8, 0x73, 0xf4, 0x0d, 0x6c, 0x5f, - 0x1c, 0x75, 0x2e, 0xce, 0x9a, 0xdd, 0xe6, 0xdb, 0xbc, 0x77, 0xe9, 0x6e, 0x4e, 0xb8, 0xc6, 0x76, - 0x47, 0x25, 0xdb, 0xc2, 0x5b, 0x23, 0x7c, 0x06, 0x8e, 0x8e, 0xa6, 0xdf, 0xb9, 0x73, 0x29, 0xbe, - 0xb6, 0xe0, 0x77, 0xcc, 0xa3, 0xa2, 0xee, 0xba, 0x54, 0xca, 0xc2, 0x57, 0xef, 0xdf, 0x2c, 0x78, - 0xbf, 0x30, 0x22, 0xff, 0x03, 0xcf, 0xdf, 0x7f, 0x97, 0xa6, 0xfd, 0xc7, 0x51, 0x70, 0xcc, 0x7d, - 0x9f, 0x04, 0xde, 0xe8, 0x48, 0x5b, 0xd3, 0x23, 0x20, 0x79, 0xbd, 0x3e, 0xd4, 0xfd, 0xe9, 0x01, - 0x52, 0x87, 0x72, 0x87, 0x47, 0xc2, 0xa5, 0x99, 0xab, 0x70, 0x91, 0x17, 0x1d, 0x57, 0xb0, 0x50, - 0xc5, 0x00, 0x9c, 0x00, 0x11, 0x83, 0xff, 0x9b, 0x58, 0x9c, 0x06, 0x61, 0xa4, 0xda, 0x44, 0x10, - 0x9f, 0xaa, 0xc9, 0xbd, 0xf8, 0x47, 0xf7, 0xb2, 0x66, 0x31, 0xb8, 0x98, 0x0d, 0x39, 0x50, 0xc1, - 0x51, 0x50, 0x97, 0xfa, 0x3a, 0x9d, 0xb9, 0x2c, 0x4f, 0xc4, 0xe8, 0x39, 0xac, 0x9a, 0x8f, 0xd1, - 0x9b, 0xca, 0x8c, 0x99, 0x91, 0x5d, 0x56, 0xe5, 0xfc, 0xdd, 0x82, 0xfd, 0xe2, 0x88, 0x27, 0x29, - 0xf3, 0xdf, 0x0e, 0xf9, 0x39, 0xac, 0x64, 0x1a, 0xcd, 0x43, 0x02, 0x9f, 0xe9, 0x36, 0x19, 0xf8, - 0xf3, 0x2f, 0xf5, 0x7d, 0xd1, 0xd4, 0x10, 0x40, 0xb9, 0xdb, 0x6c, 0xd5, 0x5b, 0xdd, 0xf5, 0xf7, - 0xd0, 0x3a, 0xac, 0x9c, 0x5d, 0xd4, 0x1b, 0x47, 0xf5, 0xb3, 0x7a, 0xeb, 0xb8, 0x89, 0xd7, 0x2d, - 0xf4, 0x04, 0x1e, 0x77, 0xba, 0xf5, 0xe3, 0x6f, 0x9a, 0x8d, 0xe3, 0x8b, 0x56, 0x17, 0x5f, 0x9c, - 0xb5, 0xcf, 0xea, 0xad, 0xe6, 0x7a, 0xe9, 0xf0, 0xfb, 0x39, 0x78, 0x9c, 0xd3, 0xe0, 0x10, 0x83, - 0xf2, 0x69, 0x70, 0xc7, 0x6f, 0x29, 0xfa, 0xe4, 0x81, 0x3b, 0x8d, 0x73, 0x74, 0xa7, 0xfa, 0x50, - 0xf3, 0x38, 0xc0, 0xce, 0x7b, 0xe8, 0x37, 0xb0, 0x18, 0x97, 0x2a, 0x45, 0x2f, 0x1f, 0x06, 0x9e, - 0xee, 0x75, 0x3b, 0x3f, 0x7d, 0x67, 0xdc, 0x78, 0xf5, 0xdf, 0x5a, 0x00, 0x93, 0x50, 0xa3, 0x07, - 0x32, 0xcd, 0xd4, 0xe6, 0xce, 0xe7, 0xef, 0x0e, 0x1c, 0xf9, 0x70, 0xf4, 0xe3, 0xcb, 0x5a, 0x8f, - 0xa9, 0x9b, 0xe8, 0x4a, 0x83, 0x6a, 0x3e, 0x73, 0x05, 0x97, 0xfc, 0x5a, 0xd5, 0x7c, 0xee, 0xd6, - 0x44, 0xe8, 0xd6, 0x26, 0xac, 0xb5, 0x84, 0xf5, 0xaa, 0x6c, 0x1a, 0xcc, 0x67, 0xff, 0x09, 0x00, - 0x00, 0xff, 0xff, 0xf6, 0x57, 0x1c, 0x1d, 0x25, 0x15, 0x00, 0x00, + // 1757 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x4f, 0x6f, 0xe3, 0xc6, + 0x15, 0x8f, 0x64, 0x5b, 0xb6, 0x9e, 0xff, 0xac, 0x3d, 0x6b, 0x7b, 0x59, 0xd7, 0xeb, 0x18, 0xdc, + 0x20, 0x70, 0xb6, 0x89, 0x94, 0x3a, 0xdb, 0x6d, 0x50, 0xa4, 0x08, 0x64, 0x4b, 0x59, 0x1b, 0xb1, + 0x65, 0x75, 0xa4, 0xdd, 0x05, 0x8c, 0x02, 0x0e, 0x4d, 0x8e, 0xe5, 0x81, 0x45, 0x0e, 0x3b, 0x33, + 0xb4, 0xa2, 0xa2, 0x97, 0xe6, 0xd4, 0xa2, 0x87, 0xf6, 0x1b, 0xf4, 0x4b, 0xb4, 0xbd, 0xf5, 0xd0, + 0x7b, 0x3f, 0x47, 0xaf, 0xfd, 0x0a, 0xc5, 0x0c, 0x49, 0x89, 0xa4, 0x48, 0xc1, 0x0b, 0x34, 0x87, + 0x9c, 0x24, 0xbe, 0xf7, 0x7e, 0xbf, 0x79, 0xf3, 0xe6, 0xfd, 0x99, 0x81, 0x67, 0x2e, 0xb3, 0xaf, + 0xec, 0x01, 0x0b, 0x1c, 0xab, 0x4f, 0x3c, 0x79, 0x75, 0x4f, 0xb9, 0x0c, 0xac, 0x81, 0x6b, 0xd9, + 0xb7, 0xd4, 0x23, 0x35, 0x9f, 0x33, 0xc9, 0xd0, 0xb6, 0xcb, 0xec, 0xda, 0xc4, 0xa8, 0x66, 0x33, + 0xd7, 0x0f, 0x24, 0xd9, 0xd9, 0xeb, 0x33, 0xd6, 0x1f, 0x90, 0xba, 0xb6, 0xba, 0x0e, 0x6e, 0xea, + 0x43, 0x6e, 0xf9, 0x3e, 0xe1, 0x22, 0xc4, 0xed, 0x3c, 0xd1, 0xe4, 0xcc, 0x75, 0x99, 0x17, 0xfd, + 0x44, 0x8a, 0xbd, 0xb4, 0x42, 0x91, 0x25, 0xf5, 0xe6, 0x5f, 0x4b, 0xb0, 0xf5, 0x26, 0xf4, 0xe4, + 0x3c, 0xf4, 0x04, 0x93, 0xdf, 0x04, 0x44, 0x48, 0xd4, 0x81, 0x47, 0x69, 0x85, 0x30, 0x4a, 0xfb, + 0x73, 0x07, 0xcb, 0x87, 0x1f, 0xd6, 0xf2, 0x9d, 0xac, 0x65, 0x78, 0xb2, 0x70, 0xf4, 0x02, 0x56, + 0x2f, 0x7c, 0xc2, 0x2d, 0x49, 0x99, 0xd7, 0x1b, 0xf9, 0xc4, 0x28, 0xef, 0x97, 0x0e, 0xd6, 0x0e, + 0xd7, 0x34, 0xdf, 0x58, 0x83, 0xd3, 0x46, 0xe6, 0xdf, 0x4a, 0xb0, 0x9d, 0xf5, 0x50, 0xf8, 0xcc, + 0x13, 0xe4, 0x7b, 0x70, 0xf1, 0x10, 0x2a, 0x98, 0x88, 0x60, 0x20, 0xb5, 0x6f, 0xcb, 0x87, 0x3b, + 0xb5, 0x30, 0xf0, 0xb5, 0x38, 0xf0, 0xb5, 0x23, 0xc6, 0x06, 0x6f, 0xac, 0x41, 0x40, 0x70, 0x64, + 0x89, 0x36, 0x61, 0xa1, 0xc5, 0x39, 0xe3, 0xc6, 0xdc, 0x7e, 0xe9, 0xa0, 0x8a, 0xc3, 0x0f, 0xb3, + 0x06, 0x2b, 0xdd, 0xee, 0x49, 0x27, 0xb8, 0x1e, 0x50, 0xfb, 0x6b, 0x32, 0x42, 0x7b, 0xb0, 0x78, + 0x47, 0x46, 0x8e, 0x25, 0x2d, 0xa3, 0xa4, 0xec, 0x8e, 0xe6, 0xff, 0xf0, 0x77, 0xa3, 0x84, 0x63, + 0xa1, 0x69, 0xc2, 0x7c, 0x93, 0x8a, 0x3b, 0xb4, 0x03, 0x4b, 0x0e, 0x15, 0x77, 0x9e, 0xe5, 0x92, + 0xd0, 0x10, 0x8f, 0xbf, 0xcd, 0xff, 0x94, 0x60, 0xb3, 0x2b, 0x19, 0xb7, 0xfa, 0xe4, 0x98, 0x79, + 0x37, 0xb4, 0x1f, 0x84, 0x71, 0x42, 0x2f, 0xa0, 0xc2, 0x84, 0x32, 0xd3, 0x90, 0xe5, 0xc3, 0xdd, + 0xa2, 0xfd, 0xab, 0x25, 0x70, 0x64, 0x8b, 0x7e, 0x01, 0x55, 0xb5, 0xb4, 0xfa, 0x2f, 0x8c, 0xb2, + 0x0e, 0xdc, 0x6c, 0xe0, 0xc4, 0x1c, 0x7d, 0x08, 0x6b, 0xd4, 0xb5, 0xfa, 0x04, 0x93, 0x1b, 0xc2, + 0x89, 0x67, 0x93, 0x68, 0xf7, 0x19, 0x29, 0x7a, 0x01, 0x5b, 0xf7, 0x6e, 0xe8, 0xec, 0x31, 0xf3, + 0xa4, 0x45, 0x3d, 0xc2, 0xdb, 0x6a, 0x6f, 0xf3, 0xda, 0x3c, 0x5f, 0x69, 0x7e, 0x05, 0xeb, 0x6d, + 0x22, 0x87, 0x8c, 0xdf, 0x9d, 0x7a, 0x92, 0xf0, 0x1b, 0xcb, 0x26, 0xe8, 0x10, 0x36, 0xbd, 0x8c, + 0xac, 0x3d, 0x09, 0x52, 0xae, 0xce, 0xfc, 0x06, 0x36, 0x23, 0x9e, 0x74, 0xbc, 0x4e, 0x00, 0x68, + 0x6c, 0x18, 0xe7, 0xcc, 0x41, 0xd1, 0xd6, 0xb3, 0x9e, 0xe0, 0x04, 0xd6, 0xfc, 0xae, 0x04, 0x1b, + 0xaf, 0x05, 0xe1, 0x69, 0xfe, 0x7d, 0x58, 0x0a, 0x04, 0xe1, 0x93, 0x43, 0x8c, 0x4e, 0x7b, 0x2c, + 0x55, 0x16, 0xbe, 0x25, 0xc4, 0x90, 0x71, 0x47, 0xa7, 0xda, 0xd8, 0x22, 0x96, 0xa2, 0x8f, 0x42, + 0x0e, 0xa9, 0x0a, 0x65, 0x4e, 0x17, 0xca, 0xaa, 0xf6, 0x50, 0xad, 0xa6, 0x0a, 0x03, 0x8f, 0xd5, + 0x2a, 0x5c, 0xb8, 0xd9, 0x49, 0xbb, 0xb0, 0x07, 0xe0, 0x50, 0x61, 0x5d, 0x0f, 0x08, 0x6e, 0x76, + 0xb4, 0x13, 0x4b, 0x38, 0x21, 0x41, 0x08, 0xe6, 0x7d, 0xc6, 0xc3, 0x3c, 0x5f, 0xc5, 0xfa, 0xbf, + 0x79, 0x09, 0xe8, 0x8c, 0x7a, 0xc1, 0xb7, 0x69, 0xa6, 0x26, 0x3c, 0x8d, 0x70, 0x9d, 0xc8, 0xb7, + 0x46, 0x20, 0x6f, 0x89, 0x27, 0xa9, 0xad, 0x0d, 0x22, 0xf2, 0xd9, 0x46, 0xe6, 0x1f, 0xcb, 0xb0, + 0xf9, 0x96, 0x7a, 0x0e, 0x1b, 0x8a, 0x34, 0xfd, 0x4b, 0xd8, 0x26, 0x9e, 0x02, 0x36, 0x02, 0xc9, + 0x5c, 0x4b, 0x52, 0xfb, 0xb5, 0xef, 0x58, 0x52, 0x9f, 0x8b, 0xe2, 0x2d, 0xd0, 0xaa, 0x42, 0x91, + 0xd4, 0x25, 0x97, 0xcc, 0x0b, 0x1b, 0x49, 0x15, 0x8f, 0xbf, 0x51, 0x6f, 0x3a, 0x20, 0x3a, 0x86, + 0x33, 0x4e, 0x39, 0x6b, 0x8f, 0xa7, 0x43, 0xfa, 0x0a, 0xd0, 0x5b, 0xea, 0xe1, 0xf3, 0x34, 0xef, + 0xbc, 0xe6, 0x7d, 0xa2, 0x79, 0xa7, 0xd5, 0x38, 0x07, 0x62, 0xfe, 0x7b, 0x01, 0x76, 0xa3, 0x26, + 0xe7, 0xf5, 0xbb, 0x23, 0x21, 0x89, 0x9b, 0x5e, 0xc9, 0x84, 0x95, 0xc8, 0x2f, 0x9e, 0xc8, 0xf1, + 0x94, 0x0c, 0x5d, 0xc0, 0xaa, 0xe5, 0xb8, 0xd4, 0xa3, 0x42, 0x72, 0x4b, 0x32, 0x1e, 0x75, 0xac, + 0x8f, 0x8a, 0x36, 0x38, 0x95, 0xa5, 0x38, 0x8d, 0x47, 0x5f, 0xc2, 0x82, 0xca, 0x28, 0x61, 0xcc, + 0xe9, 0x7a, 0x78, 0x07, 0xa2, 0x10, 0x87, 0x3e, 0x00, 0xb0, 0x03, 0x21, 0x99, 0xdb, 0x54, 0x5d, + 0x6e, 0x3e, 0x91, 0xd5, 0x09, 0x39, 0x6a, 0x02, 0xf8, 0xba, 0x2b, 0xde, 0x91, 0x91, 0x30, 0x16, + 0xf4, 0x5a, 0x1f, 0x14, 0xad, 0x95, 0x6c, 0xa1, 0x38, 0x81, 0x43, 0x9f, 0xaa, 0x8e, 0xa7, 0x6b, + 0xa3, 0xa2, 0x6b, 0xc3, 0x48, 0x0e, 0x91, 0x38, 0xa8, 0xba, 0x4c, 0x22, 0x3b, 0xf4, 0x2b, 0xd8, + 0x60, 0xe2, 0x88, 0x31, 0xa9, 0xf6, 0xeb, 0xb7, 0xbc, 0x3e, 0xf5, 0x88, 0xb1, 0xa8, 0xc1, 0xcf, + 0xf2, 0xc0, 0x19, 0x53, 0x3c, 0x8d, 0x46, 0x97, 0x80, 0x06, 0x53, 0xf5, 0x62, 0x2c, 0xe9, 0x73, + 0x78, 0x5e, 0xb4, 0xa5, 0xe9, 0x0a, 0xc3, 0x39, 0x2c, 0xe8, 0x1b, 0xd8, 0x1c, 0xe6, 0x94, 0x8b, + 0x51, 0xd5, 0xec, 0x1f, 0x17, 0xb1, 0xe7, 0x95, 0x18, 0xce, 0x65, 0x52, 0xe9, 0xec, 0x73, 0xf6, + 0xed, 0x28, 0xcd, 0x0f, 0x89, 0x74, 0xee, 0x4c, 0xa9, 0x71, 0x0e, 0xc4, 0xfc, 0x4b, 0x19, 0xb6, + 0x4e, 0x2c, 0xee, 0x0c, 0x2d, 0x9e, 0x99, 0x4b, 0x9f, 0x41, 0xe5, 0xcd, 0x79, 0x97, 0xfe, 0x36, + 0xcc, 0xe0, 0xb5, 0xc3, 0x1f, 0x6b, 0xda, 0xf4, 0xd0, 0x55, 0xea, 0xf0, 0xa0, 0x42, 0x53, 0xf4, + 0xcb, 0x38, 0x8d, 0x34, 0x30, 0xcc, 0xea, 0xa7, 0x39, 0xc0, 0xe3, 0xb1, 0x11, 0x4e, 0x00, 0xd0, + 0x15, 0xec, 0x38, 0x23, 0xcf, 0x72, 0xa9, 0x7d, 0x4e, 0x5c, 0xc6, 0x47, 0x79, 0x5d, 0xe0, 0x7d, + 0x4d, 0xd7, 0x2c, 0x34, 0xc3, 0x33, 0x28, 0x90, 0x09, 0x8b, 0x7d, 0x3f, 0x38, 0xa3, 0x42, 0x1a, + 0xf3, 0x3a, 0x7b, 0x97, 0x34, 0xdb, 0x2b, 0x3f, 0xc0, 0xb1, 0xc2, 0xfc, 0x02, 0x56, 0x5e, 0x93, + 0x1b, 0xda, 0x25, 0x52, 0x25, 0x94, 0x40, 0x1f, 0xc3, 0x86, 0x20, 0x76, 0xc0, 0x89, 0x4a, 0xa1, + 0x96, 0x6e, 0x68, 0x4e, 0xd4, 0xdf, 0xa6, 0x15, 0xe6, 0x3f, 0x4a, 0xb0, 0xd5, 0x55, 0x52, 0x2a, + 0x33, 0x6b, 0xef, 0x42, 0x35, 0x6c, 0x87, 0xbd, 0xce, 0x79, 0x84, 0x9f, 0x08, 0xd0, 0x09, 0xac, + 0x04, 0x89, 0x55, 0xa3, 0xd8, 0x15, 0x16, 0x57, 0xd2, 0x43, 0x9c, 0x42, 0xa2, 0x9f, 0xc1, 0x8a, + 0x88, 0x1c, 0xe8, 0x4d, 0x06, 0xd0, 0x86, 0x66, 0xea, 0x26, 0x14, 0x38, 0x65, 0x66, 0x9e, 0x81, + 0xd1, 0xb8, 0xb7, 0xe8, 0xc0, 0xba, 0xa6, 0x03, 0x2a, 0x47, 0x5d, 0x22, 0x27, 0x37, 0x81, 0x5d, + 0xa8, 0xf6, 0x39, 0x0b, 0xfc, 0x44, 0x43, 0x9b, 0x08, 0xd4, 0x38, 0xd2, 0xd3, 0x32, 0xec, 0xe4, + 0xfa, 0xbf, 0xf9, 0xa7, 0x25, 0x58, 0x4b, 0x1f, 0xf9, 0xd8, 0xac, 0x34, 0x31, 0x43, 0x6b, 0x50, + 0xa6, 0xd1, 0x10, 0xc5, 0x65, 0xea, 0xa0, 0xaf, 0x60, 0x51, 0x84, 0x97, 0xa4, 0xe8, 0xb4, 0x0b, + 0x8b, 0x25, 0xef, 0x2e, 0x85, 0x63, 0x30, 0x6a, 0x42, 0x99, 0x89, 0xa8, 0xbd, 0xbf, 0x28, 0xa2, + 0x98, 0xd5, 0xc6, 0x71, 0x99, 0x09, 0xe5, 0x4d, 0x74, 0x35, 0x31, 0x16, 0x66, 0x7b, 0x93, 0x77, + 0x53, 0xc1, 0x31, 0x58, 0x8d, 0x3b, 0x8f, 0x39, 0xe1, 0x95, 0xa7, 0x12, 0x8e, 0xbb, 0xf8, 0x3b, + 0x1d, 0xda, 0xc5, 0x6c, 0x68, 0x9f, 0x41, 0x45, 0x48, 0x4b, 0x06, 0x22, 0xea, 0x4c, 0xcb, 0xe1, + 0x29, 0x6a, 0x11, 0x8e, 0x54, 0x6a, 0xe2, 0x0c, 0x58, 0x38, 0xaa, 0x35, 0x4b, 0x35, 0x9c, 0x38, + 0x49, 0x19, 0xfa, 0x1c, 0x9e, 0x44, 0x33, 0xfe, 0x84, 0xf6, 0x6f, 0x93, 0x07, 0xad, 0xbb, 0xc6, + 0x12, 0x2e, 0x52, 0xa3, 0x97, 0x50, 0xb9, 0xd7, 0xdd, 0xd8, 0x58, 0xd6, 0x89, 0xb4, 0x57, 0x78, + 0x3f, 0x3f, 0x0f, 0x5b, 0x41, 0x68, 0x8d, 0x4e, 0x61, 0xe9, 0x36, 0x6a, 0x2c, 0xc6, 0x8a, 0x76, + 0xfe, 0x93, 0x22, 0x64, 0x6e, 0x03, 0xc2, 0x63, 0xb8, 0xaa, 0x40, 0x6b, 0x30, 0x60, 0x43, 0xe2, + 0x5c, 0x0c, 0xd5, 0x35, 0x93, 0x39, 0x44, 0x18, 0xab, 0xfb, 0x73, 0x07, 0x55, 0x3c, 0xad, 0x40, + 0x75, 0x00, 0x9f, 0x0d, 0x09, 0x57, 0x51, 0x22, 0xc6, 0x9a, 0x76, 0xfa, 0x51, 0xd8, 0x13, 0xc7, + 0x62, 0x9c, 0x30, 0x51, 0x9e, 0xc6, 0x95, 0x60, 0x3c, 0x9a, 0xed, 0x69, 0x6e, 0x65, 0xe3, 0x31, + 0x1c, 0x3d, 0x85, 0x79, 0x69, 0xf5, 0x85, 0xb1, 0xae, 0x69, 0xaa, 0x9a, 0xa6, 0x67, 0xf5, 0x05, + 0xd6, 0x62, 0xf4, 0x05, 0x40, 0x5f, 0x3d, 0xd0, 0x1a, 0x8a, 0xd4, 0xd8, 0x48, 0xdc, 0xf7, 0x5f, + 0x8d, 0xc5, 0x69, 0xea, 0x84, 0x3d, 0xfa, 0x35, 0x6c, 0x4f, 0xbe, 0x4e, 0x3d, 0x21, 0x2d, 0xcf, + 0x26, 0x6f, 0x28, 0x19, 0x1a, 0x28, 0xd1, 0x2c, 0xd2, 0x55, 0x37, 0x65, 0x8b, 0x0b, 0x38, 0xd0, + 0x25, 0x3c, 0xb2, 0xd2, 0xf5, 0x6f, 0x3c, 0xd6, 0xb4, 0x9f, 0x16, 0x05, 0xa3, 0xa8, 0x5d, 0xe0, + 0x2c, 0x91, 0xf9, 0xe7, 0x32, 0xec, 0xa5, 0xfd, 0x9a, 0x3c, 0x19, 0xbf, 0xb7, 0x27, 0xeb, 0x5b, + 0xd8, 0xbe, 0x38, 0xea, 0x5e, 0x9c, 0xb5, 0x7a, 0xad, 0xab, 0xbc, 0xb7, 0xeb, 0x6e, 0x4e, 0xb8, + 0xc6, 0x76, 0x47, 0x65, 0xa3, 0x84, 0xb7, 0x62, 0x7c, 0x0a, 0x8e, 0x8e, 0xb2, 0x6f, 0xe1, 0xb9, + 0x04, 0x5f, 0x87, 0xb3, 0x7b, 0xea, 0x10, 0xde, 0xb0, 0x6d, 0x22, 0x44, 0xe1, 0xcb, 0xf8, 0x9f, + 0x25, 0x78, 0xbf, 0x30, 0x22, 0x3f, 0x80, 0x27, 0xf2, 0x7f, 0xcb, 0x59, 0xff, 0x71, 0xe0, 0x1d, + 0x33, 0xd7, 0xb5, 0x3c, 0x27, 0x3e, 0xd2, 0x76, 0x76, 0x04, 0x44, 0x2f, 0xdc, 0x87, 0xba, 0x9f, + 0x1d, 0x20, 0x0d, 0xa8, 0x74, 0x59, 0xc0, 0x6d, 0x92, 0xba, 0x2e, 0x17, 0x79, 0xd1, 0xb5, 0x39, + 0xf5, 0x65, 0x08, 0xc0, 0x11, 0x10, 0x51, 0xf8, 0xd1, 0xc4, 0xe2, 0xd4, 0xf3, 0x03, 0xd9, 0xb1, + 0xb8, 0xe5, 0x12, 0x39, 0xb9, 0x3b, 0xff, 0x64, 0x26, 0x6b, 0x1a, 0x83, 0x8b, 0xd9, 0x90, 0x09, + 0x55, 0x1c, 0x78, 0x0d, 0xa1, 0xae, 0xdc, 0xa9, 0x0b, 0xf5, 0x44, 0x8c, 0x9e, 0xc3, 0xaa, 0xfe, + 0x88, 0xdf, 0x5d, 0x7a, 0xcc, 0xc4, 0x76, 0x69, 0x95, 0xf9, 0xaf, 0x12, 0xec, 0x17, 0x47, 0x3c, + 0x4a, 0x99, 0xff, 0x77, 0xc8, 0xcf, 0x61, 0x25, 0xd5, 0x68, 0x1e, 0x12, 0xf8, 0x54, 0xb7, 0x49, + 0xc1, 0x9f, 0x7f, 0xa9, 0xee, 0x94, 0xba, 0x86, 0x00, 0x2a, 0xbd, 0x56, 0xbb, 0xd1, 0xee, 0xad, + 0xbf, 0x87, 0xd6, 0x61, 0xe5, 0xec, 0xa2, 0xd1, 0x3c, 0x6a, 0x9c, 0x35, 0xda, 0xc7, 0x2d, 0xbc, + 0x5e, 0x42, 0x4f, 0xe0, 0x71, 0xb7, 0xd7, 0x38, 0xfe, 0xba, 0xd5, 0x3c, 0xbe, 0x68, 0xf7, 0xf0, + 0xc5, 0x59, 0xe7, 0xac, 0xd1, 0x6e, 0xad, 0x97, 0x0f, 0xbf, 0x9b, 0x83, 0xc7, 0x39, 0x0d, 0x0e, + 0x51, 0xa8, 0x9c, 0x7a, 0xf7, 0xec, 0x8e, 0xa0, 0x4f, 0x1e, 0xb8, 0xd3, 0x30, 0x47, 0x77, 0x6a, + 0x0f, 0x35, 0x0f, 0x03, 0x6c, 0xbe, 0x87, 0x7e, 0x07, 0x8b, 0x61, 0xa9, 0x12, 0xf4, 0xf2, 0x61, + 0xe0, 0x6c, 0xaf, 0xdb, 0xf9, 0xf9, 0x3b, 0xe3, 0xc6, 0xab, 0xff, 0xbe, 0x04, 0x30, 0x09, 0x35, + 0x7a, 0x20, 0xd3, 0x54, 0x6d, 0xee, 0x7c, 0xfe, 0xee, 0xc0, 0xd8, 0x87, 0xa3, 0x9f, 0x5e, 0xd6, + 0xfb, 0x54, 0xde, 0x06, 0xd7, 0x0a, 0x54, 0x77, 0xa9, 0xcd, 0x99, 0x60, 0x37, 0xb2, 0xee, 0x32, + 0xbb, 0xce, 0x7d, 0xbb, 0x3e, 0x61, 0xad, 0x47, 0xac, 0xd7, 0x15, 0xdd, 0x60, 0x3e, 0xfb, 0x5f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x7a, 0xbf, 0x84, 0x49, 0x15, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto b/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto index 4134ba48..9f6922b4 100644 --- a/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto +++ b/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto @@ -91,6 +91,7 @@ message HardwareConfiguration { VirtualMachineSizeType VMSize = 1; VirtualMachineCustomSize customSize = 2; DynamicMemoryConfiguration dynamicMemoryConfiguration = 3; + repeated Gpu gpuList = 4; } message UefiSettings { diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 5268678b..38a8325d 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -342,6 +342,34 @@ func (WinRMProtocolType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_7d1a061f6c82445b, []int{5} } +type GpuAssignmentType int32 + +const ( + GpuAssignmentType_GpuDDA GpuAssignmentType = 0 + GpuAssignmentType_GpuP GpuAssignmentType = 1 + GpuAssignmentType_GpuPV GpuAssignmentType = 2 +) + +var GpuAssignmentType_name = map[int32]string{ + 0: "GpuDDA", + 1: "GpuP", + 2: "GpuPV", +} + +var GpuAssignmentType_value = map[string]int32{ + "GpuDDA": 0, + "GpuP": 1, + "GpuPV": 2, +} + +func (x GpuAssignmentType) String() string { + return proto.EnumName(GpuAssignmentType_name, int32(x)) +} + +func (GpuAssignmentType) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_7d1a061f6c82445b, []int{6} +} + type PowerState int32 const ( @@ -376,7 +404,7 @@ func (x PowerState) String() string { } func (PowerState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{6} + return fileDescriptor_7d1a061f6c82445b, []int{7} } type VirtualMachineOperation int32 @@ -413,7 +441,7 @@ func (x VirtualMachineOperation) String() string { } func (VirtualMachineOperation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{7} + return fileDescriptor_7d1a061f6c82445b, []int{8} } type VirtualMachineRunCommandExecutionState int32 @@ -447,7 +475,7 @@ func (x VirtualMachineRunCommandExecutionState) String() string { } func (VirtualMachineRunCommandExecutionState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{8} + return fileDescriptor_7d1a061f6c82445b, []int{9} } type Architecture int32 @@ -490,7 +518,7 @@ func (x Architecture) String() string { } func (Architecture) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{9} + return fileDescriptor_7d1a061f6c82445b, []int{10} } type SecurityType int32 @@ -518,32 +546,7 @@ func (x SecurityType) String() string { } func (SecurityType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{10} -} - -type Gpu_AssignmentType int32 - -const ( - Gpu_GpuDDA Gpu_AssignmentType = 0 - Gpu_GpuP Gpu_AssignmentType = 1 -) - -var Gpu_AssignmentType_name = map[int32]string{ - 0: "GpuDDA", - 1: "GpuP", -} - -var Gpu_AssignmentType_value = map[string]int32{ - "GpuDDA": 0, - "GpuP": 1, -} - -func (x Gpu_AssignmentType) String() string { - return proto.EnumName(Gpu_AssignmentType_name, int32(x)) -} - -func (Gpu_AssignmentType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{2, 0} + return fileDescriptor_7d1a061f6c82445b, []int{11} } type InstanceViewStatus_StatusLevelType int32 @@ -656,11 +659,12 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { } type Gpu struct { - Assignment Gpu_AssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.Gpu_AssignmentType" json:"assignment,omitempty"` - PartitionSizeGB int32 `protobuf:"varint,2,opt,name=partitionSizeGB,proto3" json:"partitionSizeGB,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Assignment GpuAssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` + PartitionSizeGB int32 `protobuf:"varint,2,opt,name=partitionSizeGB,proto3" json:"partitionSizeGB,omitempty"` + GpuCount int32 `protobuf:"varint,3,opt,name=gpuCount,proto3" json:"gpuCount,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Gpu) Reset() { *m = Gpu{} } @@ -688,11 +692,11 @@ func (m *Gpu) XXX_DiscardUnknown() { var xxx_messageInfo_Gpu proto.InternalMessageInfo -func (m *Gpu) GetAssignment() Gpu_AssignmentType { +func (m *Gpu) GetAssignment() GpuAssignmentType { if m != nil { return m.Assignment } - return Gpu_GpuDDA + return GpuAssignmentType_GpuDDA } func (m *Gpu) GetPartitionSizeGB() int32 { @@ -702,6 +706,13 @@ func (m *Gpu) GetPartitionSizeGB() int32 { return 0 } +func (m *Gpu) GetGpuCount() int32 { + if m != nil { + return m.GpuCount + } + return 0 +} + type VirtualMachineCustomSize struct { CpuCount int32 `protobuf:"varint,1,opt,name=cpuCount,proto3" json:"cpuCount,omitempty"` MemoryMB int32 `protobuf:"varint,2,opt,name=memoryMB,proto3" json:"memoryMB,omitempty"` @@ -1273,12 +1284,12 @@ func init() { proto.RegisterEnum("moc.OperatingSystemType", OperatingSystemType_name, OperatingSystemType_value) proto.RegisterEnum("moc.VirtualMachineSizeType", VirtualMachineSizeType_name, VirtualMachineSizeType_value) proto.RegisterEnum("moc.WinRMProtocolType", WinRMProtocolType_name, WinRMProtocolType_value) + proto.RegisterEnum("moc.GpuAssignmentType", GpuAssignmentType_name, GpuAssignmentType_value) proto.RegisterEnum("moc.PowerState", PowerState_name, PowerState_value) proto.RegisterEnum("moc.VirtualMachineOperation", VirtualMachineOperation_name, VirtualMachineOperation_value) proto.RegisterEnum("moc.VirtualMachineRunCommandExecutionState", VirtualMachineRunCommandExecutionState_name, VirtualMachineRunCommandExecutionState_value) proto.RegisterEnum("moc.Architecture", Architecture_name, Architecture_value) proto.RegisterEnum("moc.SecurityType", SecurityType_name, SecurityType_value) - proto.RegisterEnum("moc.Gpu_AssignmentType", Gpu_AssignmentType_name, Gpu_AssignmentType_value) proto.RegisterEnum("moc.InstanceViewStatus_StatusLevelType", InstanceViewStatus_StatusLevelType_name, InstanceViewStatus_StatusLevelType_value) proto.RegisterType((*WinRMListener)(nil), "moc.WinRMListener") proto.RegisterType((*WinRMConfiguration)(nil), "moc.WinRMConfiguration") @@ -1300,119 +1311,120 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1821 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x72, 0xe3, 0xc6, - 0x11, 0x80, 0x17, 0xfc, 0x91, 0xc8, 0xd6, 0xdf, 0x68, 0x76, 0x2d, 0xd1, 0xca, 0x7a, 0xad, 0xd0, - 0xeb, 0xb5, 0x42, 0xdb, 0x14, 0xff, 0xcc, 0xb0, 0x5c, 0x95, 0xaa, 0x50, 0x24, 0xc4, 0xa5, 0x25, - 0x82, 0x2c, 0x80, 0x94, 0x9c, 0x5c, 0x18, 0x08, 0x1c, 0x52, 0x48, 0x08, 0x0c, 0x0a, 0x18, 0x68, - 0x25, 0x1f, 0x52, 0x39, 0xe5, 0xec, 0xca, 0x29, 0x87, 0x1c, 0x72, 0xcc, 0x0b, 0xa4, 0xf2, 0x04, - 0x79, 0x81, 0xe4, 0x79, 0x52, 0x95, 0x9a, 0x01, 0x40, 0x09, 0x90, 0x94, 0x9c, 0x88, 0xfe, 0xfa, - 0x17, 0xdd, 0xc3, 0x99, 0x01, 0xbc, 0xb1, 0xa8, 0x31, 0x35, 0xa8, 0x65, 0x51, 0x9b, 0xff, 0x38, - 0x3e, 0x23, 0x81, 0x54, 0x76, 0x5c, 0xca, 0x28, 0x4e, 0x5b, 0xd4, 0x38, 0x38, 0x5c, 0x50, 0xba, - 0x58, 0x92, 0x63, 0x81, 0xae, 0xfc, 0xf9, 0xf1, 0x8c, 0x78, 0x86, 0x6b, 0x3a, 0x8c, 0xba, 0x81, - 0x59, 0xb1, 0x03, 0x5b, 0x97, 0xa6, 0xad, 0x0e, 0xce, 0x4d, 0x8f, 0x11, 0x9b, 0xb8, 0xb8, 0x06, - 0xb9, 0x11, 0xd7, 0x18, 0x74, 0x59, 0x90, 0x0e, 0xa5, 0xa3, 0xed, 0xda, 0x5e, 0xd9, 0xa2, 0x46, - 0x59, 0x58, 0x45, 0x9a, 0xf1, 0x9d, 0x43, 0xd4, 0x95, 0x5d, 0xf1, 0x14, 0xb0, 0x50, 0x77, 0xa8, - 0x3d, 0x37, 0x17, 0xbe, 0xab, 0x33, 0x93, 0xda, 0xb8, 0x02, 0xf9, 0x28, 0xaa, 0x57, 0x90, 0x0e, - 0xd3, 0x47, 0x1b, 0x35, 0x7c, 0x1f, 0x2a, 0x52, 0xa9, 0xf7, 0x46, 0xc5, 0x1f, 0x25, 0x48, 0xf7, - 0x1c, 0x1f, 0xff, 0x1c, 0x40, 0xf7, 0x3c, 0x73, 0x61, 0x5b, 0xc4, 0x66, 0x61, 0x15, 0xfb, 0xc2, - 0xb5, 0xe7, 0xf8, 0xe5, 0xf6, 0x4a, 0x25, 0xca, 0x78, 0x60, 0x8a, 0x8f, 0x60, 0xc7, 0xd1, 0x5d, - 0x66, 0xf2, 0xfc, 0x9a, 0xf9, 0x03, 0xe9, 0x9d, 0x14, 0x52, 0x87, 0xd2, 0x51, 0x56, 0x4d, 0xe2, - 0xe2, 0x3b, 0xd8, 0x8e, 0xc7, 0xc1, 0x00, 0x6b, 0x3d, 0xc7, 0xef, 0x76, 0xdb, 0xe8, 0x05, 0xce, - 0x41, 0xa6, 0xe7, 0xf8, 0x23, 0x24, 0x15, 0xff, 0x24, 0x41, 0xe1, 0xc2, 0x74, 0x99, 0xaf, 0x2f, - 0x07, 0xba, 0x71, 0x6d, 0xda, 0xa4, 0xe3, 0x7b, 0x8c, 0x5a, 0x3c, 0x0c, 0x3e, 0x80, 0x9c, 0xe1, - 0xf8, 0x1d, 0xea, 0x87, 0x55, 0x66, 0xd5, 0x95, 0xcc, 0x75, 0x16, 0xb1, 0xa8, 0x7b, 0x37, 0x88, - 0x6a, 0x58, 0xc9, 0x5c, 0xb7, 0x88, 0xfc, 0xd2, 0x81, 0x2e, 0x92, 0x71, 0x11, 0xd6, 0x17, 0x8e, - 0xcf, 0x7b, 0x52, 0xc8, 0x88, 0x9e, 0xe5, 0xa2, 0x17, 0x57, 0x23, 0x45, 0xf1, 0xaf, 0x12, 0x1c, - 0x74, 0xef, 0x6c, 0xdd, 0x32, 0x8d, 0x81, 0x88, 0x19, 0x6f, 0xfc, 0x11, 0xec, 0x58, 0xfa, 0xad, - 0x69, 0xf9, 0xd6, 0x20, 0xaa, 0x80, 0x57, 0x97, 0x51, 0x93, 0x58, 0x58, 0x9a, 0x76, 0xcc, 0x32, - 0x15, 0x5a, 0xc6, 0x31, 0x2e, 0x03, 0x66, 0xba, 0xbb, 0x20, 0x2c, 0x20, 0x27, 0xfe, 0x7c, 0x4e, - 0x5c, 0x51, 0xfc, 0x96, 0xfa, 0x84, 0xa6, 0xf8, 0x3d, 0xbc, 0x8b, 0xb7, 0x4d, 0xf5, 0xed, 0x0e, - 0xb5, 0x2c, 0xdd, 0x9e, 0xf5, 0x6d, 0xc7, 0x67, 0x23, 0xdd, 0xd5, 0x2d, 0xc2, 0x88, 0x8b, 0x31, - 0x64, 0x14, 0xdd, 0x22, 0xa2, 0xc4, 0xbc, 0x2a, 0x9e, 0xf1, 0x01, 0x64, 0x2f, 0xf4, 0xa5, 0x4f, - 0x44, 0x35, 0xf9, 0x93, 0xcc, 0x9f, 0xff, 0x5e, 0x90, 0xd4, 0x00, 0x15, 0xff, 0x20, 0xc1, 0xdb, - 0xe7, 0x42, 0x6b, 0x62, 0x71, 0x6b, 0xd4, 0x77, 0x0d, 0x82, 0x5f, 0xc3, 0x5a, 0x20, 0x07, 0xa1, - 0x4f, 0x32, 0x3f, 0xf2, 0x28, 0x21, 0xc3, 0xaf, 0x21, 0x1f, 0x3c, 0x4d, 0xd4, 0x7e, 0x90, 0x46, - 0xbd, 0x07, 0x5c, 0x1b, 0x55, 0xdb, 0x15, 0x6f, 0x99, 0x57, 0xef, 0x41, 0xf1, 0x9f, 0xff, 0xa3, - 0x84, 0xbe, 0xed, 0x31, 0xdd, 0x36, 0xc8, 0x85, 0x49, 0x3e, 0x60, 0x0d, 0xb6, 0xe5, 0x5b, 0x62, - 0xf8, 0x62, 0xe1, 0x31, 0x9d, 0x91, 0x70, 0x31, 0x7f, 0x29, 0x66, 0xfa, 0x5c, 0x88, 0xb8, 0x8b, - 0x9a, 0x08, 0xc1, 0x57, 0x8f, 0x7c, 0x6b, 0xb2, 0x0e, 0x9d, 0x91, 0x68, 0x65, 0x45, 0x32, 0xde, - 0x83, 0xb5, 0xa1, 0xcf, 0x1c, 0x9f, 0x85, 0x45, 0x87, 0x12, 0x7e, 0x05, 0x59, 0xd9, 0x75, 0xa9, - 0x5b, 0xc8, 0x08, 0x1c, 0x08, 0xc5, 0xef, 0xe0, 0x20, 0xb1, 0xb6, 0x75, 0x47, 0xbf, 0x32, 0x97, - 0x26, 0x33, 0x89, 0x87, 0xbf, 0x82, 0xdd, 0xbe, 0x47, 0x97, 0x3a, 0x23, 0xb3, 0x0b, 0x4b, 0x68, - 0x96, 0x41, 0xfd, 0x39, 0xf5, 0xb1, 0xa2, 0xf8, 0x1f, 0x09, 0xf0, 0xc3, 0x77, 0xe7, 0xb5, 0xfa, - 0x1e, 0x9f, 0xae, 0xc1, 0x0b, 0x0d, 0xa7, 0xcb, 0x9f, 0xf1, 0x2f, 0x20, 0xbb, 0x24, 0x37, 0x64, - 0x29, 0xaa, 0xdf, 0xae, 0x7d, 0x21, 0x9a, 0xf1, 0xd8, 0xb7, 0x1c, 0xfc, 0x9c, 0x73, 0x53, 0xf1, - 0x4f, 0x0f, 0xbc, 0xf0, 0x5b, 0xd8, 0x9a, 0x99, 0x9e, 0xb3, 0xd4, 0xef, 0x02, 0x83, 0xf0, 0x55, - 0xe3, 0x10, 0x17, 0x60, 0xdd, 0x22, 0x9e, 0xa7, 0x2f, 0x48, 0xf8, 0xce, 0x91, 0xc8, 0x4b, 0x62, - 0xa6, 0x45, 0x0a, 0xd9, 0xa0, 0x24, 0xfe, 0x5c, 0xfc, 0x25, 0xec, 0x24, 0xb2, 0xe1, 0x0d, 0x58, - 0x9f, 0xd8, 0xbf, 0xb3, 0xe9, 0x07, 0x3b, 0xd8, 0x10, 0xfa, 0xf6, 0x9c, 0x22, 0x89, 0xe3, 0x4b, - 0xdd, 0xb5, 0x4d, 0x7b, 0x81, 0x52, 0x38, 0x1f, 0xb6, 0x15, 0xa5, 0x8b, 0xbf, 0x87, 0x4f, 0xe3, - 0xbd, 0x6c, 0x2f, 0x88, 0xcd, 0x62, 0xab, 0xe1, 0x1d, 0x6c, 0xdf, 0x58, 0x02, 0x5f, 0x10, 0xd7, - 0x33, 0xa9, 0x1d, 0x76, 0x25, 0x41, 0x71, 0x1d, 0x72, 0x9e, 0x28, 0x86, 0x78, 0x85, 0x94, 0xd8, - 0x03, 0xf6, 0x9f, 0x69, 0x91, 0xba, 0x32, 0x2c, 0xd6, 0x61, 0xbf, 0xe7, 0x13, 0x8f, 0x89, 0x48, - 0xf1, 0xfd, 0xa0, 0x00, 0xeb, 0xc4, 0xe6, 0x43, 0x9a, 0x85, 0xe3, 0x8b, 0xc4, 0xe2, 0x5f, 0x24, - 0xc0, 0x23, 0x97, 0xde, 0x26, 0x36, 0x90, 0x22, 0xe4, 0xaf, 0x19, 0x73, 0x84, 0x26, 0xf6, 0xe7, - 0xb9, 0xc7, 0xf8, 0x2d, 0x00, 0x17, 0xbc, 0xc0, 0x28, 0xf5, 0xc0, 0xe8, 0x01, 0xe7, 0xa9, 0x6d, - 0x1a, 0x98, 0xa4, 0x0f, 0xd3, 0x7c, 0x0a, 0xa1, 0xc8, 0x73, 0x30, 0xd7, 0xf7, 0x18, 0x99, 0x75, - 0xf4, 0x60, 0x42, 0x51, 0x8e, 0x15, 0x2e, 0xbd, 0x81, 0xdc, 0xc4, 0x23, 0xae, 0x18, 0x47, 0x0e, - 0x32, 0xea, 0x70, 0x38, 0x0e, 0x66, 0x31, 0xd1, 0x64, 0x15, 0x49, 0xa5, 0x5f, 0xc1, 0xd6, 0xc8, - 0xa5, 0x06, 0xf1, 0x3c, 0xba, 0x32, 0x52, 0xa8, 0x4d, 0xd0, 0x0b, 0x3e, 0x99, 0xbe, 0xcd, 0xc8, - 0x32, 0x98, 0x98, 0x78, 0x6c, 0x36, 0x50, 0x0a, 0xaf, 0x43, 0xba, 0x3d, 0xe8, 0xa2, 0x34, 0x37, - 0x68, 0x0f, 0xba, 0xcd, 0x06, 0xca, 0x08, 0xa6, 0x0e, 0x50, 0x56, 0x30, 0x75, 0xd0, 0x6c, 0xa0, - 0xb5, 0xd2, 0x77, 0xf0, 0x66, 0xe8, 0x10, 0xde, 0x0f, 0x7b, 0xa1, 0xdd, 0x79, 0x8c, 0x58, 0x27, - 0x94, 0x32, 0x8f, 0xb9, 0xba, 0x23, 0xdb, 0x0b, 0xd3, 0x26, 0x78, 0x1b, 0xa0, 0x73, 0x3e, 0x9c, - 0x74, 0xa7, 0x7d, 0xa5, 0xcf, 0xcb, 0x2a, 0xc0, 0xab, 0xcb, 0xbe, 0xd2, 0x1d, 0x5e, 0x6a, 0xd3, - 0xb6, 0xa2, 0x5d, 0xca, 0xea, 0xf4, 0xb4, 0x7f, 0x2e, 0x6b, 0x48, 0x2a, 0x7d, 0x0d, 0x2f, 0x13, - 0xb1, 0xa2, 0x05, 0x16, 0x3a, 0x04, 0xf5, 0x9e, 0xf7, 0x95, 0xc9, 0xf7, 0x48, 0x2a, 0xfd, 0x2d, - 0x0f, 0x7b, 0xf1, 0xa5, 0xc4, 0x0f, 0x9b, 0xc8, 0xa5, 0x4b, 0xe6, 0xba, 0xbf, 0x64, 0xe8, 0x05, - 0xc6, 0xb0, 0xad, 0x31, 0xdd, 0x9e, 0xe9, 0xee, 0x6c, 0xda, 0xae, 0x4d, 0x6f, 0x6a, 0x28, 0x15, - 0x67, 0x0d, 0xce, 0xd2, 0xf8, 0xa5, 0x58, 0xdb, 0x01, 0xeb, 0xd6, 0xbc, 0xe9, 0x4d, 0x1d, 0x65, - 0xe2, 0xb0, 0x21, 0x60, 0x36, 0x0e, 0x5b, 0x02, 0xae, 0xe1, 0x57, 0x80, 0xee, 0x61, 0xb5, 0x29, - 0xe8, 0x7a, 0x9c, 0xd6, 0x83, 0xa8, 0xb9, 0x78, 0x00, 0x4d, 0xd4, 0x94, 0x4f, 0xc0, 0x3a, 0x87, - 0x90, 0x80, 0xa2, 0xd2, 0x8d, 0x04, 0xfc, 0x86, 0xc3, 0xcd, 0x78, 0x26, 0xad, 0x2a, 0xfc, 0xb7, - 0x62, 0xa6, 0x67, 0x2d, 0x6d, 0x7a, 0x53, 0x45, 0xdb, 0x31, 0xd3, 0xb3, 0x16, 0xcf, 0x5f, 0x45, - 0x3b, 0x49, 0x5a, 0xe7, 0x14, 0x25, 0x69, 0x83, 0xd3, 0x5d, 0x8c, 0x60, 0x73, 0x45, 0x95, 0xb3, - 0x26, 0xc2, 0x78, 0x17, 0xb6, 0x1e, 0x90, 0x6a, 0x0d, 0xbd, 0x8c, 0x1b, 0x5d, 0x34, 0xd1, 0xab, - 0xb8, 0xd1, 0x45, 0xb5, 0x86, 0x3e, 0x4a, 0xc6, 0xff, 0x86, 0xc7, 0xdf, 0xc3, 0xfb, 0xf0, 0x32, - 0xd1, 0xa0, 0xe9, 0xfb, 0x91, 0x82, 0xf6, 0x13, 0x8a, 0x7a, 0xa4, 0x28, 0x24, 0x14, 0x8d, 0x48, - 0xf1, 0x71, 0x2c, 0xc1, 0x69, 0xcd, 0x13, 0xf4, 0x20, 0x4e, 0x1b, 0x01, 0xfd, 0x49, 0x9c, 0xb6, - 0x02, 0xfa, 0x1a, 0x7f, 0x04, 0xbb, 0xf7, 0x94, 0x4f, 0x96, 0xe3, 0x4f, 0x62, 0xad, 0x55, 0x3a, - 0x8d, 0x69, 0xbb, 0x86, 0xde, 0x24, 0x60, 0x8b, 0xc3, 0x4f, 0x63, 0x61, 0x95, 0x4e, 0xb5, 0xc9, - 0xe9, 0x61, 0x82, 0xd6, 0x6b, 0x9c, 0xfe, 0x34, 0x41, 0x1b, 0xd3, 0x76, 0xbd, 0x82, 0x8a, 0x09, - 0xda, 0x12, 0xf4, 0xb3, 0x58, 0x61, 0x41, 0xdc, 0x7a, 0x05, 0xbd, 0x4d, 0x60, 0x1e, 0xb8, 0x5e, - 0x41, 0x9f, 0xf3, 0x3f, 0x5e, 0x3c, 0x72, 0xb5, 0x52, 0x99, 0x36, 0x2a, 0xe8, 0x5d, 0x42, 0xd3, - 0x5a, 0x69, 0xbe, 0xc0, 0x1f, 0xc3, 0x47, 0x89, 0x0c, 0xa1, 0xea, 0x28, 0xa1, 0xe2, 0x59, 0x42, - 0xd5, 0xcf, 0x9e, 0xce, 0xd4, 0xaa, 0xa0, 0xd2, 0xd3, 0x99, 0x5a, 0x15, 0xf4, 0xe5, 0x33, 0x99, - 0x5a, 0x15, 0xf4, 0xd5, 0x33, 0x99, 0x5a, 0x15, 0xf4, 0xf5, 0xe3, 0x6e, 0x55, 0x9b, 0xa8, 0xfc, - 0xb8, 0x5b, 0xd5, 0x26, 0x3a, 0x7e, 0xa2, 0x5b, 0xd5, 0x26, 0xaa, 0x3c, 0xd1, 0xad, 0x6a, 0x13, - 0x55, 0xf1, 0x16, 0xe4, 0x83, 0x1b, 0x2c, 0x1f, 0xcb, 0xf4, 0x81, 0xa8, 0x9c, 0xa1, 0xdf, 0xf0, - 0xa5, 0x1d, 0x8a, 0x3d, 0xc7, 0x77, 0x6e, 0x90, 0xce, 0xaf, 0xc5, 0x01, 0x41, 0x57, 0x78, 0x07, - 0x36, 0x26, 0xb6, 0xe7, 0x3b, 0x0e, 0x75, 0x19, 0x99, 0x21, 0xa3, 0x74, 0x04, 0xbb, 0x8f, 0xbe, - 0x0b, 0xf8, 0x26, 0xfc, 0x7e, 0x3c, 0x1e, 0x05, 0x9b, 0x1a, 0x7f, 0xe2, 0x7b, 0xe0, 0x18, 0x60, - 0x44, 0x3f, 0x10, 0x37, 0xb8, 0xc2, 0xc4, 0xce, 0xd6, 0x0d, 0x58, 0x57, 0x7d, 0x5b, 0x9c, 0xa8, - 0x12, 0xdf, 0x8b, 0x87, 0xf3, 0x39, 0x4a, 0xf1, 0xbc, 0x23, 0xdd, 0xf7, 0xc8, 0x0c, 0xa5, 0xf1, - 0x26, 0xe4, 0x3a, 0xae, 0xc9, 0x4c, 0x43, 0x5f, 0xa2, 0x0c, 0x8f, 0xaa, 0xe9, 0x37, 0x64, 0x86, - 0xb2, 0xa5, 0x39, 0xec, 0xc7, 0x77, 0xca, 0x70, 0x9f, 0xa5, 0xb6, 0xb0, 0x1a, 0xb7, 0xd5, 0xf0, - 0xc0, 0xd0, 0xc6, 0xc3, 0x11, 0x92, 0x38, 0x54, 0x65, 0x4d, 0x1e, 0xa3, 0x14, 0xde, 0x03, 0xac, - 0xca, 0xa3, 0x76, 0x5f, 0x9d, 0xf6, 0x26, 0xb2, 0x36, 0x9e, 0xb6, 0x7b, 0xb2, 0x32, 0x0e, 0xce, - 0x85, 0x51, 0x7b, 0xa2, 0xc9, 0x28, 0x23, 0xfc, 0xda, 0x17, 0x32, 0xca, 0x96, 0xfe, 0x21, 0x3d, - 0x7f, 0x9d, 0x7d, 0x74, 0x3b, 0xdb, 0x8b, 0x93, 0xe9, 0x44, 0x39, 0x53, 0x86, 0x97, 0x0a, 0x7a, - 0xc1, 0x07, 0x9e, 0xd0, 0x9d, 0xb6, 0xfb, 0xe7, 0x72, 0x17, 0x49, 0xf8, 0x35, 0x14, 0x12, 0x2a, - 0x6d, 0xd2, 0xe9, 0xc8, 0x72, 0x57, 0xee, 0xa2, 0xd4, 0x13, 0x41, 0x47, 0xb2, 0xd2, 0xed, 0x2b, - 0x3d, 0x94, 0x7e, 0xc2, 0x53, 0x95, 0x4f, 0x86, 0xc3, 0x31, 0xd7, 0x66, 0x4a, 0x3f, 0xc0, 0x66, - 0xdb, 0x35, 0xae, 0x4d, 0x46, 0x0c, 0xe6, 0xbb, 0x84, 0xf7, 0xf7, 0xb6, 0xd5, 0x0c, 0x9a, 0x32, - 0xe8, 0xf3, 0xd1, 0x88, 0x53, 0x6f, 0xe9, 0x5c, 0xeb, 0x28, 0xc5, 0x47, 0x21, 0xa6, 0x34, 0xea, - 0xa0, 0x34, 0x5f, 0x6d, 0x6d, 0x75, 0x30, 0x7d, 0xe8, 0x8e, 0xb2, 0xdc, 0xcf, 0xd4, 0xf9, 0x11, - 0x29, 0x42, 0x35, 0x1b, 0x28, 0xcf, 0x5b, 0x29, 0x8e, 0xcd, 0xb8, 0xe9, 0x66, 0xe9, 0x3d, 0x6c, - 0x6a, 0xc4, 0xf0, 0x5d, 0x93, 0xdd, 0x89, 0x85, 0xb1, 0x0b, 0x5b, 0xca, 0x70, 0xdc, 0x19, 0x2a, - 0xa7, 0xfd, 0xde, 0x44, 0x95, 0xbb, 0xe8, 0x05, 0x47, 0x63, 0x75, 0xa2, 0x8d, 0xe5, 0xee, 0x79, - 0x7b, 0xa2, 0x74, 0xde, 0x23, 0x89, 0x1f, 0x61, 0xc2, 0xa4, 0x2b, 0x2b, 0xe3, 0x7e, 0xfb, 0xfc, - 0x62, 0x80, 0x52, 0xdf, 0x9e, 0x01, 0xf2, 0x88, 0xed, 0x99, 0xcc, 0xbc, 0x21, 0xe1, 0xc7, 0x2e, - 0xfe, 0xa4, 0x1c, 0x7c, 0xdc, 0x96, 0xa3, 0x8f, 0xdb, 0xf2, 0xa9, 0x49, 0x96, 0xb3, 0xa1, 0xc3, - 0x1b, 0xe1, 0x15, 0xfe, 0xf5, 0xc7, 0xb4, 0xb8, 0xeb, 0x3c, 0x72, 0xfc, 0x56, 0x86, 0xad, 0x15, - 0xfb, 0xad, 0x47, 0xed, 0xff, 0x17, 0xe9, 0xdf, 0x61, 0xa4, 0xb8, 0xd7, 0xc9, 0xe7, 0xbf, 0xfe, - 0x6c, 0x61, 0xb2, 0x6b, 0xff, 0xaa, 0x6c, 0x50, 0xeb, 0xd8, 0x32, 0x0d, 0x97, 0x7a, 0x74, 0xce, - 0x8e, 0x2d, 0x6a, 0x1c, 0xbb, 0x8e, 0x71, 0x1c, 0x7c, 0x8d, 0x5f, 0xad, 0x89, 0xa0, 0xf5, 0xff, - 0x06, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x1f, 0xa7, 0x82, 0xb0, 0x0f, 0x00, 0x00, + // 1827 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0x4f, 0x6f, 0xe3, 0xc6, + 0x15, 0xc0, 0x97, 0xfa, 0x63, 0x4b, 0x6f, 0x6d, 0xef, 0x78, 0x76, 0x63, 0x2b, 0xee, 0x66, 0xe3, + 0x2a, 0x9b, 0x8d, 0xab, 0x24, 0xb2, 0xfe, 0x45, 0x10, 0x02, 0x14, 0xa8, 0x2c, 0xd1, 0x5a, 0xc5, + 0x16, 0x25, 0x90, 0x92, 0x9c, 0xf6, 0xa2, 0xd2, 0xd4, 0x48, 0x66, 0x2b, 0x72, 0x08, 0x72, 0xe8, + 0xb5, 0x73, 0x28, 0x0a, 0x14, 0xe8, 0xb9, 0xe8, 0xa9, 0x87, 0x1e, 0x7a, 0xec, 0x17, 0x28, 0xfa, + 0x09, 0xfa, 0x05, 0xda, 0xcf, 0x53, 0xa0, 0x98, 0x21, 0x29, 0x9b, 0xb4, 0x9d, 0x9e, 0x34, 0xf3, + 0x7b, 0x7f, 0xf9, 0xde, 0xd3, 0x0c, 0x09, 0x6f, 0x2c, 0x6a, 0xcc, 0x0c, 0x6a, 0x59, 0xd4, 0xe6, + 0x3f, 0x8e, 0xcf, 0x48, 0xb0, 0x2b, 0x3b, 0x2e, 0x65, 0x14, 0xa7, 0x2d, 0x6a, 0x1c, 0x1c, 0x2e, + 0x29, 0x5d, 0xae, 0xc8, 0xb1, 0x40, 0x97, 0xfe, 0xe2, 0x78, 0x4e, 0x3c, 0xc3, 0x35, 0x1d, 0x46, + 0xdd, 0x40, 0xad, 0xd8, 0x81, 0xed, 0x0b, 0xd3, 0x56, 0x07, 0xe7, 0xa6, 0xc7, 0x88, 0x4d, 0x5c, + 0x5c, 0x83, 0xdc, 0x88, 0x4b, 0x0c, 0xba, 0x2a, 0x48, 0x87, 0xd2, 0xd1, 0x4e, 0x6d, 0xaf, 0x6c, + 0x51, 0xa3, 0x2c, 0xb4, 0x22, 0xc9, 0xf8, 0xd6, 0x21, 0xea, 0x5a, 0xaf, 0x78, 0x0a, 0x58, 0x88, + 0x3b, 0xd4, 0x5e, 0x98, 0x4b, 0xdf, 0xd5, 0x99, 0x49, 0x6d, 0x5c, 0x81, 0x7c, 0xe4, 0xd5, 0x2b, + 0x48, 0x87, 0xe9, 0xa3, 0xe7, 0x35, 0x7c, 0xe7, 0x2a, 0x12, 0xa9, 0x77, 0x4a, 0xc5, 0x3f, 0x48, + 0x90, 0xee, 0x39, 0x3e, 0x6e, 0x02, 0xe8, 0x9e, 0x67, 0x2e, 0x6d, 0x8b, 0xd8, 0x2c, 0x96, 0x45, + 0xcf, 0xf1, 0xdb, 0x6b, 0x89, 0xc8, 0xe2, 0x9e, 0x26, 0x3e, 0x82, 0x17, 0x8e, 0xee, 0x32, 0x93, + 0x87, 0xd7, 0xcc, 0x1f, 0x48, 0xef, 0xa4, 0x90, 0x3a, 0x94, 0x8e, 0xb2, 0x6a, 0x12, 0xe3, 0x03, + 0xc8, 0x2d, 0x1d, 0xbf, 0x43, 0x7d, 0x9b, 0x15, 0xd2, 0x42, 0x65, 0xbd, 0x2f, 0xfe, 0x59, 0x82, + 0xc2, 0xd4, 0x74, 0x99, 0xaf, 0xaf, 0x06, 0xba, 0x71, 0x65, 0xda, 0xa4, 0xe3, 0x7b, 0x8c, 0x5a, + 0xdc, 0x94, 0x1b, 0x1a, 0x91, 0xa1, 0x14, 0x18, 0x46, 0x7b, 0x2e, 0xb3, 0x88, 0x45, 0xdd, 0xdb, + 0x41, 0x14, 0x77, 0xbd, 0xff, 0xb1, 0x80, 0xb8, 0x08, 0x9b, 0x4b, 0xc7, 0xe7, 0x65, 0x28, 0x64, + 0x44, 0x99, 0x72, 0xd1, 0xb3, 0xaa, 0x91, 0xa0, 0xf8, 0x37, 0x09, 0x0e, 0xba, 0xb7, 0xb6, 0x6e, + 0x99, 0xc6, 0x40, 0xf8, 0x8c, 0xd7, 0xfa, 0x08, 0x5e, 0x58, 0xfa, 0x8d, 0x69, 0xf9, 0xd6, 0x20, + 0xca, 0x80, 0x67, 0x97, 0x51, 0x93, 0x58, 0x68, 0x9a, 0x76, 0x4c, 0x33, 0x15, 0x6a, 0xc6, 0x31, + 0x2e, 0x03, 0x66, 0xba, 0xbb, 0x24, 0x2c, 0x20, 0x27, 0xfe, 0x62, 0x41, 0x5c, 0x91, 0xfc, 0xb6, + 0xfa, 0x88, 0xa4, 0xf8, 0x3d, 0xbc, 0x8b, 0x97, 0x4d, 0xf5, 0xed, 0x0e, 0xb5, 0x2c, 0xdd, 0x9e, + 0xf7, 0x6d, 0xc7, 0x67, 0x23, 0xdd, 0xd5, 0x2d, 0xc2, 0x88, 0x8b, 0x31, 0x64, 0x14, 0xdd, 0x22, + 0x22, 0xc5, 0xbc, 0x2a, 0xd6, 0xf8, 0x00, 0xb2, 0x53, 0x7d, 0xe5, 0x13, 0x91, 0x4d, 0xfe, 0x24, + 0xf3, 0x97, 0x7f, 0x14, 0x24, 0x35, 0x40, 0xc5, 0xdf, 0x4b, 0xf0, 0xf6, 0x29, 0xd7, 0x9a, 0x98, + 0x67, 0x8d, 0xfa, 0xae, 0x41, 0xf0, 0x6b, 0xd8, 0x08, 0xf6, 0x81, 0xeb, 0x93, 0xcc, 0x9f, 0xb8, + 0x97, 0x90, 0xe1, 0xd7, 0x90, 0x0f, 0x56, 0x13, 0xb5, 0x1f, 0x84, 0x51, 0xef, 0x00, 0x97, 0x46, + 0xd9, 0x76, 0xc5, 0x53, 0xe6, 0xd5, 0x3b, 0x50, 0xfc, 0xd7, 0x8f, 0xa4, 0xd0, 0xb7, 0x3d, 0xa6, + 0xdb, 0x06, 0x99, 0x9a, 0xe4, 0x03, 0xd6, 0x60, 0x47, 0xbe, 0x21, 0x86, 0x2f, 0x86, 0x8d, 0xe9, + 0x8c, 0x84, 0xf3, 0xfb, 0xa5, 0xe8, 0xe9, 0x53, 0x2e, 0xe2, 0x26, 0x6a, 0xc2, 0x05, 0x9f, 0x1e, + 0xf9, 0xc6, 0x64, 0x1d, 0x3a, 0x27, 0xd1, 0x64, 0x45, 0x7b, 0xbc, 0x07, 0x1b, 0x43, 0x9f, 0x39, + 0x3e, 0x0b, 0x93, 0x0e, 0x77, 0xf8, 0x15, 0x64, 0x65, 0xd7, 0xa5, 0x6e, 0x21, 0x23, 0x70, 0xb0, + 0x29, 0x7e, 0x07, 0x07, 0x89, 0xd9, 0xd6, 0x1d, 0xfd, 0xd2, 0x5c, 0x99, 0xcc, 0x24, 0x1e, 0xfe, + 0x0a, 0x76, 0xfb, 0x1e, 0x5d, 0xe9, 0x8c, 0xcc, 0xa7, 0x96, 0x90, 0xac, 0x82, 0xfc, 0x73, 0xea, + 0x43, 0x41, 0xf1, 0xbf, 0x12, 0xe0, 0xfb, 0xcf, 0xce, 0x73, 0xf5, 0x3d, 0xde, 0x5d, 0x83, 0x27, + 0x1a, 0x76, 0x97, 0xaf, 0xf1, 0xcf, 0x21, 0xbb, 0x22, 0xd7, 0x64, 0x25, 0xb2, 0xdf, 0xa9, 0x7d, + 0x21, 0x8a, 0xf1, 0xd0, 0xb6, 0x1c, 0xfc, 0x9c, 0x73, 0x55, 0xf1, 0xef, 0x0e, 0xac, 0xf0, 0x5b, + 0xd8, 0x9e, 0x9b, 0x9e, 0xb3, 0xd2, 0x6f, 0x03, 0x85, 0xf0, 0x51, 0xe3, 0x10, 0x17, 0x60, 0xd3, + 0x22, 0x9e, 0xa7, 0x2f, 0x49, 0xf8, 0xcc, 0xd1, 0x96, 0xa7, 0xc4, 0x4c, 0x8b, 0x14, 0xb2, 0x41, + 0x4a, 0x7c, 0x5d, 0xfc, 0x05, 0xbc, 0x48, 0x44, 0xc3, 0xcf, 0x61, 0x73, 0x62, 0xff, 0xd6, 0xa6, + 0x1f, 0x6c, 0xf4, 0x0c, 0xe7, 0x20, 0xd3, 0xb7, 0x17, 0x14, 0x49, 0x1c, 0x5f, 0xe8, 0xae, 0x6d, + 0xda, 0x4b, 0x94, 0xc2, 0xf9, 0xb0, 0xac, 0x28, 0x5d, 0xfc, 0x1d, 0x7c, 0x1a, 0xaf, 0x65, 0x7b, + 0x49, 0x6c, 0x16, 0x9b, 0x86, 0x77, 0xb0, 0x73, 0x6d, 0x09, 0x3c, 0x25, 0xae, 0x67, 0x52, 0x3b, + 0xac, 0x4a, 0x82, 0xe2, 0x3a, 0xe4, 0x3c, 0x91, 0x0c, 0xf1, 0x0a, 0x29, 0x71, 0x06, 0xec, 0x3f, + 0x51, 0x22, 0x75, 0xad, 0x58, 0xac, 0xc3, 0x7e, 0xcf, 0x27, 0x1e, 0x13, 0x9e, 0xe2, 0xe7, 0x41, + 0x01, 0x36, 0x89, 0xcd, 0x9b, 0x34, 0x0f, 0xdb, 0x17, 0x6d, 0x8b, 0x7f, 0x95, 0x00, 0x8f, 0x5c, + 0x7a, 0x93, 0x38, 0x40, 0x8a, 0x90, 0xbf, 0x62, 0xcc, 0x11, 0x92, 0xd8, 0x9f, 0xe7, 0x0e, 0xe3, + 0xb7, 0x00, 0x7c, 0xe3, 0x05, 0x4a, 0xa9, 0x7b, 0x4a, 0xf7, 0x38, 0x0f, 0x6d, 0xd3, 0x40, 0x25, + 0x7d, 0x98, 0xe6, 0x5d, 0x08, 0xb7, 0x3c, 0x06, 0x73, 0x7d, 0x8f, 0x91, 0x79, 0x47, 0x0f, 0x3a, + 0x14, 0xc5, 0x58, 0xe3, 0xd2, 0x1b, 0xc8, 0x4d, 0x3c, 0xe2, 0x8a, 0x76, 0xe4, 0x20, 0xa3, 0x0e, + 0x87, 0xe3, 0xa0, 0x17, 0x13, 0x4d, 0x56, 0x91, 0x54, 0xfa, 0x25, 0x6c, 0x8f, 0x5c, 0x6a, 0x10, + 0xcf, 0xa3, 0x6b, 0x25, 0x85, 0xda, 0x04, 0x3d, 0xe3, 0x9d, 0xe9, 0xdb, 0x8c, 0xac, 0x82, 0x8e, + 0x89, 0x65, 0xb3, 0x81, 0x52, 0x78, 0x13, 0xd2, 0xed, 0x41, 0x17, 0xa5, 0xb9, 0x42, 0x7b, 0xd0, + 0x6d, 0x36, 0x50, 0x46, 0x30, 0x75, 0x80, 0xb2, 0x82, 0xa9, 0x83, 0x66, 0x03, 0x6d, 0x94, 0xbe, + 0x83, 0x37, 0x43, 0x87, 0xf0, 0x7a, 0xd8, 0x4b, 0xed, 0xd6, 0x63, 0xc4, 0x3a, 0xa1, 0x94, 0x79, + 0xcc, 0xd5, 0x1d, 0xd9, 0x5e, 0x9a, 0x36, 0xc1, 0x3b, 0x00, 0x9d, 0xf3, 0xe1, 0xa4, 0x3b, 0xeb, + 0x2b, 0x7d, 0x9e, 0x56, 0x01, 0x5e, 0x5d, 0xf4, 0x95, 0xee, 0xf0, 0x42, 0x9b, 0xb5, 0x15, 0xed, + 0x42, 0x56, 0x67, 0xa7, 0xfd, 0x73, 0x59, 0x43, 0x52, 0xe9, 0x6b, 0x78, 0x99, 0xf0, 0x15, 0x0d, + 0x58, 0x68, 0x10, 0xe4, 0x7b, 0xde, 0x57, 0x26, 0xdf, 0x23, 0xa9, 0xf4, 0xf7, 0x3c, 0xec, 0xc5, + 0x47, 0x89, 0x5f, 0x36, 0x91, 0x49, 0x97, 0x2c, 0x74, 0x7f, 0xc5, 0xd0, 0x33, 0x8c, 0x61, 0x47, + 0x63, 0xba, 0x3d, 0xd7, 0xdd, 0xf9, 0xac, 0x5d, 0x9b, 0x5d, 0xd7, 0x50, 0x2a, 0xce, 0x1a, 0x9c, + 0xa5, 0xf1, 0x4b, 0x31, 0xdb, 0x01, 0xeb, 0xd6, 0xbc, 0xd9, 0x75, 0x1d, 0x65, 0xe2, 0xb0, 0x21, + 0x60, 0x36, 0x0e, 0x5b, 0x02, 0x6e, 0xe0, 0x57, 0x80, 0xee, 0x60, 0xb5, 0x29, 0xe8, 0x66, 0x9c, + 0xd6, 0x03, 0xaf, 0xb9, 0xb8, 0x03, 0x4d, 0xe4, 0x94, 0x4f, 0xc0, 0x3a, 0x87, 0x90, 0x80, 0x22, + 0xd3, 0xe7, 0x09, 0xf8, 0x0d, 0x87, 0x5b, 0xf1, 0x48, 0x5a, 0x55, 0xd8, 0x6f, 0xc7, 0x54, 0xcf, + 0x5a, 0xda, 0xec, 0xba, 0x8a, 0x76, 0x62, 0xaa, 0x67, 0x2d, 0x1e, 0xbf, 0x8a, 0x5e, 0x24, 0x69, + 0x9d, 0x53, 0x94, 0xa4, 0x0d, 0x4e, 0x77, 0x31, 0x82, 0xad, 0x35, 0x55, 0xce, 0x9a, 0x08, 0xe3, + 0x5d, 0xd8, 0xbe, 0x47, 0xaa, 0x35, 0xf4, 0x32, 0xae, 0x34, 0x6d, 0xa2, 0x57, 0x71, 0xa5, 0x69, + 0xb5, 0x86, 0x3e, 0x4a, 0xfa, 0xff, 0x86, 0xfb, 0xdf, 0xc3, 0xfb, 0xf0, 0x32, 0x51, 0xa0, 0xd9, + 0xfb, 0x91, 0x82, 0xf6, 0x13, 0x82, 0x7a, 0x24, 0x28, 0x24, 0x04, 0x8d, 0x48, 0xf0, 0x71, 0x2c, + 0xc0, 0x69, 0xcd, 0x13, 0xf4, 0x20, 0x4e, 0x1b, 0x01, 0xfd, 0x49, 0x9c, 0xb6, 0x02, 0xfa, 0x1a, + 0x7f, 0x04, 0xbb, 0x77, 0x94, 0x77, 0x96, 0xe3, 0x4f, 0x62, 0xa5, 0x55, 0x3a, 0x8d, 0x59, 0xbb, + 0x86, 0xde, 0x24, 0x60, 0x8b, 0xc3, 0x4f, 0x63, 0x6e, 0x95, 0x4e, 0xb5, 0xc9, 0xe9, 0x61, 0x82, + 0xd6, 0x6b, 0x9c, 0xfe, 0x34, 0x41, 0x1b, 0xb3, 0x76, 0xbd, 0x82, 0x8a, 0x09, 0xda, 0x12, 0xf4, + 0xb3, 0x58, 0x62, 0x81, 0xdf, 0x7a, 0x05, 0xbd, 0x4d, 0x60, 0xee, 0xb8, 0x5e, 0x41, 0x9f, 0xf3, + 0x3f, 0x5e, 0xdc, 0x73, 0xb5, 0x52, 0x99, 0x35, 0x2a, 0xe8, 0x5d, 0x42, 0xd2, 0x5a, 0x4b, 0xbe, + 0xc0, 0x1f, 0xc3, 0x47, 0x89, 0x08, 0xa1, 0xe8, 0x28, 0x21, 0xe2, 0x51, 0x42, 0xd1, 0xcf, 0x1e, + 0x8f, 0xd4, 0xaa, 0xa0, 0xd2, 0xe3, 0x91, 0x5a, 0x15, 0xf4, 0xe5, 0x13, 0x91, 0x5a, 0x15, 0xf4, + 0xd5, 0x13, 0x91, 0x5a, 0x15, 0xf4, 0xf5, 0xc3, 0x6a, 0x55, 0x9b, 0xa8, 0xfc, 0xb0, 0x5a, 0xd5, + 0x26, 0x3a, 0x7e, 0xa4, 0x5a, 0xd5, 0x26, 0xaa, 0x3c, 0x52, 0xad, 0x6a, 0x13, 0x55, 0xf1, 0x36, + 0xe4, 0x83, 0x37, 0x58, 0xde, 0x96, 0xd9, 0xbd, 0xad, 0x72, 0x86, 0x7e, 0xcd, 0x47, 0x3b, 0xdc, + 0xf6, 0x1c, 0xdf, 0xb9, 0x46, 0x3a, 0x06, 0xd8, 0x08, 0x08, 0xba, 0xc4, 0x2f, 0xe0, 0xf9, 0xc4, + 0xf6, 0x7c, 0xc7, 0xa1, 0x2e, 0x23, 0x73, 0x64, 0x94, 0x8e, 0x60, 0xf7, 0xc1, 0xa7, 0x00, 0x3f, + 0x84, 0xdf, 0x8f, 0xc7, 0xa3, 0xe0, 0x50, 0xe3, 0x2b, 0x7e, 0x06, 0x36, 0x60, 0xf7, 0xc1, 0xeb, + 0x3a, 0xf7, 0xdd, 0x73, 0xfc, 0x6e, 0xb7, 0x1d, 0x9c, 0xea, 0x3d, 0xc7, 0x1f, 0x21, 0x89, 0x5b, + 0xf1, 0xd5, 0x14, 0xa5, 0x4a, 0x63, 0x80, 0x11, 0xfd, 0x40, 0xdc, 0xe0, 0xc5, 0x27, 0x76, 0x23, + 0x3f, 0x87, 0x4d, 0xd5, 0xb7, 0xc5, 0x3d, 0x2c, 0xf1, 0x13, 0x7c, 0xb8, 0x58, 0xa0, 0x14, 0xf7, + 0x38, 0xd2, 0x7d, 0x8f, 0xcc, 0x51, 0x1a, 0x6f, 0x41, 0xae, 0xe3, 0x9a, 0xcc, 0x34, 0xf4, 0x15, + 0xca, 0x70, 0xaf, 0x9a, 0x7e, 0x4d, 0xe6, 0x28, 0x5b, 0x5a, 0xc0, 0x7e, 0xfc, 0x7c, 0x0d, 0x4f, + 0x67, 0x6a, 0x0b, 0xad, 0x71, 0x5b, 0x0d, 0xaf, 0x19, 0x6d, 0x3c, 0x0c, 0x13, 0x52, 0x65, 0x4d, + 0x1e, 0xa3, 0x14, 0xde, 0x03, 0xac, 0xca, 0xa3, 0x76, 0x5f, 0x9d, 0xf5, 0x26, 0xb2, 0x36, 0x9e, + 0xb5, 0x7b, 0xb2, 0x32, 0x0e, 0x6e, 0x93, 0x51, 0x7b, 0xa2, 0xc9, 0x28, 0x23, 0xec, 0xda, 0x53, + 0x19, 0x65, 0x4b, 0xff, 0x94, 0x9e, 0x7e, 0x09, 0x7e, 0xf0, 0x4e, 0xb7, 0x17, 0x27, 0xb3, 0x89, + 0x72, 0xa6, 0x0c, 0x2f, 0x14, 0xf4, 0x8c, 0x8f, 0x49, 0x42, 0x76, 0xda, 0xee, 0x9f, 0xcb, 0x5d, + 0x24, 0xe1, 0xd7, 0x50, 0x48, 0x88, 0xb4, 0x49, 0xa7, 0x23, 0xcb, 0x5d, 0xb9, 0x8b, 0x52, 0x8f, + 0x38, 0x1d, 0xc9, 0x4a, 0xb7, 0xaf, 0xf4, 0x50, 0xfa, 0x11, 0x4b, 0x55, 0x3e, 0x19, 0x0e, 0xc7, + 0x5c, 0x9a, 0x29, 0xfd, 0x00, 0x5b, 0x6d, 0xd7, 0xb8, 0x32, 0x19, 0x31, 0x98, 0xef, 0x12, 0x5e, + 0xdf, 0x9b, 0x56, 0x33, 0x28, 0xca, 0xa0, 0xcf, 0x1b, 0x2a, 0xee, 0xca, 0x95, 0x73, 0xa5, 0xa3, + 0x14, 0x6f, 0x85, 0xe8, 0xd2, 0xa8, 0x83, 0xd2, 0x7c, 0x46, 0xdb, 0xea, 0x60, 0x76, 0xdf, 0x1c, + 0x65, 0xb9, 0x9d, 0xa9, 0xf3, 0x8b, 0x55, 0xb8, 0x6a, 0x36, 0x50, 0x9e, 0x97, 0x52, 0x5c, 0xb6, + 0x71, 0xd5, 0xad, 0xd2, 0x7b, 0xd8, 0xd2, 0x88, 0xe1, 0xbb, 0x26, 0xbb, 0x15, 0x43, 0xb2, 0x0b, + 0xdb, 0xca, 0x70, 0xdc, 0x19, 0x2a, 0xa7, 0xfd, 0xde, 0x44, 0x95, 0xbb, 0xe8, 0x19, 0x47, 0x63, + 0x75, 0xa2, 0x8d, 0xe5, 0xee, 0x79, 0x7b, 0xa2, 0x74, 0xde, 0x23, 0x89, 0x5f, 0x7c, 0x42, 0xa5, + 0x2b, 0x2b, 0xe3, 0x7e, 0xfb, 0x7c, 0x3a, 0x40, 0xa9, 0x6f, 0xcf, 0x00, 0x79, 0xc4, 0xf6, 0x4c, + 0x66, 0x5e, 0x93, 0xf0, 0xab, 0x18, 0x7f, 0x52, 0x0e, 0xbe, 0x82, 0xcb, 0xd1, 0x57, 0x70, 0xf9, + 0xd4, 0x24, 0xab, 0xf9, 0xd0, 0xe1, 0x85, 0xf0, 0x0a, 0xff, 0xfe, 0x63, 0x5a, 0xbc, 0x21, 0x3d, + 0x30, 0xfc, 0x56, 0x86, 0xed, 0x35, 0xfb, 0x8d, 0x47, 0xed, 0xff, 0xe7, 0xe9, 0x3f, 0xa1, 0xa7, + 0xb8, 0xd5, 0xc9, 0xe7, 0xbf, 0xfa, 0x6c, 0x69, 0xb2, 0x2b, 0xff, 0xb2, 0x6c, 0x50, 0xeb, 0xd8, + 0x32, 0x0d, 0x97, 0x7a, 0x74, 0xc1, 0x8e, 0x2d, 0x6a, 0x1c, 0xbb, 0x8e, 0x71, 0x1c, 0x7c, 0xb6, + 0x5f, 0x6e, 0x08, 0xa7, 0xf5, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xb3, 0x90, 0x59, 0xd9, + 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 0047c492..40596b34 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -102,14 +102,16 @@ message WinRMConfiguration { repeated WinRMListener Listeners = 1; } -message Gpu { - enum AssignmentType { - GpuDDA = 0; - GpuP = 1; - } +enum GpuAssignmentType { + GpuDDA = 0; + GpuP = 1; + GpuPV = 2; +} - AssignmentType assignment = 1; +message Gpu { + GpuAssignmentType assignment = 1; int32 partitionSizeGB = 2; + int32 gpuCount = 3; } message VirtualMachineCustomSize { diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index d56c20ed..cdb6fcfc 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -227,12 +227,13 @@ func (m *PhysicalMemory) GetSizeBytes() uint64 { } type GPU struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` - Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` + Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` + AssignType GpuAssignmentType `protobuf:"varint,4,opt,name=assignType,proto3,enum=moc.GpuAssignmentType" json:"assignType,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GPU) Reset() { *m = GPU{} } @@ -281,6 +282,13 @@ func (m *GPU) GetCount() uint32 { return 0 } +func (m *GPU) GetAssignType() GpuAssignmentType { + if m != nil { + return m.AssignType + } + return GpuAssignmentType_GpuDDA +} + type OperatingSystem struct { Operatingsystemsku uint64 `protobuf:"varint,1,opt,name=operatingsystemsku,proto3" json:"operatingsystemsku,omitempty"` Ostype OperatingSystemType `protobuf:"varint,2,opt,name=ostype,proto3,enum=moc.OperatingSystemType" json:"ostype,omitempty"` @@ -444,7 +452,7 @@ type Resources struct { Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` Gpu *GPU `protobuf:"bytes,3,opt,name=gpu,proto3" json:"gpu,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` - GpuList []*Gpu `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + GpuList []*GPU `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -503,7 +511,7 @@ func (m *Resources) GetVmCapabilities() *VirtualMachineCapabilities { return nil } -func (m *Resources) GetGpuList() []*Gpu { +func (m *Resources) GetGpuList() []*GPU { if m != nil { return m.GpuList } @@ -524,51 +532,52 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 726 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x4c, - 0x10, 0xfd, 0xf2, 0x53, 0x37, 0x99, 0xb4, 0x69, 0xbb, 0x5f, 0x01, 0x53, 0x10, 0x04, 0x57, 0x54, - 0x11, 0x42, 0x09, 0x4a, 0x55, 0x01, 0x97, 0x94, 0x8b, 0x08, 0x44, 0x69, 0xb4, 0x6d, 0xb9, 0xe0, - 0xa6, 0x72, 0x9d, 0x49, 0xb2, 0x22, 0xf6, 0x5a, 0xbb, 0xeb, 0x48, 0xee, 0x23, 0xf0, 0x5c, 0x3c, - 0x01, 0x2f, 0xc1, 0x6b, 0x20, 0x8f, 0x9d, 0xc4, 0x4e, 0xa3, 0x8a, 0x2b, 0x7b, 0xe7, 0x9c, 0x99, - 0x9d, 0x99, 0x33, 0x3b, 0xf0, 0xd8, 0x97, 0xde, 0xb5, 0x27, 0x7d, 0x5f, 0x06, 0xd7, 0x81, 0x1c, - 0xa2, 0x08, 0x46, 0xb2, 0x13, 0x2a, 0x69, 0x24, 0x03, 0x5f, 0x7a, 0x9d, 0x14, 0x3a, 0x78, 0x94, - 0xa3, 0xa5, 0x9f, 0x94, 0x74, 0xf0, 0xac, 0x08, 0x84, 0x91, 0xc1, 0x3c, 0xee, 0x9c, 0xc3, 0xfe, - 0xb9, 0xe6, 0x38, 0x16, 0xda, 0x28, 0xd7, 0x08, 0x19, 0x5c, 0x18, 0xd7, 0x44, 0x9a, 0xbd, 0x05, - 0x4b, 0xd3, 0x9f, 0x5d, 0x6a, 0x95, 0xda, 0xcd, 0xde, 0xf3, 0xce, 0xf2, 0xb6, 0xce, 0x5d, 0x0f, - 0xe4, 0x19, 0xdd, 0xf9, 0x5d, 0x86, 0xfa, 0x40, 0x49, 0x0f, 0xb5, 0x96, 0x8a, 0x31, 0xa8, 0x06, - 0xae, 0x8f, 0x14, 0xa4, 0xce, 0xe9, 0x9f, 0xed, 0xc3, 0x86, 0x27, 0x15, 0x6a, 0xbb, 0xdc, 0x2a, - 0xb5, 0xb7, 0x79, 0x7a, 0x48, 0xac, 0x3a, 0x44, 0x1c, 0xda, 0x15, 0xa2, 0xa6, 0x07, 0x76, 0x04, - 0x55, 0x13, 0x87, 0x68, 0x57, 0x29, 0x09, 0x46, 0x49, 0x2c, 0xa2, 0x5f, 0xc6, 0x21, 0x72, 0xc2, - 0xd9, 0x11, 0x34, 0x67, 0x42, 0x99, 0xc8, 0x9d, 0x8a, 0x5b, 0x4a, 0xca, 0xde, 0x68, 0x95, 0xda, - 0x35, 0xbe, 0x62, 0x65, 0xaf, 0x61, 0x6f, 0x2a, 0xc7, 0xc2, 0x73, 0xa7, 0xe1, 0x3c, 0x8a, 0xb6, - 0x2d, 0xca, 0xe3, 0x2e, 0x90, 0xb0, 0x27, 0x71, 0x88, 0x6a, 0x26, 0xb4, 0x54, 0xa1, 0x42, 0x8d, - 0x81, 0xb1, 0x37, 0x29, 0xf0, 0x5d, 0x80, 0x39, 0xb0, 0xe5, 0xbb, 0x41, 0x34, 0x72, 0x3d, 0x13, - 0x29, 0x54, 0x76, 0x8d, 0x0a, 0x29, 0xd8, 0xd8, 0x09, 0x6c, 0xb9, 0xca, 0x9b, 0x08, 0x83, 0x64, - 0xb0, 0xeb, 0x54, 0xd7, 0x1e, 0xd5, 0xf5, 0x21, 0x07, 0xf0, 0x02, 0xcd, 0xe9, 0x40, 0x73, 0x30, - 0x89, 0x75, 0x92, 0xde, 0x19, 0xfa, 0x52, 0xc5, 0xec, 0x29, 0xd4, 0xb5, 0xb8, 0xc5, 0xd3, 0xd8, - 0x60, 0x2a, 0x51, 0x95, 0x2f, 0x0d, 0xce, 0x19, 0x54, 0xfa, 0x83, 0xab, 0xb5, 0xdd, 0x2f, 0x38, - 0xa6, 0x0a, 0x2c, 0x0d, 0xa9, 0x36, 0x51, 0x60, 0x48, 0x05, 0xd2, 0x26, 0x0a, 0x8c, 0xf3, 0xa7, - 0x04, 0x3b, 0xe7, 0x21, 0x26, 0x72, 0x07, 0xe3, 0x8b, 0x58, 0x1b, 0xf4, 0x59, 0x07, 0x98, 0x9c, - 0x9b, 0x34, 0x99, 0xf4, 0x8f, 0x28, 0xcb, 0x64, 0x0d, 0xc2, 0xde, 0x80, 0x25, 0x35, 0x69, 0x59, - 0xa6, 0x9a, 0x6d, 0xaa, 0x79, 0x25, 0x2a, 0x29, 0x9a, 0xf1, 0x92, 0x4c, 0xa5, 0x9e, 0xa1, 0xd2, - 0x89, 0x9c, 0xe9, 0x54, 0x2c, 0x0d, 0xec, 0x12, 0xf6, 0xe5, 0x9a, 0xc1, 0xa5, 0x49, 0x69, 0xf4, - 0x5a, 0xf7, 0x8f, 0x6b, 0xa4, 0xf9, 0x5a, 0x6f, 0xe7, 0x57, 0x19, 0x6a, 0x5f, 0xe5, 0x10, 0x3f, - 0x05, 0x23, 0xb9, 0xb6, 0x7d, 0x4d, 0x28, 0x8b, 0x21, 0x95, 0x50, 0xe7, 0x65, 0x31, 0x64, 0x27, - 0x00, 0x9e, 0x1b, 0xba, 0x37, 0x62, 0x2a, 0x4c, 0x4c, 0x59, 0x36, 0x7a, 0x0f, 0xf2, 0x97, 0x73, - 0xd4, 0x32, 0x52, 0x1e, 0x6a, 0x9e, 0x23, 0xb2, 0xf7, 0xb0, 0xe5, 0xce, 0x5c, 0x31, 0x9d, 0x3b, - 0x56, 0xef, 0x73, 0x2c, 0x50, 0x73, 0x8d, 0xb4, 0xfe, 0xb1, 0x91, 0x87, 0x8b, 0xb7, 0xbc, 0x49, - 0xd7, 0x34, 0xc8, 0x23, 0xeb, 0x43, 0x06, 0xb1, 0x87, 0x60, 0x45, 0xa1, 0x11, 0x3e, 0xd2, 0xdc, - 0x56, 0x78, 0x76, 0x62, 0xc7, 0xc9, 0x75, 0x49, 0x3b, 0x68, 0x56, 0x1b, 0xbd, 0x27, 0x85, 0xce, - 0x16, 0x6f, 0xe5, 0x19, 0xd5, 0xf9, 0x59, 0x86, 0xfa, 0x22, 0x7f, 0x76, 0x0c, 0xf5, 0xc5, 0xa3, - 0xa2, 0x66, 0xae, 0x54, 0xba, 0x78, 0xd0, 0x7c, 0xc9, 0x63, 0x3d, 0xb0, 0x7c, 0x1a, 0x75, 0x6a, - 0x76, 0xa3, 0x77, 0x50, 0xf0, 0x28, 0x3c, 0x06, 0x9e, 0x31, 0xd9, 0x0b, 0xa8, 0x8c, 0xc3, 0x28, - 0x53, 0x61, 0x27, 0xef, 0xd0, 0x1f, 0x5c, 0xf1, 0x04, 0x63, 0x7d, 0x68, 0xce, 0xfc, 0x8f, 0x73, - 0x21, 0x04, 0x6a, 0x5a, 0x14, 0x8d, 0x6c, 0xbf, 0x7d, 0x4b, 0xb7, 0xc5, 0x99, 0xeb, 0x4d, 0x44, - 0x80, 0x79, 0x1a, 0x5f, 0x71, 0x63, 0x0e, 0x6c, 0x8e, 0xc3, 0xe8, 0x8b, 0xd0, 0xc6, 0xb6, 0x5a, - 0x95, 0x76, 0xa3, 0x57, 0xa3, 0x08, 0xfd, 0x30, 0xe2, 0x73, 0xe0, 0x73, 0xb5, 0x56, 0xdd, 0xdd, - 0x78, 0xf5, 0x0e, 0xfe, 0x5f, 0xb3, 0x30, 0xd9, 0x1e, 0x6c, 0x07, 0xd2, 0xa4, 0x76, 0x54, 0x38, - 0xdc, 0xfd, 0x8f, 0x35, 0x01, 0xd4, 0xf2, 0x5c, 0x3a, 0x7d, 0xf9, 0xfd, 0x70, 0x2c, 0xcc, 0x24, - 0xba, 0x49, 0xca, 0xe8, 0xfa, 0xc2, 0x53, 0x52, 0xcb, 0x91, 0xe9, 0xfa, 0xd2, 0xeb, 0xaa, 0xd0, - 0xeb, 0xa6, 0xc5, 0xdd, 0x58, 0xb4, 0xca, 0x8f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x4d, - 0x9b, 0x90, 0x2c, 0x06, 0x00, 0x00, + // 749 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x4e, 0xdb, 0x48, + 0x14, 0xde, 0xfc, 0x60, 0x92, 0x13, 0x08, 0x30, 0xcb, 0xb2, 0x5e, 0x76, 0xb5, 0x4d, 0x8d, 0x8a, + 0x68, 0x55, 0x25, 0x55, 0x10, 0xfd, 0xb9, 0x84, 0x5e, 0x44, 0xad, 0x4a, 0x89, 0x06, 0xe8, 0x45, + 0x6f, 0x90, 0x71, 0x4e, 0x92, 0x51, 0x63, 0x8f, 0x35, 0x33, 0x8e, 0x64, 0xee, 0xfb, 0x00, 0x7d, + 0xa7, 0x3e, 0x41, 0x5f, 0xa2, 0xaf, 0x51, 0xf9, 0xd8, 0x49, 0xec, 0x10, 0xa1, 0x5e, 0xc5, 0x73, + 0xbe, 0xef, 0xcc, 0x77, 0xfe, 0xe6, 0x04, 0xfe, 0xf1, 0xa5, 0x77, 0xe3, 0x49, 0xdf, 0x97, 0xc1, + 0x4d, 0x20, 0x07, 0x28, 0x82, 0xa1, 0x6c, 0x87, 0x4a, 0x1a, 0xc9, 0xc0, 0x97, 0x5e, 0x3b, 0x85, + 0xf6, 0xff, 0xce, 0xd1, 0xd2, 0x9f, 0x94, 0xb4, 0xff, 0x7f, 0x11, 0x08, 0x23, 0x83, 0x79, 0xdc, + 0xb9, 0x80, 0xdd, 0x0b, 0xcd, 0x71, 0x24, 0xb4, 0x51, 0xae, 0x11, 0x32, 0xb8, 0x34, 0xae, 0x89, + 0x34, 0x7b, 0x05, 0x96, 0xa6, 0x2f, 0xbb, 0xd4, 0x2a, 0x1d, 0x35, 0xbb, 0x8f, 0xda, 0x0b, 0xb5, + 0xf6, 0x7d, 0x0f, 0xe4, 0x19, 0xdd, 0xf9, 0x51, 0x86, 0x7a, 0x5f, 0x49, 0x0f, 0xb5, 0x96, 0x8a, + 0x31, 0xa8, 0x06, 0xae, 0x8f, 0x74, 0x49, 0x9d, 0xd3, 0x37, 0xdb, 0x85, 0x35, 0x4f, 0x2a, 0xd4, + 0x76, 0xb9, 0x55, 0x3a, 0xda, 0xe4, 0xe9, 0x21, 0xb1, 0xea, 0x10, 0x71, 0x60, 0x57, 0x88, 0x9a, + 0x1e, 0xd8, 0x21, 0x54, 0x4d, 0x1c, 0xa2, 0x5d, 0xa5, 0x20, 0x18, 0x05, 0x31, 0xbf, 0xfd, 0x2a, + 0x0e, 0x91, 0x13, 0xce, 0x0e, 0xa1, 0x39, 0x15, 0xca, 0x44, 0xee, 0x44, 0xdc, 0x51, 0x50, 0xf6, + 0x5a, 0xab, 0x74, 0x54, 0xe3, 0x4b, 0x56, 0xf6, 0x1c, 0x76, 0x26, 0x72, 0x24, 0x3c, 0x77, 0x12, + 0xce, 0x6e, 0xd1, 0xb6, 0x45, 0x71, 0xdc, 0x07, 0x12, 0xf6, 0x38, 0x0e, 0x51, 0x4d, 0x85, 0x96, + 0x2a, 0x54, 0xa8, 0x31, 0x30, 0xf6, 0x3a, 0x5d, 0x7c, 0x1f, 0x60, 0x0e, 0x6c, 0xf8, 0x6e, 0x10, + 0x0d, 0x5d, 0xcf, 0x44, 0x0a, 0x95, 0x5d, 0xa3, 0x44, 0x0a, 0x36, 0x76, 0x02, 0x1b, 0xae, 0xf2, + 0xc6, 0xc2, 0x20, 0x19, 0xec, 0x3a, 0xe5, 0xb5, 0x43, 0x79, 0x9d, 0xe6, 0x00, 0x5e, 0xa0, 0x39, + 0x6d, 0x68, 0xf6, 0xc7, 0xb1, 0x4e, 0xc2, 0x3b, 0x47, 0x5f, 0xaa, 0x98, 0xfd, 0x07, 0x75, 0x2d, + 0xee, 0xf0, 0x2c, 0x36, 0x98, 0xb6, 0xa8, 0xca, 0x17, 0x06, 0xe7, 0x6b, 0x09, 0x2a, 0xbd, 0xfe, + 0xf5, 0xca, 0xf2, 0x17, 0x3c, 0xd3, 0x16, 0x2c, 0x0c, 0x69, 0x73, 0xa2, 0xc0, 0x50, 0x1b, 0xa8, + 0x39, 0x51, 0x60, 0xd8, 0x4b, 0x00, 0x57, 0x6b, 0x31, 0x0a, 0xae, 0x16, 0xcd, 0xd8, 0xa3, 0xa0, + 0x7b, 0x61, 0x74, 0x4a, 0x88, 0x8f, 0x81, 0xa1, 0x86, 0xe4, 0x98, 0xce, 0xcf, 0x12, 0x6c, 0x5d, + 0x84, 0x98, 0xcc, 0x49, 0x30, 0xba, 0x8c, 0xb5, 0x41, 0x9f, 0xb5, 0x81, 0xc9, 0x99, 0x49, 0x93, + 0x49, 0x7f, 0x89, 0xb2, 0x14, 0x56, 0x20, 0xec, 0x05, 0x58, 0x52, 0xd3, 0x10, 0x94, 0x49, 0xd7, + 0x26, 0xdd, 0xa5, 0x5b, 0x49, 0x39, 0xe3, 0x25, 0x19, 0x4a, 0x3d, 0x45, 0xa5, 0x93, 0x39, 0x48, + 0xc7, 0x69, 0x61, 0x60, 0x57, 0xb0, 0x2b, 0x57, 0x4c, 0x3c, 0x65, 0xd5, 0xe8, 0xb6, 0x1e, 0x9e, + 0xf3, 0x48, 0xf3, 0x95, 0xde, 0xce, 0xf7, 0x32, 0xd4, 0x3e, 0xca, 0x01, 0xbe, 0x0b, 0x86, 0x72, + 0x65, 0xd9, 0x9b, 0x50, 0x16, 0x03, 0x4a, 0xa1, 0xce, 0xcb, 0x62, 0xc0, 0x4e, 0x00, 0x3c, 0x37, + 0x74, 0x6f, 0xc5, 0x44, 0x98, 0x98, 0xa2, 0x6c, 0x74, 0xff, 0xca, 0x8b, 0x73, 0xd4, 0x32, 0x52, + 0x1e, 0x6a, 0x9e, 0x23, 0xb2, 0x37, 0xb0, 0xe1, 0x4e, 0x5d, 0x31, 0x99, 0x39, 0x56, 0x1f, 0x72, + 0x2c, 0x50, 0x73, 0x85, 0xb4, 0x7e, 0xb3, 0x90, 0x07, 0xf3, 0x25, 0xb0, 0x4e, 0x32, 0x0d, 0xf2, + 0xc8, 0xea, 0x90, 0x41, 0x6c, 0x0f, 0xac, 0x28, 0x34, 0xc2, 0x47, 0x1a, 0xf8, 0x0a, 0xcf, 0x4e, + 0xec, 0x38, 0x91, 0x4b, 0xca, 0x41, 0x43, 0xde, 0xe8, 0xfe, 0x5b, 0xa8, 0x6c, 0x51, 0x95, 0x67, + 0x54, 0xe7, 0x5b, 0x19, 0xea, 0xf3, 0xf8, 0xd9, 0x31, 0xd4, 0xe7, 0xaf, 0x91, 0x8a, 0xb9, 0x94, + 0xe9, 0x7c, 0x13, 0xf0, 0x05, 0x8f, 0x75, 0xc1, 0xf2, 0xe9, 0x8d, 0x50, 0xb1, 0x1b, 0xdd, 0xfd, + 0x82, 0x47, 0xe1, 0x15, 0xf1, 0x8c, 0xc9, 0x1e, 0x43, 0x65, 0x14, 0x46, 0x59, 0x17, 0xb6, 0xf2, + 0x0e, 0xbd, 0xfe, 0x35, 0x4f, 0x30, 0xd6, 0x83, 0xe6, 0xd4, 0x7f, 0x3b, 0x6b, 0x84, 0x40, 0x4d, + 0x1b, 0xa6, 0x91, 0x2d, 0xc6, 0x4f, 0xe9, 0x9a, 0x39, 0x77, 0xbd, 0xb1, 0x08, 0x30, 0x4f, 0xe3, + 0x4b, 0x6e, 0xec, 0x29, 0xac, 0x8f, 0xc2, 0xe8, 0x83, 0xd0, 0xc6, 0xb6, 0x5a, 0x95, 0x55, 0x7a, + 0x33, 0xfc, 0x7d, 0xb5, 0x56, 0xdd, 0x5e, 0x7b, 0xf6, 0x1a, 0xfe, 0x5c, 0xb1, 0x70, 0xd9, 0x0e, + 0x6c, 0x06, 0xd2, 0xa4, 0x76, 0x54, 0x38, 0xd8, 0xfe, 0x83, 0x35, 0x01, 0xd4, 0xe2, 0x5c, 0x3a, + 0x7b, 0xf2, 0xf9, 0x60, 0x24, 0xcc, 0x38, 0xba, 0x4d, 0x6e, 0xef, 0xf8, 0xc2, 0x53, 0x52, 0xcb, + 0xa1, 0xe9, 0xf8, 0xd2, 0xeb, 0xa8, 0xd0, 0xeb, 0xa4, 0x9a, 0xb7, 0x16, 0xfd, 0x15, 0x1c, 0xff, + 0x0a, 0x00, 0x00, 0xff, 0xff, 0x64, 0xe7, 0x07, 0xcf, 0x6c, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index 364b64e2..ee426feb 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -37,6 +37,7 @@ message GPU { string name = 1; uint32 sizeBytes = 2; uint32 count = 3; + GpuAssignmentType assignType = 4; } message OperatingSystem { @@ -61,7 +62,7 @@ message Resources { reserved 4; Processor processor = 1; PhysicalMemory memory = 2; - GPU gpu = 3; + GPU gpu = 3; // delete it after gpuList is applied VirtualMachineCapabilities vmCapabilities = 5; - repeated Gpu gpuList = 6; + repeated GPU gpuList = 6; } \ No newline at end of file diff --git a/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go b/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go index cf669421..d63cee66 100644 --- a/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go +++ b/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go @@ -726,6 +726,7 @@ type HardwareConfiguration struct { VMSize common.VirtualMachineSizeType `protobuf:"varint,1,opt,name=VMSize,proto3,enum=moc.VirtualMachineSizeType" json:"VMSize,omitempty"` CustomSize *common.VirtualMachineCustomSize `protobuf:"bytes,2,opt,name=customSize,proto3" json:"customSize,omitempty"` DynamicMemoryConfiguration *common.DynamicMemoryConfiguration `protobuf:"bytes,3,opt,name=dynamicMemoryConfiguration,proto3" json:"dynamicMemoryConfiguration,omitempty"` + GpuList []*common.Gpu `protobuf:"bytes,4,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -777,6 +778,13 @@ func (m *HardwareConfiguration) GetDynamicMemoryConfiguration() *common.DynamicM return nil } +func (m *HardwareConfiguration) GetGpuList() []*common.Gpu { + if m != nil { + return m.GpuList + } + return nil +} + type UefiSettings struct { SecureBootEnabled bool `protobuf:"varint,1,opt,name=secureBootEnabled,proto3" json:"secureBootEnabled,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1279,114 +1287,115 @@ func init() { } var fileDescriptor_9f3eecb05bcac3b7 = []byte{ - // 1706 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x5f, 0x6f, 0x1c, 0xb7, - 0x11, 0xef, 0x9d, 0xfe, 0xde, 0xe8, 0x8f, 0x23, 0x46, 0xb2, 0x37, 0x17, 0xdb, 0x11, 0xd6, 0x69, - 0xab, 0x34, 0xee, 0x29, 0x38, 0x27, 0x69, 0x0b, 0xa4, 0x05, 0xf4, 0x2f, 0x96, 0xda, 0x4a, 0x56, - 0x79, 0xb6, 0x83, 0xa6, 0x05, 0x04, 0x6a, 0x97, 0xba, 0x23, 0x74, 0x4b, 0x6e, 0x49, 0xae, 0x2f, - 0xe7, 0x97, 0x02, 0x7d, 0x69, 0x80, 0x7e, 0x8f, 0x3e, 0xf4, 0x3d, 0x6f, 0x05, 0xda, 0x97, 0xa2, - 0x5f, 0xa6, 0xe8, 0x67, 0x28, 0xc8, 0xe5, 0xde, 0xed, 0xee, 0xed, 0x0a, 0x32, 0xe0, 0x3e, 0xe9, - 0x76, 0x66, 0x7e, 0x3f, 0xce, 0x0c, 0x67, 0x86, 0xa4, 0xc0, 0x8f, 0x44, 0x70, 0xc1, 0x45, 0x48, - 0x49, 0x9f, 0x72, 0x7d, 0xf1, 0x8a, 0x49, 0x9d, 0x90, 0x61, 0x44, 0x82, 0x01, 0xe3, 0xb4, 0x13, - 0x4b, 0xa1, 0x05, 0xda, 0x8a, 0x44, 0xd0, 0x99, 0xd8, 0x74, 0x02, 0x11, 0xc5, 0x89, 0xa6, 0xed, - 0xf7, 0xfb, 0x42, 0xf4, 0x87, 0x74, 0xd7, 0x1a, 0x5d, 0x26, 0x57, 0xbb, 0x34, 0x8a, 0xf5, 0x38, - 0xc5, 0xb4, 0x1f, 0x96, 0x95, 0x23, 0x49, 0xe2, 0x98, 0x4a, 0xe5, 0xf4, 0xf7, 0xcc, 0xba, 0x81, - 0x88, 0x22, 0xc1, 0xdd, 0x9f, 0x0c, 0x58, 0x54, 0x98, 0x95, 0x0a, 0xfa, 0x07, 0x39, 0x3d, 0x17, - 0x9a, 0x5d, 0xb1, 0x80, 0x68, 0x96, 0xa9, 0xfd, 0xbf, 0x35, 0x60, 0xeb, 0x65, 0x1a, 0xc4, 0x69, - 0x1a, 0x04, 0xa6, 0x7f, 0x48, 0xa8, 0xd2, 0xe8, 0x77, 0x65, 0x45, 0x6f, 0xac, 0x34, 0x8d, 0x94, - 0xd7, 0xd8, 0x9e, 0xdb, 0x59, 0xe9, 0x7e, 0xbf, 0x53, 0x19, 0x65, 0xa7, 0x44, 0x56, 0xcd, 0x81, - 0x3e, 0x85, 0xb5, 0x67, 0x31, 0x95, 0xd6, 0x93, 0xe7, 0xe3, 0x98, 0x7a, 0xcd, 0xed, 0xc6, 0xce, - 0x7a, 0x77, 0xdd, 0x92, 0x4e, 0x34, 0xb8, 0x68, 0xe4, 0xff, 0xa3, 0x01, 0x77, 0xcb, 0xce, 0xaa, - 0x58, 0x70, 0x45, 0xff, 0xbf, 0xde, 0x76, 0x61, 0x11, 0x53, 0x95, 0x0c, 0xb5, 0x75, 0x73, 0xa5, - 0xdb, 0xee, 0xa4, 0xbb, 0xd5, 0xc9, 0x76, 0xab, 0xb3, 0x2f, 0xc4, 0xf0, 0x25, 0x19, 0x26, 0x14, - 0x3b, 0x4b, 0xb4, 0x09, 0x0b, 0x47, 0x52, 0x0a, 0xe9, 0xcd, 0x6d, 0x37, 0x76, 0x5a, 0x38, 0xfd, - 0xf0, 0x3b, 0xb0, 0xda, 0xeb, 0x1d, 0x9f, 0x27, 0x97, 0x43, 0x16, 0xfc, 0x8a, 0x8e, 0xd1, 0x43, - 0x58, 0xba, 0xa6, 0xe3, 0x90, 0x68, 0xe2, 0x35, 0x8c, 0xdd, 0xfe, 0xfc, 0xb7, 0xdf, 0x79, 0x0d, - 0x9c, 0x09, 0x7d, 0x1f, 0xe6, 0x0f, 0x99, 0xba, 0x46, 0x6d, 0x58, 0x0e, 0x99, 0xba, 0xe6, 0x24, - 0xa2, 0xa9, 0x21, 0x9e, 0x7c, 0xfb, 0x43, 0x58, 0xed, 0x0d, 0x88, 0xa4, 0xe1, 0x97, 0x62, 0x18, - 0x52, 0x89, 0x3e, 0x85, 0x2d, 0x65, 0xbf, 0xaf, 0xec, 0xb7, 0xa4, 0x57, 0x54, 0x52, 0x1e, 0x64, - 0xc0, 0x6a, 0x25, 0xfa, 0x01, 0xac, 0xf7, 0xcd, 0xbe, 0x47, 0x22, 0xe1, 0x3a, 0x26, 0x7a, 0x60, - 0x63, 0x6d, 0xe1, 0x92, 0xd4, 0xff, 0x73, 0x13, 0x36, 0x7b, 0x5a, 0x48, 0xd2, 0xa7, 0x07, 0x82, - 0x5f, 0xb1, 0x7e, 0x92, 0x6e, 0x10, 0x7a, 0x02, 0x8b, 0x42, 0x19, 0xa7, 0xec, 0x3a, 0x2b, 0xdd, - 0xf7, 0x6b, 0x52, 0x6e, 0xe2, 0xc1, 0xce, 0x14, 0xfd, 0x0c, 0x5a, 0x26, 0x4e, 0xf3, 0x5b, 0x79, - 0x4d, 0xbb, 0x55, 0x37, 0xe2, 0xa6, 0xd6, 0x26, 0xcc, 0x57, 0x51, 0xea, 0xc2, 0x81, 0xe0, 0x9a, - 0x30, 0x4e, 0xe5, 0x99, 0xc9, 0x4f, 0x9a, 0xf0, 0x6a, 0x25, 0x3a, 0x81, 0x35, 0x95, 0x4b, 0x96, - 0xf2, 0xe6, 0xed, 0xa2, 0x8f, 0x6a, 0x16, 0xcd, 0x27, 0x16, 0x17, 0x91, 0xfe, 0x97, 0xf0, 0xce, - 0x19, 0xd5, 0x23, 0x21, 0xaf, 0x4f, 0xb8, 0xa6, 0xf2, 0x8a, 0x04, 0x14, 0x75, 0x61, 0x93, 0x97, - 0x64, 0x67, 0xd3, 0x3d, 0xab, 0xd4, 0xf9, 0x17, 0xb0, 0xe9, 0x78, 0x8a, 0x09, 0x7d, 0x0a, 0xc0, - 0x32, 0xc3, 0xac, 0x8e, 0x7f, 0x58, 0xe3, 0x67, 0xd9, 0x11, 0x9c, 0x83, 0xfa, 0x7f, 0x6a, 0xc0, - 0xc6, 0x0b, 0x45, 0x65, 0x91, 0x7e, 0x1b, 0x96, 0x13, 0x45, 0xe5, 0xb4, 0xa4, 0x5c, 0xed, 0x4d, - 0xa4, 0xc6, 0x22, 0x26, 0x4a, 0x8d, 0x84, 0x0c, 0xd3, 0x62, 0xc8, 0x2c, 0x32, 0x29, 0xfa, 0x28, - 0xe5, 0xd0, 0xa6, 0x83, 0xe7, 0x6c, 0x07, 0xaf, 0x59, 0x07, 0xcd, 0x6a, 0xa6, 0x63, 0xf1, 0x44, - 0x6d, 0xb2, 0x85, 0x0f, 0xcf, 0x8b, 0x2e, 0x3c, 0x04, 0x08, 0x99, 0x22, 0x97, 0x43, 0x8a, 0x0f, - 0xcf, 0xad, 0x13, 0xcb, 0x38, 0x27, 0x41, 0x08, 0xe6, 0x63, 0x21, 0xd3, 0xae, 0x5b, 0xc3, 0xf6, - 0xb7, 0xff, 0xd7, 0x06, 0xa0, 0x5f, 0x33, 0x9e, 0x7c, 0x53, 0xa4, 0x3a, 0x84, 0x07, 0x0e, 0x78, - 0xee, 0x9c, 0xdb, 0x4b, 0xf4, 0x80, 0x72, 0xed, 0xc6, 0x9d, 0x63, 0xbf, 0xd9, 0x08, 0xfd, 0x12, - 0xde, 0x0d, 0x86, 0x22, 0x09, 0x4f, 0x38, 0xd3, 0x87, 0x44, 0x93, 0x9e, 0x48, 0x64, 0x90, 0x0d, - 0x27, 0xcf, 0x86, 0x76, 0x30, 0xab, 0xc7, 0x55, 0x20, 0xff, 0xdb, 0x26, 0x6c, 0x7e, 0xc5, 0x78, - 0x28, 0x46, 0xaa, 0xe8, 0xea, 0xe7, 0x70, 0x97, 0x72, 0xe3, 0xc4, 0x5e, 0xa2, 0x45, 0x44, 0x34, - 0x0b, 0x5e, 0xc4, 0x21, 0xd1, 0x76, 0x8f, 0x8d, 0x8f, 0x35, 0x5a, 0x33, 0x03, 0x34, 0x8b, 0xe8, - 0xd7, 0x82, 0x53, 0xd7, 0x9b, 0x93, 0x6f, 0xd4, 0x9b, 0xcd, 0xae, 0xdd, 0x90, 0xfa, 0x8a, 0x29, - 0x9b, 0xe3, 0xd9, 0xed, 0x79, 0x0a, 0xe8, 0x2b, 0xc6, 0xf1, 0x69, 0x91, 0x76, 0xde, 0xd2, 0xde, - 0xb3, 0xb4, 0xb3, 0x6a, 0x5c, 0x01, 0xf1, 0xff, 0xbd, 0x00, 0xf7, 0xdd, 0x24, 0xe7, 0xfd, 0x74, - 0xa8, 0x16, 0x57, 0xf2, 0x61, 0xd5, 0xf9, 0x25, 0x73, 0xed, 0x52, 0x90, 0xa1, 0x33, 0x58, 0x23, - 0x61, 0xc4, 0x38, 0x53, 0x5a, 0x12, 0x2d, 0xa4, 0x9b, 0xc5, 0x3b, 0x35, 0xf1, 0xcd, 0x14, 0x3c, - 0x2e, 0xc2, 0xd1, 0x2f, 0x60, 0xc1, 0x14, 0xa7, 0xf2, 0xe6, 0x6c, 0x67, 0xdd, 0x9e, 0x27, 0x85, - 0xa1, 0x0f, 0x01, 0x82, 0x44, 0x69, 0x11, 0x99, 0x3d, 0xb7, 0x59, 0xc9, 0xfa, 0x23, 0x27, 0x47, - 0x07, 0x00, 0xb1, 0x9d, 0xf6, 0xd7, 0x74, 0xac, 0xbc, 0x85, 0x9b, 0x87, 0x4d, 0xee, 0x64, 0xc0, - 0x39, 0x18, 0xfa, 0xc4, 0x8c, 0x56, 0xdb, 0x64, 0x8b, 0xb9, 0x4a, 0x2c, 0x65, 0xd4, 0xf6, 0x9b, - 0xb3, 0x43, 0xbf, 0x81, 0x0d, 0xa1, 0xf6, 0x85, 0xd0, 0x26, 0xda, 0xf8, 0x88, 0xf7, 0x19, 0xa7, - 0xde, 0x92, 0x05, 0x3f, 0xaa, 0x02, 0x97, 0x4c, 0xf1, 0x2c, 0x1a, 0xfd, 0x16, 0xd0, 0x70, 0xa6, - 0xef, 0xbc, 0x65, 0xbb, 0x09, 0x1f, 0xd5, 0x44, 0x34, 0xdb, 0xa8, 0xb8, 0x82, 0x04, 0x5d, 0xc0, - 0xe6, 0xa8, 0xa2, 0x53, 0xbc, 0x96, 0x25, 0xff, 0xb8, 0x86, 0xbc, 0xaa, 0xb9, 0x70, 0x25, 0x91, - 0xa9, 0xe4, 0x58, 0x8a, 0x6f, 0xc6, 0x45, 0x7a, 0xc8, 0x55, 0xf2, 0xf9, 0x8c, 0x1a, 0x57, 0x40, - 0xfc, 0xff, 0x34, 0x60, 0xeb, 0x98, 0xc8, 0x70, 0x44, 0xe4, 0xec, 0xf1, 0xf7, 0xf2, 0xb4, 0xc7, - 0x5e, 0xa7, 0xc5, 0xbb, 0xee, 0x8e, 0xb1, 0xd2, 0x7d, 0x82, 0xbd, 0xa6, 0xe9, 0x36, 0xa5, 0xa6, - 0xe8, 0xe7, 0x59, 0x0d, 0x59, 0x60, 0x5a, 0xd0, 0x0f, 0x2a, 0x80, 0x07, 0x13, 0x23, 0x9c, 0x03, - 0xa0, 0x0b, 0x68, 0x87, 0x63, 0x4e, 0x22, 0x16, 0x9c, 0xd2, 0x48, 0xc8, 0x71, 0x55, 0xff, 0x7f, - 0x60, 0xe9, 0x0e, 0x6b, 0xcd, 0xf0, 0x0d, 0x14, 0xfe, 0x17, 0xb0, 0xfa, 0x82, 0x5e, 0xb1, 0x1e, - 0xd5, 0xa6, 0x54, 0x14, 0x7a, 0x0c, 0x1b, 0x8a, 0x06, 0x89, 0xa4, 0xa6, 0x38, 0x8e, 0xec, 0x98, - 0x0a, 0xdd, 0xd4, 0x9a, 0x55, 0xf8, 0xdf, 0x35, 0x60, 0xab, 0x67, 0xa4, 0x4c, 0x17, 0x79, 0xd1, - 0x7d, 0x68, 0xa5, 0x43, 0xee, 0xf9, 0xf9, 0xa9, 0xc3, 0x4f, 0x05, 0xe8, 0x29, 0xac, 0x26, 0xb9, - 0x55, 0x5d, 0x5e, 0xea, 0xba, 0x26, 0xef, 0x20, 0x2e, 0x00, 0xd1, 0x67, 0xb0, 0xaa, 0xdc, 0xfa, - 0xcf, 0xa7, 0x47, 0xd4, 0x86, 0x25, 0xea, 0xe5, 0x14, 0xb8, 0x60, 0xe6, 0xff, 0x65, 0x09, 0xd6, - 0x8b, 0xf9, 0x37, 0x27, 0x51, 0xee, 0xee, 0x65, 0x7f, 0xa3, 0x75, 0x68, 0x32, 0x77, 0x30, 0xe2, - 0x26, 0x0b, 0xd1, 0x11, 0x2c, 0xa9, 0xf4, 0x62, 0xe4, 0x52, 0x5f, 0x57, 0xb8, 0x55, 0xd7, 0x27, - 0x9c, 0x61, 0xd1, 0x01, 0x34, 0x85, 0x72, 0x53, 0xf6, 0x49, 0x0d, 0xc3, 0x4d, 0xc3, 0x14, 0x37, - 0x85, 0x32, 0xbe, 0xb8, 0xbb, 0x86, 0xb7, 0x70, 0xa3, 0x2f, 0x55, 0x37, 0x0f, 0x9c, 0x61, 0xd1, - 0x31, 0x2c, 0x0f, 0x5c, 0xb5, 0xdb, 0xd1, 0xb3, 0xd2, 0x7d, 0x5c, 0xc3, 0x53, 0xd9, 0x14, 0x78, - 0x82, 0x46, 0x8f, 0x60, 0x51, 0x69, 0xa2, 0x13, 0x65, 0xa7, 0xd0, 0x4a, 0x77, 0x25, 0xdd, 0x04, - 0x2b, 0xc2, 0x4e, 0x85, 0x7e, 0x0a, 0xf7, 0xdc, 0xf9, 0x7c, 0xcc, 0xfa, 0x83, 0xbd, 0x57, 0x84, - 0x0d, 0xc9, 0x25, 0x1b, 0x32, 0x3d, 0xb6, 0x73, 0x66, 0x19, 0xd7, 0xa9, 0x4d, 0x61, 0x92, 0xe1, - 0x50, 0x8c, 0x68, 0xf8, 0x6c, 0x64, 0xae, 0x7a, 0x22, 0xa4, 0xca, 0x6b, 0x6d, 0xcf, 0xed, 0xb4, - 0xf0, 0xac, 0x02, 0xed, 0x02, 0xc4, 0x62, 0x44, 0xa5, 0x59, 0x9e, 0xda, 0x31, 0xb0, 0xde, 0xbd, - 0x93, 0x8e, 0x81, 0x89, 0x18, 0xe7, 0x4c, 0x4c, 0x1e, 0xb2, 0x0a, 0xf1, 0x56, 0x6e, 0xcc, 0x43, - 0x65, 0xbd, 0xe3, 0x09, 0xda, 0xe4, 0xc1, 0xdc, 0x37, 0xf4, 0xd8, 0x5b, 0xcd, 0xe5, 0xe1, 0xc8, - 0x8a, 0xb0, 0x53, 0xa1, 0x73, 0xd8, 0x1a, 0x94, 0x22, 0x4c, 0x5d, 0x5d, 0xb3, 0xae, 0xb6, 0x2d, - 0xe6, 0xb8, 0xca, 0x02, 0x57, 0x03, 0xd1, 0x03, 0x98, 0xd7, 0xa4, 0xaf, 0xbc, 0x75, 0xbb, 0x68, - 0xcb, 0x12, 0x3c, 0x27, 0x7d, 0x85, 0xad, 0x18, 0x7d, 0x01, 0x60, 0xaf, 0xf9, 0x7b, 0x26, 0x16, - 0xef, 0x8e, 0x35, 0xba, 0x6f, 0x8d, 0x9e, 0x4e, 0xc4, 0xc5, 0x88, 0x72, 0xf6, 0xe8, 0xf7, 0x70, - 0x77, 0xfa, 0x75, 0xc2, 0x95, 0x26, 0x3c, 0xa0, 0x2f, 0x19, 0x1d, 0x79, 0xef, 0x58, 0xa6, 0x0f, - 0x2b, 0x26, 0xda, 0x8c, 0x2d, 0xae, 0xe1, 0x30, 0x53, 0xe4, 0x61, 0x11, 0x3b, 0x7d, 0x1f, 0xba, - 0xa7, 0xea, 0x33, 0xb8, 0x53, 0xb4, 0x78, 0xc3, 0x67, 0x5f, 0x19, 0x8d, 0xf6, 0xab, 0x9f, 0xa7, - 0xf7, 0x2b, 0x02, 0xa9, 0x7d, 0xac, 0xfe, 0xbd, 0x01, 0x1f, 0xd4, 0xfa, 0xed, 0x5e, 0xad, 0x6f, - 0xdd, 0xf1, 0xb7, 0xf7, 0x52, 0xfd, 0x6f, 0xb3, 0xec, 0x3e, 0x4e, 0xf8, 0x81, 0x88, 0x22, 0xc2, - 0xc3, 0x2c, 0xef, 0xa7, 0xe5, 0x39, 0xe9, 0x9e, 0x7e, 0xb7, 0xf4, 0xbe, 0x3c, 0x64, 0xf7, 0x60, - 0x31, 0x77, 0xe1, 0xce, 0x6e, 0x15, 0x75, 0x4e, 0xf4, 0x02, 0xc9, 0x62, 0xed, 0x6e, 0xe0, 0x0e, - 0x88, 0x18, 0xbc, 0x37, 0xb5, 0x38, 0xe1, 0x71, 0xa2, 0xcf, 0x89, 0x24, 0x11, 0xd5, 0xd3, 0x8b, - 0xde, 0xc7, 0x37, 0xb2, 0x16, 0x31, 0xb8, 0x9e, 0x0d, 0xf9, 0xd0, 0xc2, 0x09, 0xdf, 0x53, 0xe6, - 0x82, 0x58, 0xb8, 0xfe, 0x4d, 0xc5, 0xe8, 0x47, 0xb0, 0x66, 0x3f, 0xb2, 0xe7, 0x86, 0x1d, 0xc6, - 0x99, 0x5d, 0x51, 0xe5, 0xff, 0xb3, 0x01, 0xdb, 0xf5, 0x09, 0x77, 0x05, 0xf3, 0x96, 0x33, 0x7e, - 0x0a, 0xab, 0x85, 0x7e, 0xbd, 0x4d, 0xde, 0x0b, 0x4d, 0x5b, 0x80, 0x77, 0xff, 0x35, 0x07, 0xef, - 0x56, 0xb4, 0x39, 0xea, 0xc3, 0xe2, 0x09, 0x7f, 0x25, 0xae, 0x29, 0x7a, 0x7c, 0x3b, 0x3f, 0xd3, - 0xfa, 0x6a, 0xff, 0xf8, 0x96, 0xd6, 0x69, 0x72, 0xfc, 0xef, 0xa1, 0xd7, 0xb0, 0x94, 0x36, 0x19, - 0x45, 0x9f, 0xdd, 0x0a, 0x5b, 0x1e, 0x25, 0xed, 0xcf, 0xdf, 0x14, 0x36, 0x59, 0xfb, 0x18, 0x36, - 0x0e, 0x06, 0x34, 0xb8, 0x3e, 0xcb, 0xfd, 0x93, 0x0d, 0xdd, 0x9d, 0xe9, 0xbf, 0xa3, 0x28, 0xd6, - 0xe3, 0xf6, 0x7b, 0x76, 0x99, 0xbc, 0x69, 0x8e, 0xe9, 0x8f, 0x00, 0xd3, 0x74, 0xa3, 0xdb, 0x79, - 0x34, 0xd3, 0x9c, 0xed, 0x9f, 0xbc, 0x31, 0x2e, 0x73, 0x60, 0xff, 0x93, 0xaf, 0x3b, 0x7d, 0xa6, - 0x07, 0xc9, 0xa5, 0x01, 0xed, 0x46, 0x2c, 0x90, 0x42, 0x89, 0x2b, 0xbd, 0x1b, 0x89, 0x60, 0x57, - 0xc6, 0xc1, 0xee, 0x84, 0x74, 0xd7, 0x91, 0x5e, 0x2e, 0xda, 0xf8, 0x9e, 0xfc, 0x2f, 0x00, 0x00, - 0xff, 0xff, 0x7c, 0xc2, 0xee, 0xd2, 0x1f, 0x15, 0x00, 0x00, + // 1726 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0x1c, 0xb7, + 0xf1, 0xff, 0xde, 0xe9, 0xe7, 0x8d, 0x7e, 0x38, 0x62, 0x24, 0x7b, 0x73, 0xb1, 0x1d, 0x61, 0x9d, + 0x6f, 0xab, 0x34, 0xee, 0x29, 0x38, 0x27, 0x69, 0x0b, 0xa4, 0x05, 0xf4, 0x2b, 0x96, 0xda, 0x48, + 0x56, 0x79, 0xb6, 0x83, 0xa6, 0x05, 0x04, 0x6a, 0x97, 0xba, 0x23, 0x74, 0x4b, 0x6e, 0x49, 0xae, + 0x2f, 0xe7, 0x97, 0x02, 0x7d, 0x69, 0x80, 0xbe, 0xf4, 0xaf, 0xe8, 0x43, 0xdf, 0xf3, 0x56, 0xa0, + 0x7d, 0x29, 0xfa, 0xdf, 0xf4, 0x6f, 0x28, 0xc8, 0xe5, 0xde, 0xed, 0xee, 0xed, 0x0a, 0x32, 0xe0, + 0x3e, 0xe9, 0x76, 0x66, 0x3e, 0x1f, 0xce, 0x0c, 0x67, 0x86, 0xa4, 0xc0, 0x8f, 0x44, 0x70, 0xc1, + 0x45, 0x48, 0x49, 0x9f, 0x72, 0x7d, 0xf1, 0x8a, 0x49, 0x9d, 0x90, 0x61, 0x44, 0x82, 0x01, 0xe3, + 0xb4, 0x13, 0x4b, 0xa1, 0x05, 0xda, 0x8a, 0x44, 0xd0, 0x99, 0xd8, 0x74, 0x02, 0x11, 0xc5, 0x89, + 0xa6, 0xed, 0xf7, 0xfb, 0x42, 0xf4, 0x87, 0x74, 0xd7, 0x1a, 0x5d, 0x26, 0x57, 0xbb, 0x34, 0x8a, + 0xf5, 0x38, 0xc5, 0xb4, 0x1f, 0x96, 0x95, 0x23, 0x49, 0xe2, 0x98, 0x4a, 0xe5, 0xf4, 0xf7, 0xcc, + 0xba, 0x81, 0x88, 0x22, 0xc1, 0xdd, 0x9f, 0x0c, 0x58, 0x54, 0x98, 0x95, 0x0a, 0xfa, 0x07, 0x39, + 0x3d, 0x17, 0x9a, 0x5d, 0xb1, 0x80, 0x68, 0x96, 0xa9, 0xfd, 0xbf, 0x35, 0x60, 0xeb, 0x65, 0x1a, + 0xc4, 0x69, 0x1a, 0x04, 0xa6, 0xbf, 0x4f, 0xa8, 0xd2, 0xe8, 0xb7, 0x65, 0x45, 0x6f, 0xac, 0x34, + 0x8d, 0x94, 0xd7, 0xd8, 0x9e, 0xdb, 0x59, 0xe9, 0xfe, 0x7f, 0xa7, 0x32, 0xca, 0x4e, 0x89, 0xac, + 0x9a, 0x03, 0x7d, 0x0a, 0x6b, 0xcf, 0x62, 0x2a, 0xad, 0x27, 0xcf, 0xc7, 0x31, 0xf5, 0x9a, 0xdb, + 0x8d, 0x9d, 0xf5, 0xee, 0xba, 0x25, 0x9d, 0x68, 0x70, 0xd1, 0xc8, 0xff, 0x47, 0x03, 0xee, 0x96, + 0x9d, 0x55, 0xb1, 0xe0, 0x8a, 0xfe, 0x6f, 0xbd, 0xed, 0xc2, 0x22, 0xa6, 0x2a, 0x19, 0x6a, 0xeb, + 0xe6, 0x4a, 0xb7, 0xdd, 0x49, 0x77, 0xab, 0x93, 0xed, 0x56, 0x67, 0x5f, 0x88, 0xe1, 0x4b, 0x32, + 0x4c, 0x28, 0x76, 0x96, 0x68, 0x13, 0x16, 0x8e, 0xa4, 0x14, 0xd2, 0x9b, 0xdb, 0x6e, 0xec, 0xb4, + 0x70, 0xfa, 0xe1, 0x77, 0x60, 0xb5, 0xd7, 0x3b, 0x3e, 0x4f, 0x2e, 0x87, 0x2c, 0xf8, 0x15, 0x1d, + 0xa3, 0x87, 0xb0, 0x74, 0x4d, 0xc7, 0x21, 0xd1, 0xc4, 0x6b, 0x18, 0xbb, 0xfd, 0xf9, 0xef, 0xbe, + 0xf7, 0x1a, 0x38, 0x13, 0xfa, 0x3e, 0xcc, 0x1f, 0x32, 0x75, 0x8d, 0xda, 0xb0, 0x1c, 0x32, 0x75, + 0xcd, 0x49, 0x44, 0x53, 0x43, 0x3c, 0xf9, 0xf6, 0x87, 0xb0, 0xda, 0x1b, 0x10, 0x49, 0xc3, 0x2f, + 0xc5, 0x30, 0xa4, 0x12, 0x7d, 0x0a, 0x5b, 0xca, 0x7e, 0x5f, 0xd9, 0x6f, 0x49, 0xaf, 0xa8, 0xa4, + 0x3c, 0xc8, 0x80, 0xd5, 0x4a, 0xf4, 0x03, 0x58, 0xef, 0x9b, 0x7d, 0x8f, 0x44, 0xc2, 0x75, 0x4c, + 0xf4, 0xc0, 0xc6, 0xda, 0xc2, 0x25, 0xa9, 0xff, 0xa7, 0x26, 0x6c, 0xf6, 0xb4, 0x90, 0xa4, 0x4f, + 0x0f, 0x04, 0xbf, 0x62, 0xfd, 0x24, 0xdd, 0x20, 0xf4, 0x04, 0x16, 0x85, 0x32, 0x4e, 0xd9, 0x75, + 0x56, 0xba, 0xef, 0xd7, 0xa4, 0xdc, 0xc4, 0x83, 0x9d, 0x29, 0xfa, 0x19, 0xb4, 0x4c, 0x9c, 0xe6, + 0xb7, 0xf2, 0x9a, 0x76, 0xab, 0x6e, 0xc4, 0x4d, 0xad, 0x4d, 0x98, 0xaf, 0xa2, 0xd4, 0x85, 0x03, + 0xc1, 0x35, 0x61, 0x9c, 0xca, 0x33, 0x93, 0x9f, 0x34, 0xe1, 0xd5, 0x4a, 0x74, 0x02, 0x6b, 0x2a, + 0x97, 0x2c, 0xe5, 0xcd, 0xdb, 0x45, 0x1f, 0xd5, 0x2c, 0x9a, 0x4f, 0x2c, 0x2e, 0x22, 0xfd, 0x2f, + 0xe1, 0x9d, 0x33, 0xaa, 0x47, 0x42, 0x5e, 0x9f, 0x70, 0x4d, 0xe5, 0x15, 0x09, 0x28, 0xea, 0xc2, + 0x26, 0x2f, 0xc9, 0xce, 0xa6, 0x7b, 0x56, 0xa9, 0xf3, 0x2f, 0x60, 0xd3, 0xf1, 0x14, 0x13, 0xfa, + 0x14, 0x80, 0x65, 0x86, 0x59, 0x1d, 0xff, 0xb0, 0xc6, 0xcf, 0xb2, 0x23, 0x38, 0x07, 0xf5, 0xff, + 0xd8, 0x80, 0x8d, 0x17, 0x8a, 0xca, 0x22, 0xfd, 0x36, 0x2c, 0x27, 0x8a, 0xca, 0x69, 0x49, 0xb9, + 0xda, 0x9b, 0x48, 0x8d, 0x45, 0x4c, 0x94, 0x1a, 0x09, 0x19, 0xa6, 0xc5, 0x90, 0x59, 0x64, 0x52, + 0xf4, 0x51, 0xca, 0xa1, 0x4d, 0x07, 0xcf, 0xd9, 0x0e, 0x5e, 0xb3, 0x0e, 0x9a, 0xd5, 0x4c, 0xc7, + 0xe2, 0x89, 0xda, 0x64, 0x0b, 0x1f, 0x9e, 0x17, 0x5d, 0x78, 0x08, 0x10, 0x32, 0x45, 0x2e, 0x87, + 0x14, 0x1f, 0x9e, 0x5b, 0x27, 0x96, 0x71, 0x4e, 0x82, 0x10, 0xcc, 0xc7, 0x42, 0xa6, 0x5d, 0xb7, + 0x86, 0xed, 0x6f, 0xff, 0xaf, 0x0d, 0x40, 0x5f, 0x31, 0x9e, 0x7c, 0x5b, 0xa4, 0x3a, 0x84, 0x07, + 0x0e, 0x78, 0xee, 0x9c, 0xdb, 0x4b, 0xf4, 0x80, 0x72, 0xed, 0xc6, 0x9d, 0x63, 0xbf, 0xd9, 0x08, + 0xfd, 0x12, 0xde, 0x0d, 0x86, 0x22, 0x09, 0x4f, 0x38, 0xd3, 0x87, 0x44, 0x93, 0x9e, 0x48, 0x64, + 0x90, 0x0d, 0x27, 0xcf, 0x86, 0x76, 0x30, 0xab, 0xc7, 0x55, 0x20, 0xff, 0xbb, 0x26, 0x6c, 0x7e, + 0xcd, 0x78, 0x28, 0x46, 0xaa, 0xe8, 0xea, 0xe7, 0x70, 0x97, 0x72, 0xe3, 0xc4, 0x5e, 0xa2, 0x45, + 0x44, 0x34, 0x0b, 0x5e, 0xc4, 0x21, 0xd1, 0x76, 0x8f, 0x8d, 0x8f, 0x35, 0x5a, 0x33, 0x03, 0x34, + 0x8b, 0xe8, 0x37, 0x82, 0x53, 0xd7, 0x9b, 0x93, 0x6f, 0xd4, 0x9b, 0xcd, 0xae, 0xdd, 0x90, 0xfa, + 0x8a, 0x29, 0x9b, 0xe3, 0xd9, 0xed, 0x79, 0x0a, 0xe8, 0x6b, 0xc6, 0xf1, 0x69, 0x91, 0x76, 0xde, + 0xd2, 0xde, 0xb3, 0xb4, 0xb3, 0x6a, 0x5c, 0x01, 0xf1, 0xff, 0xbd, 0x00, 0xf7, 0xdd, 0x24, 0xe7, + 0xfd, 0x74, 0xa8, 0x16, 0x57, 0xf2, 0x61, 0xd5, 0xf9, 0x25, 0x73, 0xed, 0x52, 0x90, 0xa1, 0x33, + 0x58, 0x23, 0x61, 0xc4, 0x38, 0x53, 0x5a, 0x12, 0x2d, 0xa4, 0x9b, 0xc5, 0x3b, 0x35, 0xf1, 0xcd, + 0x14, 0x3c, 0x2e, 0xc2, 0xd1, 0x2f, 0x60, 0xc1, 0x14, 0xa7, 0xf2, 0xe6, 0x6c, 0x67, 0xdd, 0x9e, + 0x27, 0x85, 0xa1, 0x0f, 0x01, 0x82, 0x44, 0x69, 0x11, 0x99, 0x3d, 0xb7, 0x59, 0xc9, 0xfa, 0x23, + 0x27, 0x47, 0x07, 0x00, 0xb1, 0x9d, 0xf6, 0xd7, 0x74, 0xac, 0xbc, 0x85, 0x9b, 0x87, 0x4d, 0xee, + 0x64, 0xc0, 0x39, 0x18, 0xfa, 0xc4, 0x8c, 0x56, 0xdb, 0x64, 0x8b, 0xb9, 0x4a, 0x2c, 0x65, 0xd4, + 0xf6, 0x9b, 0xb3, 0x43, 0xbf, 0x86, 0x0d, 0xa1, 0xf6, 0x85, 0xd0, 0x26, 0xda, 0xf8, 0x88, 0xf7, + 0x19, 0xa7, 0xde, 0x92, 0x05, 0x3f, 0xaa, 0x02, 0x97, 0x4c, 0xf1, 0x2c, 0x1a, 0xfd, 0x06, 0xd0, + 0x70, 0xa6, 0xef, 0xbc, 0x65, 0xbb, 0x09, 0x1f, 0xd5, 0x44, 0x34, 0xdb, 0xa8, 0xb8, 0x82, 0x04, + 0x5d, 0xc0, 0xe6, 0xa8, 0xa2, 0x53, 0xbc, 0x96, 0x25, 0xff, 0xb8, 0x86, 0xbc, 0xaa, 0xb9, 0x70, + 0x25, 0x91, 0xa9, 0xe4, 0x58, 0x8a, 0x6f, 0xc7, 0x45, 0x7a, 0xc8, 0x55, 0xf2, 0xf9, 0x8c, 0x1a, + 0x57, 0x40, 0xfc, 0xbf, 0x34, 0x61, 0xeb, 0x98, 0xc8, 0x70, 0x44, 0xe4, 0xec, 0xf1, 0xf7, 0xf2, + 0xb4, 0xc7, 0x5e, 0xa7, 0xc5, 0xbb, 0xee, 0x8e, 0xb1, 0xd2, 0x7d, 0x82, 0xbd, 0xa6, 0xe9, 0x36, + 0xa5, 0xa6, 0xe8, 0xe7, 0x59, 0x0d, 0x59, 0x60, 0x5a, 0xd0, 0x0f, 0x2a, 0x80, 0x07, 0x13, 0x23, + 0x9c, 0x03, 0xa0, 0x0b, 0x68, 0x87, 0x63, 0x4e, 0x22, 0x16, 0x9c, 0xd2, 0x48, 0xc8, 0x71, 0x55, + 0xff, 0x7f, 0x60, 0xe9, 0x0e, 0x6b, 0xcd, 0xf0, 0x0d, 0x14, 0xc8, 0x87, 0xa5, 0x7e, 0x9c, 0x7c, + 0xc5, 0x94, 0x76, 0xe7, 0xe4, 0xb2, 0x65, 0x7b, 0x1a, 0x27, 0x38, 0x53, 0xf8, 0x5f, 0xc0, 0xea, + 0x0b, 0x7a, 0xc5, 0x7a, 0x54, 0x9b, 0x72, 0x52, 0xe8, 0x31, 0x6c, 0x28, 0x1a, 0x24, 0x92, 0x9a, + 0x02, 0x3a, 0xb2, 0xa3, 0x2c, 0x74, 0x93, 0x6d, 0x56, 0xe1, 0x7f, 0xdf, 0x80, 0xad, 0x9e, 0x91, + 0x32, 0x5d, 0x5a, 0xfb, 0x3e, 0xb4, 0xd2, 0x41, 0xf8, 0xfc, 0xfc, 0xd4, 0xe1, 0xa7, 0x02, 0xf4, + 0x14, 0x56, 0x93, 0xdc, 0xaa, 0x2e, 0x77, 0x75, 0x9d, 0x95, 0x77, 0x10, 0x17, 0x80, 0xe8, 0x33, + 0x58, 0x55, 0x6e, 0xfd, 0xe7, 0xd3, 0x63, 0x6c, 0xc3, 0x12, 0xf5, 0x72, 0x0a, 0x5c, 0x30, 0xf3, + 0xff, 0xbc, 0x04, 0xeb, 0xc5, 0x3d, 0x32, 0xa7, 0x55, 0xee, 0x7e, 0x66, 0x7f, 0xa3, 0x75, 0x68, + 0x32, 0x77, 0x78, 0xe2, 0x26, 0x0b, 0xd1, 0x11, 0x2c, 0xa9, 0xf4, 0xf2, 0xe4, 0xb6, 0xa7, 0xae, + 0xb8, 0xab, 0xae, 0x58, 0x38, 0xc3, 0xa2, 0x03, 0x68, 0x0a, 0xe5, 0x26, 0xf1, 0x93, 0x1a, 0x86, + 0x9b, 0x06, 0x2e, 0x6e, 0x0a, 0x65, 0x7c, 0x71, 0xf7, 0x11, 0x6f, 0xe1, 0x46, 0x5f, 0xaa, 0x6e, + 0x27, 0x38, 0xc3, 0xa2, 0x63, 0x58, 0x1e, 0xb8, 0x8e, 0xb0, 0xe3, 0x69, 0xa5, 0xfb, 0xb8, 0x86, + 0xa7, 0xb2, 0x71, 0xf0, 0x04, 0x8d, 0x1e, 0xc1, 0xa2, 0xd2, 0x44, 0x27, 0xca, 0x4e, 0xaa, 0x95, + 0xee, 0x4a, 0xba, 0x09, 0x56, 0x84, 0x9d, 0x0a, 0xfd, 0x14, 0xee, 0xb9, 0x33, 0xfc, 0x98, 0xf5, + 0x07, 0x7b, 0xaf, 0x08, 0x1b, 0x92, 0x4b, 0x36, 0x64, 0x7a, 0x6c, 0x67, 0xd1, 0x32, 0xae, 0x53, + 0x9b, 0xc2, 0x24, 0xc3, 0xa1, 0x18, 0xd1, 0xf0, 0xd9, 0xc8, 0x5c, 0x07, 0x45, 0x48, 0x95, 0xd7, + 0xda, 0x9e, 0xdb, 0x69, 0xe1, 0x59, 0x05, 0xda, 0x05, 0x88, 0xc5, 0x88, 0x4a, 0xb3, 0x3c, 0xb5, + 0xa3, 0x62, 0xbd, 0x7b, 0x27, 0x1d, 0x15, 0x13, 0x31, 0xce, 0x99, 0x98, 0x3c, 0x64, 0x15, 0xe2, + 0xad, 0xdc, 0x98, 0x87, 0xca, 0x7a, 0xc7, 0x13, 0xb4, 0xc9, 0x83, 0xb9, 0x93, 0xe8, 0xb1, 0xb7, + 0x9a, 0xcb, 0xc3, 0x91, 0x15, 0x61, 0xa7, 0x42, 0xe7, 0xb0, 0x35, 0x28, 0x45, 0x98, 0xba, 0xba, + 0x66, 0x5d, 0x6d, 0x5b, 0xcc, 0x71, 0x95, 0x05, 0xae, 0x06, 0xa2, 0x07, 0x30, 0xaf, 0x49, 0x5f, + 0x79, 0xeb, 0x76, 0xd1, 0x96, 0x25, 0x78, 0x4e, 0xfa, 0x0a, 0x5b, 0x31, 0xfa, 0x02, 0xc0, 0x3e, + 0x05, 0xf6, 0x4c, 0x2c, 0xde, 0x1d, 0x6b, 0x74, 0x3f, 0x1d, 0x07, 0x13, 0x71, 0x31, 0xa2, 0x9c, + 0x3d, 0xfa, 0x1d, 0xdc, 0x9d, 0x7e, 0x9d, 0x70, 0xa5, 0x09, 0x0f, 0xe8, 0x4b, 0x46, 0x47, 0xde, + 0x3b, 0x96, 0xe9, 0xc3, 0x8a, 0xa9, 0x37, 0x63, 0x8b, 0x6b, 0x38, 0xcc, 0x14, 0x79, 0x58, 0xc4, + 0x4e, 0xdf, 0x90, 0xee, 0x39, 0xfb, 0x0c, 0xee, 0x14, 0x2d, 0xde, 0xf0, 0x69, 0x58, 0x46, 0xa3, + 0xfd, 0xea, 0x27, 0xec, 0xfd, 0x8a, 0x40, 0x6a, 0x1f, 0xb4, 0x7f, 0x6f, 0xc0, 0x07, 0xb5, 0x7e, + 0xbb, 0x97, 0xed, 0x5b, 0x77, 0xfc, 0xed, 0xbd, 0x66, 0xff, 0xd3, 0x2c, 0xbb, 0x8f, 0x13, 0x7e, + 0x20, 0xa2, 0x88, 0xf0, 0x30, 0xcb, 0xfb, 0x69, 0x79, 0x4e, 0xba, 0xe7, 0xe1, 0x2d, 0xbd, 0x2f, + 0x0f, 0xd9, 0x3d, 0x58, 0xcc, 0x5d, 0xca, 0xb3, 0x9b, 0x47, 0x9d, 0x13, 0xbd, 0x40, 0xb2, 0x58, + 0xbb, 0x5b, 0xba, 0x03, 0x22, 0x06, 0xef, 0x4d, 0x2d, 0x4e, 0x78, 0x9c, 0xe8, 0x73, 0x22, 0x49, + 0x44, 0xf5, 0xf4, 0x32, 0xf8, 0xf1, 0x8d, 0xac, 0x45, 0x0c, 0xae, 0x67, 0x43, 0x3e, 0xb4, 0x70, + 0xc2, 0xf7, 0x94, 0xb9, 0x44, 0x16, 0xae, 0x88, 0x53, 0x31, 0xfa, 0x11, 0xac, 0xd9, 0x8f, 0xec, + 0x49, 0x62, 0x87, 0x71, 0x66, 0x57, 0x54, 0xf9, 0xff, 0x6c, 0xc0, 0x76, 0x7d, 0xc2, 0x5d, 0xc1, + 0xbc, 0xe5, 0x8c, 0x9f, 0xc2, 0x6a, 0xa1, 0x5f, 0x6f, 0x93, 0xf7, 0x42, 0xd3, 0x16, 0xe0, 0xdd, + 0x7f, 0xcd, 0xc1, 0xbb, 0x15, 0x6d, 0x8e, 0xfa, 0xb0, 0x78, 0xc2, 0x5f, 0x89, 0x6b, 0x8a, 0x1e, + 0xdf, 0xce, 0xcf, 0xb4, 0xbe, 0xda, 0x3f, 0xbe, 0xa5, 0x75, 0x9a, 0x1c, 0xff, 0xff, 0xd0, 0x6b, + 0x58, 0x4a, 0x9b, 0x8c, 0xa2, 0xcf, 0x6e, 0x85, 0x2d, 0x8f, 0x92, 0xf6, 0xe7, 0x6f, 0x0a, 0x9b, + 0xac, 0x7d, 0x0c, 0x1b, 0x07, 0x03, 0x1a, 0x5c, 0x9f, 0xe5, 0xfe, 0x11, 0x87, 0xee, 0xce, 0xf4, + 0xdf, 0x51, 0x14, 0xeb, 0x71, 0xfb, 0x3d, 0xbb, 0x4c, 0xde, 0x34, 0xc7, 0xf4, 0x07, 0x80, 0x69, + 0xba, 0xd1, 0xed, 0x3c, 0x9a, 0x69, 0xce, 0xf6, 0x4f, 0xde, 0x18, 0x97, 0x39, 0xb0, 0xff, 0xc9, + 0x37, 0x9d, 0x3e, 0xd3, 0x83, 0xe4, 0xd2, 0x80, 0x76, 0x23, 0x16, 0x48, 0xa1, 0xc4, 0x95, 0xde, + 0x8d, 0x44, 0xb0, 0x2b, 0xe3, 0x60, 0x77, 0x42, 0xba, 0xeb, 0x48, 0x2f, 0x17, 0x6d, 0x7c, 0x4f, + 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x43, 0x9c, 0x19, 0x13, 0x43, 0x15, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto b/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto index d03c7674..7d73a88a 100644 --- a/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto +++ b/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto @@ -94,6 +94,7 @@ message HardwareConfiguration { VirtualMachineSizeType VMSize = 1; VirtualMachineCustomSize customSize = 2; DynamicMemoryConfiguration dynamicMemoryConfiguration = 3; + repeated Gpu gpuList = 4; } message UefiSettings { From 6531cbba79e939e5ef50867a3f9a4e67ae42058c Mon Sep 17 00:00:00 2001 From: wenjlu-lgy Date: Wed, 27 Mar 2024 10:25:26 +0800 Subject: [PATCH 02/13] remove gpucount to use list length --- rpc/common/moc_common_computecommon.pb.go | 246 ++++++++++------------ rpc/common/moc_common_computecommon.proto | 2 - rpc/common/moc_common_nodeinfo.pb.go | 119 +++++------ rpc/common/moc_common_nodeinfo.proto | 3 +- 4 files changed, 170 insertions(+), 200 deletions(-) diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 38a8325d..56ac76c6 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -661,7 +661,6 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { type Gpu struct { Assignment GpuAssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` PartitionSizeGB int32 `protobuf:"varint,2,opt,name=partitionSizeGB,proto3" json:"partitionSizeGB,omitempty"` - GpuCount int32 `protobuf:"varint,3,opt,name=gpuCount,proto3" json:"gpuCount,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -706,18 +705,10 @@ func (m *Gpu) GetPartitionSizeGB() int32 { return 0 } -func (m *Gpu) GetGpuCount() int32 { - if m != nil { - return m.GpuCount - } - return 0 -} - type VirtualMachineCustomSize struct { CpuCount int32 `protobuf:"varint,1,opt,name=cpuCount,proto3" json:"cpuCount,omitempty"` MemoryMB int32 `protobuf:"varint,2,opt,name=memoryMB,proto3" json:"memoryMB,omitempty"` GpuCount int32 `protobuf:"varint,3,opt,name=gpuCount,proto3" json:"gpuCount,omitempty"` - GpuList []*Gpu `protobuf:"bytes,4,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -769,13 +760,6 @@ func (m *VirtualMachineCustomSize) GetGpuCount() int32 { return 0 } -func (m *VirtualMachineCustomSize) GetGpuList() []*Gpu { - if m != nil { - return m.GpuList - } - return nil -} - type DynamicMemoryConfiguration struct { MaximumMemoryMB uint64 `protobuf:"varint,1,opt,name=maximumMemoryMB,proto3" json:"maximumMemoryMB,omitempty"` MinimumMemoryMB uint64 `protobuf:"varint,2,opt,name=minimumMemoryMB,proto3" json:"minimumMemoryMB,omitempty"` @@ -1311,120 +1295,118 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1827 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0x4f, 0x6f, 0xe3, 0xc6, - 0x15, 0xc0, 0x97, 0xfa, 0x63, 0x4b, 0x6f, 0x6d, 0xef, 0x78, 0x76, 0x63, 0x2b, 0xee, 0x66, 0xe3, - 0x2a, 0x9b, 0x8d, 0xab, 0x24, 0xb2, 0xfe, 0x45, 0x10, 0x02, 0x14, 0xa8, 0x2c, 0xd1, 0x5a, 0xc5, - 0x16, 0x25, 0x90, 0x92, 0x9c, 0xf6, 0xa2, 0xd2, 0xd4, 0x48, 0x66, 0x2b, 0x72, 0x08, 0x72, 0xe8, - 0xb5, 0x73, 0x28, 0x0a, 0x14, 0xe8, 0xb9, 0xe8, 0xa9, 0x87, 0x1e, 0x7a, 0xec, 0x17, 0x28, 0xfa, - 0x09, 0xfa, 0x05, 0xda, 0xcf, 0x53, 0xa0, 0x98, 0x21, 0x29, 0x9b, 0xb4, 0x9d, 0x9e, 0x34, 0xf3, - 0x7b, 0x7f, 0xf9, 0xde, 0xd3, 0x0c, 0x09, 0x6f, 0x2c, 0x6a, 0xcc, 0x0c, 0x6a, 0x59, 0xd4, 0xe6, - 0x3f, 0x8e, 0xcf, 0x48, 0xb0, 0x2b, 0x3b, 0x2e, 0x65, 0x14, 0xa7, 0x2d, 0x6a, 0x1c, 0x1c, 0x2e, - 0x29, 0x5d, 0xae, 0xc8, 0xb1, 0x40, 0x97, 0xfe, 0xe2, 0x78, 0x4e, 0x3c, 0xc3, 0x35, 0x1d, 0x46, - 0xdd, 0x40, 0xad, 0xd8, 0x81, 0xed, 0x0b, 0xd3, 0x56, 0x07, 0xe7, 0xa6, 0xc7, 0x88, 0x4d, 0x5c, - 0x5c, 0x83, 0xdc, 0x88, 0x4b, 0x0c, 0xba, 0x2a, 0x48, 0x87, 0xd2, 0xd1, 0x4e, 0x6d, 0xaf, 0x6c, - 0x51, 0xa3, 0x2c, 0xb4, 0x22, 0xc9, 0xf8, 0xd6, 0x21, 0xea, 0x5a, 0xaf, 0x78, 0x0a, 0x58, 0x88, - 0x3b, 0xd4, 0x5e, 0x98, 0x4b, 0xdf, 0xd5, 0x99, 0x49, 0x6d, 0x5c, 0x81, 0x7c, 0xe4, 0xd5, 0x2b, - 0x48, 0x87, 0xe9, 0xa3, 0xe7, 0x35, 0x7c, 0xe7, 0x2a, 0x12, 0xa9, 0x77, 0x4a, 0xc5, 0x3f, 0x48, - 0x90, 0xee, 0x39, 0x3e, 0x6e, 0x02, 0xe8, 0x9e, 0x67, 0x2e, 0x6d, 0x8b, 0xd8, 0x2c, 0x96, 0x45, - 0xcf, 0xf1, 0xdb, 0x6b, 0x89, 0xc8, 0xe2, 0x9e, 0x26, 0x3e, 0x82, 0x17, 0x8e, 0xee, 0x32, 0x93, - 0x87, 0xd7, 0xcc, 0x1f, 0x48, 0xef, 0xa4, 0x90, 0x3a, 0x94, 0x8e, 0xb2, 0x6a, 0x12, 0xe3, 0x03, - 0xc8, 0x2d, 0x1d, 0xbf, 0x43, 0x7d, 0x9b, 0x15, 0xd2, 0x42, 0x65, 0xbd, 0x2f, 0xfe, 0x59, 0x82, - 0xc2, 0xd4, 0x74, 0x99, 0xaf, 0xaf, 0x06, 0xba, 0x71, 0x65, 0xda, 0xa4, 0xe3, 0x7b, 0x8c, 0x5a, - 0xdc, 0x94, 0x1b, 0x1a, 0x91, 0xa1, 0x14, 0x18, 0x46, 0x7b, 0x2e, 0xb3, 0x88, 0x45, 0xdd, 0xdb, - 0x41, 0x14, 0x77, 0xbd, 0xff, 0xb1, 0x80, 0xb8, 0x08, 0x9b, 0x4b, 0xc7, 0xe7, 0x65, 0x28, 0x64, - 0x44, 0x99, 0x72, 0xd1, 0xb3, 0xaa, 0x91, 0xa0, 0xf8, 0x37, 0x09, 0x0e, 0xba, 0xb7, 0xb6, 0x6e, - 0x99, 0xc6, 0x40, 0xf8, 0x8c, 0xd7, 0xfa, 0x08, 0x5e, 0x58, 0xfa, 0x8d, 0x69, 0xf9, 0xd6, 0x20, - 0xca, 0x80, 0x67, 0x97, 0x51, 0x93, 0x58, 0x68, 0x9a, 0x76, 0x4c, 0x33, 0x15, 0x6a, 0xc6, 0x31, - 0x2e, 0x03, 0x66, 0xba, 0xbb, 0x24, 0x2c, 0x20, 0x27, 0xfe, 0x62, 0x41, 0x5c, 0x91, 0xfc, 0xb6, - 0xfa, 0x88, 0xa4, 0xf8, 0x3d, 0xbc, 0x8b, 0x97, 0x4d, 0xf5, 0xed, 0x0e, 0xb5, 0x2c, 0xdd, 0x9e, - 0xf7, 0x6d, 0xc7, 0x67, 0x23, 0xdd, 0xd5, 0x2d, 0xc2, 0x88, 0x8b, 0x31, 0x64, 0x14, 0xdd, 0x22, - 0x22, 0xc5, 0xbc, 0x2a, 0xd6, 0xf8, 0x00, 0xb2, 0x53, 0x7d, 0xe5, 0x13, 0x91, 0x4d, 0xfe, 0x24, - 0xf3, 0x97, 0x7f, 0x14, 0x24, 0x35, 0x40, 0xc5, 0xdf, 0x4b, 0xf0, 0xf6, 0x29, 0xd7, 0x9a, 0x98, - 0x67, 0x8d, 0xfa, 0xae, 0x41, 0xf0, 0x6b, 0xd8, 0x08, 0xf6, 0x81, 0xeb, 0x93, 0xcc, 0x9f, 0xb8, - 0x97, 0x90, 0xe1, 0xd7, 0x90, 0x0f, 0x56, 0x13, 0xb5, 0x1f, 0x84, 0x51, 0xef, 0x00, 0x97, 0x46, - 0xd9, 0x76, 0xc5, 0x53, 0xe6, 0xd5, 0x3b, 0x50, 0xfc, 0xd7, 0x8f, 0xa4, 0xd0, 0xb7, 0x3d, 0xa6, - 0xdb, 0x06, 0x99, 0x9a, 0xe4, 0x03, 0xd6, 0x60, 0x47, 0xbe, 0x21, 0x86, 0x2f, 0x86, 0x8d, 0xe9, - 0x8c, 0x84, 0xf3, 0xfb, 0xa5, 0xe8, 0xe9, 0x53, 0x2e, 0xe2, 0x26, 0x6a, 0xc2, 0x05, 0x9f, 0x1e, - 0xf9, 0xc6, 0x64, 0x1d, 0x3a, 0x27, 0xd1, 0x64, 0x45, 0x7b, 0xbc, 0x07, 0x1b, 0x43, 0x9f, 0x39, - 0x3e, 0x0b, 0x93, 0x0e, 0x77, 0xf8, 0x15, 0x64, 0x65, 0xd7, 0xa5, 0x6e, 0x21, 0x23, 0x70, 0xb0, - 0x29, 0x7e, 0x07, 0x07, 0x89, 0xd9, 0xd6, 0x1d, 0xfd, 0xd2, 0x5c, 0x99, 0xcc, 0x24, 0x1e, 0xfe, - 0x0a, 0x76, 0xfb, 0x1e, 0x5d, 0xe9, 0x8c, 0xcc, 0xa7, 0x96, 0x90, 0xac, 0x82, 0xfc, 0x73, 0xea, - 0x43, 0x41, 0xf1, 0xbf, 0x12, 0xe0, 0xfb, 0xcf, 0xce, 0x73, 0xf5, 0x3d, 0xde, 0x5d, 0x83, 0x27, - 0x1a, 0x76, 0x97, 0xaf, 0xf1, 0xcf, 0x21, 0xbb, 0x22, 0xd7, 0x64, 0x25, 0xb2, 0xdf, 0xa9, 0x7d, - 0x21, 0x8a, 0xf1, 0xd0, 0xb6, 0x1c, 0xfc, 0x9c, 0x73, 0x55, 0xf1, 0xef, 0x0e, 0xac, 0xf0, 0x5b, - 0xd8, 0x9e, 0x9b, 0x9e, 0xb3, 0xd2, 0x6f, 0x03, 0x85, 0xf0, 0x51, 0xe3, 0x10, 0x17, 0x60, 0xd3, - 0x22, 0x9e, 0xa7, 0x2f, 0x49, 0xf8, 0xcc, 0xd1, 0x96, 0xa7, 0xc4, 0x4c, 0x8b, 0x14, 0xb2, 0x41, - 0x4a, 0x7c, 0x5d, 0xfc, 0x05, 0xbc, 0x48, 0x44, 0xc3, 0xcf, 0x61, 0x73, 0x62, 0xff, 0xd6, 0xa6, - 0x1f, 0x6c, 0xf4, 0x0c, 0xe7, 0x20, 0xd3, 0xb7, 0x17, 0x14, 0x49, 0x1c, 0x5f, 0xe8, 0xae, 0x6d, - 0xda, 0x4b, 0x94, 0xc2, 0xf9, 0xb0, 0xac, 0x28, 0x5d, 0xfc, 0x1d, 0x7c, 0x1a, 0xaf, 0x65, 0x7b, - 0x49, 0x6c, 0x16, 0x9b, 0x86, 0x77, 0xb0, 0x73, 0x6d, 0x09, 0x3c, 0x25, 0xae, 0x67, 0x52, 0x3b, - 0xac, 0x4a, 0x82, 0xe2, 0x3a, 0xe4, 0x3c, 0x91, 0x0c, 0xf1, 0x0a, 0x29, 0x71, 0x06, 0xec, 0x3f, - 0x51, 0x22, 0x75, 0xad, 0x58, 0xac, 0xc3, 0x7e, 0xcf, 0x27, 0x1e, 0x13, 0x9e, 0xe2, 0xe7, 0x41, - 0x01, 0x36, 0x89, 0xcd, 0x9b, 0x34, 0x0f, 0xdb, 0x17, 0x6d, 0x8b, 0x7f, 0x95, 0x00, 0x8f, 0x5c, - 0x7a, 0x93, 0x38, 0x40, 0x8a, 0x90, 0xbf, 0x62, 0xcc, 0x11, 0x92, 0xd8, 0x9f, 0xe7, 0x0e, 0xe3, - 0xb7, 0x00, 0x7c, 0xe3, 0x05, 0x4a, 0xa9, 0x7b, 0x4a, 0xf7, 0x38, 0x0f, 0x6d, 0xd3, 0x40, 0x25, - 0x7d, 0x98, 0xe6, 0x5d, 0x08, 0xb7, 0x3c, 0x06, 0x73, 0x7d, 0x8f, 0x91, 0x79, 0x47, 0x0f, 0x3a, - 0x14, 0xc5, 0x58, 0xe3, 0xd2, 0x1b, 0xc8, 0x4d, 0x3c, 0xe2, 0x8a, 0x76, 0xe4, 0x20, 0xa3, 0x0e, - 0x87, 0xe3, 0xa0, 0x17, 0x13, 0x4d, 0x56, 0x91, 0x54, 0xfa, 0x25, 0x6c, 0x8f, 0x5c, 0x6a, 0x10, - 0xcf, 0xa3, 0x6b, 0x25, 0x85, 0xda, 0x04, 0x3d, 0xe3, 0x9d, 0xe9, 0xdb, 0x8c, 0xac, 0x82, 0x8e, - 0x89, 0x65, 0xb3, 0x81, 0x52, 0x78, 0x13, 0xd2, 0xed, 0x41, 0x17, 0xa5, 0xb9, 0x42, 0x7b, 0xd0, - 0x6d, 0x36, 0x50, 0x46, 0x30, 0x75, 0x80, 0xb2, 0x82, 0xa9, 0x83, 0x66, 0x03, 0x6d, 0x94, 0xbe, - 0x83, 0x37, 0x43, 0x87, 0xf0, 0x7a, 0xd8, 0x4b, 0xed, 0xd6, 0x63, 0xc4, 0x3a, 0xa1, 0x94, 0x79, - 0xcc, 0xd5, 0x1d, 0xd9, 0x5e, 0x9a, 0x36, 0xc1, 0x3b, 0x00, 0x9d, 0xf3, 0xe1, 0xa4, 0x3b, 0xeb, - 0x2b, 0x7d, 0x9e, 0x56, 0x01, 0x5e, 0x5d, 0xf4, 0x95, 0xee, 0xf0, 0x42, 0x9b, 0xb5, 0x15, 0xed, - 0x42, 0x56, 0x67, 0xa7, 0xfd, 0x73, 0x59, 0x43, 0x52, 0xe9, 0x6b, 0x78, 0x99, 0xf0, 0x15, 0x0d, - 0x58, 0x68, 0x10, 0xe4, 0x7b, 0xde, 0x57, 0x26, 0xdf, 0x23, 0xa9, 0xf4, 0xf7, 0x3c, 0xec, 0xc5, - 0x47, 0x89, 0x5f, 0x36, 0x91, 0x49, 0x97, 0x2c, 0x74, 0x7f, 0xc5, 0xd0, 0x33, 0x8c, 0x61, 0x47, - 0x63, 0xba, 0x3d, 0xd7, 0xdd, 0xf9, 0xac, 0x5d, 0x9b, 0x5d, 0xd7, 0x50, 0x2a, 0xce, 0x1a, 0x9c, - 0xa5, 0xf1, 0x4b, 0x31, 0xdb, 0x01, 0xeb, 0xd6, 0xbc, 0xd9, 0x75, 0x1d, 0x65, 0xe2, 0xb0, 0x21, - 0x60, 0x36, 0x0e, 0x5b, 0x02, 0x6e, 0xe0, 0x57, 0x80, 0xee, 0x60, 0xb5, 0x29, 0xe8, 0x66, 0x9c, - 0xd6, 0x03, 0xaf, 0xb9, 0xb8, 0x03, 0x4d, 0xe4, 0x94, 0x4f, 0xc0, 0x3a, 0x87, 0x90, 0x80, 0x22, - 0xd3, 0xe7, 0x09, 0xf8, 0x0d, 0x87, 0x5b, 0xf1, 0x48, 0x5a, 0x55, 0xd8, 0x6f, 0xc7, 0x54, 0xcf, - 0x5a, 0xda, 0xec, 0xba, 0x8a, 0x76, 0x62, 0xaa, 0x67, 0x2d, 0x1e, 0xbf, 0x8a, 0x5e, 0x24, 0x69, - 0x9d, 0x53, 0x94, 0xa4, 0x0d, 0x4e, 0x77, 0x31, 0x82, 0xad, 0x35, 0x55, 0xce, 0x9a, 0x08, 0xe3, - 0x5d, 0xd8, 0xbe, 0x47, 0xaa, 0x35, 0xf4, 0x32, 0xae, 0x34, 0x6d, 0xa2, 0x57, 0x71, 0xa5, 0x69, - 0xb5, 0x86, 0x3e, 0x4a, 0xfa, 0xff, 0x86, 0xfb, 0xdf, 0xc3, 0xfb, 0xf0, 0x32, 0x51, 0xa0, 0xd9, - 0xfb, 0x91, 0x82, 0xf6, 0x13, 0x82, 0x7a, 0x24, 0x28, 0x24, 0x04, 0x8d, 0x48, 0xf0, 0x71, 0x2c, - 0xc0, 0x69, 0xcd, 0x13, 0xf4, 0x20, 0x4e, 0x1b, 0x01, 0xfd, 0x49, 0x9c, 0xb6, 0x02, 0xfa, 0x1a, - 0x7f, 0x04, 0xbb, 0x77, 0x94, 0x77, 0x96, 0xe3, 0x4f, 0x62, 0xa5, 0x55, 0x3a, 0x8d, 0x59, 0xbb, - 0x86, 0xde, 0x24, 0x60, 0x8b, 0xc3, 0x4f, 0x63, 0x6e, 0x95, 0x4e, 0xb5, 0xc9, 0xe9, 0x61, 0x82, - 0xd6, 0x6b, 0x9c, 0xfe, 0x34, 0x41, 0x1b, 0xb3, 0x76, 0xbd, 0x82, 0x8a, 0x09, 0xda, 0x12, 0xf4, - 0xb3, 0x58, 0x62, 0x81, 0xdf, 0x7a, 0x05, 0xbd, 0x4d, 0x60, 0xee, 0xb8, 0x5e, 0x41, 0x9f, 0xf3, - 0x3f, 0x5e, 0xdc, 0x73, 0xb5, 0x52, 0x99, 0x35, 0x2a, 0xe8, 0x5d, 0x42, 0xd2, 0x5a, 0x4b, 0xbe, - 0xc0, 0x1f, 0xc3, 0x47, 0x89, 0x08, 0xa1, 0xe8, 0x28, 0x21, 0xe2, 0x51, 0x42, 0xd1, 0xcf, 0x1e, - 0x8f, 0xd4, 0xaa, 0xa0, 0xd2, 0xe3, 0x91, 0x5a, 0x15, 0xf4, 0xe5, 0x13, 0x91, 0x5a, 0x15, 0xf4, - 0xd5, 0x13, 0x91, 0x5a, 0x15, 0xf4, 0xf5, 0xc3, 0x6a, 0x55, 0x9b, 0xa8, 0xfc, 0xb0, 0x5a, 0xd5, - 0x26, 0x3a, 0x7e, 0xa4, 0x5a, 0xd5, 0x26, 0xaa, 0x3c, 0x52, 0xad, 0x6a, 0x13, 0x55, 0xf1, 0x36, - 0xe4, 0x83, 0x37, 0x58, 0xde, 0x96, 0xd9, 0xbd, 0xad, 0x72, 0x86, 0x7e, 0xcd, 0x47, 0x3b, 0xdc, - 0xf6, 0x1c, 0xdf, 0xb9, 0x46, 0x3a, 0x06, 0xd8, 0x08, 0x08, 0xba, 0xc4, 0x2f, 0xe0, 0xf9, 0xc4, - 0xf6, 0x7c, 0xc7, 0xa1, 0x2e, 0x23, 0x73, 0x64, 0x94, 0x8e, 0x60, 0xf7, 0xc1, 0xa7, 0x00, 0x3f, - 0x84, 0xdf, 0x8f, 0xc7, 0xa3, 0xe0, 0x50, 0xe3, 0x2b, 0x7e, 0x06, 0x36, 0x60, 0xf7, 0xc1, 0xeb, - 0x3a, 0xf7, 0xdd, 0x73, 0xfc, 0x6e, 0xb7, 0x1d, 0x9c, 0xea, 0x3d, 0xc7, 0x1f, 0x21, 0x89, 0x5b, - 0xf1, 0xd5, 0x14, 0xa5, 0x4a, 0x63, 0x80, 0x11, 0xfd, 0x40, 0xdc, 0xe0, 0xc5, 0x27, 0x76, 0x23, - 0x3f, 0x87, 0x4d, 0xd5, 0xb7, 0xc5, 0x3d, 0x2c, 0xf1, 0x13, 0x7c, 0xb8, 0x58, 0xa0, 0x14, 0xf7, - 0x38, 0xd2, 0x7d, 0x8f, 0xcc, 0x51, 0x1a, 0x6f, 0x41, 0xae, 0xe3, 0x9a, 0xcc, 0x34, 0xf4, 0x15, - 0xca, 0x70, 0xaf, 0x9a, 0x7e, 0x4d, 0xe6, 0x28, 0x5b, 0x5a, 0xc0, 0x7e, 0xfc, 0x7c, 0x0d, 0x4f, - 0x67, 0x6a, 0x0b, 0xad, 0x71, 0x5b, 0x0d, 0xaf, 0x19, 0x6d, 0x3c, 0x0c, 0x13, 0x52, 0x65, 0x4d, - 0x1e, 0xa3, 0x14, 0xde, 0x03, 0xac, 0xca, 0xa3, 0x76, 0x5f, 0x9d, 0xf5, 0x26, 0xb2, 0x36, 0x9e, - 0xb5, 0x7b, 0xb2, 0x32, 0x0e, 0x6e, 0x93, 0x51, 0x7b, 0xa2, 0xc9, 0x28, 0x23, 0xec, 0xda, 0x53, - 0x19, 0x65, 0x4b, 0xff, 0x94, 0x9e, 0x7e, 0x09, 0x7e, 0xf0, 0x4e, 0xb7, 0x17, 0x27, 0xb3, 0x89, - 0x72, 0xa6, 0x0c, 0x2f, 0x14, 0xf4, 0x8c, 0x8f, 0x49, 0x42, 0x76, 0xda, 0xee, 0x9f, 0xcb, 0x5d, - 0x24, 0xe1, 0xd7, 0x50, 0x48, 0x88, 0xb4, 0x49, 0xa7, 0x23, 0xcb, 0x5d, 0xb9, 0x8b, 0x52, 0x8f, - 0x38, 0x1d, 0xc9, 0x4a, 0xb7, 0xaf, 0xf4, 0x50, 0xfa, 0x11, 0x4b, 0x55, 0x3e, 0x19, 0x0e, 0xc7, - 0x5c, 0x9a, 0x29, 0xfd, 0x00, 0x5b, 0x6d, 0xd7, 0xb8, 0x32, 0x19, 0x31, 0x98, 0xef, 0x12, 0x5e, - 0xdf, 0x9b, 0x56, 0x33, 0x28, 0xca, 0xa0, 0xcf, 0x1b, 0x2a, 0xee, 0xca, 0x95, 0x73, 0xa5, 0xa3, - 0x14, 0x6f, 0x85, 0xe8, 0xd2, 0xa8, 0x83, 0xd2, 0x7c, 0x46, 0xdb, 0xea, 0x60, 0x76, 0xdf, 0x1c, - 0x65, 0xb9, 0x9d, 0xa9, 0xf3, 0x8b, 0x55, 0xb8, 0x6a, 0x36, 0x50, 0x9e, 0x97, 0x52, 0x5c, 0xb6, - 0x71, 0xd5, 0xad, 0xd2, 0x7b, 0xd8, 0xd2, 0x88, 0xe1, 0xbb, 0x26, 0xbb, 0x15, 0x43, 0xb2, 0x0b, - 0xdb, 0xca, 0x70, 0xdc, 0x19, 0x2a, 0xa7, 0xfd, 0xde, 0x44, 0x95, 0xbb, 0xe8, 0x19, 0x47, 0x63, - 0x75, 0xa2, 0x8d, 0xe5, 0xee, 0x79, 0x7b, 0xa2, 0x74, 0xde, 0x23, 0x89, 0x5f, 0x7c, 0x42, 0xa5, - 0x2b, 0x2b, 0xe3, 0x7e, 0xfb, 0x7c, 0x3a, 0x40, 0xa9, 0x6f, 0xcf, 0x00, 0x79, 0xc4, 0xf6, 0x4c, - 0x66, 0x5e, 0x93, 0xf0, 0xab, 0x18, 0x7f, 0x52, 0x0e, 0xbe, 0x82, 0xcb, 0xd1, 0x57, 0x70, 0xf9, - 0xd4, 0x24, 0xab, 0xf9, 0xd0, 0xe1, 0x85, 0xf0, 0x0a, 0xff, 0xfe, 0x63, 0x5a, 0xbc, 0x21, 0x3d, - 0x30, 0xfc, 0x56, 0x86, 0xed, 0x35, 0xfb, 0x8d, 0x47, 0xed, 0xff, 0xe7, 0xe9, 0x3f, 0xa1, 0xa7, - 0xb8, 0xd5, 0xc9, 0xe7, 0xbf, 0xfa, 0x6c, 0x69, 0xb2, 0x2b, 0xff, 0xb2, 0x6c, 0x50, 0xeb, 0xd8, - 0x32, 0x0d, 0x97, 0x7a, 0x74, 0xc1, 0x8e, 0x2d, 0x6a, 0x1c, 0xbb, 0x8e, 0x71, 0x1c, 0x7c, 0xb6, - 0x5f, 0x6e, 0x08, 0xa7, 0xf5, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xb3, 0x90, 0x59, 0xd9, - 0x0f, 0x00, 0x00, + // 1800 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0x4f, 0x73, 0xe2, 0xc8, + 0x15, 0xc0, 0x87, 0x7f, 0xb6, 0x79, 0xfe, 0xd7, 0xee, 0x99, 0xb1, 0x59, 0x67, 0x76, 0xd6, 0x61, + 0x67, 0x67, 0x1d, 0x76, 0x17, 0xf3, 0x6f, 0x29, 0x6a, 0xab, 0x52, 0x15, 0x0c, 0x32, 0xc3, 0xda, + 0x08, 0x4a, 0x02, 0xbc, 0xc9, 0x85, 0xc8, 0xa2, 0xc1, 0x4a, 0x50, 0xb7, 0x4a, 0x6a, 0x79, 0xec, + 0x3d, 0xa4, 0x72, 0xca, 0x39, 0xc7, 0x1c, 0x72, 0xc8, 0x31, 0x5f, 0x20, 0x95, 0x4f, 0x90, 0x2f, + 0x90, 0x7c, 0x9e, 0x54, 0xa5, 0xba, 0x25, 0xb0, 0x25, 0xdb, 0xd9, 0x13, 0xea, 0xdf, 0xfb, 0xab, + 0xf7, 0x1e, 0xdd, 0x2d, 0x78, 0x6b, 0x33, 0x73, 0x62, 0x32, 0xdb, 0x66, 0x54, 0xfc, 0x38, 0x3e, + 0x27, 0xc1, 0xaa, 0xe8, 0xb8, 0x8c, 0x33, 0x9c, 0xb2, 0x99, 0x79, 0x78, 0x34, 0x67, 0x6c, 0xbe, + 0x20, 0x27, 0x12, 0x5d, 0xf9, 0xb3, 0x93, 0x29, 0xf1, 0x4c, 0xd7, 0x72, 0x38, 0x73, 0x03, 0xb5, + 0x7c, 0x0b, 0xb6, 0x2f, 0x2d, 0xaa, 0xf5, 0x2e, 0x2c, 0x8f, 0x13, 0x4a, 0x5c, 0x5c, 0x81, 0x8d, + 0x81, 0x90, 0x98, 0x6c, 0x91, 0x4b, 0x1c, 0x25, 0x8e, 0x77, 0x2a, 0xfb, 0x45, 0x9b, 0x99, 0x45, + 0xa9, 0xb5, 0x94, 0x0c, 0xef, 0x1c, 0xa2, 0xad, 0xf4, 0xf2, 0x67, 0x80, 0xa5, 0xb8, 0xc5, 0xe8, + 0xcc, 0x9a, 0xfb, 0xae, 0xc1, 0x2d, 0x46, 0x71, 0x09, 0xb2, 0x4b, 0xaf, 0x5e, 0x2e, 0x71, 0x94, + 0x3a, 0xde, 0xac, 0xe0, 0x7b, 0x57, 0x4b, 0x91, 0x76, 0xaf, 0x94, 0x9f, 0x43, 0xaa, 0xe3, 0xf8, + 0xb8, 0x0e, 0x60, 0x78, 0x9e, 0x35, 0xa7, 0x36, 0xa1, 0x3c, 0x92, 0x44, 0xc7, 0xf1, 0x9b, 0x2b, + 0x89, 0x4c, 0xe2, 0x81, 0x26, 0x3e, 0x86, 0x5d, 0xc7, 0x70, 0xb9, 0x25, 0xa2, 0xeb, 0xd6, 0x8f, + 0xa4, 0x73, 0x9a, 0x4b, 0x1e, 0x25, 0x8e, 0x33, 0x5a, 0x1c, 0xe7, 0x29, 0xe4, 0xc6, 0x96, 0xcb, + 0x7d, 0x63, 0xd1, 0x33, 0xcc, 0x6b, 0x8b, 0x92, 0x96, 0xef, 0x71, 0x66, 0x0b, 0x29, 0x3e, 0x84, + 0x0d, 0xd3, 0xf1, 0x5b, 0xcc, 0x0f, 0x63, 0x67, 0xb4, 0xd5, 0x5a, 0xc8, 0x6c, 0x62, 0x33, 0xf7, + 0xae, 0xb7, 0x74, 0xbd, 0x5a, 0x0b, 0xd9, 0x7c, 0x69, 0x97, 0x0a, 0x64, 0xcb, 0x75, 0xfe, 0x6f, + 0x09, 0x38, 0x6c, 0xdf, 0x51, 0xc3, 0xb6, 0xcc, 0x9e, 0xd4, 0x8f, 0x56, 0xea, 0x18, 0x76, 0x6d, + 0xe3, 0xd6, 0xb2, 0x7d, 0xbb, 0xb7, 0xf4, 0x2e, 0x22, 0xa7, 0xb5, 0x38, 0x96, 0x9a, 0x16, 0x8d, + 0x68, 0x26, 0x43, 0xcd, 0x28, 0xc6, 0x45, 0xc0, 0xdc, 0x70, 0xe7, 0x84, 0x07, 0xe4, 0xd4, 0x9f, + 0xcd, 0x88, 0x2b, 0x13, 0xdb, 0xd6, 0x9e, 0x90, 0xe4, 0x7f, 0x80, 0xf7, 0xd1, 0x92, 0x68, 0x3e, + 0x6d, 0x31, 0xdb, 0x36, 0xe8, 0xb4, 0x4b, 0x1d, 0x9f, 0x0f, 0x0c, 0xd7, 0xb0, 0x09, 0x27, 0x2e, + 0xc6, 0x90, 0x56, 0x0d, 0x9b, 0xc8, 0x14, 0xb3, 0x9a, 0x7c, 0xc6, 0x87, 0x90, 0x19, 0x1b, 0x0b, + 0x9f, 0xc8, 0x6c, 0xb2, 0xa7, 0xe9, 0xbf, 0xfc, 0x23, 0x97, 0xd0, 0x02, 0x94, 0xff, 0x63, 0x02, + 0xde, 0x3d, 0xe7, 0x5a, 0x97, 0xd3, 0xa8, 0x33, 0xdf, 0x35, 0x09, 0x7e, 0x03, 0x6b, 0xc1, 0x3a, + 0x70, 0x7d, 0x9a, 0xfe, 0xb3, 0xf0, 0x12, 0x32, 0xfc, 0x06, 0xb2, 0xc1, 0xd3, 0x48, 0xeb, 0x06, + 0x61, 0xb4, 0x7b, 0x20, 0xa4, 0xcb, 0x6c, 0xdb, 0xf2, 0x2d, 0xb3, 0xda, 0x3d, 0xc8, 0xff, 0xeb, + 0xff, 0xa4, 0xd0, 0xa5, 0x1e, 0x37, 0xa8, 0x49, 0xc6, 0x16, 0xf9, 0x88, 0x75, 0xd8, 0x51, 0x6e, + 0x89, 0xe9, 0xcb, 0x59, 0xe1, 0x06, 0x27, 0xe1, 0xf8, 0x7d, 0x25, 0xc7, 0xef, 0x39, 0x17, 0x51, + 0x13, 0x2d, 0xe6, 0x42, 0x4c, 0x86, 0x72, 0x6b, 0xf1, 0x16, 0x9b, 0x92, 0xe5, 0xd4, 0x2c, 0xd7, + 0x78, 0x1f, 0xd6, 0xfa, 0x3e, 0x77, 0x7c, 0x1e, 0x26, 0x1d, 0xae, 0xf0, 0x2b, 0xc8, 0x28, 0xae, + 0xcb, 0xdc, 0x5c, 0x5a, 0xe2, 0x60, 0x91, 0xff, 0x1e, 0x0e, 0x63, 0x73, 0x6b, 0x38, 0xc6, 0x95, + 0xb5, 0xb0, 0xb8, 0x45, 0x3c, 0xfc, 0x35, 0xec, 0x75, 0x3d, 0xb6, 0x30, 0x38, 0x99, 0x8e, 0x6d, + 0x29, 0x59, 0x04, 0xf9, 0x6f, 0x68, 0x8f, 0x05, 0xf9, 0xff, 0x26, 0x00, 0x3f, 0x7c, 0x77, 0x91, + 0xab, 0xef, 0x89, 0xee, 0x9a, 0x22, 0xd1, 0xb0, 0xbb, 0xe2, 0x19, 0xff, 0x12, 0x32, 0x0b, 0x72, + 0x43, 0x16, 0x32, 0xfb, 0x9d, 0xca, 0x97, 0xb2, 0x18, 0x8f, 0x6d, 0x8b, 0xc1, 0xcf, 0x85, 0x50, + 0x95, 0x7f, 0xce, 0xc0, 0x0a, 0xbf, 0x83, 0xed, 0xa9, 0xe5, 0x39, 0x0b, 0xe3, 0x2e, 0x50, 0x08, + 0x5f, 0x35, 0x0a, 0x71, 0x0e, 0xd6, 0x6d, 0xe2, 0x79, 0xc6, 0x9c, 0x84, 0xef, 0xbc, 0x5c, 0x8a, + 0x94, 0xb8, 0x65, 0x93, 0x5c, 0x26, 0x48, 0x49, 0x3c, 0xe7, 0x7f, 0x05, 0xbb, 0xb1, 0x68, 0x78, + 0x13, 0xd6, 0x47, 0xf4, 0xf7, 0x94, 0x7d, 0xa4, 0xe8, 0x05, 0xde, 0x80, 0x74, 0x97, 0xce, 0x18, + 0x4a, 0x08, 0x7c, 0x69, 0xb8, 0xd4, 0xa2, 0x73, 0x94, 0xc4, 0xd9, 0xb0, 0xac, 0x28, 0x95, 0xff, + 0x03, 0x7c, 0x16, 0xad, 0x65, 0x73, 0x4e, 0x28, 0x8f, 0x4c, 0xc3, 0x7b, 0xd8, 0xb9, 0xb1, 0x25, + 0x1e, 0x13, 0xd7, 0xb3, 0x18, 0x0d, 0xab, 0x12, 0xa3, 0xb8, 0x0a, 0x1b, 0x9e, 0x4c, 0x86, 0x78, + 0xb9, 0xa4, 0xdc, 0xe8, 0x0e, 0x9e, 0x29, 0x91, 0xb6, 0x52, 0xcc, 0x57, 0xe1, 0xa0, 0xe3, 0x13, + 0x8f, 0x4b, 0x4f, 0xd1, 0xfd, 0x20, 0x07, 0xeb, 0x84, 0x8a, 0x26, 0x4d, 0xc3, 0xf6, 0x2d, 0x97, + 0xf9, 0xbf, 0x26, 0x00, 0x0f, 0x5c, 0x76, 0x1b, 0xdb, 0x40, 0xf2, 0x90, 0xbd, 0xe6, 0xdc, 0x91, + 0x92, 0xc8, 0x9f, 0xe7, 0x1e, 0xe3, 0x77, 0x00, 0x62, 0xe1, 0x05, 0x4a, 0xc9, 0x07, 0x4a, 0x0f, + 0xb8, 0x08, 0x4d, 0x59, 0xa0, 0x92, 0x3a, 0x4a, 0x89, 0x2e, 0x84, 0x4b, 0x11, 0x83, 0xbb, 0xbe, + 0xc7, 0xc9, 0xb4, 0x65, 0x04, 0x1d, 0x5a, 0xc6, 0x58, 0xe1, 0xc2, 0x5b, 0xd8, 0x18, 0x79, 0xc4, + 0x95, 0xed, 0xd8, 0x80, 0xb4, 0xd6, 0xef, 0x0f, 0x83, 0x5e, 0x8c, 0x74, 0x45, 0x43, 0x89, 0xc2, + 0xaf, 0x61, 0x7b, 0xe0, 0x32, 0x93, 0x78, 0x1e, 0x5b, 0x29, 0xa9, 0x8c, 0x12, 0xf4, 0x42, 0x74, + 0xa6, 0x4b, 0x39, 0x59, 0x04, 0x1d, 0x93, 0x8f, 0xf5, 0x1a, 0x4a, 0xe2, 0x75, 0x48, 0x35, 0x7b, + 0x6d, 0x94, 0x12, 0x0a, 0xcd, 0x5e, 0xbb, 0x5e, 0x43, 0x69, 0xc9, 0xb4, 0x1e, 0xca, 0x48, 0xa6, + 0xf5, 0xea, 0x35, 0xb4, 0x56, 0xf8, 0x1e, 0xde, 0xf6, 0x1d, 0x22, 0xea, 0x41, 0xe7, 0xfa, 0x9d, + 0xc7, 0x89, 0x7d, 0xca, 0x18, 0xf7, 0xb8, 0x6b, 0x38, 0x0a, 0x9d, 0x5b, 0x94, 0xe0, 0x1d, 0x80, + 0xd6, 0x45, 0x7f, 0xd4, 0x9e, 0x74, 0xd5, 0xae, 0x48, 0x2b, 0x07, 0xaf, 0x2e, 0xbb, 0x6a, 0xbb, + 0x7f, 0xa9, 0x4f, 0x9a, 0xaa, 0x7e, 0xa9, 0x68, 0x93, 0xb3, 0xee, 0x85, 0xa2, 0xa3, 0x44, 0xe1, + 0x1b, 0x78, 0x19, 0xf3, 0xb5, 0x1c, 0xb0, 0xd0, 0x20, 0xc8, 0xf7, 0xa2, 0xab, 0x8e, 0x7e, 0x40, + 0x89, 0xc2, 0xdf, 0xb3, 0xb0, 0x1f, 0x1d, 0x25, 0x71, 0x90, 0x2c, 0x4d, 0xda, 0x64, 0x66, 0xf8, + 0x0b, 0x8e, 0x5e, 0x60, 0x0c, 0x3b, 0x3a, 0x37, 0xe8, 0xd4, 0x70, 0xa7, 0x93, 0x66, 0x65, 0x72, + 0x53, 0x41, 0xc9, 0x28, 0xab, 0x09, 0x96, 0xc2, 0x2f, 0xe5, 0x6c, 0x07, 0xac, 0x5d, 0xf1, 0x26, + 0x37, 0x55, 0x94, 0x8e, 0xc2, 0x9a, 0x84, 0x99, 0x28, 0x6c, 0x48, 0xb8, 0x86, 0x5f, 0x01, 0xba, + 0x87, 0xe5, 0xba, 0xa4, 0xeb, 0x51, 0x5a, 0x0d, 0xbc, 0x6e, 0x44, 0x1d, 0xe8, 0x32, 0xa7, 0x6c, + 0x0c, 0x56, 0x05, 0x84, 0x18, 0x94, 0x99, 0x6e, 0xc6, 0xe0, 0xb7, 0x02, 0x6e, 0x45, 0x23, 0xe9, + 0x65, 0x69, 0xbf, 0x1d, 0x51, 0x3d, 0x6f, 0xe8, 0x93, 0x9b, 0x32, 0xda, 0x89, 0xa8, 0x9e, 0x37, + 0x44, 0xfc, 0x32, 0xda, 0x8d, 0xd3, 0xaa, 0xa0, 0x28, 0x4e, 0x6b, 0x82, 0xee, 0x61, 0x04, 0x5b, + 0x2b, 0xaa, 0x9e, 0xd7, 0x11, 0xc6, 0x7b, 0xb0, 0xfd, 0x80, 0x94, 0x2b, 0xe8, 0x65, 0x54, 0x69, + 0x5c, 0x47, 0xaf, 0xa2, 0x4a, 0xe3, 0x72, 0x05, 0xbd, 0x8e, 0xfb, 0xff, 0x56, 0xf8, 0xdf, 0xc7, + 0x07, 0xf0, 0x32, 0x56, 0xa0, 0xc9, 0x87, 0x81, 0x8a, 0x0e, 0x62, 0x82, 0xea, 0x52, 0x90, 0x8b, + 0x09, 0x6a, 0x4b, 0xc1, 0x27, 0x91, 0x00, 0x67, 0x15, 0x4f, 0xd2, 0xc3, 0x28, 0xad, 0x05, 0xf4, + 0x67, 0x51, 0xda, 0x08, 0xe8, 0x1b, 0xfc, 0x1a, 0xf6, 0xee, 0xa9, 0xe8, 0xac, 0xc0, 0x9f, 0x46, + 0x4a, 0xab, 0xb6, 0x6a, 0x93, 0x66, 0x05, 0xbd, 0x8d, 0xc1, 0x86, 0x80, 0x9f, 0x45, 0xdc, 0xaa, + 0xad, 0x72, 0x5d, 0xd0, 0xa3, 0x18, 0xad, 0x56, 0x04, 0xfd, 0x79, 0x8c, 0xd6, 0x26, 0xcd, 0x6a, + 0x09, 0xe5, 0x63, 0xb4, 0x21, 0xe9, 0xe7, 0x91, 0xc4, 0x02, 0xbf, 0xd5, 0x12, 0x7a, 0x17, 0xc3, + 0xc2, 0x71, 0xb5, 0x84, 0xbe, 0x10, 0x7f, 0xbc, 0xa8, 0xe7, 0x72, 0xa9, 0x34, 0xa9, 0x95, 0xd0, + 0xfb, 0x98, 0xa4, 0xb1, 0x92, 0x7c, 0x89, 0x3f, 0x81, 0xd7, 0xb1, 0x08, 0xa1, 0xe8, 0x38, 0x26, + 0x12, 0x51, 0x42, 0xd1, 0x2f, 0x9e, 0x8e, 0xd4, 0x28, 0xa1, 0xc2, 0xd3, 0x91, 0x1a, 0x25, 0xf4, + 0xd5, 0x33, 0x91, 0x1a, 0x25, 0xf4, 0xf5, 0x33, 0x91, 0x1a, 0x25, 0xf4, 0xcd, 0xe3, 0x6a, 0x95, + 0xeb, 0xa8, 0xf8, 0xb8, 0x5a, 0xe5, 0x3a, 0x3a, 0x79, 0xa2, 0x5a, 0xe5, 0x3a, 0x2a, 0x3d, 0x51, + 0xad, 0x72, 0x1d, 0x95, 0xf1, 0x36, 0x64, 0x83, 0xdb, 0xa9, 0x68, 0xcb, 0xe4, 0xc1, 0x52, 0x3d, + 0x47, 0xbf, 0x15, 0xa3, 0x1d, 0x2e, 0x3b, 0x8e, 0xef, 0xdc, 0x20, 0x03, 0x03, 0xac, 0x05, 0x04, + 0x5d, 0xe1, 0x5d, 0xd8, 0x1c, 0x51, 0xcf, 0x77, 0x1c, 0xe6, 0x72, 0x32, 0x45, 0x66, 0xe1, 0x18, + 0xf6, 0x1e, 0x5d, 0xe4, 0xc5, 0x26, 0xfc, 0x61, 0x38, 0x1c, 0x04, 0x9b, 0x9a, 0x78, 0x12, 0x7b, + 0x60, 0x0d, 0xf6, 0x1e, 0xdd, 0xb6, 0x85, 0xef, 0x8e, 0xe3, 0xb7, 0xdb, 0xcd, 0x60, 0x57, 0xef, + 0x38, 0xfe, 0x00, 0x25, 0x84, 0x95, 0x78, 0x1a, 0xa3, 0x64, 0x61, 0x08, 0x30, 0x60, 0x1f, 0x89, + 0x1b, 0x5c, 0x7c, 0x22, 0x27, 0xf2, 0x26, 0xac, 0x6b, 0x3e, 0x95, 0xe7, 0x70, 0x42, 0xec, 0xe0, + 0xfd, 0xd9, 0x0c, 0x25, 0x85, 0xc7, 0x81, 0xe1, 0x7b, 0x64, 0x8a, 0x52, 0x78, 0x0b, 0x36, 0x5a, + 0xae, 0xc5, 0x2d, 0xd3, 0x58, 0xa0, 0xb4, 0xf0, 0xaa, 0x1b, 0x37, 0x64, 0x8a, 0x32, 0x85, 0x19, + 0x1c, 0x44, 0xf7, 0xd7, 0x70, 0x77, 0x66, 0x54, 0x6a, 0x0d, 0x9b, 0x5a, 0x78, 0xcc, 0xe8, 0xc3, + 0x7e, 0x98, 0x90, 0xa6, 0xe8, 0xca, 0x10, 0x25, 0xf1, 0x3e, 0x60, 0x4d, 0x19, 0x34, 0xbb, 0xda, + 0xa4, 0x33, 0x52, 0xf4, 0xe1, 0xa4, 0xd9, 0x51, 0xd4, 0x61, 0x70, 0x9a, 0x0c, 0x9a, 0x23, 0x5d, + 0x41, 0x69, 0x69, 0xd7, 0x1c, 0x2b, 0x28, 0x53, 0xf8, 0x67, 0xe2, 0xf9, 0x4b, 0xf0, 0xa3, 0x3b, + 0xdd, 0x7e, 0x94, 0x4c, 0x46, 0xea, 0xb9, 0xda, 0xbf, 0x54, 0xd1, 0x0b, 0x31, 0x26, 0x31, 0xd9, + 0x59, 0xb3, 0x7b, 0xa1, 0xb4, 0x51, 0x02, 0xbf, 0x81, 0x5c, 0x4c, 0xa4, 0x8f, 0x5a, 0x2d, 0x45, + 0x69, 0x2b, 0x6d, 0x94, 0x7c, 0xc2, 0xe9, 0x40, 0x51, 0xdb, 0x5d, 0xb5, 0x83, 0x52, 0x4f, 0x58, + 0x6a, 0xca, 0x69, 0xbf, 0x3f, 0x14, 0xd2, 0x74, 0xe1, 0x47, 0xd8, 0x6a, 0xba, 0xe6, 0xb5, 0xc5, + 0x89, 0xc9, 0x7d, 0x97, 0x88, 0xfa, 0xde, 0x36, 0xea, 0x41, 0x51, 0x7a, 0x5d, 0xd1, 0x50, 0x79, + 0x56, 0x2e, 0x9c, 0x6b, 0x03, 0x25, 0x45, 0x2b, 0x64, 0x97, 0x06, 0x2d, 0x94, 0x12, 0x33, 0xda, + 0xd4, 0x7a, 0x93, 0x87, 0xe6, 0x28, 0x23, 0xec, 0x2c, 0x43, 0x1c, 0xac, 0xd2, 0x55, 0xbd, 0x86, + 0xb2, 0xa2, 0x94, 0xf2, 0xb0, 0x8d, 0xaa, 0x6e, 0x15, 0x3e, 0xc0, 0x96, 0x4e, 0x4c, 0xdf, 0xb5, + 0xf8, 0x9d, 0x1c, 0x92, 0x3d, 0xd8, 0x56, 0xfb, 0xc3, 0x56, 0x5f, 0x3d, 0xeb, 0x76, 0x46, 0x9a, + 0xd2, 0x46, 0x2f, 0x04, 0x1a, 0x6a, 0x23, 0x7d, 0xa8, 0xb4, 0x2f, 0x9a, 0x23, 0xb5, 0xf5, 0x01, + 0x25, 0xc4, 0xc1, 0x27, 0x55, 0xda, 0x8a, 0x3a, 0xec, 0x36, 0x2f, 0xc6, 0x3d, 0x94, 0xfc, 0xee, + 0x1c, 0x90, 0x47, 0xa8, 0x67, 0x71, 0xeb, 0x86, 0x84, 0xdf, 0xb4, 0xf8, 0xd3, 0x62, 0xf0, 0x0d, + 0x5b, 0x5c, 0x7e, 0xc3, 0x16, 0xcf, 0x2c, 0xb2, 0x98, 0xf6, 0x1d, 0x51, 0x08, 0x2f, 0xf7, 0xef, + 0x3f, 0xa5, 0xe4, 0x0d, 0xe9, 0x91, 0xe1, 0x77, 0x0a, 0x6c, 0xaf, 0xd8, 0xef, 0x3c, 0x46, 0x7f, + 0xca, 0xd3, 0x7f, 0x42, 0x4f, 0x51, 0xab, 0xd3, 0x2f, 0x7e, 0xf3, 0xf9, 0xdc, 0xe2, 0xd7, 0xfe, + 0x55, 0xd1, 0x64, 0xf6, 0x89, 0x6d, 0x99, 0x2e, 0xf3, 0xd8, 0x8c, 0x9f, 0xd8, 0xcc, 0x3c, 0x71, + 0x1d, 0xf3, 0x24, 0xf8, 0xe8, 0xbe, 0x5a, 0x93, 0x4e, 0xab, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, + 0x33, 0xe5, 0x71, 0xe0, 0x97, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 40596b34..18654cb0 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -111,14 +111,12 @@ enum GpuAssignmentType { message Gpu { GpuAssignmentType assignment = 1; int32 partitionSizeGB = 2; - int32 gpuCount = 3; } message VirtualMachineCustomSize { int32 cpuCount = 1; int32 memoryMB = 2; int32 gpuCount = 3; - repeated Gpu gpuList = 4; } message DynamicMemoryConfiguration { diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index cdb6fcfc..d56c20ed 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -227,13 +227,12 @@ func (m *PhysicalMemory) GetSizeBytes() uint64 { } type GPU struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` - Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` - AssignType GpuAssignmentType `protobuf:"varint,4,opt,name=assignType,proto3,enum=moc.GpuAssignmentType" json:"assignType,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` + Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GPU) Reset() { *m = GPU{} } @@ -282,13 +281,6 @@ func (m *GPU) GetCount() uint32 { return 0 } -func (m *GPU) GetAssignType() GpuAssignmentType { - if m != nil { - return m.AssignType - } - return GpuAssignmentType_GpuDDA -} - type OperatingSystem struct { Operatingsystemsku uint64 `protobuf:"varint,1,opt,name=operatingsystemsku,proto3" json:"operatingsystemsku,omitempty"` Ostype OperatingSystemType `protobuf:"varint,2,opt,name=ostype,proto3,enum=moc.OperatingSystemType" json:"ostype,omitempty"` @@ -452,7 +444,7 @@ type Resources struct { Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` Gpu *GPU `protobuf:"bytes,3,opt,name=gpu,proto3" json:"gpu,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` - GpuList []*GPU `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + GpuList []*Gpu `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -511,7 +503,7 @@ func (m *Resources) GetVmCapabilities() *VirtualMachineCapabilities { return nil } -func (m *Resources) GetGpuList() []*GPU { +func (m *Resources) GetGpuList() []*Gpu { if m != nil { return m.GpuList } @@ -532,52 +524,51 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 749 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x4e, 0xdb, 0x48, - 0x14, 0xde, 0xfc, 0x60, 0x92, 0x13, 0x08, 0x30, 0xcb, 0xb2, 0x5e, 0x76, 0xb5, 0x4d, 0x8d, 0x8a, - 0x68, 0x55, 0x25, 0x55, 0x10, 0xfd, 0xb9, 0x84, 0x5e, 0x44, 0xad, 0x4a, 0x89, 0x06, 0xe8, 0x45, - 0x6f, 0x90, 0x71, 0x4e, 0x92, 0x51, 0x63, 0x8f, 0x35, 0x33, 0x8e, 0x64, 0xee, 0xfb, 0x00, 0x7d, - 0xa7, 0x3e, 0x41, 0x5f, 0xa2, 0xaf, 0x51, 0xf9, 0xd8, 0x49, 0xec, 0x10, 0xa1, 0x5e, 0xc5, 0x73, - 0xbe, 0xef, 0xcc, 0x77, 0xfe, 0xe6, 0x04, 0xfe, 0xf1, 0xa5, 0x77, 0xe3, 0x49, 0xdf, 0x97, 0xc1, - 0x4d, 0x20, 0x07, 0x28, 0x82, 0xa1, 0x6c, 0x87, 0x4a, 0x1a, 0xc9, 0xc0, 0x97, 0x5e, 0x3b, 0x85, - 0xf6, 0xff, 0xce, 0xd1, 0xd2, 0x9f, 0x94, 0xb4, 0xff, 0x7f, 0x11, 0x08, 0x23, 0x83, 0x79, 0xdc, - 0xb9, 0x80, 0xdd, 0x0b, 0xcd, 0x71, 0x24, 0xb4, 0x51, 0xae, 0x11, 0x32, 0xb8, 0x34, 0xae, 0x89, - 0x34, 0x7b, 0x05, 0x96, 0xa6, 0x2f, 0xbb, 0xd4, 0x2a, 0x1d, 0x35, 0xbb, 0x8f, 0xda, 0x0b, 0xb5, - 0xf6, 0x7d, 0x0f, 0xe4, 0x19, 0xdd, 0xf9, 0x51, 0x86, 0x7a, 0x5f, 0x49, 0x0f, 0xb5, 0x96, 0x8a, - 0x31, 0xa8, 0x06, 0xae, 0x8f, 0x74, 0x49, 0x9d, 0xd3, 0x37, 0xdb, 0x85, 0x35, 0x4f, 0x2a, 0xd4, - 0x76, 0xb9, 0x55, 0x3a, 0xda, 0xe4, 0xe9, 0x21, 0xb1, 0xea, 0x10, 0x71, 0x60, 0x57, 0x88, 0x9a, - 0x1e, 0xd8, 0x21, 0x54, 0x4d, 0x1c, 0xa2, 0x5d, 0xa5, 0x20, 0x18, 0x05, 0x31, 0xbf, 0xfd, 0x2a, - 0x0e, 0x91, 0x13, 0xce, 0x0e, 0xa1, 0x39, 0x15, 0xca, 0x44, 0xee, 0x44, 0xdc, 0x51, 0x50, 0xf6, - 0x5a, 0xab, 0x74, 0x54, 0xe3, 0x4b, 0x56, 0xf6, 0x1c, 0x76, 0x26, 0x72, 0x24, 0x3c, 0x77, 0x12, - 0xce, 0x6e, 0xd1, 0xb6, 0x45, 0x71, 0xdc, 0x07, 0x12, 0xf6, 0x38, 0x0e, 0x51, 0x4d, 0x85, 0x96, - 0x2a, 0x54, 0xa8, 0x31, 0x30, 0xf6, 0x3a, 0x5d, 0x7c, 0x1f, 0x60, 0x0e, 0x6c, 0xf8, 0x6e, 0x10, - 0x0d, 0x5d, 0xcf, 0x44, 0x0a, 0x95, 0x5d, 0xa3, 0x44, 0x0a, 0x36, 0x76, 0x02, 0x1b, 0xae, 0xf2, - 0xc6, 0xc2, 0x20, 0x19, 0xec, 0x3a, 0xe5, 0xb5, 0x43, 0x79, 0x9d, 0xe6, 0x00, 0x5e, 0xa0, 0x39, - 0x6d, 0x68, 0xf6, 0xc7, 0xb1, 0x4e, 0xc2, 0x3b, 0x47, 0x5f, 0xaa, 0x98, 0xfd, 0x07, 0x75, 0x2d, - 0xee, 0xf0, 0x2c, 0x36, 0x98, 0xb6, 0xa8, 0xca, 0x17, 0x06, 0xe7, 0x6b, 0x09, 0x2a, 0xbd, 0xfe, - 0xf5, 0xca, 0xf2, 0x17, 0x3c, 0xd3, 0x16, 0x2c, 0x0c, 0x69, 0x73, 0xa2, 0xc0, 0x50, 0x1b, 0xa8, - 0x39, 0x51, 0x60, 0xd8, 0x4b, 0x00, 0x57, 0x6b, 0x31, 0x0a, 0xae, 0x16, 0xcd, 0xd8, 0xa3, 0xa0, - 0x7b, 0x61, 0x74, 0x4a, 0x88, 0x8f, 0x81, 0xa1, 0x86, 0xe4, 0x98, 0xce, 0xcf, 0x12, 0x6c, 0x5d, - 0x84, 0x98, 0xcc, 0x49, 0x30, 0xba, 0x8c, 0xb5, 0x41, 0x9f, 0xb5, 0x81, 0xc9, 0x99, 0x49, 0x93, - 0x49, 0x7f, 0x89, 0xb2, 0x14, 0x56, 0x20, 0xec, 0x05, 0x58, 0x52, 0xd3, 0x10, 0x94, 0x49, 0xd7, - 0x26, 0xdd, 0xa5, 0x5b, 0x49, 0x39, 0xe3, 0x25, 0x19, 0x4a, 0x3d, 0x45, 0xa5, 0x93, 0x39, 0x48, - 0xc7, 0x69, 0x61, 0x60, 0x57, 0xb0, 0x2b, 0x57, 0x4c, 0x3c, 0x65, 0xd5, 0xe8, 0xb6, 0x1e, 0x9e, - 0xf3, 0x48, 0xf3, 0x95, 0xde, 0xce, 0xf7, 0x32, 0xd4, 0x3e, 0xca, 0x01, 0xbe, 0x0b, 0x86, 0x72, - 0x65, 0xd9, 0x9b, 0x50, 0x16, 0x03, 0x4a, 0xa1, 0xce, 0xcb, 0x62, 0xc0, 0x4e, 0x00, 0x3c, 0x37, - 0x74, 0x6f, 0xc5, 0x44, 0x98, 0x98, 0xa2, 0x6c, 0x74, 0xff, 0xca, 0x8b, 0x73, 0xd4, 0x32, 0x52, - 0x1e, 0x6a, 0x9e, 0x23, 0xb2, 0x37, 0xb0, 0xe1, 0x4e, 0x5d, 0x31, 0x99, 0x39, 0x56, 0x1f, 0x72, - 0x2c, 0x50, 0x73, 0x85, 0xb4, 0x7e, 0xb3, 0x90, 0x07, 0xf3, 0x25, 0xb0, 0x4e, 0x32, 0x0d, 0xf2, - 0xc8, 0xea, 0x90, 0x41, 0x6c, 0x0f, 0xac, 0x28, 0x34, 0xc2, 0x47, 0x1a, 0xf8, 0x0a, 0xcf, 0x4e, - 0xec, 0x38, 0x91, 0x4b, 0xca, 0x41, 0x43, 0xde, 0xe8, 0xfe, 0x5b, 0xa8, 0x6c, 0x51, 0x95, 0x67, - 0x54, 0xe7, 0x5b, 0x19, 0xea, 0xf3, 0xf8, 0xd9, 0x31, 0xd4, 0xe7, 0xaf, 0x91, 0x8a, 0xb9, 0x94, - 0xe9, 0x7c, 0x13, 0xf0, 0x05, 0x8f, 0x75, 0xc1, 0xf2, 0xe9, 0x8d, 0x50, 0xb1, 0x1b, 0xdd, 0xfd, - 0x82, 0x47, 0xe1, 0x15, 0xf1, 0x8c, 0xc9, 0x1e, 0x43, 0x65, 0x14, 0x46, 0x59, 0x17, 0xb6, 0xf2, - 0x0e, 0xbd, 0xfe, 0x35, 0x4f, 0x30, 0xd6, 0x83, 0xe6, 0xd4, 0x7f, 0x3b, 0x6b, 0x84, 0x40, 0x4d, - 0x1b, 0xa6, 0x91, 0x2d, 0xc6, 0x4f, 0xe9, 0x9a, 0x39, 0x77, 0xbd, 0xb1, 0x08, 0x30, 0x4f, 0xe3, - 0x4b, 0x6e, 0xec, 0x29, 0xac, 0x8f, 0xc2, 0xe8, 0x83, 0xd0, 0xc6, 0xb6, 0x5a, 0x95, 0x55, 0x7a, - 0x33, 0xfc, 0x7d, 0xb5, 0x56, 0xdd, 0x5e, 0x7b, 0xf6, 0x1a, 0xfe, 0x5c, 0xb1, 0x70, 0xd9, 0x0e, - 0x6c, 0x06, 0xd2, 0xa4, 0x76, 0x54, 0x38, 0xd8, 0xfe, 0x83, 0x35, 0x01, 0xd4, 0xe2, 0x5c, 0x3a, - 0x7b, 0xf2, 0xf9, 0x60, 0x24, 0xcc, 0x38, 0xba, 0x4d, 0x6e, 0xef, 0xf8, 0xc2, 0x53, 0x52, 0xcb, - 0xa1, 0xe9, 0xf8, 0xd2, 0xeb, 0xa8, 0xd0, 0xeb, 0xa4, 0x9a, 0xb7, 0x16, 0xfd, 0x15, 0x1c, 0xff, - 0x0a, 0x00, 0x00, 0xff, 0xff, 0x64, 0xe7, 0x07, 0xcf, 0x6c, 0x06, 0x00, 0x00, + // 726 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x4c, + 0x10, 0xfd, 0xf2, 0x53, 0x37, 0x99, 0xb4, 0x69, 0xbb, 0x5f, 0x01, 0x53, 0x10, 0x04, 0x57, 0x54, + 0x11, 0x42, 0x09, 0x4a, 0x55, 0x01, 0x97, 0x94, 0x8b, 0x08, 0x44, 0x69, 0xb4, 0x6d, 0xb9, 0xe0, + 0xa6, 0x72, 0x9d, 0x49, 0xb2, 0x22, 0xf6, 0x5a, 0xbb, 0xeb, 0x48, 0xee, 0x23, 0xf0, 0x5c, 0x3c, + 0x01, 0x2f, 0xc1, 0x6b, 0x20, 0x8f, 0x9d, 0xc4, 0x4e, 0xa3, 0x8a, 0x2b, 0x7b, 0xe7, 0x9c, 0x99, + 0x9d, 0x99, 0x33, 0x3b, 0xf0, 0xd8, 0x97, 0xde, 0xb5, 0x27, 0x7d, 0x5f, 0x06, 0xd7, 0x81, 0x1c, + 0xa2, 0x08, 0x46, 0xb2, 0x13, 0x2a, 0x69, 0x24, 0x03, 0x5f, 0x7a, 0x9d, 0x14, 0x3a, 0x78, 0x94, + 0xa3, 0xa5, 0x9f, 0x94, 0x74, 0xf0, 0xac, 0x08, 0x84, 0x91, 0xc1, 0x3c, 0xee, 0x9c, 0xc3, 0xfe, + 0xb9, 0xe6, 0x38, 0x16, 0xda, 0x28, 0xd7, 0x08, 0x19, 0x5c, 0x18, 0xd7, 0x44, 0x9a, 0xbd, 0x05, + 0x4b, 0xd3, 0x9f, 0x5d, 0x6a, 0x95, 0xda, 0xcd, 0xde, 0xf3, 0xce, 0xf2, 0xb6, 0xce, 0x5d, 0x0f, + 0xe4, 0x19, 0xdd, 0xf9, 0x5d, 0x86, 0xfa, 0x40, 0x49, 0x0f, 0xb5, 0x96, 0x8a, 0x31, 0xa8, 0x06, + 0xae, 0x8f, 0x14, 0xa4, 0xce, 0xe9, 0x9f, 0xed, 0xc3, 0x86, 0x27, 0x15, 0x6a, 0xbb, 0xdc, 0x2a, + 0xb5, 0xb7, 0x79, 0x7a, 0x48, 0xac, 0x3a, 0x44, 0x1c, 0xda, 0x15, 0xa2, 0xa6, 0x07, 0x76, 0x04, + 0x55, 0x13, 0x87, 0x68, 0x57, 0x29, 0x09, 0x46, 0x49, 0x2c, 0xa2, 0x5f, 0xc6, 0x21, 0x72, 0xc2, + 0xd9, 0x11, 0x34, 0x67, 0x42, 0x99, 0xc8, 0x9d, 0x8a, 0x5b, 0x4a, 0xca, 0xde, 0x68, 0x95, 0xda, + 0x35, 0xbe, 0x62, 0x65, 0xaf, 0x61, 0x6f, 0x2a, 0xc7, 0xc2, 0x73, 0xa7, 0xe1, 0x3c, 0x8a, 0xb6, + 0x2d, 0xca, 0xe3, 0x2e, 0x90, 0xb0, 0x27, 0x71, 0x88, 0x6a, 0x26, 0xb4, 0x54, 0xa1, 0x42, 0x8d, + 0x81, 0xb1, 0x37, 0x29, 0xf0, 0x5d, 0x80, 0x39, 0xb0, 0xe5, 0xbb, 0x41, 0x34, 0x72, 0x3d, 0x13, + 0x29, 0x54, 0x76, 0x8d, 0x0a, 0x29, 0xd8, 0xd8, 0x09, 0x6c, 0xb9, 0xca, 0x9b, 0x08, 0x83, 0x64, + 0xb0, 0xeb, 0x54, 0xd7, 0x1e, 0xd5, 0xf5, 0x21, 0x07, 0xf0, 0x02, 0xcd, 0xe9, 0x40, 0x73, 0x30, + 0x89, 0x75, 0x92, 0xde, 0x19, 0xfa, 0x52, 0xc5, 0xec, 0x29, 0xd4, 0xb5, 0xb8, 0xc5, 0xd3, 0xd8, + 0x60, 0x2a, 0x51, 0x95, 0x2f, 0x0d, 0xce, 0x19, 0x54, 0xfa, 0x83, 0xab, 0xb5, 0xdd, 0x2f, 0x38, + 0xa6, 0x0a, 0x2c, 0x0d, 0xa9, 0x36, 0x51, 0x60, 0x48, 0x05, 0xd2, 0x26, 0x0a, 0x8c, 0xf3, 0xa7, + 0x04, 0x3b, 0xe7, 0x21, 0x26, 0x72, 0x07, 0xe3, 0x8b, 0x58, 0x1b, 0xf4, 0x59, 0x07, 0x98, 0x9c, + 0x9b, 0x34, 0x99, 0xf4, 0x8f, 0x28, 0xcb, 0x64, 0x0d, 0xc2, 0xde, 0x80, 0x25, 0x35, 0x69, 0x59, + 0xa6, 0x9a, 0x6d, 0xaa, 0x79, 0x25, 0x2a, 0x29, 0x9a, 0xf1, 0x92, 0x4c, 0xa5, 0x9e, 0xa1, 0xd2, + 0x89, 0x9c, 0xe9, 0x54, 0x2c, 0x0d, 0xec, 0x12, 0xf6, 0xe5, 0x9a, 0xc1, 0xa5, 0x49, 0x69, 0xf4, + 0x5a, 0xf7, 0x8f, 0x6b, 0xa4, 0xf9, 0x5a, 0x6f, 0xe7, 0x57, 0x19, 0x6a, 0x5f, 0xe5, 0x10, 0x3f, + 0x05, 0x23, 0xb9, 0xb6, 0x7d, 0x4d, 0x28, 0x8b, 0x21, 0x95, 0x50, 0xe7, 0x65, 0x31, 0x64, 0x27, + 0x00, 0x9e, 0x1b, 0xba, 0x37, 0x62, 0x2a, 0x4c, 0x4c, 0x59, 0x36, 0x7a, 0x0f, 0xf2, 0x97, 0x73, + 0xd4, 0x32, 0x52, 0x1e, 0x6a, 0x9e, 0x23, 0xb2, 0xf7, 0xb0, 0xe5, 0xce, 0x5c, 0x31, 0x9d, 0x3b, + 0x56, 0xef, 0x73, 0x2c, 0x50, 0x73, 0x8d, 0xb4, 0xfe, 0xb1, 0x91, 0x87, 0x8b, 0xb7, 0xbc, 0x49, + 0xd7, 0x34, 0xc8, 0x23, 0xeb, 0x43, 0x06, 0xb1, 0x87, 0x60, 0x45, 0xa1, 0x11, 0x3e, 0xd2, 0xdc, + 0x56, 0x78, 0x76, 0x62, 0xc7, 0xc9, 0x75, 0x49, 0x3b, 0x68, 0x56, 0x1b, 0xbd, 0x27, 0x85, 0xce, + 0x16, 0x6f, 0xe5, 0x19, 0xd5, 0xf9, 0x59, 0x86, 0xfa, 0x22, 0x7f, 0x76, 0x0c, 0xf5, 0xc5, 0xa3, + 0xa2, 0x66, 0xae, 0x54, 0xba, 0x78, 0xd0, 0x7c, 0xc9, 0x63, 0x3d, 0xb0, 0x7c, 0x1a, 0x75, 0x6a, + 0x76, 0xa3, 0x77, 0x50, 0xf0, 0x28, 0x3c, 0x06, 0x9e, 0x31, 0xd9, 0x0b, 0xa8, 0x8c, 0xc3, 0x28, + 0x53, 0x61, 0x27, 0xef, 0xd0, 0x1f, 0x5c, 0xf1, 0x04, 0x63, 0x7d, 0x68, 0xce, 0xfc, 0x8f, 0x73, + 0x21, 0x04, 0x6a, 0x5a, 0x14, 0x8d, 0x6c, 0xbf, 0x7d, 0x4b, 0xb7, 0xc5, 0x99, 0xeb, 0x4d, 0x44, + 0x80, 0x79, 0x1a, 0x5f, 0x71, 0x63, 0x0e, 0x6c, 0x8e, 0xc3, 0xe8, 0x8b, 0xd0, 0xc6, 0xb6, 0x5a, + 0x95, 0x76, 0xa3, 0x57, 0xa3, 0x08, 0xfd, 0x30, 0xe2, 0x73, 0xe0, 0x73, 0xb5, 0x56, 0xdd, 0xdd, + 0x78, 0xf5, 0x0e, 0xfe, 0x5f, 0xb3, 0x30, 0xd9, 0x1e, 0x6c, 0x07, 0xd2, 0xa4, 0x76, 0x54, 0x38, + 0xdc, 0xfd, 0x8f, 0x35, 0x01, 0xd4, 0xf2, 0x5c, 0x3a, 0x7d, 0xf9, 0xfd, 0x70, 0x2c, 0xcc, 0x24, + 0xba, 0x49, 0xca, 0xe8, 0xfa, 0xc2, 0x53, 0x52, 0xcb, 0x91, 0xe9, 0xfa, 0xd2, 0xeb, 0xaa, 0xd0, + 0xeb, 0xa6, 0xc5, 0xdd, 0x58, 0xb4, 0xca, 0x8f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x4d, + 0x9b, 0x90, 0x2c, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index ee426feb..75e744c3 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -37,7 +37,6 @@ message GPU { string name = 1; uint32 sizeBytes = 2; uint32 count = 3; - GpuAssignmentType assignType = 4; } message OperatingSystem { @@ -64,5 +63,5 @@ message Resources { PhysicalMemory memory = 2; GPU gpu = 3; // delete it after gpuList is applied VirtualMachineCapabilities vmCapabilities = 5; - repeated GPU gpuList = 6; + repeated Gpu gpuList = 6; } \ No newline at end of file From b4d0b1956c36fd967597ac955b8625e2e68b74ec Mon Sep 17 00:00:00 2001 From: wenjlu-lgy Date: Wed, 27 Mar 2024 11:07:48 +0800 Subject: [PATCH 03/13] add default type to gpu assign type --- rpc/common/moc_common_computecommon.pb.go | 71 ++++++++++++----------- rpc/common/moc_common_computecommon.proto | 1 + 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 56ac76c6..c7a2e4f3 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -345,21 +345,24 @@ func (WinRMProtocolType) EnumDescriptor() ([]byte, []int) { type GpuAssignmentType int32 const ( - GpuAssignmentType_GpuDDA GpuAssignmentType = 0 - GpuAssignmentType_GpuP GpuAssignmentType = 1 - GpuAssignmentType_GpuPV GpuAssignmentType = 2 + GpuAssignmentType_GpuDDA GpuAssignmentType = 0 + GpuAssignmentType_GpuP GpuAssignmentType = 1 + GpuAssignmentType_GpuPV GpuAssignmentType = 2 + GpuAssignmentType_GpuDefault GpuAssignmentType = 4 ) var GpuAssignmentType_name = map[int32]string{ 0: "GpuDDA", 1: "GpuP", 2: "GpuPV", + 4: "GpuDefault", } var GpuAssignmentType_value = map[string]int32{ - "GpuDDA": 0, - "GpuP": 1, - "GpuPV": 2, + "GpuDDA": 0, + "GpuP": 1, + "GpuPV": 2, + "GpuDefault": 4, } func (x GpuAssignmentType) String() string { @@ -1295,7 +1298,7 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1800 bytes of a gzipped FileDescriptorProto + // 1808 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0x4f, 0x73, 0xe2, 0xc8, 0x15, 0xc0, 0x87, 0x7f, 0xb6, 0x79, 0xfe, 0xd7, 0xee, 0x99, 0xb1, 0x59, 0x67, 0x76, 0xd6, 0x61, 0x67, 0x67, 0x1d, 0x76, 0x17, 0xf3, 0x6f, 0x29, 0x6a, 0xab, 0x52, 0x15, 0x0c, 0x32, 0xc3, 0xda, @@ -1382,31 +1385,31 @@ var fileDescriptor_7d1a061f6c82445b = []byte{ 0x47, 0xbf, 0x15, 0xa3, 0x1d, 0x2e, 0x3b, 0x8e, 0xef, 0xdc, 0x20, 0x03, 0x03, 0xac, 0x05, 0x04, 0x5d, 0xe1, 0x5d, 0xd8, 0x1c, 0x51, 0xcf, 0x77, 0x1c, 0xe6, 0x72, 0x32, 0x45, 0x66, 0xe1, 0x18, 0xf6, 0x1e, 0x5d, 0xe4, 0xc5, 0x26, 0xfc, 0x61, 0x38, 0x1c, 0x04, 0x9b, 0x9a, 0x78, 0x12, 0x7b, - 0x60, 0x0d, 0xf6, 0x1e, 0xdd, 0xb6, 0x85, 0xef, 0x8e, 0xe3, 0xb7, 0xdb, 0xcd, 0x60, 0x57, 0xef, - 0x38, 0xfe, 0x00, 0x25, 0x84, 0x95, 0x78, 0x1a, 0xa3, 0x64, 0x61, 0x08, 0x30, 0x60, 0x1f, 0x89, - 0x1b, 0x5c, 0x7c, 0x22, 0x27, 0xf2, 0x26, 0xac, 0x6b, 0x3e, 0x95, 0xe7, 0x70, 0x42, 0xec, 0xe0, - 0xfd, 0xd9, 0x0c, 0x25, 0x85, 0xc7, 0x81, 0xe1, 0x7b, 0x64, 0x8a, 0x52, 0x78, 0x0b, 0x36, 0x5a, - 0xae, 0xc5, 0x2d, 0xd3, 0x58, 0xa0, 0xb4, 0xf0, 0xaa, 0x1b, 0x37, 0x64, 0x8a, 0x32, 0x85, 0x19, - 0x1c, 0x44, 0xf7, 0xd7, 0x70, 0x77, 0x66, 0x54, 0x6a, 0x0d, 0x9b, 0x5a, 0x78, 0xcc, 0xe8, 0xc3, - 0x7e, 0x98, 0x90, 0xa6, 0xe8, 0xca, 0x10, 0x25, 0xf1, 0x3e, 0x60, 0x4d, 0x19, 0x34, 0xbb, 0xda, - 0xa4, 0x33, 0x52, 0xf4, 0xe1, 0xa4, 0xd9, 0x51, 0xd4, 0x61, 0x70, 0x9a, 0x0c, 0x9a, 0x23, 0x5d, - 0x41, 0x69, 0x69, 0xd7, 0x1c, 0x2b, 0x28, 0x53, 0xf8, 0x67, 0xe2, 0xf9, 0x4b, 0xf0, 0xa3, 0x3b, - 0xdd, 0x7e, 0x94, 0x4c, 0x46, 0xea, 0xb9, 0xda, 0xbf, 0x54, 0xd1, 0x0b, 0x31, 0x26, 0x31, 0xd9, - 0x59, 0xb3, 0x7b, 0xa1, 0xb4, 0x51, 0x02, 0xbf, 0x81, 0x5c, 0x4c, 0xa4, 0x8f, 0x5a, 0x2d, 0x45, - 0x69, 0x2b, 0x6d, 0x94, 0x7c, 0xc2, 0xe9, 0x40, 0x51, 0xdb, 0x5d, 0xb5, 0x83, 0x52, 0x4f, 0x58, - 0x6a, 0xca, 0x69, 0xbf, 0x3f, 0x14, 0xd2, 0x74, 0xe1, 0x47, 0xd8, 0x6a, 0xba, 0xe6, 0xb5, 0xc5, - 0x89, 0xc9, 0x7d, 0x97, 0x88, 0xfa, 0xde, 0x36, 0xea, 0x41, 0x51, 0x7a, 0x5d, 0xd1, 0x50, 0x79, - 0x56, 0x2e, 0x9c, 0x6b, 0x03, 0x25, 0x45, 0x2b, 0x64, 0x97, 0x06, 0x2d, 0x94, 0x12, 0x33, 0xda, - 0xd4, 0x7a, 0x93, 0x87, 0xe6, 0x28, 0x23, 0xec, 0x2c, 0x43, 0x1c, 0xac, 0xd2, 0x55, 0xbd, 0x86, - 0xb2, 0xa2, 0x94, 0xf2, 0xb0, 0x8d, 0xaa, 0x6e, 0x15, 0x3e, 0xc0, 0x96, 0x4e, 0x4c, 0xdf, 0xb5, - 0xf8, 0x9d, 0x1c, 0x92, 0x3d, 0xd8, 0x56, 0xfb, 0xc3, 0x56, 0x5f, 0x3d, 0xeb, 0x76, 0x46, 0x9a, - 0xd2, 0x46, 0x2f, 0x04, 0x1a, 0x6a, 0x23, 0x7d, 0xa8, 0xb4, 0x2f, 0x9a, 0x23, 0xb5, 0xf5, 0x01, - 0x25, 0xc4, 0xc1, 0x27, 0x55, 0xda, 0x8a, 0x3a, 0xec, 0x36, 0x2f, 0xc6, 0x3d, 0x94, 0xfc, 0xee, - 0x1c, 0x90, 0x47, 0xa8, 0x67, 0x71, 0xeb, 0x86, 0x84, 0xdf, 0xb4, 0xf8, 0xd3, 0x62, 0xf0, 0x0d, - 0x5b, 0x5c, 0x7e, 0xc3, 0x16, 0xcf, 0x2c, 0xb2, 0x98, 0xf6, 0x1d, 0x51, 0x08, 0x2f, 0xf7, 0xef, - 0x3f, 0xa5, 0xe4, 0x0d, 0xe9, 0x91, 0xe1, 0x77, 0x0a, 0x6c, 0xaf, 0xd8, 0xef, 0x3c, 0x46, 0x7f, - 0xca, 0xd3, 0x7f, 0x42, 0x4f, 0x51, 0xab, 0xd3, 0x2f, 0x7e, 0xf3, 0xf9, 0xdc, 0xe2, 0xd7, 0xfe, - 0x55, 0xd1, 0x64, 0xf6, 0x89, 0x6d, 0x99, 0x2e, 0xf3, 0xd8, 0x8c, 0x9f, 0xd8, 0xcc, 0x3c, 0x71, - 0x1d, 0xf3, 0x24, 0xf8, 0xe8, 0xbe, 0x5a, 0x93, 0x4e, 0xab, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, - 0x33, 0xe5, 0x71, 0xe0, 0x97, 0x0f, 0x00, 0x00, + 0x60, 0x1b, 0xf6, 0x1e, 0xdd, 0xb6, 0x85, 0xef, 0x8e, 0xe3, 0xb7, 0xdb, 0xcd, 0x60, 0x57, 0xef, + 0x38, 0xfe, 0x00, 0x25, 0x84, 0x95, 0x78, 0x1a, 0xa3, 0xa4, 0xd8, 0x63, 0x85, 0x42, 0xb8, 0xe5, + 0xa5, 0x0b, 0x43, 0x80, 0x01, 0xfb, 0x48, 0xdc, 0xe0, 0x22, 0x14, 0x39, 0xa1, 0x37, 0x61, 0x5d, + 0xf3, 0xa9, 0x3c, 0x97, 0x13, 0x62, 0x47, 0xef, 0xcf, 0x66, 0x28, 0x29, 0x22, 0x0c, 0x0c, 0xdf, + 0x23, 0x53, 0x94, 0xc2, 0x5b, 0xb0, 0xd1, 0x72, 0x2d, 0x6e, 0x99, 0xc6, 0x02, 0xa5, 0x45, 0x14, + 0xdd, 0xb8, 0x21, 0x53, 0x94, 0x29, 0xcc, 0xe0, 0x20, 0xba, 0xdf, 0x86, 0xbb, 0x35, 0xa3, 0x52, + 0x6b, 0xd8, 0xd4, 0xc2, 0x63, 0x47, 0x1f, 0xf6, 0xc3, 0x04, 0x35, 0x45, 0x57, 0x86, 0x28, 0x89, + 0xf7, 0x01, 0x6b, 0xca, 0xa0, 0xd9, 0xd5, 0x26, 0x9d, 0x91, 0xa2, 0x0f, 0x27, 0xcd, 0x8e, 0xa2, + 0x0e, 0x83, 0xd3, 0x65, 0xd0, 0x1c, 0xe9, 0x0a, 0x4a, 0x4b, 0xbb, 0xe6, 0x58, 0x41, 0x99, 0xc2, + 0x3f, 0x13, 0xcf, 0x5f, 0x8a, 0x1f, 0xdd, 0xf1, 0xf6, 0xa3, 0x64, 0x32, 0x52, 0xcf, 0xd5, 0xfe, + 0xa5, 0x8a, 0x5e, 0x88, 0xb1, 0x89, 0xc9, 0xce, 0x9a, 0xdd, 0x0b, 0xa5, 0x8d, 0x12, 0xf8, 0x0d, + 0xe4, 0x62, 0x22, 0x7d, 0xd4, 0x6a, 0x29, 0x4a, 0x5b, 0x69, 0xa3, 0xe4, 0x13, 0x4e, 0x07, 0x8a, + 0xda, 0xee, 0xaa, 0x1d, 0x94, 0x7a, 0xc2, 0x52, 0x53, 0x4e, 0xfb, 0xfd, 0xa1, 0x90, 0xa6, 0x0b, + 0x3f, 0xc2, 0x56, 0xd3, 0x35, 0xaf, 0x2d, 0x4e, 0x4c, 0xee, 0xbb, 0x44, 0xd4, 0xf7, 0xb6, 0x51, + 0x0f, 0x8a, 0xd2, 0xeb, 0x8a, 0x06, 0xcb, 0xb3, 0x73, 0xe1, 0x5c, 0x1b, 0x28, 0x29, 0x5a, 0x21, + 0xbb, 0x34, 0x68, 0xa1, 0x94, 0x98, 0xd9, 0xa6, 0xd6, 0x9b, 0x3c, 0x34, 0x47, 0x19, 0x61, 0x67, + 0x19, 0xe2, 0xa0, 0x95, 0xae, 0xea, 0x35, 0x94, 0x15, 0xa5, 0x94, 0x87, 0x6f, 0x54, 0x75, 0xab, + 0xf0, 0x01, 0xb6, 0x74, 0x62, 0xfa, 0xae, 0xc5, 0xef, 0xe4, 0xd0, 0xec, 0xc1, 0xb6, 0xda, 0x1f, + 0xb6, 0xfa, 0xea, 0x59, 0xb7, 0x33, 0xd2, 0x94, 0x36, 0x7a, 0x21, 0xd0, 0x50, 0x1b, 0xe9, 0x43, + 0xa5, 0x7d, 0xd1, 0x1c, 0xa9, 0xad, 0x0f, 0x28, 0x21, 0x0e, 0x42, 0xa9, 0xd2, 0x56, 0xd4, 0x61, + 0xb7, 0x79, 0x31, 0xee, 0xa1, 0xe4, 0x77, 0xe7, 0x80, 0x3c, 0x42, 0x3d, 0x8b, 0x5b, 0x37, 0x24, + 0xfc, 0xc6, 0xc5, 0x9f, 0x16, 0x83, 0x6f, 0xda, 0xe2, 0xf2, 0x9b, 0xb6, 0x78, 0x66, 0x91, 0xc5, + 0xb4, 0xef, 0x88, 0x42, 0x78, 0xb9, 0x7f, 0xff, 0x29, 0x25, 0x6f, 0x4c, 0x8f, 0x0c, 0xbf, 0x53, + 0x60, 0x7b, 0xc5, 0x7e, 0xe7, 0x31, 0xfa, 0x53, 0x9e, 0xfe, 0x13, 0x7a, 0x8a, 0x5a, 0x9d, 0x7e, + 0xf1, 0x9b, 0xcf, 0xe7, 0x16, 0xbf, 0xf6, 0xaf, 0x8a, 0x26, 0xb3, 0x4f, 0x6c, 0xcb, 0x74, 0x99, + 0xc7, 0x66, 0xfc, 0xc4, 0x66, 0xe6, 0x89, 0xeb, 0x98, 0x27, 0xc1, 0x47, 0xf8, 0xd5, 0x9a, 0x74, + 0x5a, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xed, 0x6b, 0x2b, 0xa7, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 18654cb0..4433409a 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -106,6 +106,7 @@ enum GpuAssignmentType { GpuDDA = 0; GpuP = 1; GpuPV = 2; + GpuDefault = 4; // default is used when customer do not pass GPU Assign Type and moc will decide the assign type based on the underlying configuration. } message Gpu { From 5b28448eb753e078fd38927ff89090745ef14fb8 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Tue, 9 Apr 2024 17:25:35 -0700 Subject: [PATCH 04/13] Update nodeinfo GPU based on feedback --- go.mod | 4 +- go.sum | 10 +- rpc/common/moc_common_computecommon.pb.go | 241 +++++++++++----------- rpc/common/moc_common_computecommon.proto | 5 +- rpc/common/moc_common_nodeinfo.pb.go | 184 +++++++++-------- rpc/common/moc_common_nodeinfo.proto | 9 +- 6 files changed, 237 insertions(+), 216 deletions(-) diff --git a/go.mod b/go.mod index 16d941b5..64e2f89c 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,8 @@ require ( ) require ( - golang.org/x/net v0.22.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect + golang.org/x/net v0.24.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect ) replace ( diff --git a/go.sum b/go.sum index caed87d8..ef89e8b3 100644 --- a/go.sum +++ b/go.sum @@ -1113,8 +1113,8 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1174,7 +1174,7 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -1505,8 +1505,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index c7a2e4f3..44efc84e 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -662,8 +662,9 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { } type Gpu struct { - Assignment GpuAssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` - PartitionSizeGB int32 `protobuf:"varint,2,opt,name=partitionSizeGB,proto3" json:"partitionSizeGB,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Assignment GpuAssignmentType `protobuf:"varint,2,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` + PartitionSizeGB int32 `protobuf:"varint,3,opt,name=partitionSizeGB,proto3" json:"partitionSizeGB,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -694,6 +695,13 @@ func (m *Gpu) XXX_DiscardUnknown() { var xxx_messageInfo_Gpu proto.InternalMessageInfo +func (m *Gpu) GetName() string { + if m != nil { + return m.Name + } + return "" +} + func (m *Gpu) GetAssignment() GpuAssignmentType { if m != nil { return m.Assignment @@ -1298,118 +1306,119 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1808 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0x4f, 0x73, 0xe2, 0xc8, - 0x15, 0xc0, 0x87, 0x7f, 0xb6, 0x79, 0xfe, 0xd7, 0xee, 0x99, 0xb1, 0x59, 0x67, 0x76, 0xd6, 0x61, - 0x67, 0x67, 0x1d, 0x76, 0x17, 0xf3, 0x6f, 0x29, 0x6a, 0xab, 0x52, 0x15, 0x0c, 0x32, 0xc3, 0xda, - 0x08, 0x4a, 0x02, 0xbc, 0xc9, 0x85, 0xc8, 0xa2, 0xc1, 0x4a, 0x50, 0xb7, 0x4a, 0x6a, 0x79, 0xec, - 0x3d, 0xa4, 0x72, 0xca, 0x39, 0xc7, 0x1c, 0x72, 0xc8, 0x31, 0x5f, 0x20, 0x95, 0x4f, 0x90, 0x2f, - 0x90, 0x7c, 0x9e, 0x54, 0xa5, 0xba, 0x25, 0xb0, 0x25, 0xdb, 0xd9, 0x13, 0xea, 0xdf, 0xfb, 0xab, - 0xf7, 0x1e, 0xdd, 0x2d, 0x78, 0x6b, 0x33, 0x73, 0x62, 0x32, 0xdb, 0x66, 0x54, 0xfc, 0x38, 0x3e, - 0x27, 0xc1, 0xaa, 0xe8, 0xb8, 0x8c, 0x33, 0x9c, 0xb2, 0x99, 0x79, 0x78, 0x34, 0x67, 0x6c, 0xbe, - 0x20, 0x27, 0x12, 0x5d, 0xf9, 0xb3, 0x93, 0x29, 0xf1, 0x4c, 0xd7, 0x72, 0x38, 0x73, 0x03, 0xb5, - 0x7c, 0x0b, 0xb6, 0x2f, 0x2d, 0xaa, 0xf5, 0x2e, 0x2c, 0x8f, 0x13, 0x4a, 0x5c, 0x5c, 0x81, 0x8d, - 0x81, 0x90, 0x98, 0x6c, 0x91, 0x4b, 0x1c, 0x25, 0x8e, 0x77, 0x2a, 0xfb, 0x45, 0x9b, 0x99, 0x45, - 0xa9, 0xb5, 0x94, 0x0c, 0xef, 0x1c, 0xa2, 0xad, 0xf4, 0xf2, 0x67, 0x80, 0xa5, 0xb8, 0xc5, 0xe8, - 0xcc, 0x9a, 0xfb, 0xae, 0xc1, 0x2d, 0x46, 0x71, 0x09, 0xb2, 0x4b, 0xaf, 0x5e, 0x2e, 0x71, 0x94, - 0x3a, 0xde, 0xac, 0xe0, 0x7b, 0x57, 0x4b, 0x91, 0x76, 0xaf, 0x94, 0x9f, 0x43, 0xaa, 0xe3, 0xf8, - 0xb8, 0x0e, 0x60, 0x78, 0x9e, 0x35, 0xa7, 0x36, 0xa1, 0x3c, 0x92, 0x44, 0xc7, 0xf1, 0x9b, 0x2b, - 0x89, 0x4c, 0xe2, 0x81, 0x26, 0x3e, 0x86, 0x5d, 0xc7, 0x70, 0xb9, 0x25, 0xa2, 0xeb, 0xd6, 0x8f, - 0xa4, 0x73, 0x9a, 0x4b, 0x1e, 0x25, 0x8e, 0x33, 0x5a, 0x1c, 0xe7, 0x29, 0xe4, 0xc6, 0x96, 0xcb, - 0x7d, 0x63, 0xd1, 0x33, 0xcc, 0x6b, 0x8b, 0x92, 0x96, 0xef, 0x71, 0x66, 0x0b, 0x29, 0x3e, 0x84, - 0x0d, 0xd3, 0xf1, 0x5b, 0xcc, 0x0f, 0x63, 0x67, 0xb4, 0xd5, 0x5a, 0xc8, 0x6c, 0x62, 0x33, 0xf7, - 0xae, 0xb7, 0x74, 0xbd, 0x5a, 0x0b, 0xd9, 0x7c, 0x69, 0x97, 0x0a, 0x64, 0xcb, 0x75, 0xfe, 0x6f, - 0x09, 0x38, 0x6c, 0xdf, 0x51, 0xc3, 0xb6, 0xcc, 0x9e, 0xd4, 0x8f, 0x56, 0xea, 0x18, 0x76, 0x6d, - 0xe3, 0xd6, 0xb2, 0x7d, 0xbb, 0xb7, 0xf4, 0x2e, 0x22, 0xa7, 0xb5, 0x38, 0x96, 0x9a, 0x16, 0x8d, - 0x68, 0x26, 0x43, 0xcd, 0x28, 0xc6, 0x45, 0xc0, 0xdc, 0x70, 0xe7, 0x84, 0x07, 0xe4, 0xd4, 0x9f, - 0xcd, 0x88, 0x2b, 0x13, 0xdb, 0xd6, 0x9e, 0x90, 0xe4, 0x7f, 0x80, 0xf7, 0xd1, 0x92, 0x68, 0x3e, - 0x6d, 0x31, 0xdb, 0x36, 0xe8, 0xb4, 0x4b, 0x1d, 0x9f, 0x0f, 0x0c, 0xd7, 0xb0, 0x09, 0x27, 0x2e, - 0xc6, 0x90, 0x56, 0x0d, 0x9b, 0xc8, 0x14, 0xb3, 0x9a, 0x7c, 0xc6, 0x87, 0x90, 0x19, 0x1b, 0x0b, - 0x9f, 0xc8, 0x6c, 0xb2, 0xa7, 0xe9, 0xbf, 0xfc, 0x23, 0x97, 0xd0, 0x02, 0x94, 0xff, 0x63, 0x02, - 0xde, 0x3d, 0xe7, 0x5a, 0x97, 0xd3, 0xa8, 0x33, 0xdf, 0x35, 0x09, 0x7e, 0x03, 0x6b, 0xc1, 0x3a, - 0x70, 0x7d, 0x9a, 0xfe, 0xb3, 0xf0, 0x12, 0x32, 0xfc, 0x06, 0xb2, 0xc1, 0xd3, 0x48, 0xeb, 0x06, - 0x61, 0xb4, 0x7b, 0x20, 0xa4, 0xcb, 0x6c, 0xdb, 0xf2, 0x2d, 0xb3, 0xda, 0x3d, 0xc8, 0xff, 0xeb, - 0xff, 0xa4, 0xd0, 0xa5, 0x1e, 0x37, 0xa8, 0x49, 0xc6, 0x16, 0xf9, 0x88, 0x75, 0xd8, 0x51, 0x6e, - 0x89, 0xe9, 0xcb, 0x59, 0xe1, 0x06, 0x27, 0xe1, 0xf8, 0x7d, 0x25, 0xc7, 0xef, 0x39, 0x17, 0x51, - 0x13, 0x2d, 0xe6, 0x42, 0x4c, 0x86, 0x72, 0x6b, 0xf1, 0x16, 0x9b, 0x92, 0xe5, 0xd4, 0x2c, 0xd7, - 0x78, 0x1f, 0xd6, 0xfa, 0x3e, 0x77, 0x7c, 0x1e, 0x26, 0x1d, 0xae, 0xf0, 0x2b, 0xc8, 0x28, 0xae, - 0xcb, 0xdc, 0x5c, 0x5a, 0xe2, 0x60, 0x91, 0xff, 0x1e, 0x0e, 0x63, 0x73, 0x6b, 0x38, 0xc6, 0x95, - 0xb5, 0xb0, 0xb8, 0x45, 0x3c, 0xfc, 0x35, 0xec, 0x75, 0x3d, 0xb6, 0x30, 0x38, 0x99, 0x8e, 0x6d, - 0x29, 0x59, 0x04, 0xf9, 0x6f, 0x68, 0x8f, 0x05, 0xf9, 0xff, 0x26, 0x00, 0x3f, 0x7c, 0x77, 0x91, - 0xab, 0xef, 0x89, 0xee, 0x9a, 0x22, 0xd1, 0xb0, 0xbb, 0xe2, 0x19, 0xff, 0x12, 0x32, 0x0b, 0x72, - 0x43, 0x16, 0x32, 0xfb, 0x9d, 0xca, 0x97, 0xb2, 0x18, 0x8f, 0x6d, 0x8b, 0xc1, 0xcf, 0x85, 0x50, - 0x95, 0x7f, 0xce, 0xc0, 0x0a, 0xbf, 0x83, 0xed, 0xa9, 0xe5, 0x39, 0x0b, 0xe3, 0x2e, 0x50, 0x08, - 0x5f, 0x35, 0x0a, 0x71, 0x0e, 0xd6, 0x6d, 0xe2, 0x79, 0xc6, 0x9c, 0x84, 0xef, 0xbc, 0x5c, 0x8a, - 0x94, 0xb8, 0x65, 0x93, 0x5c, 0x26, 0x48, 0x49, 0x3c, 0xe7, 0x7f, 0x05, 0xbb, 0xb1, 0x68, 0x78, - 0x13, 0xd6, 0x47, 0xf4, 0xf7, 0x94, 0x7d, 0xa4, 0xe8, 0x05, 0xde, 0x80, 0x74, 0x97, 0xce, 0x18, - 0x4a, 0x08, 0x7c, 0x69, 0xb8, 0xd4, 0xa2, 0x73, 0x94, 0xc4, 0xd9, 0xb0, 0xac, 0x28, 0x95, 0xff, - 0x03, 0x7c, 0x16, 0xad, 0x65, 0x73, 0x4e, 0x28, 0x8f, 0x4c, 0xc3, 0x7b, 0xd8, 0xb9, 0xb1, 0x25, - 0x1e, 0x13, 0xd7, 0xb3, 0x18, 0x0d, 0xab, 0x12, 0xa3, 0xb8, 0x0a, 0x1b, 0x9e, 0x4c, 0x86, 0x78, - 0xb9, 0xa4, 0xdc, 0xe8, 0x0e, 0x9e, 0x29, 0x91, 0xb6, 0x52, 0xcc, 0x57, 0xe1, 0xa0, 0xe3, 0x13, - 0x8f, 0x4b, 0x4f, 0xd1, 0xfd, 0x20, 0x07, 0xeb, 0x84, 0x8a, 0x26, 0x4d, 0xc3, 0xf6, 0x2d, 0x97, - 0xf9, 0xbf, 0x26, 0x00, 0x0f, 0x5c, 0x76, 0x1b, 0xdb, 0x40, 0xf2, 0x90, 0xbd, 0xe6, 0xdc, 0x91, - 0x92, 0xc8, 0x9f, 0xe7, 0x1e, 0xe3, 0x77, 0x00, 0x62, 0xe1, 0x05, 0x4a, 0xc9, 0x07, 0x4a, 0x0f, - 0xb8, 0x08, 0x4d, 0x59, 0xa0, 0x92, 0x3a, 0x4a, 0x89, 0x2e, 0x84, 0x4b, 0x11, 0x83, 0xbb, 0xbe, - 0xc7, 0xc9, 0xb4, 0x65, 0x04, 0x1d, 0x5a, 0xc6, 0x58, 0xe1, 0xc2, 0x5b, 0xd8, 0x18, 0x79, 0xc4, - 0x95, 0xed, 0xd8, 0x80, 0xb4, 0xd6, 0xef, 0x0f, 0x83, 0x5e, 0x8c, 0x74, 0x45, 0x43, 0x89, 0xc2, - 0xaf, 0x61, 0x7b, 0xe0, 0x32, 0x93, 0x78, 0x1e, 0x5b, 0x29, 0xa9, 0x8c, 0x12, 0xf4, 0x42, 0x74, - 0xa6, 0x4b, 0x39, 0x59, 0x04, 0x1d, 0x93, 0x8f, 0xf5, 0x1a, 0x4a, 0xe2, 0x75, 0x48, 0x35, 0x7b, - 0x6d, 0x94, 0x12, 0x0a, 0xcd, 0x5e, 0xbb, 0x5e, 0x43, 0x69, 0xc9, 0xb4, 0x1e, 0xca, 0x48, 0xa6, - 0xf5, 0xea, 0x35, 0xb4, 0x56, 0xf8, 0x1e, 0xde, 0xf6, 0x1d, 0x22, 0xea, 0x41, 0xe7, 0xfa, 0x9d, - 0xc7, 0x89, 0x7d, 0xca, 0x18, 0xf7, 0xb8, 0x6b, 0x38, 0x0a, 0x9d, 0x5b, 0x94, 0xe0, 0x1d, 0x80, - 0xd6, 0x45, 0x7f, 0xd4, 0x9e, 0x74, 0xd5, 0xae, 0x48, 0x2b, 0x07, 0xaf, 0x2e, 0xbb, 0x6a, 0xbb, - 0x7f, 0xa9, 0x4f, 0x9a, 0xaa, 0x7e, 0xa9, 0x68, 0x93, 0xb3, 0xee, 0x85, 0xa2, 0xa3, 0x44, 0xe1, - 0x1b, 0x78, 0x19, 0xf3, 0xb5, 0x1c, 0xb0, 0xd0, 0x20, 0xc8, 0xf7, 0xa2, 0xab, 0x8e, 0x7e, 0x40, - 0x89, 0xc2, 0xdf, 0xb3, 0xb0, 0x1f, 0x1d, 0x25, 0x71, 0x90, 0x2c, 0x4d, 0xda, 0x64, 0x66, 0xf8, - 0x0b, 0x8e, 0x5e, 0x60, 0x0c, 0x3b, 0x3a, 0x37, 0xe8, 0xd4, 0x70, 0xa7, 0x93, 0x66, 0x65, 0x72, - 0x53, 0x41, 0xc9, 0x28, 0xab, 0x09, 0x96, 0xc2, 0x2f, 0xe5, 0x6c, 0x07, 0xac, 0x5d, 0xf1, 0x26, - 0x37, 0x55, 0x94, 0x8e, 0xc2, 0x9a, 0x84, 0x99, 0x28, 0x6c, 0x48, 0xb8, 0x86, 0x5f, 0x01, 0xba, - 0x87, 0xe5, 0xba, 0xa4, 0xeb, 0x51, 0x5a, 0x0d, 0xbc, 0x6e, 0x44, 0x1d, 0xe8, 0x32, 0xa7, 0x6c, - 0x0c, 0x56, 0x05, 0x84, 0x18, 0x94, 0x99, 0x6e, 0xc6, 0xe0, 0xb7, 0x02, 0x6e, 0x45, 0x23, 0xe9, - 0x65, 0x69, 0xbf, 0x1d, 0x51, 0x3d, 0x6f, 0xe8, 0x93, 0x9b, 0x32, 0xda, 0x89, 0xa8, 0x9e, 0x37, - 0x44, 0xfc, 0x32, 0xda, 0x8d, 0xd3, 0xaa, 0xa0, 0x28, 0x4e, 0x6b, 0x82, 0xee, 0x61, 0x04, 0x5b, - 0x2b, 0xaa, 0x9e, 0xd7, 0x11, 0xc6, 0x7b, 0xb0, 0xfd, 0x80, 0x94, 0x2b, 0xe8, 0x65, 0x54, 0x69, - 0x5c, 0x47, 0xaf, 0xa2, 0x4a, 0xe3, 0x72, 0x05, 0xbd, 0x8e, 0xfb, 0xff, 0x56, 0xf8, 0xdf, 0xc7, - 0x07, 0xf0, 0x32, 0x56, 0xa0, 0xc9, 0x87, 0x81, 0x8a, 0x0e, 0x62, 0x82, 0xea, 0x52, 0x90, 0x8b, - 0x09, 0x6a, 0x4b, 0xc1, 0x27, 0x91, 0x00, 0x67, 0x15, 0x4f, 0xd2, 0xc3, 0x28, 0xad, 0x05, 0xf4, - 0x67, 0x51, 0xda, 0x08, 0xe8, 0x1b, 0xfc, 0x1a, 0xf6, 0xee, 0xa9, 0xe8, 0xac, 0xc0, 0x9f, 0x46, - 0x4a, 0xab, 0xb6, 0x6a, 0x93, 0x66, 0x05, 0xbd, 0x8d, 0xc1, 0x86, 0x80, 0x9f, 0x45, 0xdc, 0xaa, - 0xad, 0x72, 0x5d, 0xd0, 0xa3, 0x18, 0xad, 0x56, 0x04, 0xfd, 0x79, 0x8c, 0xd6, 0x26, 0xcd, 0x6a, - 0x09, 0xe5, 0x63, 0xb4, 0x21, 0xe9, 0xe7, 0x91, 0xc4, 0x02, 0xbf, 0xd5, 0x12, 0x7a, 0x17, 0xc3, - 0xc2, 0x71, 0xb5, 0x84, 0xbe, 0x10, 0x7f, 0xbc, 0xa8, 0xe7, 0x72, 0xa9, 0x34, 0xa9, 0x95, 0xd0, - 0xfb, 0x98, 0xa4, 0xb1, 0x92, 0x7c, 0x89, 0x3f, 0x81, 0xd7, 0xb1, 0x08, 0xa1, 0xe8, 0x38, 0x26, - 0x12, 0x51, 0x42, 0xd1, 0x2f, 0x9e, 0x8e, 0xd4, 0x28, 0xa1, 0xc2, 0xd3, 0x91, 0x1a, 0x25, 0xf4, - 0xd5, 0x33, 0x91, 0x1a, 0x25, 0xf4, 0xf5, 0x33, 0x91, 0x1a, 0x25, 0xf4, 0xcd, 0xe3, 0x6a, 0x95, - 0xeb, 0xa8, 0xf8, 0xb8, 0x5a, 0xe5, 0x3a, 0x3a, 0x79, 0xa2, 0x5a, 0xe5, 0x3a, 0x2a, 0x3d, 0x51, - 0xad, 0x72, 0x1d, 0x95, 0xf1, 0x36, 0x64, 0x83, 0xdb, 0xa9, 0x68, 0xcb, 0xe4, 0xc1, 0x52, 0x3d, - 0x47, 0xbf, 0x15, 0xa3, 0x1d, 0x2e, 0x3b, 0x8e, 0xef, 0xdc, 0x20, 0x03, 0x03, 0xac, 0x05, 0x04, - 0x5d, 0xe1, 0x5d, 0xd8, 0x1c, 0x51, 0xcf, 0x77, 0x1c, 0xe6, 0x72, 0x32, 0x45, 0x66, 0xe1, 0x18, - 0xf6, 0x1e, 0x5d, 0xe4, 0xc5, 0x26, 0xfc, 0x61, 0x38, 0x1c, 0x04, 0x9b, 0x9a, 0x78, 0x12, 0x7b, - 0x60, 0x1b, 0xf6, 0x1e, 0xdd, 0xb6, 0x85, 0xef, 0x8e, 0xe3, 0xb7, 0xdb, 0xcd, 0x60, 0x57, 0xef, - 0x38, 0xfe, 0x00, 0x25, 0x84, 0x95, 0x78, 0x1a, 0xa3, 0xa4, 0xd8, 0x63, 0x85, 0x42, 0xb8, 0xe5, - 0xa5, 0x0b, 0x43, 0x80, 0x01, 0xfb, 0x48, 0xdc, 0xe0, 0x22, 0x14, 0x39, 0xa1, 0x37, 0x61, 0x5d, - 0xf3, 0xa9, 0x3c, 0x97, 0x13, 0x62, 0x47, 0xef, 0xcf, 0x66, 0x28, 0x29, 0x22, 0x0c, 0x0c, 0xdf, - 0x23, 0x53, 0x94, 0xc2, 0x5b, 0xb0, 0xd1, 0x72, 0x2d, 0x6e, 0x99, 0xc6, 0x02, 0xa5, 0x45, 0x14, - 0xdd, 0xb8, 0x21, 0x53, 0x94, 0x29, 0xcc, 0xe0, 0x20, 0xba, 0xdf, 0x86, 0xbb, 0x35, 0xa3, 0x52, - 0x6b, 0xd8, 0xd4, 0xc2, 0x63, 0x47, 0x1f, 0xf6, 0xc3, 0x04, 0x35, 0x45, 0x57, 0x86, 0x28, 0x89, - 0xf7, 0x01, 0x6b, 0xca, 0xa0, 0xd9, 0xd5, 0x26, 0x9d, 0x91, 0xa2, 0x0f, 0x27, 0xcd, 0x8e, 0xa2, - 0x0e, 0x83, 0xd3, 0x65, 0xd0, 0x1c, 0xe9, 0x0a, 0x4a, 0x4b, 0xbb, 0xe6, 0x58, 0x41, 0x99, 0xc2, - 0x3f, 0x13, 0xcf, 0x5f, 0x8a, 0x1f, 0xdd, 0xf1, 0xf6, 0xa3, 0x64, 0x32, 0x52, 0xcf, 0xd5, 0xfe, - 0xa5, 0x8a, 0x5e, 0x88, 0xb1, 0x89, 0xc9, 0xce, 0x9a, 0xdd, 0x0b, 0xa5, 0x8d, 0x12, 0xf8, 0x0d, - 0xe4, 0x62, 0x22, 0x7d, 0xd4, 0x6a, 0x29, 0x4a, 0x5b, 0x69, 0xa3, 0xe4, 0x13, 0x4e, 0x07, 0x8a, - 0xda, 0xee, 0xaa, 0x1d, 0x94, 0x7a, 0xc2, 0x52, 0x53, 0x4e, 0xfb, 0xfd, 0xa1, 0x90, 0xa6, 0x0b, - 0x3f, 0xc2, 0x56, 0xd3, 0x35, 0xaf, 0x2d, 0x4e, 0x4c, 0xee, 0xbb, 0x44, 0xd4, 0xf7, 0xb6, 0x51, - 0x0f, 0x8a, 0xd2, 0xeb, 0x8a, 0x06, 0xcb, 0xb3, 0x73, 0xe1, 0x5c, 0x1b, 0x28, 0x29, 0x5a, 0x21, - 0xbb, 0x34, 0x68, 0xa1, 0x94, 0x98, 0xd9, 0xa6, 0xd6, 0x9b, 0x3c, 0x34, 0x47, 0x19, 0x61, 0x67, - 0x19, 0xe2, 0xa0, 0x95, 0xae, 0xea, 0x35, 0x94, 0x15, 0xa5, 0x94, 0x87, 0x6f, 0x54, 0x75, 0xab, - 0xf0, 0x01, 0xb6, 0x74, 0x62, 0xfa, 0xae, 0xc5, 0xef, 0xe4, 0xd0, 0xec, 0xc1, 0xb6, 0xda, 0x1f, - 0xb6, 0xfa, 0xea, 0x59, 0xb7, 0x33, 0xd2, 0x94, 0x36, 0x7a, 0x21, 0xd0, 0x50, 0x1b, 0xe9, 0x43, - 0xa5, 0x7d, 0xd1, 0x1c, 0xa9, 0xad, 0x0f, 0x28, 0x21, 0x0e, 0x42, 0xa9, 0xd2, 0x56, 0xd4, 0x61, - 0xb7, 0x79, 0x31, 0xee, 0xa1, 0xe4, 0x77, 0xe7, 0x80, 0x3c, 0x42, 0x3d, 0x8b, 0x5b, 0x37, 0x24, - 0xfc, 0xc6, 0xc5, 0x9f, 0x16, 0x83, 0x6f, 0xda, 0xe2, 0xf2, 0x9b, 0xb6, 0x78, 0x66, 0x91, 0xc5, - 0xb4, 0xef, 0x88, 0x42, 0x78, 0xb9, 0x7f, 0xff, 0x29, 0x25, 0x6f, 0x4c, 0x8f, 0x0c, 0xbf, 0x53, - 0x60, 0x7b, 0xc5, 0x7e, 0xe7, 0x31, 0xfa, 0x53, 0x9e, 0xfe, 0x13, 0x7a, 0x8a, 0x5a, 0x9d, 0x7e, - 0xf1, 0x9b, 0xcf, 0xe7, 0x16, 0xbf, 0xf6, 0xaf, 0x8a, 0x26, 0xb3, 0x4f, 0x6c, 0xcb, 0x74, 0x99, - 0xc7, 0x66, 0xfc, 0xc4, 0x66, 0xe6, 0x89, 0xeb, 0x98, 0x27, 0xc1, 0x47, 0xf8, 0xd5, 0x9a, 0x74, - 0x5a, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xed, 0x6b, 0x2b, 0xa7, 0x0f, 0x00, 0x00, + // 1819 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xdd, 0x72, 0xe2, 0xc8, + 0x15, 0x80, 0x87, 0x3f, 0xdb, 0x1c, 0xff, 0xb5, 0x7b, 0x66, 0x6c, 0xd6, 0x99, 0x9d, 0x75, 0xd8, + 0xd9, 0x59, 0x87, 0xdd, 0xc5, 0xfc, 0x2d, 0x45, 0x6d, 0x55, 0xaa, 0x82, 0x41, 0x66, 0x58, 0x1b, + 0x41, 0x49, 0x80, 0x37, 0xb9, 0x21, 0xb2, 0x68, 0xb0, 0x12, 0xd4, 0xad, 0x92, 0x5a, 0x1e, 0x7b, + 0x53, 0x95, 0xca, 0x55, 0xae, 0x73, 0x99, 0x8b, 0x5c, 0xe4, 0x32, 0x2f, 0x90, 0xca, 0x13, 0xe4, + 0x05, 0x92, 0xe7, 0x49, 0x55, 0xaa, 0x5b, 0x02, 0x5b, 0xb2, 0x9d, 0x5c, 0xd1, 0xfd, 0x9d, 0x5f, + 0xce, 0x39, 0xea, 0x96, 0xe0, 0xad, 0xcd, 0xcc, 0x89, 0xc9, 0x6c, 0x9b, 0x51, 0xf1, 0xe3, 0xf8, + 0x9c, 0x04, 0xbb, 0xa2, 0xe3, 0x32, 0xce, 0x70, 0xca, 0x66, 0xe6, 0xe1, 0xd1, 0x9c, 0xb1, 0xf9, + 0x82, 0x9c, 0x48, 0x74, 0xe5, 0xcf, 0x4e, 0xa6, 0xc4, 0x33, 0x5d, 0xcb, 0xe1, 0xcc, 0x0d, 0xd4, + 0xf2, 0x2d, 0xd8, 0xbe, 0xb4, 0xa8, 0xd6, 0xbb, 0xb0, 0x3c, 0x4e, 0x28, 0x71, 0x71, 0x05, 0x36, + 0x06, 0x42, 0x62, 0xb2, 0x45, 0x2e, 0x71, 0x94, 0x38, 0xde, 0xa9, 0xec, 0x17, 0x6d, 0x66, 0x16, + 0xa5, 0xd6, 0x52, 0x32, 0xbc, 0x73, 0x88, 0xb6, 0xd2, 0xcb, 0x9f, 0x01, 0x96, 0xe2, 0x16, 0xa3, + 0x33, 0x6b, 0xee, 0xbb, 0x06, 0xb7, 0x18, 0xc5, 0x25, 0xc8, 0x2e, 0xbd, 0x7a, 0xb9, 0xc4, 0x51, + 0xea, 0x78, 0xb3, 0x82, 0xef, 0x5d, 0x2d, 0x45, 0xda, 0xbd, 0x52, 0xfe, 0x77, 0x90, 0xea, 0x38, + 0x3e, 0xc6, 0x90, 0xa6, 0x86, 0x4d, 0x64, 0xf8, 0xac, 0x26, 0xd7, 0xb8, 0x0e, 0x60, 0x78, 0x9e, + 0x35, 0xa7, 0x36, 0xa1, 0x3c, 0x97, 0x7c, 0x90, 0x58, 0xc7, 0xf1, 0x9b, 0x2b, 0x89, 0x4c, 0xec, + 0x81, 0x26, 0x3e, 0x86, 0x5d, 0xc7, 0x70, 0xb9, 0x25, 0x32, 0xd2, 0xad, 0x1f, 0x49, 0xe7, 0x34, + 0x97, 0x3a, 0x4a, 0x1c, 0x67, 0xb4, 0x38, 0xce, 0x53, 0xc8, 0x8d, 0x2d, 0x97, 0xfb, 0xc6, 0xa2, + 0x67, 0x98, 0xd7, 0x16, 0x25, 0x2d, 0xdf, 0xe3, 0xcc, 0x16, 0x52, 0x7c, 0x08, 0x1b, 0xa6, 0xe3, + 0xb7, 0x98, 0x4f, 0xb9, 0xcc, 0x2a, 0xa3, 0xad, 0xf6, 0x42, 0x66, 0x13, 0x9b, 0xb9, 0x77, 0xbd, + 0x53, 0x99, 0x57, 0x46, 0x5b, 0xed, 0x85, 0x6c, 0xbe, 0xb4, 0x0b, 0xc2, 0xae, 0xf6, 0xf9, 0xbf, + 0x26, 0xe0, 0xb0, 0x7d, 0x47, 0x0d, 0xdb, 0x32, 0x7b, 0x52, 0x3f, 0x5a, 0xbd, 0x63, 0xd8, 0xb5, + 0x8d, 0x5b, 0xcb, 0xf6, 0xed, 0xde, 0xd2, 0xbb, 0x88, 0x9c, 0xd6, 0xe2, 0x58, 0x6a, 0x5a, 0x34, + 0xa2, 0x99, 0x0c, 0x35, 0xa3, 0x18, 0x17, 0x01, 0x73, 0xc3, 0x9d, 0x13, 0x1e, 0x90, 0x53, 0x7f, + 0x36, 0x23, 0xae, 0x4c, 0x6c, 0x5b, 0x7b, 0x42, 0x92, 0xff, 0x01, 0xde, 0x47, 0x4b, 0xa2, 0xf9, + 0xb4, 0xc5, 0x6c, 0xdb, 0xa0, 0xd3, 0x2e, 0x75, 0x7c, 0x3e, 0x30, 0x5c, 0xc3, 0x26, 0x9c, 0xb8, + 0xa2, 0x65, 0xea, 0x83, 0x96, 0x89, 0x35, 0x3e, 0x84, 0xcc, 0xd8, 0x58, 0xf8, 0x44, 0x66, 0x93, + 0x3d, 0x4d, 0xff, 0xf9, 0xef, 0xb9, 0x84, 0x16, 0xa0, 0xfc, 0x1f, 0x12, 0xf0, 0xee, 0x39, 0xd7, + 0xba, 0x9c, 0x50, 0x9d, 0xf9, 0xae, 0x49, 0xf0, 0x1b, 0x58, 0x0b, 0xf6, 0x81, 0xeb, 0xd3, 0xf4, + 0x9f, 0x84, 0x97, 0x90, 0xe1, 0x37, 0x90, 0x0d, 0x56, 0x23, 0xad, 0x1b, 0x84, 0xd1, 0xee, 0x81, + 0x90, 0x2e, 0xb3, 0x6d, 0xcb, 0x7f, 0x99, 0xd5, 0xee, 0x41, 0xfe, 0x9f, 0xff, 0x23, 0x85, 0x2e, + 0xf5, 0xb8, 0x41, 0x4d, 0x32, 0xb6, 0xc8, 0x47, 0xac, 0xc3, 0x8e, 0x72, 0x4b, 0x4c, 0x5f, 0xce, + 0x0a, 0x37, 0x38, 0x09, 0x9f, 0x8b, 0xaf, 0xe4, 0xf8, 0x3d, 0xe7, 0x22, 0x6a, 0xa2, 0xc5, 0x5c, + 0x88, 0xc9, 0x50, 0x6e, 0x2d, 0xde, 0x62, 0x53, 0xb2, 0x9c, 0x9a, 0xe5, 0x1e, 0xef, 0xc3, 0x5a, + 0xdf, 0xe7, 0x8e, 0xcf, 0xc3, 0xa4, 0xc3, 0x1d, 0x7e, 0x05, 0x19, 0xc5, 0x75, 0x99, 0x9b, 0x4b, + 0x4b, 0x1c, 0x6c, 0xf2, 0xdf, 0xc3, 0x61, 0x6c, 0x6e, 0x0d, 0xc7, 0xb8, 0xb2, 0x16, 0x16, 0xb7, + 0x88, 0x87, 0xbf, 0x86, 0xbd, 0xae, 0xc7, 0x16, 0x06, 0x27, 0xd3, 0xb1, 0x2d, 0x25, 0x8b, 0x20, + 0xff, 0x0d, 0xed, 0xb1, 0x20, 0xff, 0x9f, 0x04, 0xe0, 0x87, 0xff, 0x5d, 0xe4, 0xea, 0x7b, 0xa2, + 0xbb, 0xa6, 0x48, 0x34, 0xec, 0xae, 0x58, 0xe3, 0x9f, 0x43, 0x66, 0x41, 0x6e, 0xc8, 0x22, 0x7c, + 0x16, 0xbf, 0x94, 0xc5, 0x78, 0x6c, 0x5b, 0x0c, 0x7e, 0x2e, 0x84, 0xaa, 0x7c, 0x38, 0x03, 0x2b, + 0xfc, 0x0e, 0xb6, 0xa7, 0x96, 0xe7, 0x2c, 0x8c, 0xbb, 0x40, 0x21, 0xfc, 0xab, 0x51, 0x88, 0x73, + 0xb0, 0x6e, 0x13, 0xcf, 0x33, 0xe6, 0x24, 0xfc, 0xcf, 0xcb, 0xad, 0x48, 0x89, 0x5b, 0x36, 0xc9, + 0x65, 0x82, 0x94, 0xc4, 0x3a, 0xff, 0x0b, 0xd8, 0x8d, 0x45, 0xc3, 0x9b, 0xb0, 0x3e, 0xa2, 0xbf, + 0xa5, 0xec, 0x23, 0x45, 0x2f, 0xf0, 0x06, 0xa4, 0xbb, 0x74, 0xc6, 0x50, 0x42, 0xe0, 0x4b, 0xc3, + 0xa5, 0x16, 0x9d, 0xa3, 0x24, 0xce, 0x86, 0x65, 0x45, 0xa9, 0xfc, 0xef, 0xe1, 0xb3, 0x68, 0x2d, + 0x9b, 0x73, 0x42, 0x79, 0x64, 0x1a, 0xde, 0xc3, 0xce, 0x8d, 0x2d, 0xf1, 0x98, 0xb8, 0x9e, 0xc5, + 0x68, 0x58, 0x95, 0x18, 0xc5, 0x55, 0xd8, 0xf0, 0x64, 0x32, 0xc4, 0xcb, 0x25, 0xe5, 0xe1, 0x77, + 0xf0, 0x4c, 0x89, 0xb4, 0x95, 0x62, 0xbe, 0x0a, 0x07, 0x1d, 0x9f, 0x78, 0x5c, 0x7a, 0x8a, 0x9e, + 0x07, 0x39, 0x58, 0x27, 0x54, 0x34, 0x69, 0x1a, 0xb6, 0x6f, 0xb9, 0xcd, 0xff, 0x25, 0x01, 0x78, + 0xe0, 0xb2, 0xdb, 0xd8, 0x01, 0x92, 0x87, 0xec, 0x35, 0xe7, 0x8e, 0x94, 0x44, 0x1e, 0x9e, 0x7b, + 0x8c, 0xdf, 0x01, 0x88, 0x8d, 0x17, 0x28, 0x25, 0x1f, 0x28, 0x3d, 0xe0, 0x22, 0x34, 0x65, 0x81, + 0x4a, 0xea, 0x28, 0x25, 0xba, 0x10, 0x6e, 0x45, 0x0c, 0xee, 0xfa, 0x1e, 0x27, 0xd3, 0x96, 0x11, + 0x74, 0x68, 0x19, 0x63, 0x85, 0x0b, 0x6f, 0x61, 0x63, 0xe4, 0x11, 0x57, 0xb6, 0x63, 0x03, 0xd2, + 0x5a, 0xbf, 0x3f, 0x0c, 0x7a, 0x31, 0xd2, 0x15, 0x0d, 0x25, 0x0a, 0xbf, 0x84, 0xed, 0x81, 0xcb, + 0x4c, 0xe2, 0x79, 0x6c, 0xa5, 0xa4, 0x32, 0x4a, 0xd0, 0x0b, 0xd1, 0x99, 0x2e, 0xe5, 0x64, 0x11, + 0x74, 0x4c, 0x2e, 0xeb, 0x35, 0x94, 0xc4, 0xeb, 0x90, 0x6a, 0xf6, 0xda, 0x28, 0x25, 0x14, 0x9a, + 0xbd, 0x76, 0xbd, 0x86, 0xd2, 0x92, 0x69, 0x3d, 0x94, 0x91, 0x4c, 0xeb, 0xd5, 0x6b, 0x68, 0xad, + 0xf0, 0x3d, 0xbc, 0xed, 0x3b, 0x44, 0xd4, 0x83, 0xce, 0xf5, 0x3b, 0x8f, 0x13, 0xfb, 0x94, 0x31, + 0xee, 0x71, 0xd7, 0x70, 0x14, 0x3a, 0xb7, 0x28, 0xc1, 0x3b, 0x00, 0xad, 0x8b, 0xfe, 0xa8, 0x3d, + 0xe9, 0xaa, 0x5d, 0x91, 0x56, 0x0e, 0x5e, 0x5d, 0x76, 0xd5, 0x76, 0xff, 0x52, 0x9f, 0x34, 0x55, + 0xfd, 0x52, 0xd1, 0x26, 0x67, 0xdd, 0x0b, 0x45, 0x47, 0x89, 0xc2, 0x37, 0xf0, 0x32, 0xe6, 0x6b, + 0x39, 0x60, 0xa1, 0x41, 0x90, 0xef, 0x45, 0x57, 0x1d, 0xfd, 0x80, 0x12, 0x85, 0xbf, 0x65, 0x61, + 0x3f, 0x3a, 0x4a, 0xe2, 0x22, 0x59, 0x9a, 0xb4, 0xc9, 0xcc, 0xf0, 0x17, 0x1c, 0xbd, 0xc0, 0x18, + 0x76, 0x74, 0x6e, 0xd0, 0xa9, 0xe1, 0x4e, 0x27, 0xcd, 0xca, 0xe4, 0xa6, 0x82, 0x92, 0x51, 0x56, + 0x13, 0x2c, 0x85, 0x5f, 0xca, 0xd9, 0x0e, 0x58, 0xbb, 0xe2, 0x4d, 0x6e, 0xaa, 0x28, 0x1d, 0x85, + 0x35, 0x09, 0x33, 0x51, 0xd8, 0x90, 0x70, 0x0d, 0xbf, 0x02, 0x74, 0x0f, 0xcb, 0x75, 0x49, 0xd7, + 0xa3, 0xb4, 0x1a, 0x78, 0xdd, 0x88, 0x3a, 0xd0, 0x65, 0x4e, 0xd9, 0x18, 0xac, 0x0a, 0x08, 0x31, + 0x28, 0x33, 0xdd, 0x8c, 0xc1, 0x6f, 0x05, 0xdc, 0x8a, 0x46, 0xd2, 0xcb, 0xd2, 0x7e, 0x3b, 0xa2, + 0x7a, 0xde, 0xd0, 0x27, 0x37, 0x65, 0xb4, 0x13, 0x51, 0x3d, 0x6f, 0x88, 0xf8, 0x65, 0xb4, 0x1b, + 0xa7, 0x55, 0x41, 0x51, 0x9c, 0xd6, 0x04, 0xdd, 0xc3, 0x08, 0xb6, 0x56, 0x54, 0x3d, 0xaf, 0x23, + 0x8c, 0xf7, 0x60, 0xfb, 0x01, 0x29, 0x57, 0xd0, 0xcb, 0xa8, 0xd2, 0xb8, 0x8e, 0x5e, 0x45, 0x95, + 0xc6, 0xe5, 0x0a, 0x7a, 0x1d, 0xf7, 0xff, 0xad, 0xf0, 0xbf, 0x8f, 0x0f, 0xe0, 0x65, 0xac, 0x40, + 0x93, 0x0f, 0x03, 0x15, 0x1d, 0xc4, 0x04, 0xd5, 0xa5, 0x20, 0x17, 0x13, 0xd4, 0x96, 0x82, 0x4f, + 0x22, 0x01, 0xce, 0x2a, 0x9e, 0xa4, 0x87, 0x51, 0x5a, 0x0b, 0xe8, 0x4f, 0xa2, 0xb4, 0x11, 0xd0, + 0x37, 0xf8, 0x35, 0xec, 0xdd, 0x53, 0xd1, 0x59, 0x81, 0x3f, 0x8d, 0x94, 0x56, 0x6d, 0xd5, 0x26, + 0xcd, 0x0a, 0x7a, 0x1b, 0x83, 0x0d, 0x01, 0x3f, 0x8b, 0xb8, 0x55, 0x5b, 0xe5, 0xba, 0xa0, 0x47, + 0x31, 0x5a, 0xad, 0x08, 0xfa, 0xd3, 0x18, 0xad, 0x4d, 0x9a, 0xd5, 0x12, 0xca, 0xc7, 0x68, 0x43, + 0xd2, 0xcf, 0x23, 0x89, 0x05, 0x7e, 0xab, 0x25, 0xf4, 0x2e, 0x86, 0x85, 0xe3, 0x6a, 0x09, 0x7d, + 0x21, 0x1e, 0xbc, 0xa8, 0xe7, 0x72, 0xa9, 0x34, 0xa9, 0x95, 0xd0, 0xfb, 0x98, 0xa4, 0xb1, 0x92, + 0x7c, 0x89, 0x3f, 0x81, 0xd7, 0xb1, 0x08, 0xa1, 0xe8, 0x38, 0x26, 0x12, 0x51, 0x42, 0xd1, 0xcf, + 0x9e, 0x8e, 0xd4, 0x28, 0xa1, 0xc2, 0xd3, 0x91, 0x1a, 0x25, 0xf4, 0xd5, 0x33, 0x91, 0x1a, 0x25, + 0xf4, 0xf5, 0x33, 0x91, 0x1a, 0x25, 0xf4, 0xcd, 0xe3, 0x6a, 0x95, 0xeb, 0xa8, 0xf8, 0xb8, 0x5a, + 0xe5, 0x3a, 0x3a, 0x79, 0xa2, 0x5a, 0xe5, 0x3a, 0x2a, 0x3d, 0x51, 0xad, 0x72, 0x1d, 0x95, 0xf1, + 0x36, 0x64, 0x83, 0xb7, 0x53, 0xd1, 0x96, 0xc9, 0x83, 0xad, 0x7a, 0x8e, 0x7e, 0x2d, 0x46, 0x3b, + 0xdc, 0x76, 0x1c, 0xdf, 0xb9, 0x41, 0x06, 0x06, 0x58, 0x0b, 0x08, 0xba, 0xc2, 0xbb, 0xb0, 0x39, + 0xa2, 0x9e, 0xef, 0x38, 0xcc, 0xe5, 0x64, 0x8a, 0xcc, 0xc2, 0x31, 0xec, 0x3d, 0x7a, 0xb9, 0x17, + 0x87, 0xf0, 0x87, 0xe1, 0x70, 0x10, 0x1c, 0x6a, 0x62, 0x25, 0xce, 0xc0, 0x36, 0xec, 0x3d, 0x7a, + 0xdb, 0x16, 0xbe, 0x3b, 0x8e, 0xdf, 0x6e, 0x37, 0x83, 0x53, 0xbd, 0xe3, 0xf8, 0x03, 0x94, 0x10, + 0x56, 0x62, 0x35, 0x46, 0x49, 0x71, 0xc6, 0x0a, 0x85, 0xf0, 0xc8, 0x4b, 0x17, 0x86, 0x00, 0x03, + 0xf6, 0x91, 0xb8, 0xc1, 0x8b, 0x50, 0xe4, 0x86, 0xde, 0x84, 0x75, 0xcd, 0xa7, 0xf2, 0x5e, 0x4e, + 0x88, 0x13, 0xbd, 0x3f, 0x9b, 0xa1, 0xa4, 0x88, 0x30, 0x30, 0x7c, 0x8f, 0x4c, 0x51, 0x0a, 0x6f, + 0xc1, 0x46, 0xcb, 0xb5, 0xb8, 0x65, 0x1a, 0x0b, 0x94, 0x16, 0x51, 0x74, 0xe3, 0x86, 0x4c, 0x51, + 0xa6, 0x30, 0x83, 0x83, 0xe8, 0x79, 0x1b, 0x9e, 0xd6, 0x8c, 0x4a, 0xad, 0x61, 0x53, 0x0b, 0xaf, + 0x1d, 0x7d, 0xd8, 0x0f, 0x13, 0xd4, 0x14, 0x5d, 0x19, 0xa2, 0x24, 0xde, 0x07, 0xac, 0x29, 0x83, + 0x66, 0x57, 0x9b, 0x74, 0x46, 0x8a, 0x3e, 0x9c, 0x34, 0x3b, 0x8a, 0x3a, 0x0c, 0x6e, 0x97, 0x41, + 0x73, 0xa4, 0x2b, 0x28, 0x2d, 0xed, 0x9a, 0x63, 0x05, 0x65, 0x0a, 0xff, 0x48, 0x3c, 0xff, 0x52, + 0xfc, 0xe8, 0x1d, 0x6f, 0x3f, 0x4a, 0x26, 0x23, 0xf5, 0x5c, 0xed, 0x5f, 0xaa, 0xe8, 0x85, 0x18, + 0x9b, 0x98, 0xec, 0xac, 0xd9, 0xbd, 0x50, 0xda, 0x28, 0x81, 0xdf, 0x40, 0x2e, 0x26, 0xd2, 0x47, + 0xad, 0x96, 0xa2, 0xb4, 0x95, 0x36, 0x4a, 0x3e, 0xe1, 0x74, 0xa0, 0xa8, 0xed, 0xae, 0xda, 0x41, + 0xa9, 0x27, 0x2c, 0x35, 0xe5, 0xb4, 0xdf, 0x1f, 0x0a, 0x69, 0xba, 0xf0, 0x23, 0x6c, 0x35, 0x5d, + 0xf3, 0xda, 0xe2, 0xc4, 0xe4, 0xbe, 0x4b, 0x44, 0x7d, 0x6f, 0x1b, 0xf5, 0xa0, 0x28, 0xbd, 0xae, + 0x68, 0xb0, 0xbc, 0x3b, 0x17, 0xce, 0xb5, 0x81, 0x92, 0xa2, 0x15, 0xb2, 0x4b, 0x83, 0x16, 0x4a, + 0x89, 0x99, 0x6d, 0x6a, 0xbd, 0xc9, 0x43, 0x73, 0x94, 0x11, 0x76, 0x96, 0x21, 0x2e, 0x5a, 0xe9, + 0xaa, 0x5e, 0x43, 0x59, 0x51, 0x4a, 0x79, 0xf9, 0x46, 0x55, 0xb7, 0x0a, 0x1f, 0x60, 0x4b, 0x27, + 0xa6, 0xef, 0x5a, 0xfc, 0x4e, 0x0e, 0xcd, 0x1e, 0x6c, 0xab, 0xfd, 0x61, 0xab, 0xaf, 0x9e, 0x75, + 0x3b, 0x23, 0x4d, 0x69, 0xa3, 0x17, 0x02, 0x0d, 0xb5, 0x91, 0x3e, 0x54, 0xda, 0x17, 0xcd, 0x91, + 0xda, 0xfa, 0x80, 0x12, 0xe2, 0x22, 0x94, 0x2a, 0x6d, 0x45, 0x1d, 0x76, 0x9b, 0x17, 0xe3, 0x1e, + 0x4a, 0x7e, 0x77, 0x0e, 0xc8, 0x23, 0xd4, 0xb3, 0xb8, 0x75, 0x43, 0xc2, 0xef, 0x5e, 0xfc, 0x69, + 0x31, 0xf8, 0xce, 0x2d, 0x2e, 0xbf, 0x73, 0x8b, 0x67, 0x16, 0x59, 0x4c, 0xfb, 0x8e, 0x28, 0x84, + 0x97, 0xfb, 0xd7, 0x1f, 0x53, 0xf2, 0x8d, 0xe9, 0x91, 0xe1, 0x77, 0x0a, 0x6c, 0xaf, 0xd8, 0x6f, + 0x3c, 0x46, 0xff, 0x9f, 0xa7, 0x7f, 0x87, 0x9e, 0xa2, 0x56, 0xa7, 0x5f, 0xfc, 0xea, 0xf3, 0xb9, + 0xc5, 0xaf, 0xfd, 0xab, 0xa2, 0xc9, 0xec, 0x13, 0xdb, 0x32, 0x5d, 0xe6, 0xb1, 0x19, 0x3f, 0xb1, + 0x99, 0x79, 0xe2, 0x3a, 0xe6, 0x49, 0xf0, 0x61, 0x7e, 0xb5, 0x26, 0x9d, 0x56, 0xff, 0x1b, 0x00, + 0x00, 0xff, 0xff, 0x72, 0xe6, 0xaa, 0xdb, 0xbb, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 4433409a..d49965aa 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -110,8 +110,9 @@ enum GpuAssignmentType { } message Gpu { - GpuAssignmentType assignment = 1; - int32 partitionSizeGB = 2; + string name = 1; + GpuAssignmentType assignment = 2; + int32 partitionSizeGB = 3; } message VirtualMachineCustomSize { diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index d56c20ed..8aefa0a9 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -226,61 +226,77 @@ func (m *PhysicalMemory) GetSizeBytes() uint64 { return 0 } -type GPU struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` - Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GPU) Reset() { *m = GPU{} } -func (m *GPU) String() string { return proto.CompactTextString(m) } -func (*GPU) ProtoMessage() {} -func (*GPU) Descriptor() ([]byte, []int) { +type HostGPU struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` + PartitionSizeBytes uint64 `protobuf:"varint,3,opt,name=partitionSizeBytes,proto3" json:"partitionSizeBytes,omitempty"` + Assignment GpuAssignmentType `protobuf:"varint,4,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` + Id string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HostGPU) Reset() { *m = HostGPU{} } +func (m *HostGPU) String() string { return proto.CompactTextString(m) } +func (*HostGPU) ProtoMessage() {} +func (*HostGPU) Descriptor() ([]byte, []int) { return fileDescriptor_7c83f03f7e6831a3, []int{3} } -func (m *GPU) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GPU.Unmarshal(m, b) +func (m *HostGPU) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_HostGPU.Unmarshal(m, b) } -func (m *GPU) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GPU.Marshal(b, m, deterministic) +func (m *HostGPU) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_HostGPU.Marshal(b, m, deterministic) } -func (m *GPU) XXX_Merge(src proto.Message) { - xxx_messageInfo_GPU.Merge(m, src) +func (m *HostGPU) XXX_Merge(src proto.Message) { + xxx_messageInfo_HostGPU.Merge(m, src) } -func (m *GPU) XXX_Size() int { - return xxx_messageInfo_GPU.Size(m) +func (m *HostGPU) XXX_Size() int { + return xxx_messageInfo_HostGPU.Size(m) } -func (m *GPU) XXX_DiscardUnknown() { - xxx_messageInfo_GPU.DiscardUnknown(m) +func (m *HostGPU) XXX_DiscardUnknown() { + xxx_messageInfo_HostGPU.DiscardUnknown(m) } -var xxx_messageInfo_GPU proto.InternalMessageInfo +var xxx_messageInfo_HostGPU proto.InternalMessageInfo -func (m *GPU) GetName() string { +func (m *HostGPU) GetName() string { if m != nil { return m.Name } return "" } -func (m *GPU) GetSizeBytes() uint32 { +func (m *HostGPU) GetSizeBytes() uint32 { if m != nil { return m.SizeBytes } return 0 } -func (m *GPU) GetCount() uint32 { +func (m *HostGPU) GetPartitionSizeBytes() uint64 { if m != nil { - return m.Count + return m.PartitionSizeBytes } return 0 } +func (m *HostGPU) GetAssignment() GpuAssignmentType { + if m != nil { + return m.Assignment + } + return GpuAssignmentType_GpuDDA +} + +func (m *HostGPU) GetId() string { + if m != nil { + return m.Id + } + return "" +} + type OperatingSystem struct { Operatingsystemsku uint64 `protobuf:"varint,1,opt,name=operatingsystemsku,proto3" json:"operatingsystemsku,omitempty"` Ostype OperatingSystemType `protobuf:"varint,2,opt,name=ostype,proto3,enum=moc.OperatingSystemType" json:"ostype,omitempty"` @@ -442,9 +458,8 @@ func (m *NodeInfo) GetOsInfo() *OperatingSystem { type Resources struct { Processor *Processor `protobuf:"bytes,1,opt,name=processor,proto3" json:"processor,omitempty"` Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` - Gpu *GPU `protobuf:"bytes,3,opt,name=gpu,proto3" json:"gpu,omitempty"` + GpuList []*HostGPU `protobuf:"bytes,3,rep,name=gpuList,proto3" json:"gpuList,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` - GpuList []*Gpu `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -489,9 +504,9 @@ func (m *Resources) GetMemory() *PhysicalMemory { return nil } -func (m *Resources) GetGpu() *GPU { +func (m *Resources) GetGpuList() []*HostGPU { if m != nil { - return m.Gpu + return m.GpuList } return nil } @@ -503,19 +518,12 @@ func (m *Resources) GetVmCapabilities() *VirtualMachineCapabilities { return nil } -func (m *Resources) GetGpuList() []*Gpu { - if m != nil { - return m.GpuList - } - return nil -} - func init() { proto.RegisterEnum("moc.common.OsRegistrationState", OsRegistrationState_name, OsRegistrationState_value) proto.RegisterType((*OsRegistrationStatus)(nil), "moc.common.OsRegistrationStatus") proto.RegisterType((*Processor)(nil), "moc.common.Processor") proto.RegisterType((*PhysicalMemory)(nil), "moc.common.PhysicalMemory") - proto.RegisterType((*GPU)(nil), "moc.common.GPU") + proto.RegisterType((*HostGPU)(nil), "moc.common.HostGPU") proto.RegisterType((*OperatingSystem)(nil), "moc.common.OperatingSystem") proto.RegisterType((*NodeInfo)(nil), "moc.common.NodeInfo") proto.RegisterType((*Resources)(nil), "moc.common.Resources") @@ -524,51 +532,53 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 726 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x4c, - 0x10, 0xfd, 0xf2, 0x53, 0x37, 0x99, 0xb4, 0x69, 0xbb, 0x5f, 0x01, 0x53, 0x10, 0x04, 0x57, 0x54, - 0x11, 0x42, 0x09, 0x4a, 0x55, 0x01, 0x97, 0x94, 0x8b, 0x08, 0x44, 0x69, 0xb4, 0x6d, 0xb9, 0xe0, - 0xa6, 0x72, 0x9d, 0x49, 0xb2, 0x22, 0xf6, 0x5a, 0xbb, 0xeb, 0x48, 0xee, 0x23, 0xf0, 0x5c, 0x3c, - 0x01, 0x2f, 0xc1, 0x6b, 0x20, 0x8f, 0x9d, 0xc4, 0x4e, 0xa3, 0x8a, 0x2b, 0x7b, 0xe7, 0x9c, 0x99, - 0x9d, 0x99, 0x33, 0x3b, 0xf0, 0xd8, 0x97, 0xde, 0xb5, 0x27, 0x7d, 0x5f, 0x06, 0xd7, 0x81, 0x1c, - 0xa2, 0x08, 0x46, 0xb2, 0x13, 0x2a, 0x69, 0x24, 0x03, 0x5f, 0x7a, 0x9d, 0x14, 0x3a, 0x78, 0x94, - 0xa3, 0xa5, 0x9f, 0x94, 0x74, 0xf0, 0xac, 0x08, 0x84, 0x91, 0xc1, 0x3c, 0xee, 0x9c, 0xc3, 0xfe, - 0xb9, 0xe6, 0x38, 0x16, 0xda, 0x28, 0xd7, 0x08, 0x19, 0x5c, 0x18, 0xd7, 0x44, 0x9a, 0xbd, 0x05, - 0x4b, 0xd3, 0x9f, 0x5d, 0x6a, 0x95, 0xda, 0xcd, 0xde, 0xf3, 0xce, 0xf2, 0xb6, 0xce, 0x5d, 0x0f, - 0xe4, 0x19, 0xdd, 0xf9, 0x5d, 0x86, 0xfa, 0x40, 0x49, 0x0f, 0xb5, 0x96, 0x8a, 0x31, 0xa8, 0x06, - 0xae, 0x8f, 0x14, 0xa4, 0xce, 0xe9, 0x9f, 0xed, 0xc3, 0x86, 0x27, 0x15, 0x6a, 0xbb, 0xdc, 0x2a, - 0xb5, 0xb7, 0x79, 0x7a, 0x48, 0xac, 0x3a, 0x44, 0x1c, 0xda, 0x15, 0xa2, 0xa6, 0x07, 0x76, 0x04, - 0x55, 0x13, 0x87, 0x68, 0x57, 0x29, 0x09, 0x46, 0x49, 0x2c, 0xa2, 0x5f, 0xc6, 0x21, 0x72, 0xc2, - 0xd9, 0x11, 0x34, 0x67, 0x42, 0x99, 0xc8, 0x9d, 0x8a, 0x5b, 0x4a, 0xca, 0xde, 0x68, 0x95, 0xda, - 0x35, 0xbe, 0x62, 0x65, 0xaf, 0x61, 0x6f, 0x2a, 0xc7, 0xc2, 0x73, 0xa7, 0xe1, 0x3c, 0x8a, 0xb6, - 0x2d, 0xca, 0xe3, 0x2e, 0x90, 0xb0, 0x27, 0x71, 0x88, 0x6a, 0x26, 0xb4, 0x54, 0xa1, 0x42, 0x8d, - 0x81, 0xb1, 0x37, 0x29, 0xf0, 0x5d, 0x80, 0x39, 0xb0, 0xe5, 0xbb, 0x41, 0x34, 0x72, 0x3d, 0x13, - 0x29, 0x54, 0x76, 0x8d, 0x0a, 0x29, 0xd8, 0xd8, 0x09, 0x6c, 0xb9, 0xca, 0x9b, 0x08, 0x83, 0x64, - 0xb0, 0xeb, 0x54, 0xd7, 0x1e, 0xd5, 0xf5, 0x21, 0x07, 0xf0, 0x02, 0xcd, 0xe9, 0x40, 0x73, 0x30, - 0x89, 0x75, 0x92, 0xde, 0x19, 0xfa, 0x52, 0xc5, 0xec, 0x29, 0xd4, 0xb5, 0xb8, 0xc5, 0xd3, 0xd8, - 0x60, 0x2a, 0x51, 0x95, 0x2f, 0x0d, 0xce, 0x19, 0x54, 0xfa, 0x83, 0xab, 0xb5, 0xdd, 0x2f, 0x38, - 0xa6, 0x0a, 0x2c, 0x0d, 0xa9, 0x36, 0x51, 0x60, 0x48, 0x05, 0xd2, 0x26, 0x0a, 0x8c, 0xf3, 0xa7, - 0x04, 0x3b, 0xe7, 0x21, 0x26, 0x72, 0x07, 0xe3, 0x8b, 0x58, 0x1b, 0xf4, 0x59, 0x07, 0x98, 0x9c, - 0x9b, 0x34, 0x99, 0xf4, 0x8f, 0x28, 0xcb, 0x64, 0x0d, 0xc2, 0xde, 0x80, 0x25, 0x35, 0x69, 0x59, - 0xa6, 0x9a, 0x6d, 0xaa, 0x79, 0x25, 0x2a, 0x29, 0x9a, 0xf1, 0x92, 0x4c, 0xa5, 0x9e, 0xa1, 0xd2, - 0x89, 0x9c, 0xe9, 0x54, 0x2c, 0x0d, 0xec, 0x12, 0xf6, 0xe5, 0x9a, 0xc1, 0xa5, 0x49, 0x69, 0xf4, - 0x5a, 0xf7, 0x8f, 0x6b, 0xa4, 0xf9, 0x5a, 0x6f, 0xe7, 0x57, 0x19, 0x6a, 0x5f, 0xe5, 0x10, 0x3f, - 0x05, 0x23, 0xb9, 0xb6, 0x7d, 0x4d, 0x28, 0x8b, 0x21, 0x95, 0x50, 0xe7, 0x65, 0x31, 0x64, 0x27, - 0x00, 0x9e, 0x1b, 0xba, 0x37, 0x62, 0x2a, 0x4c, 0x4c, 0x59, 0x36, 0x7a, 0x0f, 0xf2, 0x97, 0x73, - 0xd4, 0x32, 0x52, 0x1e, 0x6a, 0x9e, 0x23, 0xb2, 0xf7, 0xb0, 0xe5, 0xce, 0x5c, 0x31, 0x9d, 0x3b, - 0x56, 0xef, 0x73, 0x2c, 0x50, 0x73, 0x8d, 0xb4, 0xfe, 0xb1, 0x91, 0x87, 0x8b, 0xb7, 0xbc, 0x49, - 0xd7, 0x34, 0xc8, 0x23, 0xeb, 0x43, 0x06, 0xb1, 0x87, 0x60, 0x45, 0xa1, 0x11, 0x3e, 0xd2, 0xdc, - 0x56, 0x78, 0x76, 0x62, 0xc7, 0xc9, 0x75, 0x49, 0x3b, 0x68, 0x56, 0x1b, 0xbd, 0x27, 0x85, 0xce, - 0x16, 0x6f, 0xe5, 0x19, 0xd5, 0xf9, 0x59, 0x86, 0xfa, 0x22, 0x7f, 0x76, 0x0c, 0xf5, 0xc5, 0xa3, - 0xa2, 0x66, 0xae, 0x54, 0xba, 0x78, 0xd0, 0x7c, 0xc9, 0x63, 0x3d, 0xb0, 0x7c, 0x1a, 0x75, 0x6a, - 0x76, 0xa3, 0x77, 0x50, 0xf0, 0x28, 0x3c, 0x06, 0x9e, 0x31, 0xd9, 0x0b, 0xa8, 0x8c, 0xc3, 0x28, - 0x53, 0x61, 0x27, 0xef, 0xd0, 0x1f, 0x5c, 0xf1, 0x04, 0x63, 0x7d, 0x68, 0xce, 0xfc, 0x8f, 0x73, - 0x21, 0x04, 0x6a, 0x5a, 0x14, 0x8d, 0x6c, 0xbf, 0x7d, 0x4b, 0xb7, 0xc5, 0x99, 0xeb, 0x4d, 0x44, - 0x80, 0x79, 0x1a, 0x5f, 0x71, 0x63, 0x0e, 0x6c, 0x8e, 0xc3, 0xe8, 0x8b, 0xd0, 0xc6, 0xb6, 0x5a, - 0x95, 0x76, 0xa3, 0x57, 0xa3, 0x08, 0xfd, 0x30, 0xe2, 0x73, 0xe0, 0x73, 0xb5, 0x56, 0xdd, 0xdd, - 0x78, 0xf5, 0x0e, 0xfe, 0x5f, 0xb3, 0x30, 0xd9, 0x1e, 0x6c, 0x07, 0xd2, 0xa4, 0x76, 0x54, 0x38, - 0xdc, 0xfd, 0x8f, 0x35, 0x01, 0xd4, 0xf2, 0x5c, 0x3a, 0x7d, 0xf9, 0xfd, 0x70, 0x2c, 0xcc, 0x24, - 0xba, 0x49, 0xca, 0xe8, 0xfa, 0xc2, 0x53, 0x52, 0xcb, 0x91, 0xe9, 0xfa, 0xd2, 0xeb, 0xaa, 0xd0, - 0xeb, 0xa6, 0xc5, 0xdd, 0x58, 0xb4, 0xca, 0x8f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x4d, - 0x9b, 0x90, 0x2c, 0x06, 0x00, 0x00, + // 753 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xd3, 0x4a, + 0x10, 0x3e, 0x4e, 0xd2, 0xfc, 0x4c, 0xda, 0x9c, 0x76, 0xdb, 0xd3, 0xe3, 0xd3, 0x83, 0x20, 0x72, + 0x45, 0x15, 0x21, 0x48, 0x50, 0xaa, 0xf2, 0x73, 0xd9, 0x72, 0x51, 0x40, 0x94, 0x56, 0xdb, 0xc2, + 0x05, 0x37, 0x95, 0xeb, 0x4c, 0x92, 0x15, 0xb1, 0xd7, 0xda, 0x5d, 0x47, 0x72, 0x5f, 0x8b, 0x57, + 0xe0, 0x09, 0x78, 0x09, 0xee, 0x79, 0x02, 0xe4, 0xb1, 0x93, 0xd8, 0x69, 0x54, 0x71, 0x15, 0xef, + 0x7c, 0xdf, 0xec, 0x7e, 0xf3, 0xcd, 0xce, 0x06, 0xfe, 0xf3, 0xa5, 0x77, 0xed, 0x49, 0xdf, 0x97, + 0xc1, 0x75, 0x20, 0x07, 0x28, 0x82, 0xa1, 0xec, 0x86, 0x4a, 0x1a, 0xc9, 0xc0, 0x97, 0x5e, 0x37, + 0x85, 0xf6, 0xfe, 0xcd, 0xd1, 0xd2, 0x9f, 0x94, 0xb4, 0xf7, 0xb0, 0x08, 0x84, 0x91, 0xc1, 0x3c, + 0xee, 0x9c, 0xc3, 0xce, 0xb9, 0xe6, 0x38, 0x12, 0xda, 0x28, 0xd7, 0x08, 0x19, 0x5c, 0x1a, 0xd7, + 0x44, 0x9a, 0xbd, 0x84, 0xaa, 0xa6, 0x2f, 0xdb, 0x6a, 0x5b, 0x9d, 0x56, 0xff, 0x51, 0x77, 0x71, + 0x5a, 0xf7, 0x6e, 0x06, 0xf2, 0x8c, 0xee, 0xfc, 0x28, 0x41, 0xe3, 0x42, 0x49, 0x0f, 0xb5, 0x96, + 0x8a, 0x31, 0xa8, 0x04, 0xae, 0x8f, 0xb4, 0x49, 0x83, 0xd3, 0x37, 0xdb, 0x81, 0x35, 0x4f, 0x2a, + 0xd4, 0x76, 0xa9, 0x6d, 0x75, 0x36, 0x78, 0xba, 0x48, 0xa2, 0x3a, 0x44, 0x1c, 0xd8, 0x65, 0xa2, + 0xa6, 0x0b, 0x76, 0x00, 0x15, 0x13, 0x87, 0x68, 0x57, 0x48, 0x04, 0x23, 0x11, 0xf3, 0xdd, 0xaf, + 0xe2, 0x10, 0x39, 0xe1, 0xec, 0x00, 0x5a, 0x53, 0xa1, 0x4c, 0xe4, 0x4e, 0xc4, 0x2d, 0x89, 0xb2, + 0xd7, 0xda, 0x56, 0xa7, 0xce, 0x97, 0xa2, 0xec, 0x29, 0x6c, 0x4d, 0xe4, 0x48, 0x78, 0xee, 0x24, + 0x9c, 0xed, 0xa2, 0xed, 0x2a, 0xe9, 0xb8, 0x0b, 0x24, 0xec, 0x71, 0x1c, 0xa2, 0x9a, 0x0a, 0x2d, + 0x55, 0xa8, 0x50, 0x63, 0x60, 0xec, 0x1a, 0x6d, 0x7c, 0x17, 0x60, 0x0e, 0xac, 0xfb, 0x6e, 0x10, + 0x0d, 0x5d, 0xcf, 0x44, 0x0a, 0x95, 0x5d, 0xa7, 0x42, 0x0a, 0x31, 0x76, 0x04, 0xeb, 0xae, 0xf2, + 0xc6, 0xc2, 0x20, 0x05, 0xec, 0x06, 0xd5, 0xb5, 0x45, 0x75, 0x1d, 0xe7, 0x00, 0x5e, 0xa0, 0x39, + 0x5d, 0x68, 0x5d, 0x8c, 0x63, 0x9d, 0xc8, 0x3b, 0x43, 0x5f, 0xaa, 0x98, 0x3d, 0x80, 0x86, 0x16, + 0xb7, 0x78, 0x12, 0x1b, 0x4c, 0x5b, 0x54, 0xe1, 0x8b, 0x80, 0xf3, 0xcd, 0x82, 0xda, 0x5b, 0xa9, + 0xcd, 0xe9, 0xc5, 0xa7, 0x95, 0x2d, 0x28, 0x64, 0xa7, 0x6d, 0x58, 0x04, 0x58, 0x17, 0x58, 0xe8, + 0x2a, 0x23, 0xa8, 0xb9, 0x73, 0x5a, 0x99, 0x0e, 0x59, 0x81, 0xb0, 0x17, 0x00, 0xae, 0xd6, 0x62, + 0x14, 0xf8, 0x89, 0x3f, 0x69, 0xab, 0x76, 0xa9, 0xa4, 0xd3, 0x30, 0x3a, 0x9e, 0x23, 0xd4, 0xae, + 0x1c, 0x93, 0xb5, 0xa0, 0x24, 0x06, 0xd4, 0xa8, 0x06, 0x2f, 0x89, 0x81, 0xf3, 0xd3, 0x82, 0xbf, + 0xcf, 0x43, 0x4c, 0x6e, 0x55, 0x30, 0xba, 0x8c, 0xb5, 0x41, 0x3f, 0xd1, 0x22, 0x67, 0x21, 0x4d, + 0x21, 0xfd, 0x35, 0xca, 0x0a, 0x5e, 0x81, 0xb0, 0xe7, 0x50, 0x95, 0x9a, 0xae, 0x4c, 0x89, 0x74, + 0xd8, 0xa4, 0x63, 0x69, 0x57, 0x52, 0x92, 0xf1, 0x12, 0x2f, 0xa4, 0x9e, 0xa2, 0xd2, 0xc9, 0xad, + 0x49, 0x2f, 0xdf, 0x22, 0xc0, 0xae, 0x60, 0x47, 0xae, 0x98, 0x0f, 0xaa, 0xb2, 0xd9, 0x6f, 0xdf, + 0x3f, 0x15, 0x91, 0xe6, 0x2b, 0xb3, 0x9d, 0xef, 0x25, 0xa8, 0x7f, 0x94, 0x03, 0x7c, 0x17, 0x0c, + 0xe5, 0xca, 0x06, 0xa5, 0xd6, 0x94, 0x66, 0xd6, 0xb0, 0x23, 0x00, 0xcf, 0x0d, 0xdd, 0x1b, 0x31, + 0x11, 0x26, 0x26, 0x95, 0xcd, 0xfe, 0x3f, 0xf9, 0xc3, 0x39, 0x6a, 0x19, 0x29, 0x0f, 0x35, 0xcf, + 0x11, 0xd9, 0x6b, 0x58, 0x77, 0xa7, 0xae, 0x98, 0xcc, 0x12, 0x2b, 0xf7, 0x25, 0x16, 0xa8, 0x39, + 0x23, 0xab, 0x7f, 0x68, 0xe4, 0xfe, 0xfc, 0xc9, 0xa8, 0xd1, 0x31, 0x4d, 0xca, 0xc8, 0x7c, 0xc8, + 0x20, 0xb6, 0x0b, 0xd5, 0x28, 0x34, 0xc2, 0x47, 0x1a, 0x8f, 0x32, 0xcf, 0x56, 0xec, 0x30, 0x39, + 0x2e, 0xb1, 0x83, 0x46, 0xa2, 0xd9, 0xff, 0xbf, 0xe0, 0x6c, 0xf1, 0x54, 0x9e, 0x51, 0x9d, 0x5f, + 0x16, 0x34, 0xe6, 0xfa, 0xd9, 0x21, 0x34, 0xe6, 0xb3, 0x4b, 0x66, 0x2e, 0x55, 0x3a, 0x7f, 0x37, + 0xf8, 0x82, 0xc7, 0xfa, 0x50, 0xf5, 0x69, 0xa2, 0xc8, 0xec, 0x66, 0x7f, 0xaf, 0x90, 0x51, 0x98, + 0x39, 0x9e, 0x31, 0xd9, 0x33, 0xa8, 0x8d, 0xc2, 0xe8, 0x83, 0xd0, 0xc6, 0x2e, 0xb7, 0xcb, 0x9d, + 0x66, 0x7f, 0x3b, 0x9f, 0x94, 0xcd, 0x1d, 0x9f, 0x71, 0xd8, 0x29, 0xb4, 0xa6, 0xfe, 0x9b, 0x59, + 0x53, 0x04, 0x6a, 0xba, 0xf2, 0xcd, 0xec, 0x49, 0xfd, 0x9c, 0x3e, 0x50, 0x67, 0xae, 0x37, 0x16, + 0x01, 0xe6, 0x69, 0x7c, 0x29, 0xed, 0x7d, 0xa5, 0x5e, 0xd9, 0x5c, 0x7b, 0xf2, 0x0a, 0xb6, 0x57, + 0xbc, 0xbf, 0x6c, 0x0b, 0x36, 0x02, 0x69, 0xd2, 0x38, 0x2a, 0x1c, 0x6c, 0xfe, 0xc5, 0x5a, 0x00, + 0x6a, 0xb1, 0xb6, 0x4e, 0x1e, 0x7f, 0xd9, 0x1f, 0x09, 0x33, 0x8e, 0x6e, 0x12, 0xa9, 0x3d, 0x5f, + 0x78, 0x4a, 0x6a, 0x39, 0x34, 0x3d, 0x5f, 0x7a, 0x3d, 0x15, 0x7a, 0xbd, 0xb4, 0x80, 0x9b, 0x2a, + 0xfd, 0x33, 0x1c, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x94, 0xdc, 0x95, 0x5a, 0x7b, 0x06, 0x00, + 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index 75e744c3..fdc3d3a0 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -33,10 +33,12 @@ message PhysicalMemory { uint64 sizeBytes = 1; } -message GPU { +message HostGPU { string name = 1; uint32 sizeBytes = 2; - uint32 count = 3; + uint64 partitionSizeBytes = 3; + GpuAssignmentType assignment = 4; + string id = 5; } message OperatingSystem { @@ -61,7 +63,6 @@ message Resources { reserved 4; Processor processor = 1; PhysicalMemory memory = 2; - GPU gpu = 3; // delete it after gpuList is applied + repeated HostGPU gpuList = 3; VirtualMachineCapabilities vmCapabilities = 5; - repeated Gpu gpuList = 6; } \ No newline at end of file From 1efd3f2c72af692f4c1523f7603ef746b428b3b4 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Thu, 11 Apr 2024 13:39:40 -0700 Subject: [PATCH 05/13] Converting partition size to MB --- rpc/common/moc_common_computecommon.pb.go | 198 +++++++++++----------- rpc/common/moc_common_computecommon.proto | 2 +- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 44efc84e..b85fe947 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -664,7 +664,7 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { type Gpu struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Assignment GpuAssignmentType `protobuf:"varint,2,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` - PartitionSizeGB int32 `protobuf:"varint,3,opt,name=partitionSizeGB,proto3" json:"partitionSizeGB,omitempty"` + PartitionSizeMB uint64 `protobuf:"varint,3,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -709,9 +709,9 @@ func (m *Gpu) GetAssignment() GpuAssignmentType { return GpuAssignmentType_GpuDDA } -func (m *Gpu) GetPartitionSizeGB() int32 { +func (m *Gpu) GetPartitionSizeMB() uint64 { if m != nil { - return m.PartitionSizeGB + return m.PartitionSizeMB } return 0 } @@ -1323,102 +1323,102 @@ var fileDescriptor_7d1a061f6c82445b = []byte{ 0xea, 0x78, 0xb3, 0x82, 0xef, 0x5d, 0x2d, 0x45, 0xda, 0xbd, 0x52, 0xfe, 0x77, 0x90, 0xea, 0x38, 0x3e, 0xc6, 0x90, 0xa6, 0x86, 0x4d, 0x64, 0xf8, 0xac, 0x26, 0xd7, 0xb8, 0x0e, 0x60, 0x78, 0x9e, 0x35, 0xa7, 0x36, 0xa1, 0x3c, 0x97, 0x7c, 0x90, 0x58, 0xc7, 0xf1, 0x9b, 0x2b, 0x89, 0x4c, 0xec, - 0x81, 0x26, 0x3e, 0x86, 0x5d, 0xc7, 0x70, 0xb9, 0x25, 0x32, 0xd2, 0xad, 0x1f, 0x49, 0xe7, 0x34, - 0x97, 0x3a, 0x4a, 0x1c, 0x67, 0xb4, 0x38, 0xce, 0x53, 0xc8, 0x8d, 0x2d, 0x97, 0xfb, 0xc6, 0xa2, + 0x81, 0x26, 0x3e, 0x86, 0x5d, 0xc7, 0x70, 0xb9, 0x25, 0x32, 0xd2, 0xad, 0x1f, 0x49, 0xef, 0x34, + 0x97, 0x3a, 0x4a, 0x1c, 0xa7, 0xb5, 0x38, 0xce, 0x53, 0xc8, 0x8d, 0x2d, 0x97, 0xfb, 0xc6, 0xa2, 0x67, 0x98, 0xd7, 0x16, 0x25, 0x2d, 0xdf, 0xe3, 0xcc, 0x16, 0x52, 0x7c, 0x08, 0x1b, 0xa6, 0xe3, 0xb7, 0x98, 0x4f, 0xb9, 0xcc, 0x2a, 0xa3, 0xad, 0xf6, 0x42, 0x66, 0x13, 0x9b, 0xb9, 0x77, 0xbd, - 0x53, 0x99, 0x57, 0x46, 0x5b, 0xed, 0x85, 0x6c, 0xbe, 0xb4, 0x0b, 0xc2, 0xae, 0xf6, 0xf9, 0xbf, - 0x26, 0xe0, 0xb0, 0x7d, 0x47, 0x0d, 0xdb, 0x32, 0x7b, 0x52, 0x3f, 0x5a, 0xbd, 0x63, 0xd8, 0xb5, - 0x8d, 0x5b, 0xcb, 0xf6, 0xed, 0xde, 0xd2, 0xbb, 0x88, 0x9c, 0xd6, 0xe2, 0x58, 0x6a, 0x5a, 0x34, - 0xa2, 0x99, 0x0c, 0x35, 0xa3, 0x18, 0x17, 0x01, 0x73, 0xc3, 0x9d, 0x13, 0x1e, 0x90, 0x53, 0x7f, - 0x36, 0x23, 0xae, 0x4c, 0x6c, 0x5b, 0x7b, 0x42, 0x92, 0xff, 0x01, 0xde, 0x47, 0x4b, 0xa2, 0xf9, - 0xb4, 0xc5, 0x6c, 0xdb, 0xa0, 0xd3, 0x2e, 0x75, 0x7c, 0x3e, 0x30, 0x5c, 0xc3, 0x26, 0x9c, 0xb8, - 0xa2, 0x65, 0xea, 0x83, 0x96, 0x89, 0x35, 0x3e, 0x84, 0xcc, 0xd8, 0x58, 0xf8, 0x44, 0x66, 0x93, - 0x3d, 0x4d, 0xff, 0xf9, 0xef, 0xb9, 0x84, 0x16, 0xa0, 0xfc, 0x1f, 0x12, 0xf0, 0xee, 0x39, 0xd7, - 0xba, 0x9c, 0x50, 0x9d, 0xf9, 0xae, 0x49, 0xf0, 0x1b, 0x58, 0x0b, 0xf6, 0x81, 0xeb, 0xd3, 0xf4, - 0x9f, 0x84, 0x97, 0x90, 0xe1, 0x37, 0x90, 0x0d, 0x56, 0x23, 0xad, 0x1b, 0x84, 0xd1, 0xee, 0x81, - 0x90, 0x2e, 0xb3, 0x6d, 0xcb, 0x7f, 0x99, 0xd5, 0xee, 0x41, 0xfe, 0x9f, 0xff, 0x23, 0x85, 0x2e, - 0xf5, 0xb8, 0x41, 0x4d, 0x32, 0xb6, 0xc8, 0x47, 0xac, 0xc3, 0x8e, 0x72, 0x4b, 0x4c, 0x5f, 0xce, - 0x0a, 0x37, 0x38, 0x09, 0x9f, 0x8b, 0xaf, 0xe4, 0xf8, 0x3d, 0xe7, 0x22, 0x6a, 0xa2, 0xc5, 0x5c, - 0x88, 0xc9, 0x50, 0x6e, 0x2d, 0xde, 0x62, 0x53, 0xb2, 0x9c, 0x9a, 0xe5, 0x1e, 0xef, 0xc3, 0x5a, - 0xdf, 0xe7, 0x8e, 0xcf, 0xc3, 0xa4, 0xc3, 0x1d, 0x7e, 0x05, 0x19, 0xc5, 0x75, 0x99, 0x9b, 0x4b, - 0x4b, 0x1c, 0x6c, 0xf2, 0xdf, 0xc3, 0x61, 0x6c, 0x6e, 0x0d, 0xc7, 0xb8, 0xb2, 0x16, 0x16, 0xb7, - 0x88, 0x87, 0xbf, 0x86, 0xbd, 0xae, 0xc7, 0x16, 0x06, 0x27, 0xd3, 0xb1, 0x2d, 0x25, 0x8b, 0x20, - 0xff, 0x0d, 0xed, 0xb1, 0x20, 0xff, 0x9f, 0x04, 0xe0, 0x87, 0xff, 0x5d, 0xe4, 0xea, 0x7b, 0xa2, - 0xbb, 0xa6, 0x48, 0x34, 0xec, 0xae, 0x58, 0xe3, 0x9f, 0x43, 0x66, 0x41, 0x6e, 0xc8, 0x22, 0x7c, - 0x16, 0xbf, 0x94, 0xc5, 0x78, 0x6c, 0x5b, 0x0c, 0x7e, 0x2e, 0x84, 0xaa, 0x7c, 0x38, 0x03, 0x2b, - 0xfc, 0x0e, 0xb6, 0xa7, 0x96, 0xe7, 0x2c, 0x8c, 0xbb, 0x40, 0x21, 0xfc, 0xab, 0x51, 0x88, 0x73, - 0xb0, 0x6e, 0x13, 0xcf, 0x33, 0xe6, 0x24, 0xfc, 0xcf, 0xcb, 0xad, 0x48, 0x89, 0x5b, 0x36, 0xc9, - 0x65, 0x82, 0x94, 0xc4, 0x3a, 0xff, 0x0b, 0xd8, 0x8d, 0x45, 0xc3, 0x9b, 0xb0, 0x3e, 0xa2, 0xbf, - 0xa5, 0xec, 0x23, 0x45, 0x2f, 0xf0, 0x06, 0xa4, 0xbb, 0x74, 0xc6, 0x50, 0x42, 0xe0, 0x4b, 0xc3, - 0xa5, 0x16, 0x9d, 0xa3, 0x24, 0xce, 0x86, 0x65, 0x45, 0xa9, 0xfc, 0xef, 0xe1, 0xb3, 0x68, 0x2d, - 0x9b, 0x73, 0x42, 0x79, 0x64, 0x1a, 0xde, 0xc3, 0xce, 0x8d, 0x2d, 0xf1, 0x98, 0xb8, 0x9e, 0xc5, - 0x68, 0x58, 0x95, 0x18, 0xc5, 0x55, 0xd8, 0xf0, 0x64, 0x32, 0xc4, 0xcb, 0x25, 0xe5, 0xe1, 0x77, - 0xf0, 0x4c, 0x89, 0xb4, 0x95, 0x62, 0xbe, 0x0a, 0x07, 0x1d, 0x9f, 0x78, 0x5c, 0x7a, 0x8a, 0x9e, - 0x07, 0x39, 0x58, 0x27, 0x54, 0x34, 0x69, 0x1a, 0xb6, 0x6f, 0xb9, 0xcd, 0xff, 0x25, 0x01, 0x78, - 0xe0, 0xb2, 0xdb, 0xd8, 0x01, 0x92, 0x87, 0xec, 0x35, 0xe7, 0x8e, 0x94, 0x44, 0x1e, 0x9e, 0x7b, - 0x8c, 0xdf, 0x01, 0x88, 0x8d, 0x17, 0x28, 0x25, 0x1f, 0x28, 0x3d, 0xe0, 0x22, 0x34, 0x65, 0x81, - 0x4a, 0xea, 0x28, 0x25, 0xba, 0x10, 0x6e, 0x45, 0x0c, 0xee, 0xfa, 0x1e, 0x27, 0xd3, 0x96, 0x11, - 0x74, 0x68, 0x19, 0x63, 0x85, 0x0b, 0x6f, 0x61, 0x63, 0xe4, 0x11, 0x57, 0xb6, 0x63, 0x03, 0xd2, - 0x5a, 0xbf, 0x3f, 0x0c, 0x7a, 0x31, 0xd2, 0x15, 0x0d, 0x25, 0x0a, 0xbf, 0x84, 0xed, 0x81, 0xcb, - 0x4c, 0xe2, 0x79, 0x6c, 0xa5, 0xa4, 0x32, 0x4a, 0xd0, 0x0b, 0xd1, 0x99, 0x2e, 0xe5, 0x64, 0x11, - 0x74, 0x4c, 0x2e, 0xeb, 0x35, 0x94, 0xc4, 0xeb, 0x90, 0x6a, 0xf6, 0xda, 0x28, 0x25, 0x14, 0x9a, - 0xbd, 0x76, 0xbd, 0x86, 0xd2, 0x92, 0x69, 0x3d, 0x94, 0x91, 0x4c, 0xeb, 0xd5, 0x6b, 0x68, 0xad, - 0xf0, 0x3d, 0xbc, 0xed, 0x3b, 0x44, 0xd4, 0x83, 0xce, 0xf5, 0x3b, 0x8f, 0x13, 0xfb, 0x94, 0x31, - 0xee, 0x71, 0xd7, 0x70, 0x14, 0x3a, 0xb7, 0x28, 0xc1, 0x3b, 0x00, 0xad, 0x8b, 0xfe, 0xa8, 0x3d, - 0xe9, 0xaa, 0x5d, 0x91, 0x56, 0x0e, 0x5e, 0x5d, 0x76, 0xd5, 0x76, 0xff, 0x52, 0x9f, 0x34, 0x55, - 0xfd, 0x52, 0xd1, 0x26, 0x67, 0xdd, 0x0b, 0x45, 0x47, 0x89, 0xc2, 0x37, 0xf0, 0x32, 0xe6, 0x6b, - 0x39, 0x60, 0xa1, 0x41, 0x90, 0xef, 0x45, 0x57, 0x1d, 0xfd, 0x80, 0x12, 0x85, 0xbf, 0x65, 0x61, - 0x3f, 0x3a, 0x4a, 0xe2, 0x22, 0x59, 0x9a, 0xb4, 0xc9, 0xcc, 0xf0, 0x17, 0x1c, 0xbd, 0xc0, 0x18, - 0x76, 0x74, 0x6e, 0xd0, 0xa9, 0xe1, 0x4e, 0x27, 0xcd, 0xca, 0xe4, 0xa6, 0x82, 0x92, 0x51, 0x56, - 0x13, 0x2c, 0x85, 0x5f, 0xca, 0xd9, 0x0e, 0x58, 0xbb, 0xe2, 0x4d, 0x6e, 0xaa, 0x28, 0x1d, 0x85, - 0x35, 0x09, 0x33, 0x51, 0xd8, 0x90, 0x70, 0x0d, 0xbf, 0x02, 0x74, 0x0f, 0xcb, 0x75, 0x49, 0xd7, - 0xa3, 0xb4, 0x1a, 0x78, 0xdd, 0x88, 0x3a, 0xd0, 0x65, 0x4e, 0xd9, 0x18, 0xac, 0x0a, 0x08, 0x31, - 0x28, 0x33, 0xdd, 0x8c, 0xc1, 0x6f, 0x05, 0xdc, 0x8a, 0x46, 0xd2, 0xcb, 0xd2, 0x7e, 0x3b, 0xa2, - 0x7a, 0xde, 0xd0, 0x27, 0x37, 0x65, 0xb4, 0x13, 0x51, 0x3d, 0x6f, 0x88, 0xf8, 0x65, 0xb4, 0x1b, - 0xa7, 0x55, 0x41, 0x51, 0x9c, 0xd6, 0x04, 0xdd, 0xc3, 0x08, 0xb6, 0x56, 0x54, 0x3d, 0xaf, 0x23, - 0x8c, 0xf7, 0x60, 0xfb, 0x01, 0x29, 0x57, 0xd0, 0xcb, 0xa8, 0xd2, 0xb8, 0x8e, 0x5e, 0x45, 0x95, - 0xc6, 0xe5, 0x0a, 0x7a, 0x1d, 0xf7, 0xff, 0xad, 0xf0, 0xbf, 0x8f, 0x0f, 0xe0, 0x65, 0xac, 0x40, - 0x93, 0x0f, 0x03, 0x15, 0x1d, 0xc4, 0x04, 0xd5, 0xa5, 0x20, 0x17, 0x13, 0xd4, 0x96, 0x82, 0x4f, - 0x22, 0x01, 0xce, 0x2a, 0x9e, 0xa4, 0x87, 0x51, 0x5a, 0x0b, 0xe8, 0x4f, 0xa2, 0xb4, 0x11, 0xd0, - 0x37, 0xf8, 0x35, 0xec, 0xdd, 0x53, 0xd1, 0x59, 0x81, 0x3f, 0x8d, 0x94, 0x56, 0x6d, 0xd5, 0x26, - 0xcd, 0x0a, 0x7a, 0x1b, 0x83, 0x0d, 0x01, 0x3f, 0x8b, 0xb8, 0x55, 0x5b, 0xe5, 0xba, 0xa0, 0x47, - 0x31, 0x5a, 0xad, 0x08, 0xfa, 0xd3, 0x18, 0xad, 0x4d, 0x9a, 0xd5, 0x12, 0xca, 0xc7, 0x68, 0x43, - 0xd2, 0xcf, 0x23, 0x89, 0x05, 0x7e, 0xab, 0x25, 0xf4, 0x2e, 0x86, 0x85, 0xe3, 0x6a, 0x09, 0x7d, - 0x21, 0x1e, 0xbc, 0xa8, 0xe7, 0x72, 0xa9, 0x34, 0xa9, 0x95, 0xd0, 0xfb, 0x98, 0xa4, 0xb1, 0x92, - 0x7c, 0x89, 0x3f, 0x81, 0xd7, 0xb1, 0x08, 0xa1, 0xe8, 0x38, 0x26, 0x12, 0x51, 0x42, 0xd1, 0xcf, - 0x9e, 0x8e, 0xd4, 0x28, 0xa1, 0xc2, 0xd3, 0x91, 0x1a, 0x25, 0xf4, 0xd5, 0x33, 0x91, 0x1a, 0x25, - 0xf4, 0xf5, 0x33, 0x91, 0x1a, 0x25, 0xf4, 0xcd, 0xe3, 0x6a, 0x95, 0xeb, 0xa8, 0xf8, 0xb8, 0x5a, - 0xe5, 0x3a, 0x3a, 0x79, 0xa2, 0x5a, 0xe5, 0x3a, 0x2a, 0x3d, 0x51, 0xad, 0x72, 0x1d, 0x95, 0xf1, - 0x36, 0x64, 0x83, 0xb7, 0x53, 0xd1, 0x96, 0xc9, 0x83, 0xad, 0x7a, 0x8e, 0x7e, 0x2d, 0x46, 0x3b, - 0xdc, 0x76, 0x1c, 0xdf, 0xb9, 0x41, 0x06, 0x06, 0x58, 0x0b, 0x08, 0xba, 0xc2, 0xbb, 0xb0, 0x39, - 0xa2, 0x9e, 0xef, 0x38, 0xcc, 0xe5, 0x64, 0x8a, 0xcc, 0xc2, 0x31, 0xec, 0x3d, 0x7a, 0xb9, 0x17, - 0x87, 0xf0, 0x87, 0xe1, 0x70, 0x10, 0x1c, 0x6a, 0x62, 0x25, 0xce, 0xc0, 0x36, 0xec, 0x3d, 0x7a, - 0xdb, 0x16, 0xbe, 0x3b, 0x8e, 0xdf, 0x6e, 0x37, 0x83, 0x53, 0xbd, 0xe3, 0xf8, 0x03, 0x94, 0x10, - 0x56, 0x62, 0x35, 0x46, 0x49, 0x71, 0xc6, 0x0a, 0x85, 0xf0, 0xc8, 0x4b, 0x17, 0x86, 0x00, 0x03, - 0xf6, 0x91, 0xb8, 0xc1, 0x8b, 0x50, 0xe4, 0x86, 0xde, 0x84, 0x75, 0xcd, 0xa7, 0xf2, 0x5e, 0x4e, - 0x88, 0x13, 0xbd, 0x3f, 0x9b, 0xa1, 0xa4, 0x88, 0x30, 0x30, 0x7c, 0x8f, 0x4c, 0x51, 0x0a, 0x6f, - 0xc1, 0x46, 0xcb, 0xb5, 0xb8, 0x65, 0x1a, 0x0b, 0x94, 0x16, 0x51, 0x74, 0xe3, 0x86, 0x4c, 0x51, - 0xa6, 0x30, 0x83, 0x83, 0xe8, 0x79, 0x1b, 0x9e, 0xd6, 0x8c, 0x4a, 0xad, 0x61, 0x53, 0x0b, 0xaf, - 0x1d, 0x7d, 0xd8, 0x0f, 0x13, 0xd4, 0x14, 0x5d, 0x19, 0xa2, 0x24, 0xde, 0x07, 0xac, 0x29, 0x83, - 0x66, 0x57, 0x9b, 0x74, 0x46, 0x8a, 0x3e, 0x9c, 0x34, 0x3b, 0x8a, 0x3a, 0x0c, 0x6e, 0x97, 0x41, - 0x73, 0xa4, 0x2b, 0x28, 0x2d, 0xed, 0x9a, 0x63, 0x05, 0x65, 0x0a, 0xff, 0x48, 0x3c, 0xff, 0x52, - 0xfc, 0xe8, 0x1d, 0x6f, 0x3f, 0x4a, 0x26, 0x23, 0xf5, 0x5c, 0xed, 0x5f, 0xaa, 0xe8, 0x85, 0x18, - 0x9b, 0x98, 0xec, 0xac, 0xd9, 0xbd, 0x50, 0xda, 0x28, 0x81, 0xdf, 0x40, 0x2e, 0x26, 0xd2, 0x47, - 0xad, 0x96, 0xa2, 0xb4, 0x95, 0x36, 0x4a, 0x3e, 0xe1, 0x74, 0xa0, 0xa8, 0xed, 0xae, 0xda, 0x41, - 0xa9, 0x27, 0x2c, 0x35, 0xe5, 0xb4, 0xdf, 0x1f, 0x0a, 0x69, 0xba, 0xf0, 0x23, 0x6c, 0x35, 0x5d, - 0xf3, 0xda, 0xe2, 0xc4, 0xe4, 0xbe, 0x4b, 0x44, 0x7d, 0x6f, 0x1b, 0xf5, 0xa0, 0x28, 0xbd, 0xae, - 0x68, 0xb0, 0xbc, 0x3b, 0x17, 0xce, 0xb5, 0x81, 0x92, 0xa2, 0x15, 0xb2, 0x4b, 0x83, 0x16, 0x4a, - 0x89, 0x99, 0x6d, 0x6a, 0xbd, 0xc9, 0x43, 0x73, 0x94, 0x11, 0x76, 0x96, 0x21, 0x2e, 0x5a, 0xe9, - 0xaa, 0x5e, 0x43, 0x59, 0x51, 0x4a, 0x79, 0xf9, 0x46, 0x55, 0xb7, 0x0a, 0x1f, 0x60, 0x4b, 0x27, - 0xa6, 0xef, 0x5a, 0xfc, 0x4e, 0x0e, 0xcd, 0x1e, 0x6c, 0xab, 0xfd, 0x61, 0xab, 0xaf, 0x9e, 0x75, - 0x3b, 0x23, 0x4d, 0x69, 0xa3, 0x17, 0x02, 0x0d, 0xb5, 0x91, 0x3e, 0x54, 0xda, 0x17, 0xcd, 0x91, - 0xda, 0xfa, 0x80, 0x12, 0xe2, 0x22, 0x94, 0x2a, 0x6d, 0x45, 0x1d, 0x76, 0x9b, 0x17, 0xe3, 0x1e, - 0x4a, 0x7e, 0x77, 0x0e, 0xc8, 0x23, 0xd4, 0xb3, 0xb8, 0x75, 0x43, 0xc2, 0xef, 0x5e, 0xfc, 0x69, - 0x31, 0xf8, 0xce, 0x2d, 0x2e, 0xbf, 0x73, 0x8b, 0x67, 0x16, 0x59, 0x4c, 0xfb, 0x8e, 0x28, 0x84, - 0x97, 0xfb, 0xd7, 0x1f, 0x53, 0xf2, 0x8d, 0xe9, 0x91, 0xe1, 0x77, 0x0a, 0x6c, 0xaf, 0xd8, 0x6f, - 0x3c, 0x46, 0xff, 0x9f, 0xa7, 0x7f, 0x87, 0x9e, 0xa2, 0x56, 0xa7, 0x5f, 0xfc, 0xea, 0xf3, 0xb9, - 0xc5, 0xaf, 0xfd, 0xab, 0xa2, 0xc9, 0xec, 0x13, 0xdb, 0x32, 0x5d, 0xe6, 0xb1, 0x19, 0x3f, 0xb1, - 0x99, 0x79, 0xe2, 0x3a, 0xe6, 0x49, 0xf0, 0x61, 0x7e, 0xb5, 0x26, 0x9d, 0x56, 0xff, 0x1b, 0x00, - 0x00, 0xff, 0xff, 0x72, 0xe6, 0xaa, 0xdb, 0xbb, 0x0f, 0x00, 0x00, + 0x53, 0x99, 0x57, 0x46, 0x5b, 0xed, 0x85, 0x6c, 0xbe, 0xb4, 0x4b, 0x05, 0xb2, 0xe5, 0x3e, 0xff, + 0xd7, 0x04, 0x1c, 0xb6, 0xef, 0xa8, 0x61, 0x5b, 0x66, 0x4f, 0xea, 0x47, 0xab, 0x77, 0x0c, 0xbb, + 0xb6, 0x71, 0x6b, 0xd9, 0xbe, 0xdd, 0x5b, 0x7a, 0x4f, 0x04, 0x89, 0xc7, 0xb0, 0xd4, 0xb4, 0x68, + 0x44, 0x33, 0x19, 0x6a, 0x46, 0x31, 0x2e, 0x02, 0xe6, 0x86, 0x3b, 0x27, 0x3c, 0x20, 0xa7, 0xfe, + 0x6c, 0x46, 0x5c, 0x99, 0xd8, 0xb6, 0xf6, 0x84, 0x24, 0xff, 0x03, 0xbc, 0x8f, 0x96, 0x44, 0xf3, + 0x69, 0x8b, 0xd9, 0xb6, 0x41, 0xa7, 0x5d, 0xea, 0xf8, 0x7c, 0x60, 0xb8, 0x86, 0x4d, 0x38, 0x71, + 0x45, 0xcb, 0xd4, 0x07, 0x2d, 0x13, 0x6b, 0x7c, 0x08, 0x99, 0xb1, 0xb1, 0xf0, 0x89, 0xcc, 0x26, + 0x7b, 0x9a, 0xfe, 0xf3, 0xdf, 0x73, 0x09, 0x2d, 0x40, 0xf9, 0x3f, 0x24, 0xe0, 0xdd, 0x73, 0xae, + 0x75, 0x39, 0xa1, 0x3a, 0xf3, 0x5d, 0x93, 0xe0, 0x37, 0xb0, 0x16, 0xec, 0x03, 0xd7, 0xa7, 0xe9, + 0x3f, 0x09, 0x2f, 0x21, 0xc3, 0x6f, 0x20, 0x1b, 0xac, 0x46, 0x5a, 0x37, 0x08, 0xa3, 0xdd, 0x03, + 0x21, 0x5d, 0x66, 0xdb, 0x96, 0xff, 0x32, 0xab, 0xdd, 0x83, 0xfc, 0x3f, 0xff, 0x47, 0x0a, 0x5d, + 0xea, 0x71, 0x83, 0x9a, 0x64, 0x6c, 0x91, 0x8f, 0x58, 0x87, 0x1d, 0xe5, 0x96, 0x98, 0xbe, 0x9c, + 0x15, 0x6e, 0x70, 0x12, 0x3e, 0x17, 0x5f, 0xc9, 0xf1, 0x7b, 0xce, 0x45, 0xd4, 0x44, 0x8b, 0xb9, + 0x10, 0x93, 0xa1, 0xdc, 0x5a, 0xbc, 0xc5, 0xa6, 0x64, 0x39, 0x35, 0xcb, 0x3d, 0xde, 0x87, 0xb5, + 0xbe, 0xcf, 0x1d, 0x9f, 0x87, 0x49, 0x87, 0x3b, 0xfc, 0x0a, 0x32, 0x8a, 0xeb, 0x32, 0x37, 0x97, + 0x96, 0x38, 0xd8, 0xe4, 0xbf, 0x87, 0xc3, 0xd8, 0xdc, 0x1a, 0x8e, 0x71, 0x65, 0x2d, 0x2c, 0x6e, + 0x11, 0x0f, 0x7f, 0x0d, 0x7b, 0x5d, 0x8f, 0x2d, 0x0c, 0x4e, 0xa6, 0x63, 0x5b, 0x4a, 0x16, 0x41, + 0xfe, 0x1b, 0xda, 0x63, 0x41, 0xfe, 0x3f, 0x09, 0xc0, 0x0f, 0xff, 0xbb, 0xc8, 0xd5, 0xf7, 0x44, + 0x77, 0x4d, 0x91, 0x68, 0xd8, 0x5d, 0xb1, 0xc6, 0x3f, 0x87, 0xcc, 0x82, 0xdc, 0x90, 0x45, 0xf8, + 0x2c, 0x7e, 0x29, 0x8b, 0xf1, 0xd8, 0xb6, 0x18, 0xfc, 0x5c, 0x08, 0x55, 0xf9, 0x70, 0x06, 0x56, + 0xf8, 0x1d, 0x6c, 0x4f, 0x2d, 0xcf, 0x59, 0x18, 0x77, 0x81, 0x42, 0xf8, 0x57, 0xa3, 0x10, 0xe7, + 0x60, 0xdd, 0x26, 0x9e, 0x67, 0xcc, 0x49, 0xf8, 0x9f, 0x97, 0x5b, 0x91, 0x12, 0xb7, 0x6c, 0x92, + 0xcb, 0x04, 0x29, 0x89, 0x75, 0xfe, 0x17, 0xb0, 0x1b, 0x8b, 0x86, 0x37, 0x61, 0x7d, 0x44, 0x7f, + 0x4b, 0xd9, 0x47, 0x8a, 0x5e, 0xe0, 0x0d, 0x48, 0x77, 0xe9, 0x8c, 0xa1, 0x84, 0xc0, 0x97, 0x86, + 0x4b, 0x2d, 0x3a, 0x47, 0x49, 0x9c, 0x0d, 0xcb, 0x8a, 0x52, 0xf9, 0xdf, 0xc3, 0x67, 0xd1, 0x5a, + 0x36, 0xe7, 0x84, 0xf2, 0xc8, 0x34, 0xbc, 0x87, 0x9d, 0x1b, 0x5b, 0xe2, 0x31, 0x71, 0x3d, 0x8b, + 0xd1, 0xb0, 0x2a, 0x31, 0x8a, 0xab, 0xb0, 0xe1, 0xc9, 0x64, 0x88, 0x97, 0x4b, 0xca, 0xc3, 0xef, + 0xe0, 0x99, 0x12, 0x69, 0x2b, 0xc5, 0x7c, 0x15, 0x0e, 0x3a, 0x3e, 0xf1, 0xb8, 0xf4, 0x14, 0x3d, + 0x0f, 0x72, 0xb0, 0x4e, 0xa8, 0x68, 0xd2, 0x34, 0x6c, 0xdf, 0x72, 0x9b, 0xff, 0x4b, 0x02, 0xf0, + 0xc0, 0x65, 0xb7, 0xb1, 0x03, 0x24, 0x0f, 0xd9, 0x6b, 0xce, 0x1d, 0x29, 0x89, 0x3c, 0x3c, 0xf7, + 0x18, 0xbf, 0x03, 0x10, 0x1b, 0x2f, 0x50, 0x4a, 0x3e, 0x50, 0x7a, 0xc0, 0x45, 0x68, 0xca, 0x02, + 0x95, 0xd4, 0x51, 0x4a, 0x74, 0x21, 0xdc, 0x8a, 0x18, 0xdc, 0xf5, 0x3d, 0x4e, 0xa6, 0x2d, 0x23, + 0xe8, 0xd0, 0x32, 0xc6, 0x0a, 0x17, 0xde, 0xc2, 0xc6, 0xc8, 0x23, 0xae, 0x6c, 0xc7, 0x06, 0xa4, + 0xb5, 0x7e, 0x7f, 0x18, 0xf4, 0x62, 0xa4, 0x2b, 0x1a, 0x4a, 0x14, 0x7e, 0x09, 0xdb, 0x03, 0x97, + 0x99, 0xc4, 0xf3, 0xd8, 0x4a, 0x49, 0x65, 0x94, 0xa0, 0x17, 0xa2, 0x33, 0x5d, 0xca, 0xc9, 0x22, + 0xe8, 0x98, 0x5c, 0xd6, 0x6b, 0x28, 0x89, 0xd7, 0x21, 0xd5, 0xec, 0xb5, 0x51, 0x4a, 0x28, 0x34, + 0x7b, 0xed, 0x7a, 0x0d, 0xa5, 0x25, 0xd3, 0x7a, 0x28, 0x23, 0x99, 0xd6, 0xab, 0xd7, 0xd0, 0x5a, + 0xe1, 0x7b, 0x78, 0xdb, 0x77, 0x88, 0xa8, 0x07, 0x9d, 0xeb, 0x77, 0x1e, 0x27, 0xf6, 0x29, 0x63, + 0xdc, 0xe3, 0xae, 0xe1, 0x28, 0x74, 0x6e, 0x51, 0x82, 0x77, 0x00, 0x5a, 0x17, 0xfd, 0x51, 0x7b, + 0xd2, 0x55, 0xbb, 0x22, 0xad, 0x1c, 0xbc, 0xba, 0xec, 0xaa, 0xed, 0xfe, 0xa5, 0x3e, 0x69, 0xaa, + 0xfa, 0xa5, 0xa2, 0x4d, 0xce, 0xba, 0x17, 0x8a, 0x8e, 0x12, 0x85, 0x6f, 0xe0, 0x65, 0xcc, 0xd7, + 0x72, 0xc0, 0x42, 0x83, 0x20, 0xdf, 0x8b, 0xae, 0x3a, 0xfa, 0x01, 0x25, 0x0a, 0x7f, 0xcb, 0xc2, + 0x7e, 0x74, 0x94, 0xc4, 0x45, 0xb2, 0x34, 0x69, 0x93, 0x99, 0xe1, 0x2f, 0x38, 0x7a, 0x81, 0x31, + 0xec, 0xe8, 0xdc, 0xa0, 0x53, 0xc3, 0x9d, 0x4e, 0x9a, 0x95, 0xc9, 0x4d, 0x05, 0x25, 0xa3, 0xac, + 0x26, 0x58, 0x0a, 0xbf, 0x94, 0xb3, 0x1d, 0xb0, 0x76, 0xc5, 0x9b, 0xdc, 0x54, 0x51, 0x3a, 0x0a, + 0x6b, 0x12, 0x66, 0xa2, 0xb0, 0x21, 0xe1, 0x1a, 0x7e, 0x05, 0xe8, 0x1e, 0x96, 0xeb, 0x92, 0xae, + 0x47, 0x69, 0x35, 0xf0, 0xba, 0x11, 0x75, 0xa0, 0xcb, 0x9c, 0xb2, 0x31, 0x58, 0x15, 0x10, 0x62, + 0x50, 0x66, 0xba, 0x19, 0x83, 0xdf, 0x0a, 0xb8, 0x15, 0x8d, 0xa4, 0x97, 0xa5, 0xfd, 0x76, 0x44, + 0xf5, 0xbc, 0xa1, 0x4f, 0x6e, 0xca, 0x68, 0x27, 0xa2, 0x7a, 0xde, 0x10, 0xf1, 0xcb, 0x68, 0x37, + 0x4e, 0xab, 0x82, 0xa2, 0x38, 0xad, 0x09, 0xba, 0x87, 0x11, 0x6c, 0xad, 0xa8, 0x7a, 0x5e, 0x47, + 0x18, 0xef, 0xc1, 0xf6, 0x03, 0x52, 0xae, 0xa0, 0x97, 0x51, 0xa5, 0x71, 0x1d, 0xbd, 0x8a, 0x2a, + 0x8d, 0xcb, 0x15, 0xf4, 0x3a, 0xee, 0xff, 0x5b, 0xe1, 0x7f, 0x1f, 0x1f, 0xc0, 0xcb, 0x58, 0x81, + 0x26, 0x1f, 0x06, 0x2a, 0x3a, 0x88, 0x09, 0xaa, 0x4b, 0x41, 0x2e, 0x26, 0xa8, 0x2d, 0x05, 0x9f, + 0x44, 0x02, 0x9c, 0x55, 0x3c, 0x49, 0x0f, 0xa3, 0xb4, 0x16, 0xd0, 0x9f, 0x44, 0x69, 0x23, 0xa0, + 0x6f, 0xf0, 0x6b, 0xd8, 0xbb, 0xa7, 0xa2, 0xb3, 0x02, 0x7f, 0x1a, 0x29, 0xad, 0xda, 0xaa, 0x4d, + 0x9a, 0x15, 0xf4, 0x36, 0x06, 0x1b, 0x02, 0x7e, 0x16, 0x71, 0xab, 0xb6, 0xca, 0x75, 0x41, 0x8f, + 0x62, 0xb4, 0x5a, 0x11, 0xf4, 0xa7, 0x31, 0x5a, 0x9b, 0x34, 0xab, 0x25, 0x94, 0x8f, 0xd1, 0x86, + 0xa4, 0x9f, 0x47, 0x12, 0x0b, 0xfc, 0x56, 0x4b, 0xe8, 0x5d, 0x0c, 0x0b, 0xc7, 0xd5, 0x12, 0xfa, + 0x42, 0x3c, 0x78, 0x51, 0xcf, 0xe5, 0x52, 0x69, 0x52, 0x2b, 0xa1, 0xf7, 0x31, 0x49, 0x63, 0x25, + 0xf9, 0x12, 0x7f, 0x02, 0xaf, 0x63, 0x11, 0x42, 0xd1, 0x71, 0x4c, 0x24, 0xa2, 0x84, 0xa2, 0x9f, + 0x3d, 0x1d, 0xa9, 0x51, 0x42, 0x85, 0xa7, 0x23, 0x35, 0x4a, 0xe8, 0xab, 0x67, 0x22, 0x35, 0x4a, + 0xe8, 0xeb, 0x67, 0x22, 0x35, 0x4a, 0xe8, 0x9b, 0xc7, 0xd5, 0x2a, 0xd7, 0x51, 0xf1, 0x71, 0xb5, + 0xca, 0x75, 0x74, 0xf2, 0x44, 0xb5, 0xca, 0x75, 0x54, 0x7a, 0xa2, 0x5a, 0xe5, 0x3a, 0x2a, 0xe3, + 0x6d, 0xc8, 0x06, 0x6f, 0xa7, 0xa2, 0x2d, 0x93, 0x07, 0x5b, 0xf5, 0x1c, 0xfd, 0x5a, 0x8c, 0x76, + 0xb8, 0xed, 0x38, 0xbe, 0x73, 0x83, 0x0c, 0x0c, 0xb0, 0x16, 0x10, 0x74, 0x85, 0x77, 0x61, 0x73, + 0x44, 0x3d, 0xdf, 0x71, 0x98, 0xcb, 0xc9, 0x14, 0x99, 0x85, 0x63, 0xd8, 0x7b, 0xf4, 0x72, 0x2f, + 0x0e, 0xe1, 0x0f, 0xc3, 0xe1, 0x20, 0x38, 0xd4, 0xc4, 0x4a, 0x9c, 0x81, 0x6d, 0xd8, 0x7b, 0xf4, + 0xb6, 0x2d, 0x7c, 0x77, 0x1c, 0xbf, 0xdd, 0x6e, 0x06, 0xa7, 0x7a, 0xc7, 0xf1, 0x07, 0x28, 0x21, + 0xac, 0xc4, 0x6a, 0x8c, 0x92, 0xe2, 0x8c, 0x15, 0x0a, 0xe1, 0x91, 0x97, 0x2e, 0x0c, 0x01, 0x06, + 0xec, 0x23, 0x71, 0x83, 0x17, 0xa1, 0xc8, 0x0d, 0xbd, 0x09, 0xeb, 0x9a, 0x4f, 0xe5, 0xbd, 0x9c, + 0x10, 0x27, 0x7a, 0x7f, 0x36, 0x43, 0x49, 0x11, 0x61, 0x60, 0xf8, 0x1e, 0x99, 0xa2, 0x14, 0xde, + 0x82, 0x8d, 0x96, 0x6b, 0x71, 0xcb, 0x34, 0x16, 0x28, 0x2d, 0xa2, 0xe8, 0xc6, 0x0d, 0x99, 0xa2, + 0x4c, 0x61, 0x06, 0x07, 0xd1, 0xf3, 0x36, 0x3c, 0xad, 0x19, 0x95, 0x5a, 0xc3, 0xa6, 0x16, 0x5e, + 0x3b, 0xfa, 0xb0, 0x1f, 0x26, 0xa8, 0x29, 0xba, 0x32, 0x44, 0x49, 0xbc, 0x0f, 0x58, 0x53, 0x06, + 0xcd, 0xae, 0x36, 0xe9, 0x8c, 0x14, 0x7d, 0x38, 0x69, 0x76, 0x14, 0x75, 0x18, 0xdc, 0x2e, 0x83, + 0xe6, 0x48, 0x57, 0x50, 0x5a, 0xda, 0x35, 0xc7, 0x0a, 0xca, 0x14, 0xfe, 0x91, 0x78, 0xfe, 0xa5, + 0xf8, 0xd1, 0x3b, 0xde, 0x7e, 0x94, 0x4c, 0x46, 0xea, 0xb9, 0xda, 0xbf, 0x54, 0xd1, 0x0b, 0x31, + 0x36, 0x31, 0xd9, 0x59, 0xb3, 0x7b, 0xa1, 0xb4, 0x51, 0x02, 0xbf, 0x81, 0x5c, 0x4c, 0xa4, 0x8f, + 0x5a, 0x2d, 0x45, 0x69, 0x2b, 0x6d, 0x94, 0x7c, 0xc2, 0xe9, 0x40, 0x51, 0xdb, 0x5d, 0xb5, 0x83, + 0x52, 0x4f, 0x58, 0x6a, 0xca, 0x69, 0xbf, 0x3f, 0x14, 0xd2, 0x74, 0xe1, 0x47, 0xd8, 0x6a, 0xba, + 0xe6, 0xb5, 0xc5, 0x89, 0xc9, 0x7d, 0x97, 0x88, 0xfa, 0xde, 0x36, 0xea, 0x41, 0x51, 0x7a, 0x5d, + 0xd1, 0x60, 0x79, 0x77, 0x2e, 0x9c, 0x6b, 0x03, 0x25, 0x45, 0x2b, 0x64, 0x97, 0x06, 0x2d, 0x94, + 0x12, 0x33, 0xdb, 0xd4, 0x7a, 0x93, 0x87, 0xe6, 0x28, 0x23, 0xec, 0x2c, 0x43, 0x5c, 0xb4, 0xd2, + 0x55, 0xbd, 0x86, 0xb2, 0xa2, 0x94, 0xf2, 0xf2, 0x8d, 0xaa, 0x6e, 0x15, 0x3e, 0xc0, 0x96, 0x4e, + 0x4c, 0xdf, 0xb5, 0xf8, 0x9d, 0x1c, 0x9a, 0x3d, 0xd8, 0x56, 0xfb, 0xc3, 0x56, 0x5f, 0x3d, 0xeb, + 0x76, 0x46, 0x9a, 0xd2, 0x46, 0x2f, 0x04, 0x1a, 0x6a, 0x23, 0x7d, 0xa8, 0xb4, 0x2f, 0x9a, 0x23, + 0xb5, 0xf5, 0x01, 0x25, 0xc4, 0x45, 0x28, 0x55, 0xda, 0x8a, 0x3a, 0xec, 0x36, 0x2f, 0xc6, 0x3d, + 0x94, 0xfc, 0xee, 0x1c, 0x90, 0x47, 0xa8, 0x67, 0x71, 0xeb, 0x86, 0x84, 0xdf, 0xbd, 0xf8, 0xd3, + 0x62, 0xf0, 0x9d, 0x5b, 0x5c, 0x7e, 0xe7, 0x16, 0xcf, 0x2c, 0xb2, 0x98, 0xf6, 0x1d, 0x51, 0x08, + 0x2f, 0xf7, 0xaf, 0x3f, 0xa6, 0xe4, 0x1b, 0xd3, 0x23, 0xc3, 0xef, 0x14, 0xd8, 0x5e, 0xb1, 0xdf, + 0x78, 0x8c, 0xfe, 0x3f, 0x4f, 0xff, 0x0e, 0x3d, 0x45, 0xad, 0x4e, 0xbf, 0xf8, 0xd5, 0xe7, 0x73, + 0x8b, 0x5f, 0xfb, 0x57, 0x45, 0x93, 0xd9, 0x27, 0xb6, 0x65, 0xba, 0xcc, 0x63, 0x33, 0x7e, 0x62, + 0x33, 0xf3, 0xc4, 0x75, 0xcc, 0x93, 0xe0, 0xc3, 0xfc, 0x6a, 0x4d, 0x3a, 0xad, 0xfe, 0x37, 0x00, + 0x00, 0xff, 0xff, 0x7b, 0xf6, 0x68, 0xe8, 0xbb, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index d49965aa..4c3fd22e 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -112,7 +112,7 @@ enum GpuAssignmentType { message Gpu { string name = 1; GpuAssignmentType assignment = 2; - int32 partitionSizeGB = 3; + uint64 partitionSizeMB = 3; } message VirtualMachineCustomSize { From 048f2d72caf28ea9f980c3f3b8fb4bf0e7e84820 Mon Sep 17 00:00:00 2001 From: wenjlu-lgy Date: Tue, 23 Apr 2024 10:44:37 +0800 Subject: [PATCH 06/13] fix comment --- go.mod | 2 +- go.sum | 4 +- rpc/common/moc_common_nodeinfo.pb.go | 127 +++++++++++++++------------ rpc/common/moc_common_nodeinfo.proto | 10 ++- 4 files changed, 81 insertions(+), 62 deletions(-) diff --git a/go.mod b/go.mod index 64e2f89c..8d09611b 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( require ( golang.org/x/net v0.24.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect ) replace ( diff --git a/go.sum b/go.sum index ef89e8b3..44dad3d2 100644 --- a/go.sum +++ b/go.sum @@ -1505,8 +1505,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index 8aefa0a9..a065a4a3 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -229,9 +229,10 @@ func (m *PhysicalMemory) GetSizeBytes() uint64 { type HostGPU struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` - PartitionSizeBytes uint64 `protobuf:"varint,3,opt,name=partitionSizeBytes,proto3" json:"partitionSizeBytes,omitempty"` - Assignment GpuAssignmentType `protobuf:"varint,4,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` - Id string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"` + Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` + PartitionSizeBytes uint64 `protobuf:"varint,4,opt,name=partitionSizeBytes,proto3" json:"partitionSizeBytes,omitempty"` + Assignment GpuAssignmentType `protobuf:"varint,5,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` + Id string `protobuf:"bytes,6,opt,name=id,proto3" json:"id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -276,6 +277,13 @@ func (m *HostGPU) GetSizeBytes() uint32 { return 0 } +func (m *HostGPU) GetCount() uint32 { + if m != nil { + return m.Count + } + return 0 +} + func (m *HostGPU) GetPartitionSizeBytes() uint64 { if m != nil { return m.PartitionSizeBytes @@ -458,8 +466,9 @@ func (m *NodeInfo) GetOsInfo() *OperatingSystem { type Resources struct { Processor *Processor `protobuf:"bytes,1,opt,name=processor,proto3" json:"processor,omitempty"` Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` - GpuList []*HostGPU `protobuf:"bytes,3,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + Gpu *HostGPU `protobuf:"bytes,3,opt,name=gpu,proto3" json:"gpu,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` + GpuList []*HostGPU `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -504,9 +513,9 @@ func (m *Resources) GetMemory() *PhysicalMemory { return nil } -func (m *Resources) GetGpuList() []*HostGPU { +func (m *Resources) GetGpu() *HostGPU { if m != nil { - return m.GpuList + return m.Gpu } return nil } @@ -518,6 +527,13 @@ func (m *Resources) GetVmCapabilities() *VirtualMachineCapabilities { return nil } +func (m *Resources) GetGpuList() []*HostGPU { + if m != nil { + return m.GpuList + } + return nil +} + func init() { proto.RegisterEnum("moc.common.OsRegistrationState", OsRegistrationState_name, OsRegistrationState_value) proto.RegisterType((*OsRegistrationStatus)(nil), "moc.common.OsRegistrationStatus") @@ -532,53 +548,54 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 753 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xd3, 0x4a, - 0x10, 0x3e, 0x4e, 0xd2, 0xfc, 0x4c, 0xda, 0x9c, 0x76, 0xdb, 0xd3, 0xe3, 0xd3, 0x83, 0x20, 0x72, - 0x45, 0x15, 0x21, 0x48, 0x50, 0xaa, 0xf2, 0x73, 0xd9, 0x72, 0x51, 0x40, 0x94, 0x56, 0xdb, 0xc2, - 0x05, 0x37, 0x95, 0xeb, 0x4c, 0x92, 0x15, 0xb1, 0xd7, 0xda, 0x5d, 0x47, 0x72, 0x5f, 0x8b, 0x57, - 0xe0, 0x09, 0x78, 0x09, 0xee, 0x79, 0x02, 0xe4, 0xb1, 0x93, 0xd8, 0x69, 0x54, 0x71, 0x15, 0xef, - 0x7c, 0xdf, 0xec, 0x7e, 0xf3, 0xcd, 0xce, 0x06, 0xfe, 0xf3, 0xa5, 0x77, 0xed, 0x49, 0xdf, 0x97, - 0xc1, 0x75, 0x20, 0x07, 0x28, 0x82, 0xa1, 0xec, 0x86, 0x4a, 0x1a, 0xc9, 0xc0, 0x97, 0x5e, 0x37, - 0x85, 0xf6, 0xfe, 0xcd, 0xd1, 0xd2, 0x9f, 0x94, 0xb4, 0xf7, 0xb0, 0x08, 0x84, 0x91, 0xc1, 0x3c, - 0xee, 0x9c, 0xc3, 0xce, 0xb9, 0xe6, 0x38, 0x12, 0xda, 0x28, 0xd7, 0x08, 0x19, 0x5c, 0x1a, 0xd7, - 0x44, 0x9a, 0xbd, 0x84, 0xaa, 0xa6, 0x2f, 0xdb, 0x6a, 0x5b, 0x9d, 0x56, 0xff, 0x51, 0x77, 0x71, - 0x5a, 0xf7, 0x6e, 0x06, 0xf2, 0x8c, 0xee, 0xfc, 0x28, 0x41, 0xe3, 0x42, 0x49, 0x0f, 0xb5, 0x96, - 0x8a, 0x31, 0xa8, 0x04, 0xae, 0x8f, 0xb4, 0x49, 0x83, 0xd3, 0x37, 0xdb, 0x81, 0x35, 0x4f, 0x2a, - 0xd4, 0x76, 0xa9, 0x6d, 0x75, 0x36, 0x78, 0xba, 0x48, 0xa2, 0x3a, 0x44, 0x1c, 0xd8, 0x65, 0xa2, - 0xa6, 0x0b, 0x76, 0x00, 0x15, 0x13, 0x87, 0x68, 0x57, 0x48, 0x04, 0x23, 0x11, 0xf3, 0xdd, 0xaf, - 0xe2, 0x10, 0x39, 0xe1, 0xec, 0x00, 0x5a, 0x53, 0xa1, 0x4c, 0xe4, 0x4e, 0xc4, 0x2d, 0x89, 0xb2, - 0xd7, 0xda, 0x56, 0xa7, 0xce, 0x97, 0xa2, 0xec, 0x29, 0x6c, 0x4d, 0xe4, 0x48, 0x78, 0xee, 0x24, - 0x9c, 0xed, 0xa2, 0xed, 0x2a, 0xe9, 0xb8, 0x0b, 0x24, 0xec, 0x71, 0x1c, 0xa2, 0x9a, 0x0a, 0x2d, - 0x55, 0xa8, 0x50, 0x63, 0x60, 0xec, 0x1a, 0x6d, 0x7c, 0x17, 0x60, 0x0e, 0xac, 0xfb, 0x6e, 0x10, - 0x0d, 0x5d, 0xcf, 0x44, 0x0a, 0x95, 0x5d, 0xa7, 0x42, 0x0a, 0x31, 0x76, 0x04, 0xeb, 0xae, 0xf2, - 0xc6, 0xc2, 0x20, 0x05, 0xec, 0x06, 0xd5, 0xb5, 0x45, 0x75, 0x1d, 0xe7, 0x00, 0x5e, 0xa0, 0x39, - 0x5d, 0x68, 0x5d, 0x8c, 0x63, 0x9d, 0xc8, 0x3b, 0x43, 0x5f, 0xaa, 0x98, 0x3d, 0x80, 0x86, 0x16, - 0xb7, 0x78, 0x12, 0x1b, 0x4c, 0x5b, 0x54, 0xe1, 0x8b, 0x80, 0xf3, 0xcd, 0x82, 0xda, 0x5b, 0xa9, - 0xcd, 0xe9, 0xc5, 0xa7, 0x95, 0x2d, 0x28, 0x64, 0xa7, 0x6d, 0x58, 0x04, 0x58, 0x17, 0x58, 0xe8, - 0x2a, 0x23, 0xa8, 0xb9, 0x73, 0x5a, 0x99, 0x0e, 0x59, 0x81, 0xb0, 0x17, 0x00, 0xae, 0xd6, 0x62, - 0x14, 0xf8, 0x89, 0x3f, 0x69, 0xab, 0x76, 0xa9, 0xa4, 0xd3, 0x30, 0x3a, 0x9e, 0x23, 0xd4, 0xae, - 0x1c, 0x93, 0xb5, 0xa0, 0x24, 0x06, 0xd4, 0xa8, 0x06, 0x2f, 0x89, 0x81, 0xf3, 0xd3, 0x82, 0xbf, - 0xcf, 0x43, 0x4c, 0x6e, 0x55, 0x30, 0xba, 0x8c, 0xb5, 0x41, 0x3f, 0xd1, 0x22, 0x67, 0x21, 0x4d, - 0x21, 0xfd, 0x35, 0xca, 0x0a, 0x5e, 0x81, 0xb0, 0xe7, 0x50, 0x95, 0x9a, 0xae, 0x4c, 0x89, 0x74, - 0xd8, 0xa4, 0x63, 0x69, 0x57, 0x52, 0x92, 0xf1, 0x12, 0x2f, 0xa4, 0x9e, 0xa2, 0xd2, 0xc9, 0xad, - 0x49, 0x2f, 0xdf, 0x22, 0xc0, 0xae, 0x60, 0x47, 0xae, 0x98, 0x0f, 0xaa, 0xb2, 0xd9, 0x6f, 0xdf, - 0x3f, 0x15, 0x91, 0xe6, 0x2b, 0xb3, 0x9d, 0xef, 0x25, 0xa8, 0x7f, 0x94, 0x03, 0x7c, 0x17, 0x0c, - 0xe5, 0xca, 0x06, 0xa5, 0xd6, 0x94, 0x66, 0xd6, 0xb0, 0x23, 0x00, 0xcf, 0x0d, 0xdd, 0x1b, 0x31, - 0x11, 0x26, 0x26, 0x95, 0xcd, 0xfe, 0x3f, 0xf9, 0xc3, 0x39, 0x6a, 0x19, 0x29, 0x0f, 0x35, 0xcf, - 0x11, 0xd9, 0x6b, 0x58, 0x77, 0xa7, 0xae, 0x98, 0xcc, 0x12, 0x2b, 0xf7, 0x25, 0x16, 0xa8, 0x39, - 0x23, 0xab, 0x7f, 0x68, 0xe4, 0xfe, 0xfc, 0xc9, 0xa8, 0xd1, 0x31, 0x4d, 0xca, 0xc8, 0x7c, 0xc8, - 0x20, 0xb6, 0x0b, 0xd5, 0x28, 0x34, 0xc2, 0x47, 0x1a, 0x8f, 0x32, 0xcf, 0x56, 0xec, 0x30, 0x39, - 0x2e, 0xb1, 0x83, 0x46, 0xa2, 0xd9, 0xff, 0xbf, 0xe0, 0x6c, 0xf1, 0x54, 0x9e, 0x51, 0x9d, 0x5f, - 0x16, 0x34, 0xe6, 0xfa, 0xd9, 0x21, 0x34, 0xe6, 0xb3, 0x4b, 0x66, 0x2e, 0x55, 0x3a, 0x7f, 0x37, - 0xf8, 0x82, 0xc7, 0xfa, 0x50, 0xf5, 0x69, 0xa2, 0xc8, 0xec, 0x66, 0x7f, 0xaf, 0x90, 0x51, 0x98, - 0x39, 0x9e, 0x31, 0xd9, 0x33, 0xa8, 0x8d, 0xc2, 0xe8, 0x83, 0xd0, 0xc6, 0x2e, 0xb7, 0xcb, 0x9d, - 0x66, 0x7f, 0x3b, 0x9f, 0x94, 0xcd, 0x1d, 0x9f, 0x71, 0xd8, 0x29, 0xb4, 0xa6, 0xfe, 0x9b, 0x59, - 0x53, 0x04, 0x6a, 0xba, 0xf2, 0xcd, 0xec, 0x49, 0xfd, 0x9c, 0x3e, 0x50, 0x67, 0xae, 0x37, 0x16, - 0x01, 0xe6, 0x69, 0x7c, 0x29, 0xed, 0x7d, 0xa5, 0x5e, 0xd9, 0x5c, 0x7b, 0xf2, 0x0a, 0xb6, 0x57, - 0xbc, 0xbf, 0x6c, 0x0b, 0x36, 0x02, 0x69, 0xd2, 0x38, 0x2a, 0x1c, 0x6c, 0xfe, 0xc5, 0x5a, 0x00, - 0x6a, 0xb1, 0xb6, 0x4e, 0x1e, 0x7f, 0xd9, 0x1f, 0x09, 0x33, 0x8e, 0x6e, 0x12, 0xa9, 0x3d, 0x5f, - 0x78, 0x4a, 0x6a, 0x39, 0x34, 0x3d, 0x5f, 0x7a, 0x3d, 0x15, 0x7a, 0xbd, 0xb4, 0x80, 0x9b, 0x2a, - 0xfd, 0x33, 0x1c, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x94, 0xdc, 0x95, 0x5a, 0x7b, 0x06, 0x00, - 0x00, + // 773 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x6e, 0xdb, 0x38, + 0x10, 0x5e, 0xcb, 0xb2, 0x6c, 0x8f, 0x13, 0x6f, 0xc2, 0x64, 0xb3, 0xda, 0xec, 0x62, 0xd7, 0x50, + 0x90, 0x20, 0x58, 0xb4, 0x76, 0xe1, 0x20, 0xfd, 0x39, 0x26, 0x3d, 0xa4, 0x2d, 0x9a, 0x26, 0x60, + 0xd2, 0x1e, 0x7a, 0x09, 0x14, 0x99, 0xb6, 0x89, 0x5a, 0x22, 0x41, 0x52, 0x06, 0x94, 0x37, 0xe9, + 0xfb, 0xf4, 0xd2, 0x6b, 0x5f, 0xa2, 0xaf, 0x51, 0x68, 0x24, 0xdb, 0x92, 0xe3, 0x06, 0x3d, 0x59, + 0x9c, 0xef, 0x1b, 0xce, 0xf0, 0xfb, 0x38, 0x34, 0xfc, 0x15, 0x8a, 0xe0, 0x26, 0x10, 0x61, 0x28, + 0xa2, 0x9b, 0x48, 0x0c, 0x18, 0x8f, 0x86, 0xa2, 0x2b, 0x95, 0x30, 0x82, 0x40, 0x28, 0x82, 0x6e, + 0x06, 0xed, 0xfe, 0x59, 0xa0, 0x65, 0x3f, 0x19, 0x69, 0xf7, 0xdf, 0x32, 0x20, 0x63, 0xc3, 0x8a, + 0xb8, 0x77, 0x01, 0xdb, 0x17, 0x9a, 0xb2, 0x11, 0xd7, 0x46, 0xf9, 0x86, 0x8b, 0xe8, 0xca, 0xf8, + 0x26, 0xd6, 0xe4, 0x19, 0x38, 0x1a, 0xbf, 0xdc, 0x4a, 0xa7, 0x72, 0xd8, 0xee, 0xff, 0xd7, 0x5d, + 0x54, 0xeb, 0xde, 0xcf, 0x60, 0x34, 0xa7, 0x7b, 0xdf, 0x2c, 0x68, 0x5e, 0x2a, 0x11, 0x30, 0xad, + 0x85, 0x22, 0x04, 0xec, 0xc8, 0x0f, 0x19, 0x6e, 0xd2, 0xa4, 0xf8, 0x4d, 0xb6, 0xa1, 0x16, 0x08, + 0xc5, 0xb4, 0x6b, 0x75, 0x2a, 0x87, 0xeb, 0x34, 0x5b, 0xa4, 0x51, 0x2d, 0x19, 0x1b, 0xb8, 0x55, + 0xa4, 0x66, 0x0b, 0x72, 0x00, 0xb6, 0x49, 0x24, 0x73, 0x6d, 0x6c, 0x82, 0x60, 0x13, 0xf3, 0xdd, + 0xaf, 0x13, 0xc9, 0x28, 0xe2, 0xe4, 0x00, 0xda, 0x53, 0xae, 0x4c, 0xec, 0x4f, 0xf8, 0x1d, 0x36, + 0xe5, 0xd6, 0x3a, 0x95, 0xc3, 0x06, 0x5d, 0x8a, 0x92, 0x47, 0xb0, 0x39, 0x11, 0x23, 0x1e, 0xf8, + 0x13, 0x39, 0xdb, 0x45, 0xbb, 0x0e, 0xf6, 0x71, 0x1f, 0x48, 0xd9, 0xe3, 0x44, 0x32, 0x35, 0xe5, + 0x5a, 0x28, 0xa9, 0x98, 0x66, 0x91, 0x71, 0xeb, 0xb8, 0xf1, 0x7d, 0x80, 0x78, 0xb0, 0x16, 0xfa, + 0x51, 0x3c, 0xf4, 0x03, 0x13, 0x2b, 0xa6, 0xdc, 0x06, 0x1e, 0xa4, 0x14, 0x23, 0xc7, 0xb0, 0xe6, + 0xab, 0x60, 0xcc, 0x0d, 0xc3, 0x80, 0xdb, 0xc4, 0x73, 0x6d, 0xe2, 0xb9, 0x4e, 0x0a, 0x00, 0x2d, + 0xd1, 0xbc, 0x2e, 0xb4, 0x2f, 0xc7, 0x89, 0x4e, 0xdb, 0x3b, 0x67, 0xa1, 0x50, 0x09, 0xf9, 0x07, + 0x9a, 0x9a, 0xdf, 0xb1, 0xd3, 0xc4, 0xb0, 0xcc, 0x22, 0x9b, 0x2e, 0x02, 0xde, 0xd7, 0x0a, 0xd4, + 0x5f, 0x09, 0x6d, 0xce, 0x2e, 0xdf, 0xaf, 0xb4, 0xa0, 0x94, 0x9d, 0xd9, 0xb0, 0x08, 0x64, 0x06, + 0xc5, 0x91, 0x41, 0x2b, 0xd0, 0xa0, 0x38, 0x32, 0xa4, 0x0b, 0x44, 0xfa, 0xca, 0x70, 0xb4, 0x7c, + 0x9e, 0x6c, 0x63, 0xe9, 0x15, 0x08, 0x79, 0x0a, 0xe0, 0x6b, 0xcd, 0x47, 0x51, 0x98, 0xaa, 0x56, + 0xc3, 0x83, 0xee, 0xe0, 0x41, 0xcf, 0x64, 0x7c, 0x32, 0x47, 0xd0, 0xc4, 0x02, 0x93, 0xb4, 0xc1, + 0xe2, 0x03, 0xf4, 0xa4, 0x49, 0x2d, 0x3e, 0xf0, 0xbe, 0x57, 0xe0, 0xf7, 0x0b, 0xc9, 0xd2, 0xbb, + 0x16, 0x8d, 0xae, 0x12, 0x6d, 0x58, 0x98, 0xf6, 0x22, 0x66, 0x21, 0x8d, 0x21, 0xfd, 0x29, 0xce, + 0x65, 0x58, 0x81, 0x90, 0x27, 0xe0, 0x08, 0x8d, 0x17, 0xc9, 0xc2, 0x3e, 0x5c, 0xec, 0x63, 0x69, + 0x57, 0xec, 0x24, 0xe7, 0xa5, 0x0a, 0x09, 0x3d, 0x65, 0x4a, 0xa7, 0x77, 0x29, 0xbb, 0x92, 0x8b, + 0x00, 0xb9, 0x86, 0x6d, 0xb1, 0x62, 0x6a, 0x50, 0x8d, 0x56, 0xbf, 0xf3, 0xf0, 0xac, 0xc4, 0x9a, + 0xae, 0xcc, 0xf6, 0xbe, 0x58, 0xd0, 0x78, 0x27, 0x06, 0xec, 0x75, 0x34, 0x14, 0x2b, 0x6d, 0xcb, + 0xa4, 0xb1, 0x66, 0xd2, 0x90, 0x63, 0x80, 0xc0, 0x97, 0xfe, 0x2d, 0x9f, 0x70, 0x93, 0x60, 0x97, + 0xad, 0xfe, 0x1f, 0xc5, 0xe2, 0x94, 0x69, 0x11, 0xab, 0x80, 0x69, 0x5a, 0x20, 0x92, 0x17, 0xb0, + 0xe6, 0x4f, 0x7d, 0x3e, 0x99, 0x25, 0xda, 0x0f, 0x25, 0x96, 0xa8, 0x05, 0x21, 0x9d, 0x5f, 0x14, + 0x72, 0x6f, 0xfe, 0x90, 0xd4, 0xb1, 0x4c, 0x0b, 0x33, 0x72, 0x1d, 0x72, 0x88, 0xec, 0x80, 0x13, + 0x4b, 0xc3, 0x43, 0x86, 0x43, 0x53, 0xa5, 0xf9, 0x8a, 0x1c, 0xa5, 0xe5, 0x52, 0x39, 0x70, 0x50, + 0x5a, 0xfd, 0xbf, 0x4b, 0xca, 0x96, 0xab, 0xd2, 0x9c, 0xea, 0x7d, 0xb6, 0xa0, 0x39, 0xef, 0x9f, + 0x1c, 0x41, 0x73, 0x3e, 0xd1, 0x28, 0xe6, 0xd2, 0x49, 0xe7, 0xaf, 0x09, 0x5d, 0xf0, 0x48, 0x1f, + 0x9c, 0x10, 0xe7, 0x0c, 0xc5, 0x6e, 0xf5, 0x77, 0x4b, 0x19, 0xa5, 0x49, 0xa4, 0x39, 0x93, 0xec, + 0x43, 0x75, 0x24, 0xe3, 0xdc, 0x85, 0xad, 0x62, 0x42, 0x3e, 0x89, 0x34, 0xc5, 0xc9, 0x19, 0xb4, + 0xa7, 0xe1, 0xcb, 0x99, 0x19, 0x9c, 0x69, 0x1c, 0x8d, 0x56, 0xfe, 0xc0, 0x7e, 0xc8, 0x9e, 0xab, + 0x73, 0x3f, 0x18, 0xf3, 0x88, 0x15, 0x69, 0x74, 0x29, 0x8d, 0x3c, 0x86, 0xfa, 0x48, 0xc6, 0x6f, + 0xb9, 0x36, 0xae, 0xd3, 0xa9, 0xfe, 0xac, 0xe6, 0x8c, 0xf3, 0xc6, 0x6e, 0xd8, 0x1b, 0xb5, 0xff, + 0x9f, 0xc3, 0xd6, 0x8a, 0xc7, 0x9b, 0x6c, 0xc2, 0x7a, 0x24, 0x4c, 0x16, 0x67, 0x8a, 0x0d, 0x36, + 0x7e, 0x23, 0x6d, 0x00, 0xb5, 0x58, 0x57, 0x4e, 0xf7, 0x3f, 0xee, 0x8d, 0xb8, 0x19, 0xc7, 0xb7, + 0x69, 0x85, 0x5e, 0xc8, 0x03, 0x25, 0xb4, 0x18, 0x9a, 0x5e, 0x28, 0x82, 0x9e, 0x92, 0x41, 0x2f, + 0xab, 0x7b, 0xeb, 0xe0, 0xdf, 0xca, 0xd1, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0xa8, 0xcb, + 0x01, 0xb8, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index fdc3d3a0..e58cc19c 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -36,9 +36,10 @@ message PhysicalMemory { message HostGPU { string name = 1; uint32 sizeBytes = 2; - uint64 partitionSizeBytes = 3; - GpuAssignmentType assignment = 4; - string id = 5; + uint32 count = 3; + uint64 partitionSizeBytes = 4; + GpuAssignmentType assignment = 5; + string id = 6; } message OperatingSystem { @@ -63,6 +64,7 @@ message Resources { reserved 4; Processor processor = 1; PhysicalMemory memory = 2; - repeated HostGPU gpuList = 3; + HostGPU gpu = 3; VirtualMachineCapabilities vmCapabilities = 5; + repeated HostGPU gpuList = 6; } \ No newline at end of file From 3fd2b25b473960b9bc35802e0d8c25203f30132e Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Wed, 24 Apr 2024 10:29:48 -0700 Subject: [PATCH 07/13] Make default the first gpu assignment type --- go.mod | 2 +- go.sum | 4 +- rpc/common/moc_common_computecommon.pb.go | 256 +++++++++++----------- rpc/common/moc_common_computecommon.proto | 8 +- rpc/common/moc_common_nodeinfo.pb.go | 2 +- 5 files changed, 136 insertions(+), 136 deletions(-) diff --git a/go.mod b/go.mod index 64e2f89c..8d09611b 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( require ( golang.org/x/net v0.24.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect ) replace ( diff --git a/go.sum b/go.sum index ef89e8b3..44dad3d2 100644 --- a/go.sum +++ b/go.sum @@ -1505,8 +1505,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index b85fe947..815efc44 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -345,24 +345,24 @@ func (WinRMProtocolType) EnumDescriptor() ([]byte, []int) { type GpuAssignmentType int32 const ( - GpuAssignmentType_GpuDDA GpuAssignmentType = 0 - GpuAssignmentType_GpuP GpuAssignmentType = 1 - GpuAssignmentType_GpuPV GpuAssignmentType = 2 - GpuAssignmentType_GpuDefault GpuAssignmentType = 4 + GpuAssignmentType_GpuDefault GpuAssignmentType = 0 + GpuAssignmentType_GpuDDA GpuAssignmentType = 1 + GpuAssignmentType_GpuP GpuAssignmentType = 2 + GpuAssignmentType_GpuPV GpuAssignmentType = 3 ) var GpuAssignmentType_name = map[int32]string{ - 0: "GpuDDA", - 1: "GpuP", - 2: "GpuPV", - 4: "GpuDefault", + 0: "GpuDefault", + 1: "GpuDDA", + 2: "GpuP", + 3: "GpuPV", } var GpuAssignmentType_value = map[string]int32{ - "GpuDDA": 0, - "GpuP": 1, - "GpuPV": 2, - "GpuDefault": 4, + "GpuDefault": 0, + "GpuDDA": 1, + "GpuP": 2, + "GpuPV": 3, } func (x GpuAssignmentType) String() string { @@ -706,7 +706,7 @@ func (m *Gpu) GetAssignment() GpuAssignmentType { if m != nil { return m.Assignment } - return GpuAssignmentType_GpuDDA + return GpuAssignmentType_GpuDefault } func (m *Gpu) GetPartitionSizeMB() uint64 { @@ -1306,119 +1306,119 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1819 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xdd, 0x72, 0xe2, 0xc8, - 0x15, 0x80, 0x87, 0x3f, 0xdb, 0x1c, 0xff, 0xb5, 0x7b, 0x66, 0x6c, 0xd6, 0x99, 0x9d, 0x75, 0xd8, - 0xd9, 0x59, 0x87, 0xdd, 0xc5, 0xfc, 0x2d, 0x45, 0x6d, 0x55, 0xaa, 0x82, 0x41, 0x66, 0x58, 0x1b, - 0x41, 0x49, 0x80, 0x37, 0xb9, 0x21, 0xb2, 0x68, 0xb0, 0x12, 0xd4, 0xad, 0x92, 0x5a, 0x1e, 0x7b, - 0x53, 0x95, 0xca, 0x55, 0xae, 0x73, 0x99, 0x8b, 0x5c, 0xe4, 0x32, 0x2f, 0x90, 0xca, 0x13, 0xe4, - 0x05, 0x92, 0xe7, 0x49, 0x55, 0xaa, 0x5b, 0x02, 0x5b, 0xb2, 0x9d, 0x5c, 0xd1, 0xfd, 0x9d, 0x5f, - 0xce, 0x39, 0xea, 0x96, 0xe0, 0xad, 0xcd, 0xcc, 0x89, 0xc9, 0x6c, 0x9b, 0x51, 0xf1, 0xe3, 0xf8, - 0x9c, 0x04, 0xbb, 0xa2, 0xe3, 0x32, 0xce, 0x70, 0xca, 0x66, 0xe6, 0xe1, 0xd1, 0x9c, 0xb1, 0xf9, - 0x82, 0x9c, 0x48, 0x74, 0xe5, 0xcf, 0x4e, 0xa6, 0xc4, 0x33, 0x5d, 0xcb, 0xe1, 0xcc, 0x0d, 0xd4, - 0xf2, 0x2d, 0xd8, 0xbe, 0xb4, 0xa8, 0xd6, 0xbb, 0xb0, 0x3c, 0x4e, 0x28, 0x71, 0x71, 0x05, 0x36, - 0x06, 0x42, 0x62, 0xb2, 0x45, 0x2e, 0x71, 0x94, 0x38, 0xde, 0xa9, 0xec, 0x17, 0x6d, 0x66, 0x16, - 0xa5, 0xd6, 0x52, 0x32, 0xbc, 0x73, 0x88, 0xb6, 0xd2, 0xcb, 0x9f, 0x01, 0x96, 0xe2, 0x16, 0xa3, - 0x33, 0x6b, 0xee, 0xbb, 0x06, 0xb7, 0x18, 0xc5, 0x25, 0xc8, 0x2e, 0xbd, 0x7a, 0xb9, 0xc4, 0x51, - 0xea, 0x78, 0xb3, 0x82, 0xef, 0x5d, 0x2d, 0x45, 0xda, 0xbd, 0x52, 0xfe, 0x77, 0x90, 0xea, 0x38, - 0x3e, 0xc6, 0x90, 0xa6, 0x86, 0x4d, 0x64, 0xf8, 0xac, 0x26, 0xd7, 0xb8, 0x0e, 0x60, 0x78, 0x9e, - 0x35, 0xa7, 0x36, 0xa1, 0x3c, 0x97, 0x7c, 0x90, 0x58, 0xc7, 0xf1, 0x9b, 0x2b, 0x89, 0x4c, 0xec, - 0x81, 0x26, 0x3e, 0x86, 0x5d, 0xc7, 0x70, 0xb9, 0x25, 0x32, 0xd2, 0xad, 0x1f, 0x49, 0xef, 0x34, - 0x97, 0x3a, 0x4a, 0x1c, 0xa7, 0xb5, 0x38, 0xce, 0x53, 0xc8, 0x8d, 0x2d, 0x97, 0xfb, 0xc6, 0xa2, - 0x67, 0x98, 0xd7, 0x16, 0x25, 0x2d, 0xdf, 0xe3, 0xcc, 0x16, 0x52, 0x7c, 0x08, 0x1b, 0xa6, 0xe3, - 0xb7, 0x98, 0x4f, 0xb9, 0xcc, 0x2a, 0xa3, 0xad, 0xf6, 0x42, 0x66, 0x13, 0x9b, 0xb9, 0x77, 0xbd, - 0x53, 0x99, 0x57, 0x46, 0x5b, 0xed, 0x85, 0x6c, 0xbe, 0xb4, 0x4b, 0x05, 0xb2, 0xe5, 0x3e, 0xff, - 0xd7, 0x04, 0x1c, 0xb6, 0xef, 0xa8, 0x61, 0x5b, 0x66, 0x4f, 0xea, 0x47, 0xab, 0x77, 0x0c, 0xbb, - 0xb6, 0x71, 0x6b, 0xd9, 0xbe, 0xdd, 0x5b, 0x7a, 0x4f, 0x04, 0x89, 0xc7, 0xb0, 0xd4, 0xb4, 0x68, - 0x44, 0x33, 0x19, 0x6a, 0x46, 0x31, 0x2e, 0x02, 0xe6, 0x86, 0x3b, 0x27, 0x3c, 0x20, 0xa7, 0xfe, - 0x6c, 0x46, 0x5c, 0x99, 0xd8, 0xb6, 0xf6, 0x84, 0x24, 0xff, 0x03, 0xbc, 0x8f, 0x96, 0x44, 0xf3, - 0x69, 0x8b, 0xd9, 0xb6, 0x41, 0xa7, 0x5d, 0xea, 0xf8, 0x7c, 0x60, 0xb8, 0x86, 0x4d, 0x38, 0x71, - 0x45, 0xcb, 0xd4, 0x07, 0x2d, 0x13, 0x6b, 0x7c, 0x08, 0x99, 0xb1, 0xb1, 0xf0, 0x89, 0xcc, 0x26, - 0x7b, 0x9a, 0xfe, 0xf3, 0xdf, 0x73, 0x09, 0x2d, 0x40, 0xf9, 0x3f, 0x24, 0xe0, 0xdd, 0x73, 0xae, - 0x75, 0x39, 0xa1, 0x3a, 0xf3, 0x5d, 0x93, 0xe0, 0x37, 0xb0, 0x16, 0xec, 0x03, 0xd7, 0xa7, 0xe9, - 0x3f, 0x09, 0x2f, 0x21, 0xc3, 0x6f, 0x20, 0x1b, 0xac, 0x46, 0x5a, 0x37, 0x08, 0xa3, 0xdd, 0x03, - 0x21, 0x5d, 0x66, 0xdb, 0x96, 0xff, 0x32, 0xab, 0xdd, 0x83, 0xfc, 0x3f, 0xff, 0x47, 0x0a, 0x5d, - 0xea, 0x71, 0x83, 0x9a, 0x64, 0x6c, 0x91, 0x8f, 0x58, 0x87, 0x1d, 0xe5, 0x96, 0x98, 0xbe, 0x9c, - 0x15, 0x6e, 0x70, 0x12, 0x3e, 0x17, 0x5f, 0xc9, 0xf1, 0x7b, 0xce, 0x45, 0xd4, 0x44, 0x8b, 0xb9, - 0x10, 0x93, 0xa1, 0xdc, 0x5a, 0xbc, 0xc5, 0xa6, 0x64, 0x39, 0x35, 0xcb, 0x3d, 0xde, 0x87, 0xb5, - 0xbe, 0xcf, 0x1d, 0x9f, 0x87, 0x49, 0x87, 0x3b, 0xfc, 0x0a, 0x32, 0x8a, 0xeb, 0x32, 0x37, 0x97, - 0x96, 0x38, 0xd8, 0xe4, 0xbf, 0x87, 0xc3, 0xd8, 0xdc, 0x1a, 0x8e, 0x71, 0x65, 0x2d, 0x2c, 0x6e, - 0x11, 0x0f, 0x7f, 0x0d, 0x7b, 0x5d, 0x8f, 0x2d, 0x0c, 0x4e, 0xa6, 0x63, 0x5b, 0x4a, 0x16, 0x41, - 0xfe, 0x1b, 0xda, 0x63, 0x41, 0xfe, 0x3f, 0x09, 0xc0, 0x0f, 0xff, 0xbb, 0xc8, 0xd5, 0xf7, 0x44, - 0x77, 0x4d, 0x91, 0x68, 0xd8, 0x5d, 0xb1, 0xc6, 0x3f, 0x87, 0xcc, 0x82, 0xdc, 0x90, 0x45, 0xf8, - 0x2c, 0x7e, 0x29, 0x8b, 0xf1, 0xd8, 0xb6, 0x18, 0xfc, 0x5c, 0x08, 0x55, 0xf9, 0x70, 0x06, 0x56, - 0xf8, 0x1d, 0x6c, 0x4f, 0x2d, 0xcf, 0x59, 0x18, 0x77, 0x81, 0x42, 0xf8, 0x57, 0xa3, 0x10, 0xe7, - 0x60, 0xdd, 0x26, 0x9e, 0x67, 0xcc, 0x49, 0xf8, 0x9f, 0x97, 0x5b, 0x91, 0x12, 0xb7, 0x6c, 0x92, - 0xcb, 0x04, 0x29, 0x89, 0x75, 0xfe, 0x17, 0xb0, 0x1b, 0x8b, 0x86, 0x37, 0x61, 0x7d, 0x44, 0x7f, - 0x4b, 0xd9, 0x47, 0x8a, 0x5e, 0xe0, 0x0d, 0x48, 0x77, 0xe9, 0x8c, 0xa1, 0x84, 0xc0, 0x97, 0x86, - 0x4b, 0x2d, 0x3a, 0x47, 0x49, 0x9c, 0x0d, 0xcb, 0x8a, 0x52, 0xf9, 0xdf, 0xc3, 0x67, 0xd1, 0x5a, - 0x36, 0xe7, 0x84, 0xf2, 0xc8, 0x34, 0xbc, 0x87, 0x9d, 0x1b, 0x5b, 0xe2, 0x31, 0x71, 0x3d, 0x8b, - 0xd1, 0xb0, 0x2a, 0x31, 0x8a, 0xab, 0xb0, 0xe1, 0xc9, 0x64, 0x88, 0x97, 0x4b, 0xca, 0xc3, 0xef, - 0xe0, 0x99, 0x12, 0x69, 0x2b, 0xc5, 0x7c, 0x15, 0x0e, 0x3a, 0x3e, 0xf1, 0xb8, 0xf4, 0x14, 0x3d, - 0x0f, 0x72, 0xb0, 0x4e, 0xa8, 0x68, 0xd2, 0x34, 0x6c, 0xdf, 0x72, 0x9b, 0xff, 0x4b, 0x02, 0xf0, - 0xc0, 0x65, 0xb7, 0xb1, 0x03, 0x24, 0x0f, 0xd9, 0x6b, 0xce, 0x1d, 0x29, 0x89, 0x3c, 0x3c, 0xf7, - 0x18, 0xbf, 0x03, 0x10, 0x1b, 0x2f, 0x50, 0x4a, 0x3e, 0x50, 0x7a, 0xc0, 0x45, 0x68, 0xca, 0x02, - 0x95, 0xd4, 0x51, 0x4a, 0x74, 0x21, 0xdc, 0x8a, 0x18, 0xdc, 0xf5, 0x3d, 0x4e, 0xa6, 0x2d, 0x23, - 0xe8, 0xd0, 0x32, 0xc6, 0x0a, 0x17, 0xde, 0xc2, 0xc6, 0xc8, 0x23, 0xae, 0x6c, 0xc7, 0x06, 0xa4, - 0xb5, 0x7e, 0x7f, 0x18, 0xf4, 0x62, 0xa4, 0x2b, 0x1a, 0x4a, 0x14, 0x7e, 0x09, 0xdb, 0x03, 0x97, - 0x99, 0xc4, 0xf3, 0xd8, 0x4a, 0x49, 0x65, 0x94, 0xa0, 0x17, 0xa2, 0x33, 0x5d, 0xca, 0xc9, 0x22, - 0xe8, 0x98, 0x5c, 0xd6, 0x6b, 0x28, 0x89, 0xd7, 0x21, 0xd5, 0xec, 0xb5, 0x51, 0x4a, 0x28, 0x34, - 0x7b, 0xed, 0x7a, 0x0d, 0xa5, 0x25, 0xd3, 0x7a, 0x28, 0x23, 0x99, 0xd6, 0xab, 0xd7, 0xd0, 0x5a, - 0xe1, 0x7b, 0x78, 0xdb, 0x77, 0x88, 0xa8, 0x07, 0x9d, 0xeb, 0x77, 0x1e, 0x27, 0xf6, 0x29, 0x63, - 0xdc, 0xe3, 0xae, 0xe1, 0x28, 0x74, 0x6e, 0x51, 0x82, 0x77, 0x00, 0x5a, 0x17, 0xfd, 0x51, 0x7b, - 0xd2, 0x55, 0xbb, 0x22, 0xad, 0x1c, 0xbc, 0xba, 0xec, 0xaa, 0xed, 0xfe, 0xa5, 0x3e, 0x69, 0xaa, - 0xfa, 0xa5, 0xa2, 0x4d, 0xce, 0xba, 0x17, 0x8a, 0x8e, 0x12, 0x85, 0x6f, 0xe0, 0x65, 0xcc, 0xd7, - 0x72, 0xc0, 0x42, 0x83, 0x20, 0xdf, 0x8b, 0xae, 0x3a, 0xfa, 0x01, 0x25, 0x0a, 0x7f, 0xcb, 0xc2, - 0x7e, 0x74, 0x94, 0xc4, 0x45, 0xb2, 0x34, 0x69, 0x93, 0x99, 0xe1, 0x2f, 0x38, 0x7a, 0x81, 0x31, - 0xec, 0xe8, 0xdc, 0xa0, 0x53, 0xc3, 0x9d, 0x4e, 0x9a, 0x95, 0xc9, 0x4d, 0x05, 0x25, 0xa3, 0xac, - 0x26, 0x58, 0x0a, 0xbf, 0x94, 0xb3, 0x1d, 0xb0, 0x76, 0xc5, 0x9b, 0xdc, 0x54, 0x51, 0x3a, 0x0a, - 0x6b, 0x12, 0x66, 0xa2, 0xb0, 0x21, 0xe1, 0x1a, 0x7e, 0x05, 0xe8, 0x1e, 0x96, 0xeb, 0x92, 0xae, - 0x47, 0x69, 0x35, 0xf0, 0xba, 0x11, 0x75, 0xa0, 0xcb, 0x9c, 0xb2, 0x31, 0x58, 0x15, 0x10, 0x62, - 0x50, 0x66, 0xba, 0x19, 0x83, 0xdf, 0x0a, 0xb8, 0x15, 0x8d, 0xa4, 0x97, 0xa5, 0xfd, 0x76, 0x44, - 0xf5, 0xbc, 0xa1, 0x4f, 0x6e, 0xca, 0x68, 0x27, 0xa2, 0x7a, 0xde, 0x10, 0xf1, 0xcb, 0x68, 0x37, - 0x4e, 0xab, 0x82, 0xa2, 0x38, 0xad, 0x09, 0xba, 0x87, 0x11, 0x6c, 0xad, 0xa8, 0x7a, 0x5e, 0x47, - 0x18, 0xef, 0xc1, 0xf6, 0x03, 0x52, 0xae, 0xa0, 0x97, 0x51, 0xa5, 0x71, 0x1d, 0xbd, 0x8a, 0x2a, - 0x8d, 0xcb, 0x15, 0xf4, 0x3a, 0xee, 0xff, 0x5b, 0xe1, 0x7f, 0x1f, 0x1f, 0xc0, 0xcb, 0x58, 0x81, - 0x26, 0x1f, 0x06, 0x2a, 0x3a, 0x88, 0x09, 0xaa, 0x4b, 0x41, 0x2e, 0x26, 0xa8, 0x2d, 0x05, 0x9f, - 0x44, 0x02, 0x9c, 0x55, 0x3c, 0x49, 0x0f, 0xa3, 0xb4, 0x16, 0xd0, 0x9f, 0x44, 0x69, 0x23, 0xa0, - 0x6f, 0xf0, 0x6b, 0xd8, 0xbb, 0xa7, 0xa2, 0xb3, 0x02, 0x7f, 0x1a, 0x29, 0xad, 0xda, 0xaa, 0x4d, - 0x9a, 0x15, 0xf4, 0x36, 0x06, 0x1b, 0x02, 0x7e, 0x16, 0x71, 0xab, 0xb6, 0xca, 0x75, 0x41, 0x8f, - 0x62, 0xb4, 0x5a, 0x11, 0xf4, 0xa7, 0x31, 0x5a, 0x9b, 0x34, 0xab, 0x25, 0x94, 0x8f, 0xd1, 0x86, - 0xa4, 0x9f, 0x47, 0x12, 0x0b, 0xfc, 0x56, 0x4b, 0xe8, 0x5d, 0x0c, 0x0b, 0xc7, 0xd5, 0x12, 0xfa, - 0x42, 0x3c, 0x78, 0x51, 0xcf, 0xe5, 0x52, 0x69, 0x52, 0x2b, 0xa1, 0xf7, 0x31, 0x49, 0x63, 0x25, - 0xf9, 0x12, 0x7f, 0x02, 0xaf, 0x63, 0x11, 0x42, 0xd1, 0x71, 0x4c, 0x24, 0xa2, 0x84, 0xa2, 0x9f, - 0x3d, 0x1d, 0xa9, 0x51, 0x42, 0x85, 0xa7, 0x23, 0x35, 0x4a, 0xe8, 0xab, 0x67, 0x22, 0x35, 0x4a, - 0xe8, 0xeb, 0x67, 0x22, 0x35, 0x4a, 0xe8, 0x9b, 0xc7, 0xd5, 0x2a, 0xd7, 0x51, 0xf1, 0x71, 0xb5, - 0xca, 0x75, 0x74, 0xf2, 0x44, 0xb5, 0xca, 0x75, 0x54, 0x7a, 0xa2, 0x5a, 0xe5, 0x3a, 0x2a, 0xe3, - 0x6d, 0xc8, 0x06, 0x6f, 0xa7, 0xa2, 0x2d, 0x93, 0x07, 0x5b, 0xf5, 0x1c, 0xfd, 0x5a, 0x8c, 0x76, - 0xb8, 0xed, 0x38, 0xbe, 0x73, 0x83, 0x0c, 0x0c, 0xb0, 0x16, 0x10, 0x74, 0x85, 0x77, 0x61, 0x73, - 0x44, 0x3d, 0xdf, 0x71, 0x98, 0xcb, 0xc9, 0x14, 0x99, 0x85, 0x63, 0xd8, 0x7b, 0xf4, 0x72, 0x2f, - 0x0e, 0xe1, 0x0f, 0xc3, 0xe1, 0x20, 0x38, 0xd4, 0xc4, 0x4a, 0x9c, 0x81, 0x6d, 0xd8, 0x7b, 0xf4, - 0xb6, 0x2d, 0x7c, 0x77, 0x1c, 0xbf, 0xdd, 0x6e, 0x06, 0xa7, 0x7a, 0xc7, 0xf1, 0x07, 0x28, 0x21, - 0xac, 0xc4, 0x6a, 0x8c, 0x92, 0xe2, 0x8c, 0x15, 0x0a, 0xe1, 0x91, 0x97, 0x2e, 0x0c, 0x01, 0x06, - 0xec, 0x23, 0x71, 0x83, 0x17, 0xa1, 0xc8, 0x0d, 0xbd, 0x09, 0xeb, 0x9a, 0x4f, 0xe5, 0xbd, 0x9c, - 0x10, 0x27, 0x7a, 0x7f, 0x36, 0x43, 0x49, 0x11, 0x61, 0x60, 0xf8, 0x1e, 0x99, 0xa2, 0x14, 0xde, - 0x82, 0x8d, 0x96, 0x6b, 0x71, 0xcb, 0x34, 0x16, 0x28, 0x2d, 0xa2, 0xe8, 0xc6, 0x0d, 0x99, 0xa2, - 0x4c, 0x61, 0x06, 0x07, 0xd1, 0xf3, 0x36, 0x3c, 0xad, 0x19, 0x95, 0x5a, 0xc3, 0xa6, 0x16, 0x5e, - 0x3b, 0xfa, 0xb0, 0x1f, 0x26, 0xa8, 0x29, 0xba, 0x32, 0x44, 0x49, 0xbc, 0x0f, 0x58, 0x53, 0x06, - 0xcd, 0xae, 0x36, 0xe9, 0x8c, 0x14, 0x7d, 0x38, 0x69, 0x76, 0x14, 0x75, 0x18, 0xdc, 0x2e, 0x83, - 0xe6, 0x48, 0x57, 0x50, 0x5a, 0xda, 0x35, 0xc7, 0x0a, 0xca, 0x14, 0xfe, 0x91, 0x78, 0xfe, 0xa5, - 0xf8, 0xd1, 0x3b, 0xde, 0x7e, 0x94, 0x4c, 0x46, 0xea, 0xb9, 0xda, 0xbf, 0x54, 0xd1, 0x0b, 0x31, - 0x36, 0x31, 0xd9, 0x59, 0xb3, 0x7b, 0xa1, 0xb4, 0x51, 0x02, 0xbf, 0x81, 0x5c, 0x4c, 0xa4, 0x8f, - 0x5a, 0x2d, 0x45, 0x69, 0x2b, 0x6d, 0x94, 0x7c, 0xc2, 0xe9, 0x40, 0x51, 0xdb, 0x5d, 0xb5, 0x83, - 0x52, 0x4f, 0x58, 0x6a, 0xca, 0x69, 0xbf, 0x3f, 0x14, 0xd2, 0x74, 0xe1, 0x47, 0xd8, 0x6a, 0xba, - 0xe6, 0xb5, 0xc5, 0x89, 0xc9, 0x7d, 0x97, 0x88, 0xfa, 0xde, 0x36, 0xea, 0x41, 0x51, 0x7a, 0x5d, - 0xd1, 0x60, 0x79, 0x77, 0x2e, 0x9c, 0x6b, 0x03, 0x25, 0x45, 0x2b, 0x64, 0x97, 0x06, 0x2d, 0x94, - 0x12, 0x33, 0xdb, 0xd4, 0x7a, 0x93, 0x87, 0xe6, 0x28, 0x23, 0xec, 0x2c, 0x43, 0x5c, 0xb4, 0xd2, - 0x55, 0xbd, 0x86, 0xb2, 0xa2, 0x94, 0xf2, 0xf2, 0x8d, 0xaa, 0x6e, 0x15, 0x3e, 0xc0, 0x96, 0x4e, - 0x4c, 0xdf, 0xb5, 0xf8, 0x9d, 0x1c, 0x9a, 0x3d, 0xd8, 0x56, 0xfb, 0xc3, 0x56, 0x5f, 0x3d, 0xeb, - 0x76, 0x46, 0x9a, 0xd2, 0x46, 0x2f, 0x04, 0x1a, 0x6a, 0x23, 0x7d, 0xa8, 0xb4, 0x2f, 0x9a, 0x23, - 0xb5, 0xf5, 0x01, 0x25, 0xc4, 0x45, 0x28, 0x55, 0xda, 0x8a, 0x3a, 0xec, 0x36, 0x2f, 0xc6, 0x3d, - 0x94, 0xfc, 0xee, 0x1c, 0x90, 0x47, 0xa8, 0x67, 0x71, 0xeb, 0x86, 0x84, 0xdf, 0xbd, 0xf8, 0xd3, - 0x62, 0xf0, 0x9d, 0x5b, 0x5c, 0x7e, 0xe7, 0x16, 0xcf, 0x2c, 0xb2, 0x98, 0xf6, 0x1d, 0x51, 0x08, - 0x2f, 0xf7, 0xaf, 0x3f, 0xa6, 0xe4, 0x1b, 0xd3, 0x23, 0xc3, 0xef, 0x14, 0xd8, 0x5e, 0xb1, 0xdf, - 0x78, 0x8c, 0xfe, 0x3f, 0x4f, 0xff, 0x0e, 0x3d, 0x45, 0xad, 0x4e, 0xbf, 0xf8, 0xd5, 0xe7, 0x73, - 0x8b, 0x5f, 0xfb, 0x57, 0x45, 0x93, 0xd9, 0x27, 0xb6, 0x65, 0xba, 0xcc, 0x63, 0x33, 0x7e, 0x62, - 0x33, 0xf3, 0xc4, 0x75, 0xcc, 0x93, 0xe0, 0xc3, 0xfc, 0x6a, 0x4d, 0x3a, 0xad, 0xfe, 0x37, 0x00, - 0x00, 0xff, 0xff, 0x7b, 0xf6, 0x68, 0xe8, 0xbb, 0x0f, 0x00, 0x00, + // 1823 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x6e, 0xe3, 0xc8, + 0x11, 0x80, 0x87, 0xfa, 0xb1, 0xad, 0x1a, 0xdb, 0xd3, 0xee, 0x99, 0xf1, 0x68, 0x9d, 0xd9, 0x59, + 0x47, 0x3b, 0x3b, 0xeb, 0x68, 0x77, 0x65, 0xfd, 0xad, 0x20, 0x2c, 0x10, 0x20, 0xb2, 0x44, 0x6b, + 0xb4, 0xb6, 0x28, 0x81, 0x94, 0xe4, 0x4d, 0x2e, 0x0a, 0x87, 0x6a, 0xc9, 0x4c, 0xc4, 0x6e, 0x82, + 0x6c, 0x7a, 0xec, 0x0d, 0x10, 0xe4, 0x94, 0x73, 0x8e, 0x39, 0xe4, 0x90, 0x63, 0x5e, 0x20, 0xc8, + 0x13, 0xe4, 0x05, 0x92, 0xe7, 0x09, 0x10, 0x74, 0x93, 0x92, 0x4d, 0xda, 0x4e, 0x4e, 0xea, 0xfa, + 0xaa, 0xba, 0xaa, 0x54, 0x55, 0xec, 0x26, 0xe1, 0x8d, 0xc3, 0xac, 0xa9, 0xc5, 0x1c, 0x87, 0x51, + 0xf1, 0xe3, 0x06, 0x9c, 0x84, 0x52, 0xc9, 0xf5, 0x18, 0x67, 0x38, 0xed, 0x30, 0xeb, 0xe0, 0x70, + 0xc1, 0xd8, 0x62, 0x49, 0x8e, 0x25, 0xfa, 0x10, 0xcc, 0x8f, 0x67, 0xc4, 0xb7, 0x3c, 0xdb, 0xe5, + 0xcc, 0x0b, 0xcd, 0x0a, 0x6d, 0xd8, 0xb9, 0xb0, 0xa9, 0xde, 0x3f, 0xb7, 0x7d, 0x4e, 0x28, 0xf1, + 0x70, 0x15, 0xb6, 0x86, 0x42, 0x63, 0xb1, 0x65, 0x5e, 0x39, 0x54, 0x8e, 0x76, 0xab, 0xfb, 0x25, + 0x87, 0x59, 0x25, 0x69, 0xb5, 0xd2, 0x8c, 0x6e, 0x5c, 0xa2, 0xaf, 0xed, 0x0a, 0xa7, 0x80, 0xa5, + 0xba, 0xcd, 0xe8, 0xdc, 0x5e, 0x04, 0x9e, 0xc9, 0x6d, 0x46, 0x71, 0x19, 0x72, 0x2b, 0xaf, 0x7e, + 0x5e, 0x39, 0x4c, 0x1f, 0x3d, 0xad, 0xe2, 0x5b, 0x57, 0x2b, 0x95, 0x7e, 0x6b, 0x54, 0xf8, 0x1d, + 0xa4, 0xbb, 0x6e, 0x80, 0x31, 0x64, 0xa8, 0xe9, 0x10, 0x19, 0x3e, 0xa7, 0xcb, 0x35, 0x6e, 0x00, + 0x98, 0xbe, 0x6f, 0x2f, 0xa8, 0x43, 0x28, 0xcf, 0xa7, 0xee, 0x24, 0xd6, 0x75, 0x83, 0xd6, 0x5a, + 0x23, 0x13, 0xbb, 0x63, 0x89, 0x8f, 0xe0, 0x99, 0x6b, 0x7a, 0xdc, 0x16, 0x19, 0x19, 0xf6, 0x8f, + 0xa4, 0x7f, 0x92, 0x4f, 0x1f, 0x2a, 0x47, 0x19, 0x3d, 0x89, 0x0b, 0x14, 0xf2, 0x13, 0xdb, 0xe3, + 0x81, 0xb9, 0xec, 0x9b, 0xd6, 0xa5, 0x4d, 0x49, 0x3b, 0xf0, 0x39, 0x73, 0x84, 0x16, 0x1f, 0xc0, + 0x96, 0xe5, 0x06, 0x6d, 0x16, 0x50, 0x2e, 0xb3, 0xca, 0xea, 0x6b, 0x59, 0xe8, 0x1c, 0xe2, 0x30, + 0xef, 0xa6, 0x7f, 0x22, 0xf3, 0xca, 0xea, 0x6b, 0x59, 0xe8, 0x16, 0xab, 0x7d, 0xe9, 0x50, 0xb7, + 0x92, 0x0b, 0x7f, 0x55, 0xe0, 0xa0, 0x73, 0x43, 0x4d, 0xc7, 0xb6, 0xfa, 0xd2, 0x3e, 0x5e, 0xbd, + 0x23, 0x78, 0xe6, 0x98, 0xd7, 0xb6, 0x13, 0x38, 0xfd, 0x95, 0x77, 0x25, 0x4c, 0x3c, 0x81, 0xa5, + 0xa5, 0x4d, 0x63, 0x96, 0xa9, 0xc8, 0x32, 0x8e, 0x71, 0x09, 0x30, 0x37, 0xbd, 0x05, 0xe1, 0x21, + 0x39, 0x09, 0xe6, 0x73, 0xe2, 0xc9, 0xc4, 0x76, 0xf4, 0x07, 0x34, 0x85, 0x1f, 0xe0, 0x5d, 0xbc, + 0x24, 0x7a, 0x40, 0xdb, 0xcc, 0x71, 0x4c, 0x3a, 0xeb, 0x51, 0x37, 0xe0, 0x43, 0xd3, 0x33, 0x1d, + 0xc2, 0x89, 0x27, 0x5a, 0xa6, 0xdd, 0x69, 0x99, 0x58, 0xe3, 0x03, 0xc8, 0x4e, 0xcc, 0x65, 0x40, + 0x64, 0x36, 0xb9, 0x93, 0xcc, 0x9f, 0xff, 0x9e, 0x57, 0xf4, 0x10, 0x15, 0xfe, 0xa0, 0xc0, 0xdb, + 0xc7, 0x5c, 0x1b, 0x72, 0x42, 0x0d, 0x16, 0x78, 0x16, 0xc1, 0xaf, 0x61, 0x23, 0x94, 0x43, 0xd7, + 0x27, 0x99, 0x3f, 0x09, 0x2f, 0x11, 0xc3, 0xaf, 0x21, 0x17, 0xae, 0xc6, 0x7a, 0x2f, 0x0c, 0xa3, + 0xdf, 0x02, 0xa1, 0x5d, 0x65, 0xdb, 0x91, 0xff, 0x32, 0xa7, 0xdf, 0x82, 0xc2, 0x3f, 0xff, 0x47, + 0x0a, 0x3d, 0xea, 0x73, 0x93, 0x5a, 0x64, 0x62, 0x93, 0x8f, 0xd8, 0x80, 0x5d, 0xf5, 0x9a, 0x58, + 0x81, 0x9c, 0x15, 0x6e, 0x72, 0x12, 0x3d, 0x17, 0x5f, 0xc9, 0xf1, 0x7b, 0xcc, 0x45, 0x7c, 0x8b, + 0x9e, 0x70, 0x21, 0x26, 0x43, 0xbd, 0xb6, 0x79, 0x9b, 0xcd, 0xc8, 0x6a, 0x6a, 0x56, 0x32, 0xde, + 0x87, 0x8d, 0x41, 0xc0, 0xdd, 0x80, 0x47, 0x49, 0x47, 0x12, 0x7e, 0x01, 0x59, 0xd5, 0xf3, 0x98, + 0x97, 0xcf, 0x48, 0x1c, 0x0a, 0x85, 0xef, 0xe1, 0x20, 0x31, 0xb7, 0xa6, 0x6b, 0x7e, 0xb0, 0x97, + 0x36, 0xb7, 0x89, 0x8f, 0xbf, 0x86, 0xbd, 0x9e, 0xcf, 0x96, 0x26, 0x27, 0xb3, 0x89, 0x23, 0x35, + 0xcb, 0x30, 0xff, 0x2d, 0xfd, 0xbe, 0xa2, 0xf0, 0x1f, 0x05, 0xf0, 0xdd, 0xff, 0x2e, 0x72, 0x0d, + 0x7c, 0xd1, 0x5d, 0x4b, 0x24, 0x1a, 0x75, 0x57, 0xac, 0xf1, 0xcf, 0x21, 0xbb, 0x24, 0x57, 0x64, + 0x19, 0x3d, 0x8b, 0x5f, 0xca, 0x62, 0xdc, 0xdf, 0x5b, 0x0a, 0x7f, 0xce, 0x85, 0xa9, 0x7c, 0x38, + 0xc3, 0x5d, 0xf8, 0x2d, 0xec, 0xcc, 0x6c, 0xdf, 0x5d, 0x9a, 0x37, 0xa1, 0x41, 0xf4, 0x57, 0xe3, + 0x10, 0xe7, 0x61, 0xd3, 0x21, 0xbe, 0x6f, 0x2e, 0x48, 0xf4, 0x9f, 0x57, 0xa2, 0x48, 0x89, 0xdb, + 0x0e, 0xc9, 0x67, 0xc3, 0x94, 0xc4, 0xba, 0xf0, 0x0b, 0x78, 0x96, 0x88, 0x86, 0x9f, 0xc2, 0xe6, + 0x98, 0xfe, 0x96, 0xb2, 0x8f, 0x14, 0x3d, 0xc1, 0x5b, 0x90, 0xe9, 0xd1, 0x39, 0x43, 0x8a, 0xc0, + 0x17, 0xa6, 0x47, 0x6d, 0xba, 0x40, 0x29, 0x9c, 0x8b, 0xca, 0x8a, 0xd2, 0x85, 0xdf, 0xc3, 0x67, + 0xf1, 0x5a, 0xb6, 0x16, 0x84, 0xf2, 0xd8, 0x34, 0xbc, 0x83, 0xdd, 0x2b, 0x47, 0xe2, 0x09, 0xf1, + 0x7c, 0x9b, 0xd1, 0xa8, 0x2a, 0x09, 0x8a, 0x6b, 0xb0, 0xe5, 0xcb, 0x64, 0x88, 0x9f, 0x4f, 0xc9, + 0xc3, 0xef, 0xd5, 0x23, 0x25, 0xd2, 0xd7, 0x86, 0x85, 0x1a, 0xbc, 0xea, 0x06, 0xc4, 0xe7, 0xd2, + 0x53, 0xfc, 0x3c, 0xc8, 0xc3, 0x26, 0xa1, 0xa2, 0x49, 0xb3, 0xa8, 0x7d, 0x2b, 0xb1, 0xf0, 0x17, + 0x05, 0xf0, 0xd0, 0x63, 0xd7, 0x89, 0x03, 0xa4, 0x00, 0xb9, 0x4b, 0xce, 0x5d, 0xa9, 0x89, 0x3d, + 0x3c, 0xb7, 0x18, 0xbf, 0x05, 0x10, 0x82, 0x1f, 0x1a, 0xa5, 0xee, 0x18, 0xdd, 0xe1, 0x22, 0x34, + 0x65, 0xa1, 0x49, 0xfa, 0x30, 0x2d, 0xba, 0x10, 0x89, 0x22, 0x06, 0xf7, 0x02, 0x9f, 0x93, 0x59, + 0xdb, 0x0c, 0x3b, 0xb4, 0x8a, 0xb1, 0xc6, 0xc5, 0x37, 0xb0, 0x35, 0xf6, 0x89, 0x27, 0xdb, 0xb1, + 0x05, 0x19, 0x7d, 0x30, 0x18, 0x85, 0xbd, 0x18, 0x1b, 0xaa, 0x8e, 0x94, 0xe2, 0x2f, 0x61, 0x67, + 0xe8, 0x31, 0x8b, 0xf8, 0x3e, 0x5b, 0x1b, 0x69, 0x8c, 0x12, 0xf4, 0x44, 0x74, 0xa6, 0x47, 0x39, + 0x59, 0x86, 0x1d, 0x93, 0xcb, 0x46, 0x1d, 0xa5, 0xf0, 0x26, 0xa4, 0x5b, 0xfd, 0x0e, 0x4a, 0x0b, + 0x83, 0x56, 0xbf, 0xd3, 0xa8, 0xa3, 0x8c, 0x64, 0x7a, 0x1f, 0x65, 0x25, 0xd3, 0xfb, 0x8d, 0x3a, + 0xda, 0x28, 0x7e, 0x0f, 0x6f, 0x06, 0x2e, 0x11, 0xf5, 0xa0, 0x0b, 0xe3, 0xc6, 0xe7, 0xc4, 0x39, + 0x61, 0x8c, 0xfb, 0xdc, 0x33, 0x5d, 0x95, 0x2e, 0x6c, 0x4a, 0xf0, 0x2e, 0x40, 0xfb, 0x7c, 0x30, + 0xee, 0x4c, 0x7b, 0x5a, 0x4f, 0xa4, 0x95, 0x87, 0x17, 0x17, 0x3d, 0xad, 0x33, 0xb8, 0x30, 0xa6, + 0x2d, 0xcd, 0xb8, 0x50, 0xf5, 0xe9, 0x69, 0xef, 0x5c, 0x35, 0x90, 0x52, 0xfc, 0x06, 0x9e, 0x27, + 0x7c, 0xad, 0x06, 0x2c, 0xda, 0x10, 0xe6, 0x7b, 0xde, 0xd3, 0xc6, 0x3f, 0x20, 0xa5, 0xf8, 0xb7, + 0x1c, 0xec, 0xc7, 0x47, 0x49, 0x5c, 0x24, 0xab, 0x2d, 0x1d, 0x32, 0x37, 0x83, 0x25, 0x47, 0x4f, + 0x30, 0x86, 0x5d, 0x83, 0x9b, 0x74, 0x66, 0x7a, 0xb3, 0x69, 0xab, 0x3a, 0xbd, 0xaa, 0xa2, 0x54, + 0x9c, 0xd5, 0x05, 0x4b, 0xe3, 0xe7, 0x72, 0xb6, 0x43, 0xd6, 0xa9, 0xfa, 0xd3, 0xab, 0x1a, 0xca, + 0xc4, 0x61, 0x5d, 0xc2, 0x6c, 0x1c, 0x36, 0x25, 0xdc, 0xc0, 0x2f, 0x00, 0xdd, 0xc2, 0x4a, 0x43, + 0xd2, 0xcd, 0x38, 0xad, 0x85, 0x5e, 0xb7, 0xe2, 0x0e, 0x0c, 0x99, 0x53, 0x2e, 0x01, 0x6b, 0x02, + 0x42, 0x02, 0xca, 0x4c, 0x9f, 0x26, 0xe0, 0xb7, 0x02, 0x6e, 0xc7, 0x23, 0x19, 0x15, 0xb9, 0x7f, + 0x27, 0x66, 0x7a, 0xd6, 0x34, 0xa6, 0x57, 0x15, 0xb4, 0x1b, 0x33, 0x3d, 0x6b, 0x8a, 0xf8, 0x15, + 0xf4, 0x2c, 0x49, 0x6b, 0x82, 0xa2, 0x24, 0xad, 0x0b, 0xba, 0x87, 0x11, 0x6c, 0xaf, 0xa9, 0x76, + 0xd6, 0x40, 0x18, 0xef, 0xc1, 0xce, 0x1d, 0x52, 0xa9, 0xa2, 0xe7, 0x71, 0xa3, 0x49, 0x03, 0xbd, + 0x88, 0x1b, 0x4d, 0x2a, 0x55, 0xf4, 0x32, 0xe9, 0xff, 0x5b, 0xe1, 0x7f, 0x1f, 0xbf, 0x82, 0xe7, + 0x89, 0x02, 0x4d, 0xdf, 0x0f, 0x35, 0xf4, 0x2a, 0xa1, 0xa8, 0xad, 0x14, 0xf9, 0x84, 0xa2, 0xbe, + 0x52, 0x7c, 0x12, 0x0b, 0x70, 0x5a, 0xf5, 0x25, 0x3d, 0x88, 0xd3, 0x7a, 0x48, 0x7f, 0x12, 0xa7, + 0xcd, 0x90, 0xbe, 0xc6, 0x2f, 0x61, 0xef, 0x96, 0x8a, 0xce, 0x0a, 0xfc, 0x69, 0xac, 0xb4, 0x5a, + 0xbb, 0x3e, 0x6d, 0x55, 0xd1, 0x9b, 0x04, 0x6c, 0x0a, 0xf8, 0x59, 0xcc, 0xad, 0xd6, 0xae, 0x34, + 0x04, 0x3d, 0x4c, 0xd0, 0x5a, 0x55, 0xd0, 0x9f, 0x26, 0x68, 0x7d, 0xda, 0xaa, 0x95, 0x51, 0x21, + 0x41, 0x9b, 0x92, 0x7e, 0x1e, 0x4b, 0x2c, 0xf4, 0x5b, 0x2b, 0xa3, 0xb7, 0x09, 0x2c, 0x1c, 0xd7, + 0xca, 0xe8, 0x0b, 0xf1, 0xe0, 0xc5, 0x3d, 0x57, 0xca, 0xe5, 0x69, 0xbd, 0x8c, 0xde, 0x25, 0x34, + 0xcd, 0xb5, 0xe6, 0x4b, 0xfc, 0x09, 0xbc, 0x4c, 0x44, 0x88, 0x54, 0x47, 0x09, 0x95, 0x88, 0x12, + 0xa9, 0x7e, 0xf6, 0x70, 0xa4, 0x66, 0x19, 0x15, 0x1f, 0x8e, 0xd4, 0x2c, 0xa3, 0xaf, 0x1e, 0x89, + 0xd4, 0x2c, 0xa3, 0xaf, 0x1f, 0x89, 0xd4, 0x2c, 0xa3, 0x6f, 0xee, 0x57, 0xab, 0xd2, 0x40, 0xa5, + 0xfb, 0xd5, 0xaa, 0x34, 0xd0, 0xf1, 0x03, 0xd5, 0xaa, 0x34, 0x50, 0xf9, 0x81, 0x6a, 0x55, 0x1a, + 0xa8, 0x82, 0x77, 0x20, 0x17, 0xbe, 0x9d, 0x8a, 0xb6, 0x4c, 0xef, 0x88, 0xda, 0x19, 0xfa, 0xb5, + 0x18, 0xed, 0x48, 0xec, 0xba, 0x81, 0x7b, 0x85, 0x4c, 0x0c, 0xb0, 0x11, 0x12, 0xf4, 0x01, 0x3f, + 0x83, 0xa7, 0x63, 0xea, 0x07, 0xae, 0xcb, 0x3c, 0x4e, 0x66, 0xc8, 0x2a, 0x1e, 0xc1, 0xde, 0xbd, + 0x97, 0x7b, 0x71, 0x08, 0xbf, 0x1f, 0x8d, 0x86, 0xe1, 0xa1, 0x26, 0x56, 0xe2, 0x0c, 0xec, 0xc0, + 0xde, 0xbd, 0xb7, 0x6d, 0x71, 0x84, 0x76, 0xdd, 0xe0, 0xf6, 0x44, 0x03, 0xd8, 0x10, 0x72, 0xa7, + 0x85, 0x14, 0xe1, 0xa5, 0xeb, 0x06, 0xc3, 0xf0, 0x92, 0x15, 0xab, 0x09, 0x4a, 0x17, 0x47, 0x00, + 0x43, 0xf6, 0x91, 0x78, 0xe1, 0x8b, 0x50, 0xec, 0x86, 0x7e, 0x0a, 0x9b, 0x7a, 0x40, 0xe5, 0xbd, + 0xac, 0x88, 0x13, 0x7d, 0x30, 0x9f, 0xa3, 0x94, 0xf0, 0x38, 0x34, 0x03, 0x9f, 0xcc, 0x50, 0x1a, + 0x6f, 0xc3, 0x56, 0xdb, 0xb3, 0xb9, 0x6d, 0x99, 0x4b, 0x94, 0x11, 0x5e, 0x0d, 0xf3, 0x8a, 0xcc, + 0x50, 0xb6, 0x38, 0x87, 0x57, 0xf1, 0xf3, 0x36, 0x3a, 0xad, 0x19, 0x95, 0x56, 0xa3, 0x96, 0x1e, + 0x5d, 0x3b, 0xc6, 0x68, 0x30, 0x44, 0x8a, 0x80, 0xba, 0x6a, 0xa8, 0x23, 0x94, 0xc2, 0xfb, 0x80, + 0x75, 0x75, 0xd8, 0xea, 0xe9, 0xd3, 0xee, 0x58, 0x35, 0x46, 0xd3, 0x56, 0x57, 0xd5, 0x46, 0xe1, + 0xed, 0x32, 0x6c, 0x8d, 0x0d, 0x15, 0x65, 0xe4, 0xbe, 0xd6, 0x44, 0x45, 0xd9, 0xe2, 0x3f, 0x94, + 0xc7, 0x5f, 0x8a, 0xef, 0xbd, 0xe3, 0xed, 0xc7, 0xc9, 0x74, 0xac, 0x9d, 0x69, 0x83, 0x0b, 0x0d, + 0x3d, 0x11, 0x63, 0x93, 0xd0, 0x9d, 0xb6, 0x7a, 0xe7, 0x6a, 0x07, 0x29, 0xf8, 0x35, 0xe4, 0x13, + 0x2a, 0x63, 0xdc, 0x6e, 0xab, 0x6a, 0x47, 0xed, 0xa0, 0xd4, 0x03, 0x4e, 0x87, 0xaa, 0xd6, 0xe9, + 0x69, 0x5d, 0x94, 0x7e, 0x60, 0xa7, 0xae, 0x9e, 0x0c, 0x06, 0x23, 0xa1, 0xcd, 0x14, 0x7f, 0x84, + 0xed, 0x96, 0x67, 0x5d, 0xda, 0x9c, 0x58, 0x3c, 0xf0, 0x88, 0xa8, 0xef, 0x75, 0xb3, 0x11, 0x16, + 0xa5, 0xdf, 0x13, 0x0d, 0x96, 0x77, 0xe7, 0xd2, 0xbd, 0x34, 0x51, 0x4a, 0xb4, 0x42, 0x76, 0x69, + 0xd8, 0x46, 0x69, 0x31, 0xb3, 0x2d, 0xbd, 0x3f, 0xbd, 0xbb, 0x1d, 0x65, 0xc5, 0x3e, 0xdb, 0x14, + 0x17, 0xad, 0x74, 0xd5, 0xa8, 0xa3, 0x9c, 0x28, 0xa5, 0xbc, 0x7c, 0xe3, 0xa6, 0xdb, 0xc5, 0xf7, + 0xb0, 0x6d, 0x10, 0x2b, 0xf0, 0x6c, 0x7e, 0x23, 0x87, 0x66, 0x0f, 0x76, 0xb4, 0xc1, 0xa8, 0x3d, + 0xd0, 0x4e, 0x7b, 0xdd, 0xb1, 0xae, 0x76, 0xd0, 0x13, 0x81, 0x46, 0xfa, 0xd8, 0x18, 0xa9, 0x9d, + 0xf3, 0xd6, 0x58, 0x6b, 0xbf, 0x47, 0x8a, 0xb8, 0x08, 0xa5, 0x49, 0x47, 0xd5, 0x46, 0xbd, 0xd6, + 0xf9, 0xa4, 0x8f, 0x52, 0xdf, 0x9d, 0x01, 0xf2, 0x09, 0xf5, 0x6d, 0x6e, 0x5f, 0x91, 0xe8, 0xbb, + 0x17, 0x7f, 0x5a, 0x0a, 0xbf, 0x73, 0x4b, 0xab, 0xef, 0xdc, 0xd2, 0xa9, 0x4d, 0x96, 0xb3, 0x81, + 0x2b, 0x0a, 0xe1, 0xe7, 0xff, 0xf5, 0xc7, 0xb4, 0x7c, 0x63, 0xba, 0xb7, 0xf1, 0x3b, 0x15, 0x76, + 0xd6, 0xec, 0x37, 0x3e, 0xa3, 0xff, 0xcf, 0xd3, 0xbf, 0x23, 0x4f, 0xf1, 0x5d, 0x27, 0x5f, 0xfc, + 0xea, 0xf3, 0x85, 0xcd, 0x2f, 0x83, 0x0f, 0x25, 0x8b, 0x39, 0xc7, 0x8e, 0x6d, 0x79, 0xcc, 0x67, + 0x73, 0x7e, 0xec, 0x30, 0xeb, 0xd8, 0x73, 0xad, 0xe3, 0xf0, 0xc3, 0xfc, 0xc3, 0x86, 0x74, 0x5a, + 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0xf0, 0xb5, 0xdb, 0xbb, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 4c3fd22e..26d4fed8 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -103,10 +103,10 @@ message WinRMConfiguration { } enum GpuAssignmentType { - GpuDDA = 0; - GpuP = 1; - GpuPV = 2; - GpuDefault = 4; // default is used when customer do not pass GPU Assign Type and moc will decide the assign type based on the underlying configuration. + GpuDefault = 0; // default is used when customer do not pass GPU Assign Type and moc will decide the assign type based on the underlying configuration. + GpuDDA = 1; + GpuP = 2; + GpuPV = 3; } message Gpu { diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index 8aefa0a9..0ba3d373 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -287,7 +287,7 @@ func (m *HostGPU) GetAssignment() GpuAssignmentType { if m != nil { return m.Assignment } - return GpuAssignmentType_GpuDDA + return GpuAssignmentType_GpuDefault } func (m *HostGPU) GetId() string { From 1a7cef7ca39e54ad6024b2a093041307dddab7af Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Thu, 25 Apr 2024 23:31:03 -0700 Subject: [PATCH 08/13] Revert to use AssignmentType enum --- rpc/common/moc_common_computecommon.pb.go | 298 +++++++++++----------- rpc/common/moc_common_computecommon.proto | 16 +- rpc/common/moc_common_nodeinfo.pb.go | 121 +++++---- rpc/common/moc_common_nodeinfo.proto | 2 +- 4 files changed, 218 insertions(+), 219 deletions(-) diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 815efc44..4f709628 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -342,34 +342,34 @@ func (WinRMProtocolType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_7d1a061f6c82445b, []int{5} } -type GpuAssignmentType int32 +type AssignmentType int32 const ( - GpuAssignmentType_GpuDefault GpuAssignmentType = 0 - GpuAssignmentType_GpuDDA GpuAssignmentType = 1 - GpuAssignmentType_GpuP GpuAssignmentType = 2 - GpuAssignmentType_GpuPV GpuAssignmentType = 3 + AssignmentType_GpuDDA AssignmentType = 0 + AssignmentType_GpuP AssignmentType = 1 + AssignmentType_GpuPV AssignmentType = 2 + AssignmentType_GpuDefault AssignmentType = 3 ) -var GpuAssignmentType_name = map[int32]string{ - 0: "GpuDefault", - 1: "GpuDDA", - 2: "GpuP", - 3: "GpuPV", +var AssignmentType_name = map[int32]string{ + 0: "GpuDDA", + 1: "GpuP", + 2: "GpuPV", + 3: "GpuDefault", } -var GpuAssignmentType_value = map[string]int32{ - "GpuDefault": 0, - "GpuDDA": 1, - "GpuP": 2, - "GpuPV": 3, +var AssignmentType_value = map[string]int32{ + "GpuDDA": 0, + "GpuP": 1, + "GpuPV": 2, + "GpuDefault": 3, } -func (x GpuAssignmentType) String() string { - return proto.EnumName(GpuAssignmentType_name, int32(x)) +func (x AssignmentType) String() string { + return proto.EnumName(AssignmentType_name, int32(x)) } -func (GpuAssignmentType) EnumDescriptor() ([]byte, []int) { +func (AssignmentType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_7d1a061f6c82445b, []int{6} } @@ -662,12 +662,12 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { } type Gpu struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Assignment GpuAssignmentType `protobuf:"varint,2,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` - PartitionSizeMB uint64 `protobuf:"varint,3,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Assignment AssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.AssignmentType" json:"assignment,omitempty"` + PartitionSizeMB uint64 `protobuf:"varint,2,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Gpu) Reset() { *m = Gpu{} } @@ -695,18 +695,11 @@ func (m *Gpu) XXX_DiscardUnknown() { var xxx_messageInfo_Gpu proto.InternalMessageInfo -func (m *Gpu) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Gpu) GetAssignment() GpuAssignmentType { +func (m *Gpu) GetAssignment() AssignmentType { if m != nil { return m.Assignment } - return GpuAssignmentType_GpuDefault + return AssignmentType_GpuDDA } func (m *Gpu) GetPartitionSizeMB() uint64 { @@ -716,6 +709,13 @@ func (m *Gpu) GetPartitionSizeMB() uint64 { return 0 } +func (m *Gpu) GetName() string { + if m != nil { + return m.Name + } + return "" +} + type VirtualMachineCustomSize struct { CpuCount int32 `protobuf:"varint,1,opt,name=cpuCount,proto3" json:"cpuCount,omitempty"` MemoryMB int32 `protobuf:"varint,2,opt,name=memoryMB,proto3" json:"memoryMB,omitempty"` @@ -1279,7 +1279,7 @@ func init() { proto.RegisterEnum("moc.OperatingSystemType", OperatingSystemType_name, OperatingSystemType_value) proto.RegisterEnum("moc.VirtualMachineSizeType", VirtualMachineSizeType_name, VirtualMachineSizeType_value) proto.RegisterEnum("moc.WinRMProtocolType", WinRMProtocolType_name, WinRMProtocolType_value) - proto.RegisterEnum("moc.GpuAssignmentType", GpuAssignmentType_name, GpuAssignmentType_value) + proto.RegisterEnum("moc.AssignmentType", AssignmentType_name, AssignmentType_value) proto.RegisterEnum("moc.PowerState", PowerState_name, PowerState_value) proto.RegisterEnum("moc.VirtualMachineOperation", VirtualMachineOperation_name, VirtualMachineOperation_value) proto.RegisterEnum("moc.VirtualMachineRunCommandExecutionState", VirtualMachineRunCommandExecutionState_name, VirtualMachineRunCommandExecutionState_value) @@ -1306,119 +1306,119 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1823 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x6e, 0xe3, 0xc8, - 0x11, 0x80, 0x87, 0xfa, 0xb1, 0xad, 0x1a, 0xdb, 0xd3, 0xee, 0x99, 0xf1, 0x68, 0x9d, 0xd9, 0x59, - 0x47, 0x3b, 0x3b, 0xeb, 0x68, 0x77, 0x65, 0xfd, 0xad, 0x20, 0x2c, 0x10, 0x20, 0xb2, 0x44, 0x6b, - 0xb4, 0xb6, 0x28, 0x81, 0x94, 0xe4, 0x4d, 0x2e, 0x0a, 0x87, 0x6a, 0xc9, 0x4c, 0xc4, 0x6e, 0x82, - 0x6c, 0x7a, 0xec, 0x0d, 0x10, 0xe4, 0x94, 0x73, 0x8e, 0x39, 0xe4, 0x90, 0x63, 0x5e, 0x20, 0xc8, - 0x13, 0xe4, 0x05, 0x92, 0xe7, 0x09, 0x10, 0x74, 0x93, 0x92, 0x4d, 0xda, 0x4e, 0x4e, 0xea, 0xfa, - 0xaa, 0xba, 0xaa, 0x54, 0x55, 0xec, 0x26, 0xe1, 0x8d, 0xc3, 0xac, 0xa9, 0xc5, 0x1c, 0x87, 0x51, - 0xf1, 0xe3, 0x06, 0x9c, 0x84, 0x52, 0xc9, 0xf5, 0x18, 0x67, 0x38, 0xed, 0x30, 0xeb, 0xe0, 0x70, - 0xc1, 0xd8, 0x62, 0x49, 0x8e, 0x25, 0xfa, 0x10, 0xcc, 0x8f, 0x67, 0xc4, 0xb7, 0x3c, 0xdb, 0xe5, - 0xcc, 0x0b, 0xcd, 0x0a, 0x6d, 0xd8, 0xb9, 0xb0, 0xa9, 0xde, 0x3f, 0xb7, 0x7d, 0x4e, 0x28, 0xf1, - 0x70, 0x15, 0xb6, 0x86, 0x42, 0x63, 0xb1, 0x65, 0x5e, 0x39, 0x54, 0x8e, 0x76, 0xab, 0xfb, 0x25, - 0x87, 0x59, 0x25, 0x69, 0xb5, 0xd2, 0x8c, 0x6e, 0x5c, 0xa2, 0xaf, 0xed, 0x0a, 0xa7, 0x80, 0xa5, - 0xba, 0xcd, 0xe8, 0xdc, 0x5e, 0x04, 0x9e, 0xc9, 0x6d, 0x46, 0x71, 0x19, 0x72, 0x2b, 0xaf, 0x7e, - 0x5e, 0x39, 0x4c, 0x1f, 0x3d, 0xad, 0xe2, 0x5b, 0x57, 0x2b, 0x95, 0x7e, 0x6b, 0x54, 0xf8, 0x1d, - 0xa4, 0xbb, 0x6e, 0x80, 0x31, 0x64, 0xa8, 0xe9, 0x10, 0x19, 0x3e, 0xa7, 0xcb, 0x35, 0x6e, 0x00, - 0x98, 0xbe, 0x6f, 0x2f, 0xa8, 0x43, 0x28, 0xcf, 0xa7, 0xee, 0x24, 0xd6, 0x75, 0x83, 0xd6, 0x5a, - 0x23, 0x13, 0xbb, 0x63, 0x89, 0x8f, 0xe0, 0x99, 0x6b, 0x7a, 0xdc, 0x16, 0x19, 0x19, 0xf6, 0x8f, - 0xa4, 0x7f, 0x92, 0x4f, 0x1f, 0x2a, 0x47, 0x19, 0x3d, 0x89, 0x0b, 0x14, 0xf2, 0x13, 0xdb, 0xe3, - 0x81, 0xb9, 0xec, 0x9b, 0xd6, 0xa5, 0x4d, 0x49, 0x3b, 0xf0, 0x39, 0x73, 0x84, 0x16, 0x1f, 0xc0, - 0x96, 0xe5, 0x06, 0x6d, 0x16, 0x50, 0x2e, 0xb3, 0xca, 0xea, 0x6b, 0x59, 0xe8, 0x1c, 0xe2, 0x30, - 0xef, 0xa6, 0x7f, 0x22, 0xf3, 0xca, 0xea, 0x6b, 0x59, 0xe8, 0x16, 0xab, 0x7d, 0xe9, 0x50, 0xb7, - 0x92, 0x0b, 0x7f, 0x55, 0xe0, 0xa0, 0x73, 0x43, 0x4d, 0xc7, 0xb6, 0xfa, 0xd2, 0x3e, 0x5e, 0xbd, - 0x23, 0x78, 0xe6, 0x98, 0xd7, 0xb6, 0x13, 0x38, 0xfd, 0x95, 0x77, 0x25, 0x4c, 0x3c, 0x81, 0xa5, - 0xa5, 0x4d, 0x63, 0x96, 0xa9, 0xc8, 0x32, 0x8e, 0x71, 0x09, 0x30, 0x37, 0xbd, 0x05, 0xe1, 0x21, - 0x39, 0x09, 0xe6, 0x73, 0xe2, 0xc9, 0xc4, 0x76, 0xf4, 0x07, 0x34, 0x85, 0x1f, 0xe0, 0x5d, 0xbc, - 0x24, 0x7a, 0x40, 0xdb, 0xcc, 0x71, 0x4c, 0x3a, 0xeb, 0x51, 0x37, 0xe0, 0x43, 0xd3, 0x33, 0x1d, - 0xc2, 0x89, 0x27, 0x5a, 0xa6, 0xdd, 0x69, 0x99, 0x58, 0xe3, 0x03, 0xc8, 0x4e, 0xcc, 0x65, 0x40, - 0x64, 0x36, 0xb9, 0x93, 0xcc, 0x9f, 0xff, 0x9e, 0x57, 0xf4, 0x10, 0x15, 0xfe, 0xa0, 0xc0, 0xdb, - 0xc7, 0x5c, 0x1b, 0x72, 0x42, 0x0d, 0x16, 0x78, 0x16, 0xc1, 0xaf, 0x61, 0x23, 0x94, 0x43, 0xd7, - 0x27, 0x99, 0x3f, 0x09, 0x2f, 0x11, 0xc3, 0xaf, 0x21, 0x17, 0xae, 0xc6, 0x7a, 0x2f, 0x0c, 0xa3, - 0xdf, 0x02, 0xa1, 0x5d, 0x65, 0xdb, 0x91, 0xff, 0x32, 0xa7, 0xdf, 0x82, 0xc2, 0x3f, 0xff, 0x47, - 0x0a, 0x3d, 0xea, 0x73, 0x93, 0x5a, 0x64, 0x62, 0x93, 0x8f, 0xd8, 0x80, 0x5d, 0xf5, 0x9a, 0x58, - 0x81, 0x9c, 0x15, 0x6e, 0x72, 0x12, 0x3d, 0x17, 0x5f, 0xc9, 0xf1, 0x7b, 0xcc, 0x45, 0x7c, 0x8b, - 0x9e, 0x70, 0x21, 0x26, 0x43, 0xbd, 0xb6, 0x79, 0x9b, 0xcd, 0xc8, 0x6a, 0x6a, 0x56, 0x32, 0xde, - 0x87, 0x8d, 0x41, 0xc0, 0xdd, 0x80, 0x47, 0x49, 0x47, 0x12, 0x7e, 0x01, 0x59, 0xd5, 0xf3, 0x98, - 0x97, 0xcf, 0x48, 0x1c, 0x0a, 0x85, 0xef, 0xe1, 0x20, 0x31, 0xb7, 0xa6, 0x6b, 0x7e, 0xb0, 0x97, - 0x36, 0xb7, 0x89, 0x8f, 0xbf, 0x86, 0xbd, 0x9e, 0xcf, 0x96, 0x26, 0x27, 0xb3, 0x89, 0x23, 0x35, - 0xcb, 0x30, 0xff, 0x2d, 0xfd, 0xbe, 0xa2, 0xf0, 0x1f, 0x05, 0xf0, 0xdd, 0xff, 0x2e, 0x72, 0x0d, - 0x7c, 0xd1, 0x5d, 0x4b, 0x24, 0x1a, 0x75, 0x57, 0xac, 0xf1, 0xcf, 0x21, 0xbb, 0x24, 0x57, 0x64, - 0x19, 0x3d, 0x8b, 0x5f, 0xca, 0x62, 0xdc, 0xdf, 0x5b, 0x0a, 0x7f, 0xce, 0x85, 0xa9, 0x7c, 0x38, - 0xc3, 0x5d, 0xf8, 0x2d, 0xec, 0xcc, 0x6c, 0xdf, 0x5d, 0x9a, 0x37, 0xa1, 0x41, 0xf4, 0x57, 0xe3, - 0x10, 0xe7, 0x61, 0xd3, 0x21, 0xbe, 0x6f, 0x2e, 0x48, 0xf4, 0x9f, 0x57, 0xa2, 0x48, 0x89, 0xdb, - 0x0e, 0xc9, 0x67, 0xc3, 0x94, 0xc4, 0xba, 0xf0, 0x0b, 0x78, 0x96, 0x88, 0x86, 0x9f, 0xc2, 0xe6, - 0x98, 0xfe, 0x96, 0xb2, 0x8f, 0x14, 0x3d, 0xc1, 0x5b, 0x90, 0xe9, 0xd1, 0x39, 0x43, 0x8a, 0xc0, - 0x17, 0xa6, 0x47, 0x6d, 0xba, 0x40, 0x29, 0x9c, 0x8b, 0xca, 0x8a, 0xd2, 0x85, 0xdf, 0xc3, 0x67, - 0xf1, 0x5a, 0xb6, 0x16, 0x84, 0xf2, 0xd8, 0x34, 0xbc, 0x83, 0xdd, 0x2b, 0x47, 0xe2, 0x09, 0xf1, - 0x7c, 0x9b, 0xd1, 0xa8, 0x2a, 0x09, 0x8a, 0x6b, 0xb0, 0xe5, 0xcb, 0x64, 0x88, 0x9f, 0x4f, 0xc9, - 0xc3, 0xef, 0xd5, 0x23, 0x25, 0xd2, 0xd7, 0x86, 0x85, 0x1a, 0xbc, 0xea, 0x06, 0xc4, 0xe7, 0xd2, - 0x53, 0xfc, 0x3c, 0xc8, 0xc3, 0x26, 0xa1, 0xa2, 0x49, 0xb3, 0xa8, 0x7d, 0x2b, 0xb1, 0xf0, 0x17, - 0x05, 0xf0, 0xd0, 0x63, 0xd7, 0x89, 0x03, 0xa4, 0x00, 0xb9, 0x4b, 0xce, 0x5d, 0xa9, 0x89, 0x3d, - 0x3c, 0xb7, 0x18, 0xbf, 0x05, 0x10, 0x82, 0x1f, 0x1a, 0xa5, 0xee, 0x18, 0xdd, 0xe1, 0x22, 0x34, - 0x65, 0xa1, 0x49, 0xfa, 0x30, 0x2d, 0xba, 0x10, 0x89, 0x22, 0x06, 0xf7, 0x02, 0x9f, 0x93, 0x59, - 0xdb, 0x0c, 0x3b, 0xb4, 0x8a, 0xb1, 0xc6, 0xc5, 0x37, 0xb0, 0x35, 0xf6, 0x89, 0x27, 0xdb, 0xb1, - 0x05, 0x19, 0x7d, 0x30, 0x18, 0x85, 0xbd, 0x18, 0x1b, 0xaa, 0x8e, 0x94, 0xe2, 0x2f, 0x61, 0x67, - 0xe8, 0x31, 0x8b, 0xf8, 0x3e, 0x5b, 0x1b, 0x69, 0x8c, 0x12, 0xf4, 0x44, 0x74, 0xa6, 0x47, 0x39, - 0x59, 0x86, 0x1d, 0x93, 0xcb, 0x46, 0x1d, 0xa5, 0xf0, 0x26, 0xa4, 0x5b, 0xfd, 0x0e, 0x4a, 0x0b, - 0x83, 0x56, 0xbf, 0xd3, 0xa8, 0xa3, 0x8c, 0x64, 0x7a, 0x1f, 0x65, 0x25, 0xd3, 0xfb, 0x8d, 0x3a, - 0xda, 0x28, 0x7e, 0x0f, 0x6f, 0x06, 0x2e, 0x11, 0xf5, 0xa0, 0x0b, 0xe3, 0xc6, 0xe7, 0xc4, 0x39, - 0x61, 0x8c, 0xfb, 0xdc, 0x33, 0x5d, 0x95, 0x2e, 0x6c, 0x4a, 0xf0, 0x2e, 0x40, 0xfb, 0x7c, 0x30, - 0xee, 0x4c, 0x7b, 0x5a, 0x4f, 0xa4, 0x95, 0x87, 0x17, 0x17, 0x3d, 0xad, 0x33, 0xb8, 0x30, 0xa6, - 0x2d, 0xcd, 0xb8, 0x50, 0xf5, 0xe9, 0x69, 0xef, 0x5c, 0x35, 0x90, 0x52, 0xfc, 0x06, 0x9e, 0x27, - 0x7c, 0xad, 0x06, 0x2c, 0xda, 0x10, 0xe6, 0x7b, 0xde, 0xd3, 0xc6, 0x3f, 0x20, 0xa5, 0xf8, 0xb7, - 0x1c, 0xec, 0xc7, 0x47, 0x49, 0x5c, 0x24, 0xab, 0x2d, 0x1d, 0x32, 0x37, 0x83, 0x25, 0x47, 0x4f, - 0x30, 0x86, 0x5d, 0x83, 0x9b, 0x74, 0x66, 0x7a, 0xb3, 0x69, 0xab, 0x3a, 0xbd, 0xaa, 0xa2, 0x54, - 0x9c, 0xd5, 0x05, 0x4b, 0xe3, 0xe7, 0x72, 0xb6, 0x43, 0xd6, 0xa9, 0xfa, 0xd3, 0xab, 0x1a, 0xca, - 0xc4, 0x61, 0x5d, 0xc2, 0x6c, 0x1c, 0x36, 0x25, 0xdc, 0xc0, 0x2f, 0x00, 0xdd, 0xc2, 0x4a, 0x43, - 0xd2, 0xcd, 0x38, 0xad, 0x85, 0x5e, 0xb7, 0xe2, 0x0e, 0x0c, 0x99, 0x53, 0x2e, 0x01, 0x6b, 0x02, - 0x42, 0x02, 0xca, 0x4c, 0x9f, 0x26, 0xe0, 0xb7, 0x02, 0x6e, 0xc7, 0x23, 0x19, 0x15, 0xb9, 0x7f, - 0x27, 0x66, 0x7a, 0xd6, 0x34, 0xa6, 0x57, 0x15, 0xb4, 0x1b, 0x33, 0x3d, 0x6b, 0x8a, 0xf8, 0x15, - 0xf4, 0x2c, 0x49, 0x6b, 0x82, 0xa2, 0x24, 0xad, 0x0b, 0xba, 0x87, 0x11, 0x6c, 0xaf, 0xa9, 0x76, - 0xd6, 0x40, 0x18, 0xef, 0xc1, 0xce, 0x1d, 0x52, 0xa9, 0xa2, 0xe7, 0x71, 0xa3, 0x49, 0x03, 0xbd, - 0x88, 0x1b, 0x4d, 0x2a, 0x55, 0xf4, 0x32, 0xe9, 0xff, 0x5b, 0xe1, 0x7f, 0x1f, 0xbf, 0x82, 0xe7, - 0x89, 0x02, 0x4d, 0xdf, 0x0f, 0x35, 0xf4, 0x2a, 0xa1, 0xa8, 0xad, 0x14, 0xf9, 0x84, 0xa2, 0xbe, - 0x52, 0x7c, 0x12, 0x0b, 0x70, 0x5a, 0xf5, 0x25, 0x3d, 0x88, 0xd3, 0x7a, 0x48, 0x7f, 0x12, 0xa7, - 0xcd, 0x90, 0xbe, 0xc6, 0x2f, 0x61, 0xef, 0x96, 0x8a, 0xce, 0x0a, 0xfc, 0x69, 0xac, 0xb4, 0x5a, - 0xbb, 0x3e, 0x6d, 0x55, 0xd1, 0x9b, 0x04, 0x6c, 0x0a, 0xf8, 0x59, 0xcc, 0xad, 0xd6, 0xae, 0x34, - 0x04, 0x3d, 0x4c, 0xd0, 0x5a, 0x55, 0xd0, 0x9f, 0x26, 0x68, 0x7d, 0xda, 0xaa, 0x95, 0x51, 0x21, - 0x41, 0x9b, 0x92, 0x7e, 0x1e, 0x4b, 0x2c, 0xf4, 0x5b, 0x2b, 0xa3, 0xb7, 0x09, 0x2c, 0x1c, 0xd7, - 0xca, 0xe8, 0x0b, 0xf1, 0xe0, 0xc5, 0x3d, 0x57, 0xca, 0xe5, 0x69, 0xbd, 0x8c, 0xde, 0x25, 0x34, - 0xcd, 0xb5, 0xe6, 0x4b, 0xfc, 0x09, 0xbc, 0x4c, 0x44, 0x88, 0x54, 0x47, 0x09, 0x95, 0x88, 0x12, - 0xa9, 0x7e, 0xf6, 0x70, 0xa4, 0x66, 0x19, 0x15, 0x1f, 0x8e, 0xd4, 0x2c, 0xa3, 0xaf, 0x1e, 0x89, - 0xd4, 0x2c, 0xa3, 0xaf, 0x1f, 0x89, 0xd4, 0x2c, 0xa3, 0x6f, 0xee, 0x57, 0xab, 0xd2, 0x40, 0xa5, - 0xfb, 0xd5, 0xaa, 0x34, 0xd0, 0xf1, 0x03, 0xd5, 0xaa, 0x34, 0x50, 0xf9, 0x81, 0x6a, 0x55, 0x1a, - 0xa8, 0x82, 0x77, 0x20, 0x17, 0xbe, 0x9d, 0x8a, 0xb6, 0x4c, 0xef, 0x88, 0xda, 0x19, 0xfa, 0xb5, - 0x18, 0xed, 0x48, 0xec, 0xba, 0x81, 0x7b, 0x85, 0x4c, 0x0c, 0xb0, 0x11, 0x12, 0xf4, 0x01, 0x3f, - 0x83, 0xa7, 0x63, 0xea, 0x07, 0xae, 0xcb, 0x3c, 0x4e, 0x66, 0xc8, 0x2a, 0x1e, 0xc1, 0xde, 0xbd, - 0x97, 0x7b, 0x71, 0x08, 0xbf, 0x1f, 0x8d, 0x86, 0xe1, 0xa1, 0x26, 0x56, 0xe2, 0x0c, 0xec, 0xc0, - 0xde, 0xbd, 0xb7, 0x6d, 0x71, 0x84, 0x76, 0xdd, 0xe0, 0xf6, 0x44, 0x03, 0xd8, 0x10, 0x72, 0xa7, - 0x85, 0x14, 0xe1, 0xa5, 0xeb, 0x06, 0xc3, 0xf0, 0x92, 0x15, 0xab, 0x09, 0x4a, 0x17, 0x47, 0x00, - 0x43, 0xf6, 0x91, 0x78, 0xe1, 0x8b, 0x50, 0xec, 0x86, 0x7e, 0x0a, 0x9b, 0x7a, 0x40, 0xe5, 0xbd, - 0xac, 0x88, 0x13, 0x7d, 0x30, 0x9f, 0xa3, 0x94, 0xf0, 0x38, 0x34, 0x03, 0x9f, 0xcc, 0x50, 0x1a, - 0x6f, 0xc3, 0x56, 0xdb, 0xb3, 0xb9, 0x6d, 0x99, 0x4b, 0x94, 0x11, 0x5e, 0x0d, 0xf3, 0x8a, 0xcc, - 0x50, 0xb6, 0x38, 0x87, 0x57, 0xf1, 0xf3, 0x36, 0x3a, 0xad, 0x19, 0x95, 0x56, 0xa3, 0x96, 0x1e, - 0x5d, 0x3b, 0xc6, 0x68, 0x30, 0x44, 0x8a, 0x80, 0xba, 0x6a, 0xa8, 0x23, 0x94, 0xc2, 0xfb, 0x80, - 0x75, 0x75, 0xd8, 0xea, 0xe9, 0xd3, 0xee, 0x58, 0x35, 0x46, 0xd3, 0x56, 0x57, 0xd5, 0x46, 0xe1, - 0xed, 0x32, 0x6c, 0x8d, 0x0d, 0x15, 0x65, 0xe4, 0xbe, 0xd6, 0x44, 0x45, 0xd9, 0xe2, 0x3f, 0x94, - 0xc7, 0x5f, 0x8a, 0xef, 0xbd, 0xe3, 0xed, 0xc7, 0xc9, 0x74, 0xac, 0x9d, 0x69, 0x83, 0x0b, 0x0d, - 0x3d, 0x11, 0x63, 0x93, 0xd0, 0x9d, 0xb6, 0x7a, 0xe7, 0x6a, 0x07, 0x29, 0xf8, 0x35, 0xe4, 0x13, - 0x2a, 0x63, 0xdc, 0x6e, 0xab, 0x6a, 0x47, 0xed, 0xa0, 0xd4, 0x03, 0x4e, 0x87, 0xaa, 0xd6, 0xe9, - 0x69, 0x5d, 0x94, 0x7e, 0x60, 0xa7, 0xae, 0x9e, 0x0c, 0x06, 0x23, 0xa1, 0xcd, 0x14, 0x7f, 0x84, - 0xed, 0x96, 0x67, 0x5d, 0xda, 0x9c, 0x58, 0x3c, 0xf0, 0x88, 0xa8, 0xef, 0x75, 0xb3, 0x11, 0x16, - 0xa5, 0xdf, 0x13, 0x0d, 0x96, 0x77, 0xe7, 0xd2, 0xbd, 0x34, 0x51, 0x4a, 0xb4, 0x42, 0x76, 0x69, - 0xd8, 0x46, 0x69, 0x31, 0xb3, 0x2d, 0xbd, 0x3f, 0xbd, 0xbb, 0x1d, 0x65, 0xc5, 0x3e, 0xdb, 0x14, - 0x17, 0xad, 0x74, 0xd5, 0xa8, 0xa3, 0x9c, 0x28, 0xa5, 0xbc, 0x7c, 0xe3, 0xa6, 0xdb, 0xc5, 0xf7, - 0xb0, 0x6d, 0x10, 0x2b, 0xf0, 0x6c, 0x7e, 0x23, 0x87, 0x66, 0x0f, 0x76, 0xb4, 0xc1, 0xa8, 0x3d, - 0xd0, 0x4e, 0x7b, 0xdd, 0xb1, 0xae, 0x76, 0xd0, 0x13, 0x81, 0x46, 0xfa, 0xd8, 0x18, 0xa9, 0x9d, - 0xf3, 0xd6, 0x58, 0x6b, 0xbf, 0x47, 0x8a, 0xb8, 0x08, 0xa5, 0x49, 0x47, 0xd5, 0x46, 0xbd, 0xd6, - 0xf9, 0xa4, 0x8f, 0x52, 0xdf, 0x9d, 0x01, 0xf2, 0x09, 0xf5, 0x6d, 0x6e, 0x5f, 0x91, 0xe8, 0xbb, - 0x17, 0x7f, 0x5a, 0x0a, 0xbf, 0x73, 0x4b, 0xab, 0xef, 0xdc, 0xd2, 0xa9, 0x4d, 0x96, 0xb3, 0x81, - 0x2b, 0x0a, 0xe1, 0xe7, 0xff, 0xf5, 0xc7, 0xb4, 0x7c, 0x63, 0xba, 0xb7, 0xf1, 0x3b, 0x15, 0x76, - 0xd6, 0xec, 0x37, 0x3e, 0xa3, 0xff, 0xcf, 0xd3, 0xbf, 0x23, 0x4f, 0xf1, 0x5d, 0x27, 0x5f, 0xfc, - 0xea, 0xf3, 0x85, 0xcd, 0x2f, 0x83, 0x0f, 0x25, 0x8b, 0x39, 0xc7, 0x8e, 0x6d, 0x79, 0xcc, 0x67, - 0x73, 0x7e, 0xec, 0x30, 0xeb, 0xd8, 0x73, 0xad, 0xe3, 0xf0, 0xc3, 0xfc, 0xc3, 0x86, 0x74, 0x5a, - 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0xf0, 0xb5, 0xdb, 0xbb, 0x0f, 0x00, 0x00, + // 1817 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x52, 0xeb, 0xc8, + 0x15, 0x80, 0x91, 0x7f, 0x00, 0x1f, 0xfe, 0x9a, 0xe6, 0x5e, 0xf0, 0x90, 0x3b, 0x77, 0x88, 0xe7, + 0xce, 0x1d, 0xe2, 0x99, 0x31, 0xfe, 0x1b, 0x97, 0x6b, 0xaa, 0x52, 0x15, 0x61, 0x0b, 0xae, 0x07, + 0x2c, 0xbb, 0x24, 0xdb, 0x4c, 0xb2, 0x71, 0x84, 0xdc, 0x36, 0x4a, 0x2c, 0xb5, 0x4a, 0x6a, 0x71, + 0x61, 0x16, 0xa9, 0xac, 0xb2, 0xce, 0x32, 0x8b, 0x2c, 0xb2, 0xcc, 0x0b, 0xa4, 0xf2, 0x04, 0x79, + 0x81, 0xe4, 0x79, 0x52, 0x95, 0xea, 0x96, 0x6c, 0x90, 0x80, 0xcc, 0xca, 0xdd, 0xdf, 0xf9, 0xd5, + 0x39, 0xc7, 0xdd, 0x12, 0xbc, 0xb5, 0xa9, 0x39, 0x36, 0xa9, 0x6d, 0x53, 0x87, 0xff, 0xb8, 0x01, + 0x23, 0xe1, 0xae, 0xe4, 0x7a, 0x94, 0x51, 0x9c, 0xb6, 0xa9, 0x79, 0x78, 0x34, 0xa3, 0x74, 0x36, + 0x27, 0x27, 0x02, 0x5d, 0x07, 0xd3, 0x93, 0x09, 0xf1, 0x4d, 0xcf, 0x72, 0x19, 0xf5, 0x42, 0xb5, + 0x42, 0x0b, 0xb6, 0xae, 0x2c, 0x47, 0xeb, 0x5e, 0x5a, 0x3e, 0x23, 0x0e, 0xf1, 0x70, 0x15, 0xd6, + 0xfb, 0x5c, 0x62, 0xd2, 0x79, 0x5e, 0x3a, 0x92, 0x8e, 0xb7, 0xab, 0xfb, 0x25, 0x9b, 0x9a, 0x25, + 0xa1, 0xb5, 0x90, 0x0c, 0xee, 0x5d, 0xa2, 0x2d, 0xf5, 0x0a, 0x67, 0x80, 0x85, 0xb8, 0x45, 0x9d, + 0xa9, 0x35, 0x0b, 0x3c, 0x83, 0x59, 0xd4, 0xc1, 0x65, 0xc8, 0x2d, 0xbc, 0xfa, 0x79, 0xe9, 0x28, + 0x7d, 0xbc, 0x51, 0xc5, 0x0f, 0xae, 0x16, 0x22, 0xed, 0x41, 0xa9, 0x70, 0x07, 0xe9, 0x73, 0x37, + 0xc0, 0x35, 0x00, 0xc3, 0xf7, 0xad, 0x99, 0x63, 0x13, 0x87, 0x45, 0x49, 0xec, 0x09, 0x4b, 0x79, + 0x89, 0x45, 0x06, 0x8f, 0xd4, 0xf0, 0x31, 0xec, 0xb8, 0x86, 0xc7, 0x2c, 0x1e, 0x5a, 0xb7, 0x7e, + 0x24, 0xdd, 0xd3, 0x7c, 0xea, 0x48, 0x3a, 0xce, 0x68, 0x49, 0x8c, 0x31, 0x64, 0x1c, 0xc3, 0x26, + 0xf9, 0xf4, 0x91, 0x74, 0x9c, 0xd3, 0xc4, 0xba, 0xe0, 0x40, 0x7e, 0x64, 0x79, 0x2c, 0x30, 0xe6, + 0x5d, 0xc3, 0xbc, 0xb1, 0x1c, 0xd2, 0x0a, 0x7c, 0x46, 0x6d, 0x6e, 0x81, 0x0f, 0x61, 0xdd, 0x74, + 0x83, 0x16, 0x0d, 0xa2, 0x64, 0xb2, 0xda, 0x72, 0xcf, 0x65, 0x36, 0xb1, 0xa9, 0x77, 0x1f, 0x85, + 0xcb, 0x6a, 0xcb, 0x3d, 0x97, 0xcd, 0x16, 0x76, 0xe9, 0x50, 0xb6, 0xd8, 0x17, 0xfe, 0x26, 0xc1, + 0x61, 0xfb, 0xde, 0x31, 0x6c, 0xcb, 0xec, 0x0a, 0xfd, 0x78, 0xe9, 0x8e, 0x61, 0xc7, 0x36, 0xee, + 0x2c, 0x3b, 0xb0, 0xbb, 0x0b, 0xef, 0x52, 0xf8, 0x30, 0x09, 0x2c, 0x34, 0x2d, 0x27, 0xa6, 0x19, + 0x3d, 0x76, 0x02, 0xe3, 0x12, 0x60, 0x66, 0x78, 0x33, 0xc2, 0x42, 0x72, 0x1a, 0x4c, 0xa7, 0xc4, + 0x13, 0x89, 0x6d, 0x69, 0xcf, 0x48, 0x0a, 0x3f, 0xc0, 0xfb, 0x78, 0x49, 0xb4, 0xc0, 0x69, 0x51, + 0xdb, 0x36, 0x9c, 0x49, 0xc7, 0x71, 0x03, 0xd6, 0x37, 0x3c, 0xc3, 0x26, 0x8c, 0x78, 0xbc, 0xa0, + 0x2a, 0x2f, 0xa8, 0x14, 0x16, 0x94, 0xaf, 0xf1, 0x21, 0x64, 0x47, 0xc6, 0x3c, 0x20, 0x22, 0x9b, + 0xdc, 0x69, 0xe6, 0x2f, 0xff, 0xc8, 0x4b, 0x5a, 0x88, 0x0a, 0x7f, 0x94, 0xe0, 0xdd, 0x4b, 0xae, + 0x75, 0x31, 0x9e, 0x3a, 0x0d, 0x3c, 0x93, 0xe0, 0x37, 0xb0, 0x1a, 0xee, 0x43, 0xd7, 0xa7, 0x99, + 0x3f, 0x73, 0x2f, 0x11, 0xc3, 0x6f, 0x20, 0x17, 0xae, 0x86, 0x5a, 0x27, 0x0c, 0xa3, 0x3d, 0x00, + 0x2e, 0x5d, 0x64, 0xdb, 0x8e, 0x5a, 0xfd, 0x00, 0x0a, 0xff, 0xfa, 0x3f, 0x29, 0x74, 0x1c, 0x9f, + 0x19, 0x8e, 0x49, 0x46, 0x16, 0xf9, 0x88, 0x75, 0xd8, 0x56, 0xee, 0x88, 0x19, 0x88, 0xf9, 0x61, + 0x06, 0x23, 0xd1, 0x3c, 0x7e, 0x25, 0xe6, 0xf1, 0x25, 0x17, 0x71, 0x13, 0x2d, 0xe1, 0x82, 0x4f, + 0x86, 0x72, 0x67, 0xb1, 0x16, 0x9d, 0x90, 0xc5, 0xd4, 0x2c, 0xf6, 0x78, 0x1f, 0x56, 0x7b, 0x01, + 0x73, 0x03, 0x16, 0x25, 0x1d, 0xed, 0xf0, 0x2b, 0xc8, 0x2a, 0x9e, 0x47, 0xbd, 0x7c, 0x46, 0xe0, + 0x70, 0x53, 0xf8, 0x1e, 0x0e, 0x13, 0x73, 0x6b, 0xb8, 0xc6, 0xb5, 0x35, 0xb7, 0x98, 0x45, 0x7c, + 0xfc, 0x35, 0xec, 0x76, 0x7c, 0x3a, 0x37, 0x18, 0x99, 0x8c, 0x6c, 0x21, 0x99, 0x87, 0xf9, 0xaf, + 0x6b, 0x4f, 0x05, 0x85, 0xff, 0x4a, 0x80, 0x1f, 0x3f, 0x3b, 0xcf, 0x35, 0xf0, 0x79, 0x77, 0x4d, + 0x9e, 0x68, 0xd4, 0x5d, 0xbe, 0xc6, 0xbf, 0x84, 0xec, 0x9c, 0xdc, 0x92, 0xb9, 0xc8, 0x7e, 0xbb, + 0xfa, 0xa5, 0x28, 0xc6, 0x53, 0xdb, 0x52, 0xf8, 0x73, 0xc9, 0x55, 0xc5, 0x1f, 0x36, 0xb4, 0xc2, + 0xef, 0x60, 0x6b, 0x62, 0xf9, 0xee, 0xdc, 0xb8, 0x0f, 0x15, 0xa2, 0x47, 0x8d, 0x43, 0x9c, 0x87, + 0x35, 0x9b, 0xf8, 0xbe, 0x31, 0x23, 0xd1, 0x33, 0x2f, 0xb6, 0x3c, 0x25, 0x66, 0xd9, 0x24, 0x9f, + 0x0d, 0x53, 0xe2, 0xeb, 0xc2, 0xaf, 0x60, 0x27, 0x11, 0x0d, 0x6f, 0xc0, 0xda, 0xd0, 0xf9, 0xbd, + 0x43, 0x3f, 0x3a, 0x68, 0x05, 0xaf, 0x43, 0xa6, 0xe3, 0x4c, 0x29, 0x92, 0x38, 0xbe, 0x32, 0x3c, + 0xc7, 0x72, 0x66, 0x28, 0x85, 0x73, 0x51, 0x59, 0x51, 0xba, 0xf0, 0x07, 0xf8, 0x2c, 0x5e, 0x4b, + 0x79, 0x46, 0x1c, 0x16, 0x9b, 0x86, 0xf7, 0xb0, 0x7d, 0x6b, 0x0b, 0x3c, 0x22, 0x9e, 0x6f, 0x51, + 0x27, 0xaa, 0x4a, 0x82, 0xe2, 0x1a, 0xac, 0xfb, 0x22, 0x19, 0xe2, 0xe7, 0x53, 0xe2, 0xe4, 0x3b, + 0x78, 0xa1, 0x44, 0xda, 0x52, 0xb1, 0x50, 0x83, 0x83, 0xf3, 0x80, 0xf8, 0x4c, 0x78, 0x8a, 0x9f, + 0x07, 0x79, 0x58, 0x23, 0x0e, 0x6f, 0xd2, 0x24, 0x6a, 0xdf, 0x62, 0x5b, 0xf8, 0xab, 0x04, 0xb8, + 0xef, 0xd1, 0xbb, 0xc4, 0x01, 0x52, 0x80, 0xdc, 0x0d, 0x63, 0xae, 0x90, 0xc4, 0xfe, 0x3c, 0x0f, + 0x18, 0xbf, 0x03, 0xe0, 0x1b, 0x3f, 0x54, 0x4a, 0x3d, 0x52, 0x7a, 0xc4, 0x79, 0x68, 0x87, 0x86, + 0x2a, 0xe9, 0xa3, 0x34, 0xef, 0x42, 0xb4, 0xe5, 0x31, 0x98, 0x17, 0xf8, 0x8c, 0x4c, 0x5a, 0x46, + 0xd8, 0xa1, 0x45, 0x8c, 0x25, 0x2e, 0xbe, 0x85, 0xf5, 0xa1, 0x4f, 0x3c, 0xd1, 0x8e, 0x75, 0xc8, + 0x68, 0xbd, 0xde, 0x20, 0xec, 0xc5, 0x50, 0x57, 0x34, 0x24, 0x15, 0x7f, 0x0d, 0x5b, 0x7d, 0x8f, + 0x9a, 0xc4, 0xf7, 0xe9, 0x52, 0x49, 0xa5, 0x0e, 0x41, 0x2b, 0xbc, 0x33, 0x1d, 0x87, 0x91, 0x79, + 0xd8, 0x31, 0xb1, 0x6c, 0xd4, 0x51, 0x0a, 0xaf, 0x41, 0x5a, 0xee, 0xb6, 0x51, 0x9a, 0x2b, 0xc8, + 0xdd, 0x76, 0xa3, 0x8e, 0x32, 0x82, 0x69, 0x5d, 0x94, 0x15, 0x4c, 0xeb, 0x36, 0xea, 0x68, 0xb5, + 0xf8, 0x3d, 0xbc, 0xed, 0xb9, 0x84, 0xd7, 0xc3, 0x99, 0xe9, 0xf7, 0x3e, 0x23, 0xf6, 0x29, 0xa5, + 0xcc, 0x67, 0x9e, 0xe1, 0x2a, 0xce, 0xcc, 0x72, 0x08, 0xde, 0x06, 0x68, 0x5d, 0xf6, 0x86, 0xed, + 0x71, 0x47, 0xed, 0xf0, 0xb4, 0xf2, 0xf0, 0xea, 0xaa, 0xa3, 0xb6, 0x7b, 0x57, 0xfa, 0x58, 0x56, + 0xf5, 0x2b, 0x45, 0x1b, 0x9f, 0x75, 0x2e, 0x15, 0x1d, 0x49, 0xc5, 0x6f, 0x60, 0x2f, 0xe1, 0x6b, + 0x31, 0x60, 0x91, 0x41, 0x98, 0xef, 0x65, 0x47, 0x1d, 0xfe, 0x80, 0xa4, 0xe2, 0xdf, 0x73, 0xb0, + 0x1f, 0x1f, 0x25, 0x7e, 0x91, 0x2c, 0x4c, 0xda, 0x64, 0x6a, 0x04, 0x73, 0x86, 0x56, 0x30, 0x86, + 0x6d, 0x9d, 0x19, 0xce, 0xc4, 0xf0, 0x26, 0x63, 0xb9, 0x3a, 0xbe, 0xad, 0xa2, 0x54, 0x9c, 0xd5, + 0x39, 0x4b, 0xe3, 0x3d, 0x31, 0xdb, 0x21, 0x6b, 0x57, 0xfd, 0xf1, 0x6d, 0x0d, 0x65, 0xe2, 0xb0, + 0x2e, 0x60, 0x36, 0x0e, 0x9b, 0x02, 0xae, 0xe2, 0x57, 0x80, 0x1e, 0x60, 0xa5, 0x21, 0xe8, 0x5a, + 0x9c, 0xd6, 0x42, 0xaf, 0xeb, 0x71, 0x07, 0xba, 0xc8, 0x29, 0x97, 0x80, 0x35, 0x0e, 0x21, 0x01, + 0x45, 0xa6, 0x1b, 0x09, 0xf8, 0x2d, 0x87, 0x9b, 0xf1, 0x48, 0x7a, 0x45, 0xd8, 0x6f, 0xc5, 0x54, + 0x2f, 0x9a, 0xfa, 0xf8, 0xb6, 0x82, 0xb6, 0x63, 0xaa, 0x17, 0x4d, 0x1e, 0xbf, 0x82, 0x76, 0x92, + 0xb4, 0xc6, 0x29, 0x4a, 0xd2, 0x3a, 0xa7, 0xbb, 0x18, 0xc1, 0xe6, 0x92, 0xaa, 0x17, 0x0d, 0x84, + 0xf1, 0x2e, 0x6c, 0x3d, 0x22, 0x95, 0x2a, 0xda, 0x8b, 0x2b, 0x8d, 0x1a, 0xe8, 0x55, 0x5c, 0x69, + 0x54, 0xa9, 0xa2, 0xd7, 0x49, 0xff, 0xdf, 0x72, 0xff, 0xfb, 0xf8, 0x00, 0xf6, 0x12, 0x05, 0x1a, + 0x7f, 0xe8, 0xab, 0xe8, 0x20, 0x21, 0xa8, 0x2d, 0x04, 0xf9, 0x84, 0xa0, 0xbe, 0x10, 0x7c, 0x12, + 0x0b, 0x70, 0x56, 0xf5, 0x05, 0x3d, 0x8c, 0xd3, 0x7a, 0x48, 0x7f, 0x16, 0xa7, 0xcd, 0x90, 0xbe, + 0xc1, 0xaf, 0x61, 0xf7, 0x81, 0xf2, 0xce, 0x72, 0xfc, 0x69, 0xac, 0xb4, 0x6a, 0xab, 0x3e, 0x96, + 0xab, 0xe8, 0x6d, 0x02, 0x36, 0x39, 0xfc, 0x2c, 0xe6, 0x56, 0x6d, 0x55, 0x1a, 0x9c, 0x1e, 0x25, + 0x68, 0xad, 0xca, 0xe9, 0xcf, 0x13, 0xb4, 0x3e, 0x96, 0x6b, 0x65, 0x54, 0x48, 0xd0, 0xa6, 0xa0, + 0x9f, 0xc7, 0x12, 0x0b, 0xfd, 0xd6, 0xca, 0xe8, 0x5d, 0x02, 0x73, 0xc7, 0xb5, 0x32, 0xfa, 0x82, + 0xff, 0xf1, 0xe2, 0x9e, 0x2b, 0xe5, 0xf2, 0xb8, 0x5e, 0x46, 0xef, 0x13, 0x92, 0xe6, 0x52, 0xf2, + 0x25, 0xfe, 0x04, 0x5e, 0x27, 0x22, 0x44, 0xa2, 0xe3, 0x84, 0x88, 0x47, 0x89, 0x44, 0xbf, 0x78, + 0x3e, 0x52, 0xb3, 0x8c, 0x8a, 0xcf, 0x47, 0x6a, 0x96, 0xd1, 0x57, 0x2f, 0x44, 0x6a, 0x96, 0xd1, + 0xd7, 0x2f, 0x44, 0x6a, 0x96, 0xd1, 0x37, 0x4f, 0xab, 0x55, 0x69, 0xa0, 0xd2, 0xd3, 0x6a, 0x55, + 0x1a, 0xe8, 0xe4, 0x99, 0x6a, 0x55, 0x1a, 0xa8, 0xfc, 0x4c, 0xb5, 0x2a, 0x0d, 0x54, 0xc1, 0x5b, + 0x90, 0x0b, 0xdf, 0x4e, 0x79, 0x5b, 0xc6, 0x8f, 0xb6, 0xea, 0x05, 0xfa, 0x2d, 0x1f, 0xed, 0x68, + 0x7b, 0xee, 0x06, 0xee, 0x2d, 0x32, 0x30, 0xc0, 0x6a, 0x48, 0xd0, 0x35, 0xde, 0x81, 0x8d, 0xa1, + 0xe3, 0x07, 0xae, 0x4b, 0x3d, 0x46, 0x26, 0xc8, 0x2c, 0x1e, 0xc3, 0xee, 0x93, 0x37, 0x7b, 0x7e, + 0x08, 0x7f, 0x18, 0x0c, 0xfa, 0xe1, 0xa1, 0xc6, 0x57, 0xfc, 0x0c, 0x94, 0x61, 0x3b, 0xfe, 0xfa, + 0xcd, 0x1d, 0x9f, 0xbb, 0x41, 0xbb, 0x2d, 0x87, 0x47, 0xfa, 0xb9, 0x1b, 0xf4, 0x91, 0xc4, 0x4d, + 0xf8, 0x6a, 0x84, 0x52, 0xfc, 0x80, 0xe5, 0x0a, 0xd1, 0x79, 0x97, 0x2e, 0x0e, 0x00, 0xfa, 0xf4, + 0x23, 0xf1, 0xc2, 0xb7, 0xa0, 0xd8, 0xf5, 0xbc, 0x01, 0x6b, 0x5a, 0xe0, 0x88, 0x4b, 0x59, 0xe2, + 0xc7, 0x79, 0x6f, 0x3a, 0x45, 0x29, 0x1e, 0xa1, 0x6f, 0x04, 0x3e, 0x99, 0xa0, 0x34, 0xde, 0x84, + 0xf5, 0x96, 0x67, 0x31, 0xcb, 0x34, 0xe6, 0x28, 0xc3, 0xa3, 0xe8, 0xc6, 0x2d, 0x99, 0xa0, 0x6c, + 0x71, 0x0a, 0x07, 0xf1, 0xc3, 0x36, 0x3a, 0xaa, 0xa9, 0x23, 0xb4, 0x06, 0xb2, 0x16, 0xdd, 0x39, + 0xfa, 0xa0, 0x17, 0x25, 0xa8, 0x29, 0xba, 0x32, 0x40, 0x29, 0xbc, 0x0f, 0x58, 0x53, 0xfa, 0x72, + 0x47, 0x1b, 0x9f, 0x0f, 0x15, 0x7d, 0x30, 0x96, 0xcf, 0x15, 0x75, 0x10, 0x5e, 0x2d, 0x7d, 0x79, + 0xa8, 0x2b, 0x28, 0x23, 0xec, 0xe4, 0x91, 0x82, 0xb2, 0xc5, 0x7f, 0x4a, 0x2f, 0xbf, 0x11, 0x3f, + 0x79, 0xc1, 0xdb, 0x8f, 0x93, 0xf1, 0x50, 0xbd, 0x50, 0x7b, 0x57, 0x2a, 0x5a, 0xe1, 0x33, 0x93, + 0x90, 0x9d, 0xc9, 0x9d, 0x4b, 0xa5, 0x8d, 0x24, 0xfc, 0x06, 0xf2, 0x09, 0x91, 0x3e, 0x6c, 0xb5, + 0x14, 0xa5, 0xad, 0xb4, 0x51, 0xea, 0x19, 0xa7, 0x7d, 0x45, 0x6d, 0x77, 0xd4, 0x73, 0x94, 0x7e, + 0xc6, 0x52, 0x53, 0x4e, 0x7b, 0xbd, 0x01, 0x97, 0x66, 0x8a, 0x3f, 0xc2, 0xa6, 0xec, 0x99, 0x37, + 0x16, 0x23, 0x26, 0x0b, 0x3c, 0xc2, 0xeb, 0x7b, 0xd7, 0x6c, 0x84, 0x45, 0xe9, 0x76, 0x78, 0x77, + 0xc5, 0xc5, 0x39, 0x77, 0x6f, 0x0c, 0x94, 0xe2, 0xad, 0x10, 0x5d, 0xea, 0xb7, 0x50, 0x9a, 0x0f, + 0xac, 0xac, 0x75, 0xc7, 0x8f, 0xcd, 0x51, 0x96, 0xdb, 0x59, 0x06, 0xbf, 0x65, 0x85, 0xab, 0x46, + 0x1d, 0xe5, 0x78, 0x29, 0xc5, 0xcd, 0x1b, 0x57, 0xdd, 0x2c, 0x7e, 0x80, 0x4d, 0x9d, 0x98, 0x81, + 0x67, 0xb1, 0x7b, 0x31, 0x34, 0xbb, 0xb0, 0xa5, 0xf6, 0x06, 0xad, 0x9e, 0x7a, 0xd6, 0x39, 0x1f, + 0x6a, 0x4a, 0x1b, 0xad, 0x70, 0x34, 0xd0, 0x86, 0xfa, 0x40, 0x69, 0x5f, 0xca, 0x43, 0xb5, 0xf5, + 0x01, 0x49, 0xfc, 0x16, 0x14, 0x2a, 0x6d, 0x45, 0x1d, 0x74, 0xe4, 0xcb, 0x51, 0x17, 0xa5, 0xbe, + 0xbb, 0x00, 0xe4, 0x13, 0xc7, 0xb7, 0x98, 0x75, 0x4b, 0xa2, 0x2f, 0x5e, 0xfc, 0x69, 0x29, 0xfc, + 0xc2, 0x2d, 0x2d, 0xbe, 0x70, 0x4b, 0x67, 0x16, 0x99, 0x4f, 0x7a, 0x2e, 0x2f, 0x84, 0x9f, 0xff, + 0xf7, 0x9f, 0xd2, 0xe2, 0x75, 0xe9, 0x89, 0xe1, 0x77, 0x0a, 0x6c, 0x2d, 0xd9, 0xef, 0x7c, 0xea, + 0xfc, 0x94, 0xa7, 0xff, 0x44, 0x9e, 0xe2, 0x56, 0xa7, 0x5f, 0xfc, 0xe6, 0xf3, 0x99, 0xc5, 0x6e, + 0x82, 0xeb, 0x92, 0x49, 0xed, 0x13, 0xdb, 0x32, 0x3d, 0xea, 0xd3, 0x29, 0x3b, 0xb1, 0xa9, 0x79, + 0xe2, 0xb9, 0xe6, 0x49, 0xf8, 0x49, 0x7e, 0xbd, 0x2a, 0x9c, 0xd6, 0xfe, 0x17, 0x00, 0x00, 0xff, + 0xff, 0x11, 0xd4, 0x65, 0x76, 0xb5, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 26d4fed8..03240f89 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -102,17 +102,17 @@ message WinRMConfiguration { repeated WinRMListener Listeners = 1; } -enum GpuAssignmentType { - GpuDefault = 0; // default is used when customer do not pass GPU Assign Type and moc will decide the assign type based on the underlying configuration. - GpuDDA = 1; - GpuP = 2; - GpuPV = 3; +enum AssignmentType { + GpuDDA = 0; + GpuP = 1; + GpuPV = 2; + GpuDefault = 3; // default is used when customer do not pass GPU Assign Type and moc will decide the assign type based on the underlying configuration. } message Gpu { - string name = 1; - GpuAssignmentType assignment = 2; - uint64 partitionSizeMB = 3; + AssignmentType assignment = 1; + uint64 partitionSizeMB = 2; + string name = 3; } message VirtualMachineCustomSize { diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index 953841c3..d14c37e7 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -227,15 +227,15 @@ func (m *PhysicalMemory) GetSizeBytes() uint64 { } type HostGPU struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` - Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` - PartitionSizeBytes uint64 `protobuf:"varint,4,opt,name=partitionSizeBytes,proto3" json:"partitionSizeBytes,omitempty"` - Assignment GpuAssignmentType `protobuf:"varint,5,opt,name=assignment,proto3,enum=moc.GpuAssignmentType" json:"assignment,omitempty"` - Id string `protobuf:"bytes,6,opt,name=id,proto3" json:"id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` + Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` + PartitionSizeBytes uint64 `protobuf:"varint,4,opt,name=partitionSizeBytes,proto3" json:"partitionSizeBytes,omitempty"` + Assignment AssignmentType `protobuf:"varint,5,opt,name=assignment,proto3,enum=moc.AssignmentType" json:"assignment,omitempty"` + Id string `protobuf:"bytes,6,opt,name=id,proto3" json:"id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HostGPU) Reset() { *m = HostGPU{} } @@ -291,11 +291,11 @@ func (m *HostGPU) GetPartitionSizeBytes() uint64 { return 0 } -func (m *HostGPU) GetAssignment() GpuAssignmentType { +func (m *HostGPU) GetAssignment() AssignmentType { if m != nil { return m.Assignment } - return GpuAssignmentType_GpuDefault + return AssignmentType_GpuDDA } func (m *HostGPU) GetId() string { @@ -548,54 +548,53 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 773 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x6e, 0xdb, 0x38, - 0x10, 0x5e, 0xcb, 0xb2, 0x6c, 0x8f, 0x13, 0x6f, 0xc2, 0x64, 0xb3, 0xda, 0xec, 0x62, 0xd7, 0x50, - 0x90, 0x20, 0x58, 0xb4, 0x76, 0xe1, 0x20, 0xfd, 0x39, 0x26, 0x3d, 0xa4, 0x2d, 0x9a, 0x26, 0x60, - 0xd2, 0x1e, 0x7a, 0x09, 0x14, 0x99, 0xb6, 0x89, 0x5a, 0x22, 0x41, 0x52, 0x06, 0x94, 0x37, 0xe9, - 0xfb, 0xf4, 0xd2, 0x6b, 0x5f, 0xa2, 0xaf, 0x51, 0x68, 0x24, 0xdb, 0x92, 0xe3, 0x06, 0x3d, 0x59, - 0x9c, 0xef, 0x1b, 0xce, 0xf0, 0xfb, 0x38, 0x34, 0xfc, 0x15, 0x8a, 0xe0, 0x26, 0x10, 0x61, 0x28, - 0xa2, 0x9b, 0x48, 0x0c, 0x18, 0x8f, 0x86, 0xa2, 0x2b, 0x95, 0x30, 0x82, 0x40, 0x28, 0x82, 0x6e, - 0x06, 0xed, 0xfe, 0x59, 0xa0, 0x65, 0x3f, 0x19, 0x69, 0xf7, 0xdf, 0x32, 0x20, 0x63, 0xc3, 0x8a, - 0xb8, 0x77, 0x01, 0xdb, 0x17, 0x9a, 0xb2, 0x11, 0xd7, 0x46, 0xf9, 0x86, 0x8b, 0xe8, 0xca, 0xf8, - 0x26, 0xd6, 0xe4, 0x19, 0x38, 0x1a, 0xbf, 0xdc, 0x4a, 0xa7, 0x72, 0xd8, 0xee, 0xff, 0xd7, 0x5d, - 0x54, 0xeb, 0xde, 0xcf, 0x60, 0x34, 0xa7, 0x7b, 0xdf, 0x2c, 0x68, 0x5e, 0x2a, 0x11, 0x30, 0xad, - 0x85, 0x22, 0x04, 0xec, 0xc8, 0x0f, 0x19, 0x6e, 0xd2, 0xa4, 0xf8, 0x4d, 0xb6, 0xa1, 0x16, 0x08, - 0xc5, 0xb4, 0x6b, 0x75, 0x2a, 0x87, 0xeb, 0x34, 0x5b, 0xa4, 0x51, 0x2d, 0x19, 0x1b, 0xb8, 0x55, - 0xa4, 0x66, 0x0b, 0x72, 0x00, 0xb6, 0x49, 0x24, 0x73, 0x6d, 0x6c, 0x82, 0x60, 0x13, 0xf3, 0xdd, - 0xaf, 0x13, 0xc9, 0x28, 0xe2, 0xe4, 0x00, 0xda, 0x53, 0xae, 0x4c, 0xec, 0x4f, 0xf8, 0x1d, 0x36, - 0xe5, 0xd6, 0x3a, 0x95, 0xc3, 0x06, 0x5d, 0x8a, 0x92, 0x47, 0xb0, 0x39, 0x11, 0x23, 0x1e, 0xf8, - 0x13, 0x39, 0xdb, 0x45, 0xbb, 0x0e, 0xf6, 0x71, 0x1f, 0x48, 0xd9, 0xe3, 0x44, 0x32, 0x35, 0xe5, - 0x5a, 0x28, 0xa9, 0x98, 0x66, 0x91, 0x71, 0xeb, 0xb8, 0xf1, 0x7d, 0x80, 0x78, 0xb0, 0x16, 0xfa, - 0x51, 0x3c, 0xf4, 0x03, 0x13, 0x2b, 0xa6, 0xdc, 0x06, 0x1e, 0xa4, 0x14, 0x23, 0xc7, 0xb0, 0xe6, - 0xab, 0x60, 0xcc, 0x0d, 0xc3, 0x80, 0xdb, 0xc4, 0x73, 0x6d, 0xe2, 0xb9, 0x4e, 0x0a, 0x00, 0x2d, - 0xd1, 0xbc, 0x2e, 0xb4, 0x2f, 0xc7, 0x89, 0x4e, 0xdb, 0x3b, 0x67, 0xa1, 0x50, 0x09, 0xf9, 0x07, - 0x9a, 0x9a, 0xdf, 0xb1, 0xd3, 0xc4, 0xb0, 0xcc, 0x22, 0x9b, 0x2e, 0x02, 0xde, 0xd7, 0x0a, 0xd4, - 0x5f, 0x09, 0x6d, 0xce, 0x2e, 0xdf, 0xaf, 0xb4, 0xa0, 0x94, 0x9d, 0xd9, 0xb0, 0x08, 0x64, 0x06, - 0xc5, 0x91, 0x41, 0x2b, 0xd0, 0xa0, 0x38, 0x32, 0xa4, 0x0b, 0x44, 0xfa, 0xca, 0x70, 0xb4, 0x7c, - 0x9e, 0x6c, 0x63, 0xe9, 0x15, 0x08, 0x79, 0x0a, 0xe0, 0x6b, 0xcd, 0x47, 0x51, 0x98, 0xaa, 0x56, - 0xc3, 0x83, 0xee, 0xe0, 0x41, 0xcf, 0x64, 0x7c, 0x32, 0x47, 0xd0, 0xc4, 0x02, 0x93, 0xb4, 0xc1, - 0xe2, 0x03, 0xf4, 0xa4, 0x49, 0x2d, 0x3e, 0xf0, 0xbe, 0x57, 0xe0, 0xf7, 0x0b, 0xc9, 0xd2, 0xbb, - 0x16, 0x8d, 0xae, 0x12, 0x6d, 0x58, 0x98, 0xf6, 0x22, 0x66, 0x21, 0x8d, 0x21, 0xfd, 0x29, 0xce, - 0x65, 0x58, 0x81, 0x90, 0x27, 0xe0, 0x08, 0x8d, 0x17, 0xc9, 0xc2, 0x3e, 0x5c, 0xec, 0x63, 0x69, - 0x57, 0xec, 0x24, 0xe7, 0xa5, 0x0a, 0x09, 0x3d, 0x65, 0x4a, 0xa7, 0x77, 0x29, 0xbb, 0x92, 0x8b, - 0x00, 0xb9, 0x86, 0x6d, 0xb1, 0x62, 0x6a, 0x50, 0x8d, 0x56, 0xbf, 0xf3, 0xf0, 0xac, 0xc4, 0x9a, - 0xae, 0xcc, 0xf6, 0xbe, 0x58, 0xd0, 0x78, 0x27, 0x06, 0xec, 0x75, 0x34, 0x14, 0x2b, 0x6d, 0xcb, - 0xa4, 0xb1, 0x66, 0xd2, 0x90, 0x63, 0x80, 0xc0, 0x97, 0xfe, 0x2d, 0x9f, 0x70, 0x93, 0x60, 0x97, - 0xad, 0xfe, 0x1f, 0xc5, 0xe2, 0x94, 0x69, 0x11, 0xab, 0x80, 0x69, 0x5a, 0x20, 0x92, 0x17, 0xb0, - 0xe6, 0x4f, 0x7d, 0x3e, 0x99, 0x25, 0xda, 0x0f, 0x25, 0x96, 0xa8, 0x05, 0x21, 0x9d, 0x5f, 0x14, - 0x72, 0x6f, 0xfe, 0x90, 0xd4, 0xb1, 0x4c, 0x0b, 0x33, 0x72, 0x1d, 0x72, 0x88, 0xec, 0x80, 0x13, - 0x4b, 0xc3, 0x43, 0x86, 0x43, 0x53, 0xa5, 0xf9, 0x8a, 0x1c, 0xa5, 0xe5, 0x52, 0x39, 0x70, 0x50, - 0x5a, 0xfd, 0xbf, 0x4b, 0xca, 0x96, 0xab, 0xd2, 0x9c, 0xea, 0x7d, 0xb6, 0xa0, 0x39, 0xef, 0x9f, - 0x1c, 0x41, 0x73, 0x3e, 0xd1, 0x28, 0xe6, 0xd2, 0x49, 0xe7, 0xaf, 0x09, 0x5d, 0xf0, 0x48, 0x1f, - 0x9c, 0x10, 0xe7, 0x0c, 0xc5, 0x6e, 0xf5, 0x77, 0x4b, 0x19, 0xa5, 0x49, 0xa4, 0x39, 0x93, 0xec, - 0x43, 0x75, 0x24, 0xe3, 0xdc, 0x85, 0xad, 0x62, 0x42, 0x3e, 0x89, 0x34, 0xc5, 0xc9, 0x19, 0xb4, - 0xa7, 0xe1, 0xcb, 0x99, 0x19, 0x9c, 0x69, 0x1c, 0x8d, 0x56, 0xfe, 0xc0, 0x7e, 0xc8, 0x9e, 0xab, - 0x73, 0x3f, 0x18, 0xf3, 0x88, 0x15, 0x69, 0x74, 0x29, 0x8d, 0x3c, 0x86, 0xfa, 0x48, 0xc6, 0x6f, - 0xb9, 0x36, 0xae, 0xd3, 0xa9, 0xfe, 0xac, 0xe6, 0x8c, 0xf3, 0xc6, 0x6e, 0xd8, 0x1b, 0xb5, 0xff, - 0x9f, 0xc3, 0xd6, 0x8a, 0xc7, 0x9b, 0x6c, 0xc2, 0x7a, 0x24, 0x4c, 0x16, 0x67, 0x8a, 0x0d, 0x36, - 0x7e, 0x23, 0x6d, 0x00, 0xb5, 0x58, 0x57, 0x4e, 0xf7, 0x3f, 0xee, 0x8d, 0xb8, 0x19, 0xc7, 0xb7, - 0x69, 0x85, 0x5e, 0xc8, 0x03, 0x25, 0xb4, 0x18, 0x9a, 0x5e, 0x28, 0x82, 0x9e, 0x92, 0x41, 0x2f, - 0xab, 0x7b, 0xeb, 0xe0, 0xdf, 0xca, 0xd1, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0xa8, 0xcb, - 0x01, 0xb8, 0x06, 0x00, 0x00, + // 768 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x48, + 0x14, 0xdd, 0x38, 0x8e, 0x93, 0xdc, 0xb4, 0xd9, 0x76, 0xda, 0xdd, 0xf5, 0x76, 0x57, 0x10, 0xb9, + 0x6a, 0x55, 0x21, 0x48, 0x50, 0xa2, 0x0a, 0x78, 0xa4, 0x3c, 0x14, 0x10, 0xa5, 0xd5, 0xb4, 0xf0, + 0xc0, 0x4b, 0xe5, 0x3a, 0x93, 0x64, 0x44, 0xec, 0x19, 0xcd, 0x8c, 0x23, 0xb9, 0x7f, 0xc2, 0xff, + 0x20, 0x3e, 0x80, 0x9f, 0xe0, 0x37, 0x90, 0xaf, 0x9d, 0xc4, 0x4e, 0x43, 0xc5, 0x53, 0x3c, 0xf7, + 0x9e, 0x3b, 0xf7, 0xcc, 0x39, 0x73, 0x27, 0xf0, 0x6f, 0x28, 0x82, 0xeb, 0x40, 0x84, 0xa1, 0x88, + 0xae, 0x23, 0x31, 0x64, 0x3c, 0x1a, 0x89, 0xae, 0x54, 0xc2, 0x08, 0x02, 0xa1, 0x08, 0xba, 0x59, + 0x6a, 0xef, 0x9f, 0x02, 0x2c, 0xfb, 0xc9, 0x40, 0x7b, 0x0f, 0xca, 0x09, 0x19, 0x1b, 0x56, 0xcc, + 0x7b, 0xe7, 0xb0, 0x7b, 0xae, 0x29, 0x1b, 0x73, 0x6d, 0x94, 0x6f, 0xb8, 0x88, 0x2e, 0x8d, 0x6f, + 0x62, 0x4d, 0x9e, 0x81, 0xa3, 0xf1, 0xcb, 0xad, 0x74, 0x2a, 0x47, 0xed, 0xfe, 0xc3, 0xee, 0xb2, + 0x5b, 0xf7, 0x6e, 0x05, 0xa3, 0x39, 0xdc, 0xfb, 0x6e, 0x41, 0xf3, 0x42, 0x89, 0x80, 0x69, 0x2d, + 0x14, 0x21, 0x60, 0x47, 0x7e, 0xc8, 0x70, 0x93, 0x26, 0xc5, 0x6f, 0xb2, 0x0b, 0xb5, 0x40, 0x28, + 0xa6, 0x5d, 0xab, 0x53, 0x39, 0xda, 0xa4, 0xd9, 0x22, 0x8d, 0x6a, 0xc9, 0xd8, 0xd0, 0xad, 0x22, + 0x34, 0x5b, 0x90, 0x43, 0xb0, 0x4d, 0x22, 0x99, 0x6b, 0x23, 0x09, 0x82, 0x24, 0x16, 0xbb, 0x5f, + 0x25, 0x92, 0x51, 0xcc, 0x93, 0x43, 0x68, 0xcf, 0xb8, 0x32, 0xb1, 0x3f, 0xe5, 0xb7, 0x48, 0xca, + 0xad, 0x75, 0x2a, 0x47, 0x0d, 0xba, 0x12, 0x25, 0x8f, 0x61, 0x7b, 0x2a, 0xc6, 0x3c, 0xf0, 0xa7, + 0x72, 0xbe, 0x8b, 0x76, 0x1d, 0xe4, 0x71, 0x37, 0x91, 0xa2, 0x27, 0x89, 0x64, 0x6a, 0xc6, 0xb5, + 0x50, 0x52, 0x31, 0xcd, 0x22, 0xe3, 0xd6, 0x71, 0xe3, 0xbb, 0x09, 0xe2, 0xc1, 0x46, 0xe8, 0x47, + 0xf1, 0xc8, 0x0f, 0x4c, 0xac, 0x98, 0x72, 0x1b, 0x78, 0x90, 0x52, 0x8c, 0x1c, 0xc3, 0x86, 0xaf, + 0x82, 0x09, 0x37, 0x0c, 0x03, 0x6e, 0x13, 0xcf, 0xb5, 0x8d, 0xe7, 0x7a, 0x59, 0x48, 0xd0, 0x12, + 0xcc, 0xeb, 0x42, 0xfb, 0x62, 0x92, 0xe8, 0x94, 0xde, 0x19, 0x0b, 0x85, 0x4a, 0xc8, 0xff, 0xd0, + 0xd4, 0xfc, 0x96, 0x9d, 0x24, 0x86, 0x65, 0x16, 0xd9, 0x74, 0x19, 0xf0, 0xbe, 0x55, 0xa0, 0xfe, + 0x5a, 0x68, 0x73, 0x7a, 0xf1, 0x61, 0xad, 0x05, 0xa5, 0xea, 0xcc, 0x86, 0x65, 0x20, 0x33, 0x28, + 0x8e, 0x0c, 0x5a, 0x81, 0x06, 0xc5, 0x91, 0x21, 0x5d, 0x20, 0xd2, 0x57, 0x86, 0xa3, 0xe5, 0x8b, + 0x62, 0x1b, 0x5b, 0xaf, 0xc9, 0x90, 0x01, 0x80, 0xaf, 0x35, 0x1f, 0x47, 0x61, 0xaa, 0x5a, 0x0d, + 0x0f, 0xba, 0x93, 0x1d, 0x74, 0x11, 0x46, 0x07, 0x0b, 0x30, 0xd2, 0x06, 0x8b, 0x0f, 0xd1, 0x90, + 0x26, 0xb5, 0xf8, 0xd0, 0xfb, 0x51, 0x81, 0x3f, 0xcf, 0x25, 0x4b, 0x2f, 0x5a, 0x34, 0xbe, 0x4c, + 0xb4, 0x61, 0x61, 0x4a, 0x44, 0xcc, 0x43, 0x1a, 0x43, 0xfa, 0x73, 0x9c, 0x6b, 0xb0, 0x26, 0x43, + 0x9e, 0x82, 0x23, 0x34, 0xde, 0x22, 0x0b, 0x49, 0xb8, 0x48, 0x62, 0x65, 0x57, 0x64, 0x92, 0xe3, + 0x52, 0x79, 0x84, 0x9e, 0x31, 0xa5, 0xd3, 0x8b, 0x94, 0xdd, 0xc7, 0x65, 0x80, 0x5c, 0xc1, 0xae, + 0x58, 0x33, 0x32, 0x28, 0x45, 0xab, 0xdf, 0xb9, 0x7f, 0x50, 0x62, 0x4d, 0xd7, 0x56, 0x7b, 0x5f, + 0x2d, 0x68, 0xbc, 0x17, 0x43, 0xf6, 0x26, 0x1a, 0x89, 0xb5, 0x9e, 0x65, 0xd2, 0x58, 0x73, 0x69, + 0xc8, 0x31, 0x40, 0xe0, 0x4b, 0xff, 0x86, 0x4f, 0xb9, 0x49, 0x90, 0x65, 0xab, 0xff, 0x57, 0xb1, + 0x39, 0x65, 0x5a, 0xc4, 0x2a, 0x60, 0x9a, 0x16, 0x80, 0xe4, 0x05, 0x6c, 0xf8, 0x33, 0x9f, 0x4f, + 0xe7, 0x85, 0xf6, 0x7d, 0x85, 0x25, 0x68, 0x41, 0x48, 0xe7, 0x37, 0x85, 0xdc, 0x5f, 0xbc, 0x22, + 0x75, 0x6c, 0xd3, 0xc2, 0x8a, 0x5c, 0x87, 0x3c, 0x45, 0xfe, 0x06, 0x27, 0x96, 0x86, 0x87, 0x0c, + 0x27, 0xa6, 0x4a, 0xf3, 0x15, 0x19, 0xa4, 0xed, 0x52, 0x39, 0x70, 0x4a, 0x5a, 0xfd, 0xff, 0x4a, + 0xca, 0x96, 0xbb, 0xd2, 0x1c, 0xea, 0x7d, 0xb1, 0xa0, 0xb9, 0xe0, 0x4f, 0x06, 0xd0, 0x5c, 0x8c, + 0x33, 0x8a, 0xb9, 0x72, 0xd2, 0xc5, 0x53, 0x42, 0x97, 0x38, 0xd2, 0x07, 0x27, 0xc4, 0x21, 0x43, + 0xb1, 0x5b, 0xfd, 0xbd, 0x52, 0x45, 0x69, 0x0c, 0x69, 0x8e, 0x24, 0x07, 0x50, 0x1d, 0xcb, 0x38, + 0x77, 0x61, 0xa7, 0x58, 0x90, 0x8f, 0x21, 0x4d, 0xf3, 0xe4, 0x14, 0xda, 0xb3, 0xf0, 0xd5, 0xdc, + 0x0c, 0xce, 0x34, 0xce, 0x45, 0x2b, 0x7f, 0x5d, 0x3f, 0x66, 0x6f, 0xd5, 0x99, 0x1f, 0x4c, 0x78, + 0xc4, 0x8a, 0x30, 0xba, 0x52, 0x46, 0x9e, 0x40, 0x7d, 0x2c, 0xe3, 0x77, 0x5c, 0x1b, 0xd7, 0xe9, + 0x54, 0x7f, 0xd5, 0x73, 0x8e, 0x79, 0x6b, 0x37, 0xec, 0xad, 0xda, 0xa3, 0xe7, 0xb0, 0xb3, 0xe6, + 0xe5, 0x26, 0xdb, 0xb0, 0x19, 0x09, 0x93, 0xc5, 0x99, 0x62, 0xc3, 0xad, 0x3f, 0x48, 0x1b, 0x40, + 0x2d, 0xd7, 0x95, 0x93, 0x83, 0x4f, 0xfb, 0x63, 0x6e, 0x26, 0xf1, 0x4d, 0xda, 0xa1, 0x17, 0xf2, + 0x40, 0x09, 0x2d, 0x46, 0xa6, 0x17, 0x8a, 0xa0, 0xa7, 0x64, 0xd0, 0xcb, 0xfa, 0xde, 0x38, 0xf8, + 0x9f, 0x32, 0xf8, 0x19, 0x00, 0x00, 0xff, 0xff, 0x18, 0xc8, 0x6a, 0x70, 0xb5, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index e58cc19c..7452eb09 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -38,7 +38,7 @@ message HostGPU { uint32 sizeBytes = 2; uint32 count = 3; uint64 partitionSizeBytes = 4; - GpuAssignmentType assignment = 5; + AssignmentType assignment = 5; string id = 6; } From 95665ef60e58d90d753005de7484fa66e8cf0e45 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Wed, 1 May 2024 13:58:41 -0700 Subject: [PATCH 09/13] Reserve unused fields --- go.mod | 3 +- go.sum | 7 +- rpc/common/moc_common_computecommon.pb.go | 233 +++++++++++----------- rpc/common/moc_common_computecommon.proto | 6 +- rpc/common/moc_common_nodeinfo.pb.go | 106 +++++----- rpc/common/moc_common_nodeinfo.proto | 2 +- 6 files changed, 177 insertions(+), 180 deletions(-) diff --git a/go.mod b/go.mod index 8d09611b..0c183ee3 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,8 @@ require ( require ( golang.org/x/net v0.24.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect + google.golang.org/protobuf v1.34.0 // indirect ) replace ( diff --git a/go.sum b/go.sum index 44dad3d2..a9ae0d40 100644 --- a/go.sum +++ b/go.sum @@ -1505,8 +1505,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= @@ -1528,8 +1528,9 @@ google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= +google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 4f709628..23724426 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -663,8 +663,8 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { type Gpu struct { Assignment AssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.AssignmentType" json:"assignment,omitempty"` - PartitionSizeMB uint64 `protobuf:"varint,2,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + PartitionSizeMB uint64 `protobuf:"varint,3,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1306,119 +1306,120 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1817 bytes of a gzipped FileDescriptorProto + // 1831 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x52, 0xeb, 0xc8, - 0x15, 0x80, 0x91, 0x7f, 0x00, 0x1f, 0xfe, 0x9a, 0xe6, 0x5e, 0xf0, 0x90, 0x3b, 0x77, 0x88, 0xe7, - 0xce, 0x1d, 0xe2, 0x99, 0x31, 0xfe, 0x1b, 0x97, 0x6b, 0xaa, 0x52, 0x15, 0x61, 0x0b, 0xae, 0x07, - 0x2c, 0xbb, 0x24, 0xdb, 0x4c, 0xb2, 0x71, 0x84, 0xdc, 0x36, 0x4a, 0x2c, 0xb5, 0x4a, 0x6a, 0x71, - 0x61, 0x16, 0xa9, 0xac, 0xb2, 0xce, 0x32, 0x8b, 0x2c, 0xb2, 0xcc, 0x0b, 0xa4, 0xf2, 0x04, 0x79, - 0x81, 0xe4, 0x79, 0x52, 0x95, 0xea, 0x96, 0x6c, 0x90, 0x80, 0xcc, 0xca, 0xdd, 0xdf, 0xf9, 0xd5, - 0x39, 0xc7, 0xdd, 0x12, 0xbc, 0xb5, 0xa9, 0x39, 0x36, 0xa9, 0x6d, 0x53, 0x87, 0xff, 0xb8, 0x01, - 0x23, 0xe1, 0xae, 0xe4, 0x7a, 0x94, 0x51, 0x9c, 0xb6, 0xa9, 0x79, 0x78, 0x34, 0xa3, 0x74, 0x36, - 0x27, 0x27, 0x02, 0x5d, 0x07, 0xd3, 0x93, 0x09, 0xf1, 0x4d, 0xcf, 0x72, 0x19, 0xf5, 0x42, 0xb5, - 0x42, 0x0b, 0xb6, 0xae, 0x2c, 0x47, 0xeb, 0x5e, 0x5a, 0x3e, 0x23, 0x0e, 0xf1, 0x70, 0x15, 0xd6, - 0xfb, 0x5c, 0x62, 0xd2, 0x79, 0x5e, 0x3a, 0x92, 0x8e, 0xb7, 0xab, 0xfb, 0x25, 0x9b, 0x9a, 0x25, - 0xa1, 0xb5, 0x90, 0x0c, 0xee, 0x5d, 0xa2, 0x2d, 0xf5, 0x0a, 0x67, 0x80, 0x85, 0xb8, 0x45, 0x9d, - 0xa9, 0x35, 0x0b, 0x3c, 0x83, 0x59, 0xd4, 0xc1, 0x65, 0xc8, 0x2d, 0xbc, 0xfa, 0x79, 0xe9, 0x28, - 0x7d, 0xbc, 0x51, 0xc5, 0x0f, 0xae, 0x16, 0x22, 0xed, 0x41, 0xa9, 0x70, 0x07, 0xe9, 0x73, 0x37, - 0xc0, 0x35, 0x00, 0xc3, 0xf7, 0xad, 0x99, 0x63, 0x13, 0x87, 0x45, 0x49, 0xec, 0x09, 0x4b, 0x79, - 0x89, 0x45, 0x06, 0x8f, 0xd4, 0xf0, 0x31, 0xec, 0xb8, 0x86, 0xc7, 0x2c, 0x1e, 0x5a, 0xb7, 0x7e, - 0x24, 0xdd, 0xd3, 0x7c, 0xea, 0x48, 0x3a, 0xce, 0x68, 0x49, 0x8c, 0x31, 0x64, 0x1c, 0xc3, 0x26, - 0xf9, 0xf4, 0x91, 0x74, 0x9c, 0xd3, 0xc4, 0xba, 0xe0, 0x40, 0x7e, 0x64, 0x79, 0x2c, 0x30, 0xe6, - 0x5d, 0xc3, 0xbc, 0xb1, 0x1c, 0xd2, 0x0a, 0x7c, 0x46, 0x6d, 0x6e, 0x81, 0x0f, 0x61, 0xdd, 0x74, - 0x83, 0x16, 0x0d, 0xa2, 0x64, 0xb2, 0xda, 0x72, 0xcf, 0x65, 0x36, 0xb1, 0xa9, 0x77, 0x1f, 0x85, - 0xcb, 0x6a, 0xcb, 0x3d, 0x97, 0xcd, 0x16, 0x76, 0xe9, 0x50, 0xb6, 0xd8, 0x17, 0xfe, 0x26, 0xc1, - 0x61, 0xfb, 0xde, 0x31, 0x6c, 0xcb, 0xec, 0x0a, 0xfd, 0x78, 0xe9, 0x8e, 0x61, 0xc7, 0x36, 0xee, - 0x2c, 0x3b, 0xb0, 0xbb, 0x0b, 0xef, 0x52, 0xf8, 0x30, 0x09, 0x2c, 0x34, 0x2d, 0x27, 0xa6, 0x19, - 0x3d, 0x76, 0x02, 0xe3, 0x12, 0x60, 0x66, 0x78, 0x33, 0xc2, 0x42, 0x72, 0x1a, 0x4c, 0xa7, 0xc4, - 0x13, 0x89, 0x6d, 0x69, 0xcf, 0x48, 0x0a, 0x3f, 0xc0, 0xfb, 0x78, 0x49, 0xb4, 0xc0, 0x69, 0x51, - 0xdb, 0x36, 0x9c, 0x49, 0xc7, 0x71, 0x03, 0xd6, 0x37, 0x3c, 0xc3, 0x26, 0x8c, 0x78, 0xbc, 0xa0, - 0x2a, 0x2f, 0xa8, 0x14, 0x16, 0x94, 0xaf, 0xf1, 0x21, 0x64, 0x47, 0xc6, 0x3c, 0x20, 0x22, 0x9b, - 0xdc, 0x69, 0xe6, 0x2f, 0xff, 0xc8, 0x4b, 0x5a, 0x88, 0x0a, 0x7f, 0x94, 0xe0, 0xdd, 0x4b, 0xae, - 0x75, 0x31, 0x9e, 0x3a, 0x0d, 0x3c, 0x93, 0xe0, 0x37, 0xb0, 0x1a, 0xee, 0x43, 0xd7, 0xa7, 0x99, - 0x3f, 0x73, 0x2f, 0x11, 0xc3, 0x6f, 0x20, 0x17, 0xae, 0x86, 0x5a, 0x27, 0x0c, 0xa3, 0x3d, 0x00, - 0x2e, 0x5d, 0x64, 0xdb, 0x8e, 0x5a, 0xfd, 0x00, 0x0a, 0xff, 0xfa, 0x3f, 0x29, 0x74, 0x1c, 0x9f, - 0x19, 0x8e, 0x49, 0x46, 0x16, 0xf9, 0x88, 0x75, 0xd8, 0x56, 0xee, 0x88, 0x19, 0x88, 0xf9, 0x61, - 0x06, 0x23, 0xd1, 0x3c, 0x7e, 0x25, 0xe6, 0xf1, 0x25, 0x17, 0x71, 0x13, 0x2d, 0xe1, 0x82, 0x4f, - 0x86, 0x72, 0x67, 0xb1, 0x16, 0x9d, 0x90, 0xc5, 0xd4, 0x2c, 0xf6, 0x78, 0x1f, 0x56, 0x7b, 0x01, - 0x73, 0x03, 0x16, 0x25, 0x1d, 0xed, 0xf0, 0x2b, 0xc8, 0x2a, 0x9e, 0x47, 0xbd, 0x7c, 0x46, 0xe0, - 0x70, 0x53, 0xf8, 0x1e, 0x0e, 0x13, 0x73, 0x6b, 0xb8, 0xc6, 0xb5, 0x35, 0xb7, 0x98, 0x45, 0x7c, - 0xfc, 0x35, 0xec, 0x76, 0x7c, 0x3a, 0x37, 0x18, 0x99, 0x8c, 0x6c, 0x21, 0x99, 0x87, 0xf9, 0xaf, - 0x6b, 0x4f, 0x05, 0x85, 0xff, 0x4a, 0x80, 0x1f, 0x3f, 0x3b, 0xcf, 0x35, 0xf0, 0x79, 0x77, 0x4d, - 0x9e, 0x68, 0xd4, 0x5d, 0xbe, 0xc6, 0xbf, 0x84, 0xec, 0x9c, 0xdc, 0x92, 0xb9, 0xc8, 0x7e, 0xbb, - 0xfa, 0xa5, 0x28, 0xc6, 0x53, 0xdb, 0x52, 0xf8, 0x73, 0xc9, 0x55, 0xc5, 0x1f, 0x36, 0xb4, 0xc2, - 0xef, 0x60, 0x6b, 0x62, 0xf9, 0xee, 0xdc, 0xb8, 0x0f, 0x15, 0xa2, 0x47, 0x8d, 0x43, 0x9c, 0x87, - 0x35, 0x9b, 0xf8, 0xbe, 0x31, 0x23, 0xd1, 0x33, 0x2f, 0xb6, 0x3c, 0x25, 0x66, 0xd9, 0x24, 0x9f, - 0x0d, 0x53, 0xe2, 0xeb, 0xc2, 0xaf, 0x60, 0x27, 0x11, 0x0d, 0x6f, 0xc0, 0xda, 0xd0, 0xf9, 0xbd, - 0x43, 0x3f, 0x3a, 0x68, 0x05, 0xaf, 0x43, 0xa6, 0xe3, 0x4c, 0x29, 0x92, 0x38, 0xbe, 0x32, 0x3c, - 0xc7, 0x72, 0x66, 0x28, 0x85, 0x73, 0x51, 0x59, 0x51, 0xba, 0xf0, 0x07, 0xf8, 0x2c, 0x5e, 0x4b, - 0x79, 0x46, 0x1c, 0x16, 0x9b, 0x86, 0xf7, 0xb0, 0x7d, 0x6b, 0x0b, 0x3c, 0x22, 0x9e, 0x6f, 0x51, - 0x27, 0xaa, 0x4a, 0x82, 0xe2, 0x1a, 0xac, 0xfb, 0x22, 0x19, 0xe2, 0xe7, 0x53, 0xe2, 0xe4, 0x3b, - 0x78, 0xa1, 0x44, 0xda, 0x52, 0xb1, 0x50, 0x83, 0x83, 0xf3, 0x80, 0xf8, 0x4c, 0x78, 0x8a, 0x9f, - 0x07, 0x79, 0x58, 0x23, 0x0e, 0x6f, 0xd2, 0x24, 0x6a, 0xdf, 0x62, 0x5b, 0xf8, 0xab, 0x04, 0xb8, - 0xef, 0xd1, 0xbb, 0xc4, 0x01, 0x52, 0x80, 0xdc, 0x0d, 0x63, 0xae, 0x90, 0xc4, 0xfe, 0x3c, 0x0f, - 0x18, 0xbf, 0x03, 0xe0, 0x1b, 0x3f, 0x54, 0x4a, 0x3d, 0x52, 0x7a, 0xc4, 0x79, 0x68, 0x87, 0x86, - 0x2a, 0xe9, 0xa3, 0x34, 0xef, 0x42, 0xb4, 0xe5, 0x31, 0x98, 0x17, 0xf8, 0x8c, 0x4c, 0x5a, 0x46, - 0xd8, 0xa1, 0x45, 0x8c, 0x25, 0x2e, 0xbe, 0x85, 0xf5, 0xa1, 0x4f, 0x3c, 0xd1, 0x8e, 0x75, 0xc8, - 0x68, 0xbd, 0xde, 0x20, 0xec, 0xc5, 0x50, 0x57, 0x34, 0x24, 0x15, 0x7f, 0x0d, 0x5b, 0x7d, 0x8f, - 0x9a, 0xc4, 0xf7, 0xe9, 0x52, 0x49, 0xa5, 0x0e, 0x41, 0x2b, 0xbc, 0x33, 0x1d, 0x87, 0x91, 0x79, - 0xd8, 0x31, 0xb1, 0x6c, 0xd4, 0x51, 0x0a, 0xaf, 0x41, 0x5a, 0xee, 0xb6, 0x51, 0x9a, 0x2b, 0xc8, - 0xdd, 0x76, 0xa3, 0x8e, 0x32, 0x82, 0x69, 0x5d, 0x94, 0x15, 0x4c, 0xeb, 0x36, 0xea, 0x68, 0xb5, - 0xf8, 0x3d, 0xbc, 0xed, 0xb9, 0x84, 0xd7, 0xc3, 0x99, 0xe9, 0xf7, 0x3e, 0x23, 0xf6, 0x29, 0xa5, - 0xcc, 0x67, 0x9e, 0xe1, 0x2a, 0xce, 0xcc, 0x72, 0x08, 0xde, 0x06, 0x68, 0x5d, 0xf6, 0x86, 0xed, - 0x71, 0x47, 0xed, 0xf0, 0xb4, 0xf2, 0xf0, 0xea, 0xaa, 0xa3, 0xb6, 0x7b, 0x57, 0xfa, 0x58, 0x56, - 0xf5, 0x2b, 0x45, 0x1b, 0x9f, 0x75, 0x2e, 0x15, 0x1d, 0x49, 0xc5, 0x6f, 0x60, 0x2f, 0xe1, 0x6b, - 0x31, 0x60, 0x91, 0x41, 0x98, 0xef, 0x65, 0x47, 0x1d, 0xfe, 0x80, 0xa4, 0xe2, 0xdf, 0x73, 0xb0, - 0x1f, 0x1f, 0x25, 0x7e, 0x91, 0x2c, 0x4c, 0xda, 0x64, 0x6a, 0x04, 0x73, 0x86, 0x56, 0x30, 0x86, - 0x6d, 0x9d, 0x19, 0xce, 0xc4, 0xf0, 0x26, 0x63, 0xb9, 0x3a, 0xbe, 0xad, 0xa2, 0x54, 0x9c, 0xd5, - 0x39, 0x4b, 0xe3, 0x3d, 0x31, 0xdb, 0x21, 0x6b, 0x57, 0xfd, 0xf1, 0x6d, 0x0d, 0x65, 0xe2, 0xb0, - 0x2e, 0x60, 0x36, 0x0e, 0x9b, 0x02, 0xae, 0xe2, 0x57, 0x80, 0x1e, 0x60, 0xa5, 0x21, 0xe8, 0x5a, - 0x9c, 0xd6, 0x42, 0xaf, 0xeb, 0x71, 0x07, 0xba, 0xc8, 0x29, 0x97, 0x80, 0x35, 0x0e, 0x21, 0x01, - 0x45, 0xa6, 0x1b, 0x09, 0xf8, 0x2d, 0x87, 0x9b, 0xf1, 0x48, 0x7a, 0x45, 0xd8, 0x6f, 0xc5, 0x54, - 0x2f, 0x9a, 0xfa, 0xf8, 0xb6, 0x82, 0xb6, 0x63, 0xaa, 0x17, 0x4d, 0x1e, 0xbf, 0x82, 0x76, 0x92, - 0xb4, 0xc6, 0x29, 0x4a, 0xd2, 0x3a, 0xa7, 0xbb, 0x18, 0xc1, 0xe6, 0x92, 0xaa, 0x17, 0x0d, 0x84, - 0xf1, 0x2e, 0x6c, 0x3d, 0x22, 0x95, 0x2a, 0xda, 0x8b, 0x2b, 0x8d, 0x1a, 0xe8, 0x55, 0x5c, 0x69, - 0x54, 0xa9, 0xa2, 0xd7, 0x49, 0xff, 0xdf, 0x72, 0xff, 0xfb, 0xf8, 0x00, 0xf6, 0x12, 0x05, 0x1a, - 0x7f, 0xe8, 0xab, 0xe8, 0x20, 0x21, 0xa8, 0x2d, 0x04, 0xf9, 0x84, 0xa0, 0xbe, 0x10, 0x7c, 0x12, - 0x0b, 0x70, 0x56, 0xf5, 0x05, 0x3d, 0x8c, 0xd3, 0x7a, 0x48, 0x7f, 0x16, 0xa7, 0xcd, 0x90, 0xbe, - 0xc1, 0xaf, 0x61, 0xf7, 0x81, 0xf2, 0xce, 0x72, 0xfc, 0x69, 0xac, 0xb4, 0x6a, 0xab, 0x3e, 0x96, - 0xab, 0xe8, 0x6d, 0x02, 0x36, 0x39, 0xfc, 0x2c, 0xe6, 0x56, 0x6d, 0x55, 0x1a, 0x9c, 0x1e, 0x25, - 0x68, 0xad, 0xca, 0xe9, 0xcf, 0x13, 0xb4, 0x3e, 0x96, 0x6b, 0x65, 0x54, 0x48, 0xd0, 0xa6, 0xa0, - 0x9f, 0xc7, 0x12, 0x0b, 0xfd, 0xd6, 0xca, 0xe8, 0x5d, 0x02, 0x73, 0xc7, 0xb5, 0x32, 0xfa, 0x82, - 0xff, 0xf1, 0xe2, 0x9e, 0x2b, 0xe5, 0xf2, 0xb8, 0x5e, 0x46, 0xef, 0x13, 0x92, 0xe6, 0x52, 0xf2, - 0x25, 0xfe, 0x04, 0x5e, 0x27, 0x22, 0x44, 0xa2, 0xe3, 0x84, 0x88, 0x47, 0x89, 0x44, 0xbf, 0x78, - 0x3e, 0x52, 0xb3, 0x8c, 0x8a, 0xcf, 0x47, 0x6a, 0x96, 0xd1, 0x57, 0x2f, 0x44, 0x6a, 0x96, 0xd1, - 0xd7, 0x2f, 0x44, 0x6a, 0x96, 0xd1, 0x37, 0x4f, 0xab, 0x55, 0x69, 0xa0, 0xd2, 0xd3, 0x6a, 0x55, - 0x1a, 0xe8, 0xe4, 0x99, 0x6a, 0x55, 0x1a, 0xa8, 0xfc, 0x4c, 0xb5, 0x2a, 0x0d, 0x54, 0xc1, 0x5b, - 0x90, 0x0b, 0xdf, 0x4e, 0x79, 0x5b, 0xc6, 0x8f, 0xb6, 0xea, 0x05, 0xfa, 0x2d, 0x1f, 0xed, 0x68, - 0x7b, 0xee, 0x06, 0xee, 0x2d, 0x32, 0x30, 0xc0, 0x6a, 0x48, 0xd0, 0x35, 0xde, 0x81, 0x8d, 0xa1, - 0xe3, 0x07, 0xae, 0x4b, 0x3d, 0x46, 0x26, 0xc8, 0x2c, 0x1e, 0xc3, 0xee, 0x93, 0x37, 0x7b, 0x7e, - 0x08, 0x7f, 0x18, 0x0c, 0xfa, 0xe1, 0xa1, 0xc6, 0x57, 0xfc, 0x0c, 0x94, 0x61, 0x3b, 0xfe, 0xfa, - 0xcd, 0x1d, 0x9f, 0xbb, 0x41, 0xbb, 0x2d, 0x87, 0x47, 0xfa, 0xb9, 0x1b, 0xf4, 0x91, 0xc4, 0x4d, - 0xf8, 0x6a, 0x84, 0x52, 0xfc, 0x80, 0xe5, 0x0a, 0xd1, 0x79, 0x97, 0x2e, 0x0e, 0x00, 0xfa, 0xf4, - 0x23, 0xf1, 0xc2, 0xb7, 0xa0, 0xd8, 0xf5, 0xbc, 0x01, 0x6b, 0x5a, 0xe0, 0x88, 0x4b, 0x59, 0xe2, - 0xc7, 0x79, 0x6f, 0x3a, 0x45, 0x29, 0x1e, 0xa1, 0x6f, 0x04, 0x3e, 0x99, 0xa0, 0x34, 0xde, 0x84, - 0xf5, 0x96, 0x67, 0x31, 0xcb, 0x34, 0xe6, 0x28, 0xc3, 0xa3, 0xe8, 0xc6, 0x2d, 0x99, 0xa0, 0x6c, - 0x71, 0x0a, 0x07, 0xf1, 0xc3, 0x36, 0x3a, 0xaa, 0xa9, 0x23, 0xb4, 0x06, 0xb2, 0x16, 0xdd, 0x39, - 0xfa, 0xa0, 0x17, 0x25, 0xa8, 0x29, 0xba, 0x32, 0x40, 0x29, 0xbc, 0x0f, 0x58, 0x53, 0xfa, 0x72, - 0x47, 0x1b, 0x9f, 0x0f, 0x15, 0x7d, 0x30, 0x96, 0xcf, 0x15, 0x75, 0x10, 0x5e, 0x2d, 0x7d, 0x79, - 0xa8, 0x2b, 0x28, 0x23, 0xec, 0xe4, 0x91, 0x82, 0xb2, 0xc5, 0x7f, 0x4a, 0x2f, 0xbf, 0x11, 0x3f, - 0x79, 0xc1, 0xdb, 0x8f, 0x93, 0xf1, 0x50, 0xbd, 0x50, 0x7b, 0x57, 0x2a, 0x5a, 0xe1, 0x33, 0x93, - 0x90, 0x9d, 0xc9, 0x9d, 0x4b, 0xa5, 0x8d, 0x24, 0xfc, 0x06, 0xf2, 0x09, 0x91, 0x3e, 0x6c, 0xb5, - 0x14, 0xa5, 0xad, 0xb4, 0x51, 0xea, 0x19, 0xa7, 0x7d, 0x45, 0x6d, 0x77, 0xd4, 0x73, 0x94, 0x7e, - 0xc6, 0x52, 0x53, 0x4e, 0x7b, 0xbd, 0x01, 0x97, 0x66, 0x8a, 0x3f, 0xc2, 0xa6, 0xec, 0x99, 0x37, - 0x16, 0x23, 0x26, 0x0b, 0x3c, 0xc2, 0xeb, 0x7b, 0xd7, 0x6c, 0x84, 0x45, 0xe9, 0x76, 0x78, 0x77, - 0xc5, 0xc5, 0x39, 0x77, 0x6f, 0x0c, 0x94, 0xe2, 0xad, 0x10, 0x5d, 0xea, 0xb7, 0x50, 0x9a, 0x0f, - 0xac, 0xac, 0x75, 0xc7, 0x8f, 0xcd, 0x51, 0x96, 0xdb, 0x59, 0x06, 0xbf, 0x65, 0x85, 0xab, 0x46, - 0x1d, 0xe5, 0x78, 0x29, 0xc5, 0xcd, 0x1b, 0x57, 0xdd, 0x2c, 0x7e, 0x80, 0x4d, 0x9d, 0x98, 0x81, - 0x67, 0xb1, 0x7b, 0x31, 0x34, 0xbb, 0xb0, 0xa5, 0xf6, 0x06, 0xad, 0x9e, 0x7a, 0xd6, 0x39, 0x1f, - 0x6a, 0x4a, 0x1b, 0xad, 0x70, 0x34, 0xd0, 0x86, 0xfa, 0x40, 0x69, 0x5f, 0xca, 0x43, 0xb5, 0xf5, - 0x01, 0x49, 0xfc, 0x16, 0x14, 0x2a, 0x6d, 0x45, 0x1d, 0x74, 0xe4, 0xcb, 0x51, 0x17, 0xa5, 0xbe, - 0xbb, 0x00, 0xe4, 0x13, 0xc7, 0xb7, 0x98, 0x75, 0x4b, 0xa2, 0x2f, 0x5e, 0xfc, 0x69, 0x29, 0xfc, - 0xc2, 0x2d, 0x2d, 0xbe, 0x70, 0x4b, 0x67, 0x16, 0x99, 0x4f, 0x7a, 0x2e, 0x2f, 0x84, 0x9f, 0xff, - 0xf7, 0x9f, 0xd2, 0xe2, 0x75, 0xe9, 0x89, 0xe1, 0x77, 0x0a, 0x6c, 0x2d, 0xd9, 0xef, 0x7c, 0xea, - 0xfc, 0x94, 0xa7, 0xff, 0x44, 0x9e, 0xe2, 0x56, 0xa7, 0x5f, 0xfc, 0xe6, 0xf3, 0x99, 0xc5, 0x6e, - 0x82, 0xeb, 0x92, 0x49, 0xed, 0x13, 0xdb, 0x32, 0x3d, 0xea, 0xd3, 0x29, 0x3b, 0xb1, 0xa9, 0x79, - 0xe2, 0xb9, 0xe6, 0x49, 0xf8, 0x49, 0x7e, 0xbd, 0x2a, 0x9c, 0xd6, 0xfe, 0x17, 0x00, 0x00, 0xff, - 0xff, 0x11, 0xd4, 0x65, 0x76, 0xb5, 0x0f, 0x00, 0x00, + 0x15, 0x80, 0x91, 0x7f, 0xc0, 0x3e, 0xfc, 0x35, 0xcd, 0x1d, 0xf0, 0x90, 0x3b, 0x77, 0x88, 0xe7, + 0xce, 0x1d, 0xe2, 0x99, 0x31, 0xfe, 0x1b, 0x97, 0x6b, 0xaa, 0x52, 0x15, 0x61, 0x0b, 0xae, 0x2f, + 0x58, 0x76, 0x49, 0xb6, 0x99, 0x64, 0xe3, 0x08, 0xb9, 0x6d, 0x94, 0x58, 0x6a, 0x95, 0xd4, 0xe2, + 0xc2, 0x2c, 0xa6, 0xb2, 0xca, 0x3a, 0xcb, 0x2c, 0xb2, 0xc8, 0x32, 0x2f, 0x90, 0xca, 0x13, 0xe4, + 0x05, 0x92, 0xe7, 0x49, 0x55, 0xaa, 0x5b, 0x32, 0x20, 0x01, 0xc9, 0xca, 0xdd, 0xdf, 0xf9, 0xf5, + 0x39, 0x47, 0xdd, 0x12, 0xbc, 0xb1, 0xa9, 0x39, 0x31, 0xa9, 0x6d, 0x53, 0x87, 0xff, 0xb8, 0x01, + 0x23, 0xe1, 0xae, 0xec, 0x7a, 0x94, 0x51, 0x9c, 0xb6, 0xa9, 0x79, 0x70, 0x38, 0xa7, 0x74, 0xbe, + 0x20, 0xc7, 0x02, 0x5d, 0x05, 0xb3, 0xe3, 0x29, 0xf1, 0x4d, 0xcf, 0x72, 0x19, 0xf5, 0x42, 0xb5, + 0x62, 0x1b, 0x36, 0x2f, 0x2d, 0x47, 0xeb, 0x5d, 0x58, 0x3e, 0x23, 0x0e, 0xf1, 0x70, 0x0d, 0x72, + 0x03, 0x2e, 0x31, 0xe9, 0xa2, 0x20, 0x1d, 0x4a, 0x47, 0x5b, 0xb5, 0xbd, 0xb2, 0x4d, 0xcd, 0xb2, + 0xd0, 0x5a, 0x4a, 0x86, 0x77, 0x2e, 0xd1, 0xee, 0xf5, 0x8a, 0xa7, 0x80, 0x85, 0xb8, 0x4d, 0x9d, + 0x99, 0x35, 0x0f, 0x3c, 0x83, 0x59, 0xd4, 0xc1, 0x15, 0xc8, 0x2f, 0xbd, 0xfa, 0x05, 0xe9, 0x30, + 0x7d, 0xb4, 0x5e, 0xc3, 0x0f, 0xae, 0x96, 0x22, 0xed, 0x41, 0xa9, 0xf8, 0x13, 0xa4, 0xcf, 0xdc, + 0x00, 0xd7, 0x01, 0x0c, 0xdf, 0xb7, 0xe6, 0x8e, 0x4d, 0x1c, 0x16, 0x25, 0xb1, 0x2b, 0x2c, 0xe5, + 0x7b, 0x2c, 0x32, 0x78, 0xa4, 0x86, 0x8f, 0x60, 0xdb, 0x35, 0x3c, 0x66, 0xf1, 0xd0, 0xba, 0xf5, + 0x23, 0xe9, 0x9d, 0x14, 0xd2, 0x87, 0xd2, 0x51, 0x46, 0x4b, 0x62, 0x8c, 0x21, 0xe3, 0x18, 0x36, + 0x29, 0x64, 0x0e, 0xa5, 0xa3, 0xbc, 0x26, 0xd6, 0x1f, 0x32, 0xb9, 0x14, 0x4a, 0x17, 0x19, 0x14, + 0xc6, 0x96, 0xc7, 0x02, 0x63, 0xd1, 0x33, 0xcc, 0x6b, 0xcb, 0x21, 0xed, 0xc0, 0x67, 0xd4, 0xe6, + 0x76, 0xf8, 0x00, 0x72, 0xa6, 0x1b, 0xb4, 0x69, 0x10, 0xa5, 0x94, 0xd5, 0xee, 0xf7, 0x5c, 0x66, + 0x13, 0x9b, 0x7a, 0x77, 0xbd, 0x93, 0x42, 0x2a, 0x94, 0x2d, 0xf7, 0x5c, 0x36, 0x5f, 0xda, 0xa5, + 0x43, 0xd9, 0x72, 0xff, 0x21, 0x93, 0xcb, 0xa0, 0x6c, 0xf1, 0xaf, 0x12, 0x1c, 0x74, 0xee, 0x1c, + 0xc3, 0xb6, 0xcc, 0x9e, 0xb0, 0x8a, 0x97, 0xf1, 0x08, 0xb6, 0x6d, 0xe3, 0xd6, 0xb2, 0x03, 0xbb, + 0xb7, 0x8c, 0x21, 0x85, 0x7f, 0x2c, 0x81, 0x85, 0xa6, 0xe5, 0xc4, 0x34, 0x53, 0x91, 0x66, 0x1c, + 0xe3, 0x32, 0x60, 0x66, 0x78, 0x73, 0xc2, 0x42, 0x72, 0x12, 0xcc, 0x66, 0xc4, 0x13, 0xe9, 0x6d, + 0x6a, 0xcf, 0x48, 0x8a, 0x3f, 0xc0, 0xbb, 0x78, 0x61, 0xb4, 0xc0, 0x69, 0x53, 0xdb, 0x36, 0x9c, + 0x69, 0xd7, 0x71, 0x03, 0x36, 0x30, 0x3c, 0xc3, 0x26, 0x8c, 0x78, 0xbc, 0xb8, 0x2a, 0x2f, 0xae, + 0x14, 0x16, 0x97, 0xaf, 0xf1, 0x01, 0x64, 0xc7, 0xc6, 0x22, 0x20, 0x22, 0x9b, 0xfc, 0x49, 0xe6, + 0xcf, 0x7f, 0x2f, 0x48, 0x5a, 0x88, 0x8a, 0x7f, 0x90, 0xe0, 0xed, 0x4b, 0xae, 0x75, 0x31, 0xaa, + 0x3a, 0x0d, 0x3c, 0x93, 0xe0, 0xd7, 0xb0, 0x1a, 0xee, 0x43, 0xd7, 0x27, 0x99, 0x3f, 0x71, 0x2f, + 0x11, 0xc3, 0xaf, 0x21, 0x1f, 0xae, 0x46, 0x5a, 0x37, 0x0c, 0xa3, 0x3d, 0x00, 0x2e, 0x5d, 0x66, + 0xdb, 0x11, 0xff, 0x32, 0xaf, 0x3d, 0x80, 0xe2, 0x3f, 0xff, 0x47, 0x0a, 0x5d, 0xc7, 0x67, 0x86, + 0x63, 0x92, 0xb1, 0x45, 0x3e, 0x62, 0x1d, 0xb6, 0x94, 0x5b, 0x62, 0x06, 0x62, 0x96, 0x98, 0xc1, + 0x48, 0x34, 0x9b, 0x5f, 0x8b, 0xd9, 0x7c, 0xc9, 0x45, 0xdc, 0x44, 0x4b, 0xb8, 0xe0, 0xf3, 0xa1, + 0xdc, 0x5a, 0xac, 0x4d, 0xa7, 0x64, 0x39, 0x3b, 0xcb, 0x3d, 0xde, 0x83, 0xd5, 0x7e, 0xc0, 0xdc, + 0x80, 0x45, 0x49, 0x47, 0x3b, 0xfc, 0x0a, 0xb2, 0x8a, 0xe7, 0x51, 0x2f, 0x1a, 0xe1, 0x70, 0x53, + 0xfc, 0x00, 0x07, 0x89, 0xe9, 0x35, 0x5c, 0xe3, 0xca, 0x5a, 0x58, 0xcc, 0x22, 0x3e, 0xfe, 0x06, + 0x76, 0xba, 0x3e, 0x5d, 0x18, 0x8c, 0x4c, 0xc7, 0xb6, 0x90, 0x2c, 0xc2, 0xfc, 0x73, 0xda, 0x53, + 0x41, 0xf1, 0x3f, 0x12, 0xe0, 0xc7, 0xff, 0x9d, 0xe7, 0x1a, 0xf8, 0xbc, 0xbb, 0x26, 0x4f, 0x34, + 0xea, 0x2e, 0x5f, 0xe3, 0x5f, 0x42, 0x76, 0x41, 0x6e, 0xc8, 0x42, 0x64, 0xbf, 0x55, 0xfb, 0x4a, + 0x14, 0xe3, 0xa9, 0x6d, 0x39, 0xfc, 0xb9, 0xe0, 0xaa, 0xe2, 0xe1, 0x0d, 0xad, 0xf0, 0x5b, 0xd8, + 0x9c, 0x5a, 0xbe, 0xbb, 0x30, 0xee, 0x42, 0x85, 0xe8, 0xaf, 0xc6, 0x21, 0x2e, 0xc0, 0x9a, 0x4d, + 0x7c, 0xdf, 0x98, 0x2f, 0x1f, 0xdb, 0xe5, 0x96, 0xa7, 0xc4, 0x2c, 0x9b, 0x14, 0xb2, 0x61, 0x4a, + 0x7c, 0x5d, 0xfc, 0x15, 0x6c, 0x27, 0xa2, 0xe1, 0x75, 0x58, 0x1b, 0x39, 0xbf, 0x77, 0xe8, 0x47, + 0x07, 0xad, 0xe0, 0x1c, 0x64, 0xba, 0xce, 0x8c, 0x22, 0x89, 0xe3, 0x4b, 0xc3, 0x73, 0x2c, 0x67, + 0x8e, 0x52, 0x38, 0x1f, 0x95, 0x15, 0xa5, 0x8b, 0x3f, 0xc1, 0xe7, 0xf1, 0x5a, 0xca, 0x73, 0xe2, + 0xb0, 0xd8, 0x34, 0xbc, 0x83, 0xad, 0x1b, 0x5b, 0xe0, 0x31, 0xf1, 0x7c, 0x8b, 0x3a, 0x51, 0x55, + 0x12, 0x14, 0xd7, 0x21, 0xe7, 0x8b, 0x64, 0x88, 0x5f, 0x48, 0x89, 0x53, 0x70, 0xff, 0x85, 0x12, + 0x69, 0xf7, 0x8a, 0xc5, 0x3a, 0xec, 0x9f, 0x05, 0xc4, 0x67, 0xc2, 0x53, 0xfc, 0x3c, 0x28, 0xc0, + 0x1a, 0x71, 0x78, 0x93, 0xa6, 0x51, 0xfb, 0x96, 0xdb, 0xe2, 0x5f, 0x24, 0xc0, 0x03, 0x8f, 0xde, + 0x26, 0x0e, 0x90, 0x22, 0xe4, 0xaf, 0x19, 0x73, 0x85, 0x24, 0xf6, 0xf0, 0x3c, 0x60, 0xfc, 0x16, + 0x80, 0x6f, 0xfc, 0x50, 0x29, 0xf5, 0x48, 0xe9, 0x11, 0xe7, 0xa1, 0x1d, 0x1a, 0xaa, 0xa4, 0x0f, + 0xd3, 0xbc, 0x0b, 0xd1, 0x96, 0xc7, 0x60, 0x5e, 0xe0, 0x33, 0x32, 0x6d, 0x1b, 0x61, 0x87, 0x96, + 0x31, 0xee, 0x71, 0xe9, 0x0d, 0xe4, 0x46, 0x3e, 0xf1, 0x44, 0x3b, 0x72, 0x90, 0xd1, 0xfa, 0xfd, + 0x61, 0xd8, 0x8b, 0x91, 0xae, 0x68, 0x48, 0x2a, 0xfd, 0x1a, 0x36, 0x07, 0x1e, 0x35, 0x89, 0xef, + 0xd3, 0x7b, 0x25, 0x95, 0x3a, 0x04, 0xad, 0xf0, 0xce, 0x74, 0x1d, 0x46, 0x16, 0x61, 0xc7, 0xc4, + 0xb2, 0xd9, 0x40, 0x29, 0xbc, 0x06, 0x69, 0xb9, 0xd7, 0x41, 0x69, 0xae, 0x20, 0xf7, 0x3a, 0xcd, + 0x06, 0xca, 0x08, 0xa6, 0xf5, 0x50, 0x56, 0x30, 0xad, 0xd7, 0x6c, 0xa0, 0xd5, 0xd2, 0x07, 0x78, + 0xd3, 0x77, 0x09, 0xaf, 0x87, 0x33, 0xd7, 0xef, 0x7c, 0x46, 0xec, 0x13, 0x4a, 0x99, 0xcf, 0x3c, + 0xc3, 0x55, 0x9c, 0xb9, 0xe5, 0x10, 0xbc, 0x05, 0xd0, 0xbe, 0xe8, 0x8f, 0x3a, 0x93, 0xae, 0xda, + 0xe5, 0x69, 0x15, 0xe0, 0xd5, 0x65, 0x57, 0xed, 0xf4, 0x2f, 0xf5, 0x89, 0xac, 0xea, 0x97, 0x8a, + 0x36, 0x39, 0xed, 0x5e, 0x28, 0x3a, 0x92, 0x4a, 0xdf, 0xc2, 0x6e, 0xc2, 0xd7, 0x72, 0xc0, 0x22, + 0x83, 0x30, 0xdf, 0x8b, 0xae, 0x3a, 0xfa, 0x01, 0x49, 0xa5, 0xbf, 0xe5, 0x61, 0x2f, 0x3e, 0x4a, + 0xfc, 0x3a, 0x59, 0x9a, 0x74, 0xc8, 0xcc, 0x08, 0x16, 0x0c, 0xad, 0x60, 0x0c, 0x5b, 0x3a, 0x33, + 0x9c, 0xa9, 0xe1, 0x4d, 0x27, 0x72, 0x6d, 0x72, 0x53, 0x43, 0xa9, 0x38, 0x6b, 0x70, 0x96, 0xc6, + 0xbb, 0x62, 0xb6, 0x43, 0xd6, 0xa9, 0xf9, 0x93, 0x9b, 0x3a, 0xca, 0xc4, 0x61, 0x43, 0xc0, 0x6c, + 0x1c, 0xb6, 0x04, 0x5c, 0xc5, 0xaf, 0x00, 0x3d, 0xc0, 0x6a, 0x53, 0xd0, 0xb5, 0x38, 0xad, 0x87, + 0x5e, 0x73, 0x71, 0x07, 0xba, 0xc8, 0x29, 0x9f, 0x80, 0x75, 0x0e, 0x21, 0x01, 0x45, 0xa6, 0xeb, + 0x09, 0xf8, 0x1d, 0x87, 0x1b, 0xf1, 0x48, 0x7a, 0x55, 0xd8, 0x6f, 0xc6, 0x54, 0xcf, 0x5b, 0xfa, + 0xe4, 0xa6, 0x8a, 0xb6, 0x62, 0xaa, 0xe7, 0x2d, 0x1e, 0xbf, 0x8a, 0xb6, 0x93, 0xb4, 0xce, 0x29, + 0x4a, 0xd2, 0x06, 0xa7, 0x3b, 0x18, 0xc1, 0xc6, 0x3d, 0x55, 0xcf, 0x9b, 0x08, 0xe3, 0x1d, 0xd8, + 0x7c, 0x44, 0xaa, 0x35, 0xb4, 0x1b, 0x57, 0x1a, 0x37, 0xd1, 0xab, 0xb8, 0xd2, 0xb8, 0x5a, 0x43, + 0x9f, 0x24, 0xfd, 0x7f, 0xc7, 0xfd, 0xef, 0xe1, 0x7d, 0xd8, 0x4d, 0x14, 0x68, 0xf2, 0x7e, 0xa0, + 0xa2, 0xfd, 0x84, 0xa0, 0xbe, 0x14, 0x14, 0x12, 0x82, 0xc6, 0x52, 0xf0, 0x69, 0x2c, 0xc0, 0x69, + 0xcd, 0x17, 0xf4, 0x20, 0x4e, 0x1b, 0x21, 0xfd, 0x59, 0x9c, 0xb6, 0x42, 0xfa, 0x1a, 0x7f, 0x02, + 0x3b, 0x0f, 0x94, 0x77, 0x96, 0xe3, 0xcf, 0x62, 0xa5, 0x55, 0xdb, 0x8d, 0x89, 0x5c, 0x43, 0x6f, + 0x12, 0xb0, 0xc5, 0xe1, 0xe7, 0x31, 0xb7, 0x6a, 0xbb, 0xda, 0xe4, 0xf4, 0x30, 0x41, 0xeb, 0x35, + 0x4e, 0x7f, 0x9e, 0xa0, 0x8d, 0x89, 0x5c, 0xaf, 0xa0, 0x62, 0x82, 0xb6, 0x04, 0xfd, 0x22, 0x96, + 0x58, 0xe8, 0xb7, 0x5e, 0x41, 0x6f, 0x13, 0x98, 0x3b, 0xae, 0x57, 0xd0, 0x97, 0xfc, 0xc1, 0x8b, + 0x7b, 0xae, 0x56, 0x2a, 0x93, 0x46, 0x05, 0xbd, 0x4b, 0x48, 0x5a, 0xf7, 0x92, 0xaf, 0xf0, 0xa7, + 0xf0, 0x49, 0x22, 0x42, 0x24, 0x3a, 0x4a, 0x88, 0x78, 0x94, 0x48, 0xf4, 0x8b, 0xe7, 0x23, 0xb5, + 0x2a, 0xa8, 0xf4, 0x7c, 0xa4, 0x56, 0x05, 0x7d, 0xfd, 0x42, 0xa4, 0x56, 0x05, 0x7d, 0xf3, 0x42, + 0xa4, 0x56, 0x05, 0x7d, 0xfb, 0xb4, 0x5a, 0xd5, 0x26, 0x2a, 0x3f, 0xad, 0x56, 0xb5, 0x89, 0x8e, + 0x9f, 0xa9, 0x56, 0xb5, 0x89, 0x2a, 0xcf, 0x54, 0xab, 0xda, 0x44, 0x55, 0xbc, 0x09, 0xf9, 0xf0, + 0x1d, 0x95, 0xb7, 0x65, 0xf2, 0x68, 0xab, 0x9e, 0xa3, 0xdf, 0xf2, 0xd1, 0x8e, 0xb6, 0x67, 0x6e, + 0xe0, 0xde, 0x20, 0x03, 0x03, 0xac, 0x86, 0x04, 0x5d, 0xe1, 0x6d, 0x58, 0x1f, 0x39, 0x7e, 0xe0, + 0xba, 0xd4, 0x63, 0x64, 0x8a, 0xcc, 0xd2, 0x11, 0xec, 0x3c, 0x79, 0xcb, 0xe7, 0x87, 0xf0, 0xfb, + 0xe1, 0x70, 0x10, 0x1e, 0x6a, 0x7c, 0xc5, 0xcf, 0x40, 0x19, 0xb6, 0xe2, 0xaf, 0xe2, 0xdc, 0xf1, + 0x99, 0x1b, 0x74, 0x3a, 0x72, 0x78, 0xa4, 0x9f, 0xb9, 0xc1, 0x00, 0x49, 0xdc, 0x84, 0xaf, 0xc6, + 0x28, 0xc5, 0x0f, 0x58, 0xae, 0x10, 0x9d, 0x77, 0xe9, 0xd2, 0x10, 0x60, 0x40, 0x3f, 0x12, 0x2f, + 0x7c, 0x0b, 0x8a, 0x5d, 0xcf, 0xeb, 0xb0, 0xa6, 0x05, 0x8e, 0xb8, 0x94, 0x25, 0x7e, 0x9c, 0xf7, + 0x67, 0x33, 0x94, 0xe2, 0x11, 0x06, 0x46, 0xe0, 0x93, 0x29, 0x4a, 0xe3, 0x0d, 0xc8, 0xb5, 0x3d, + 0x8b, 0x59, 0xa6, 0xb1, 0x40, 0x19, 0x1e, 0x45, 0x37, 0x6e, 0xc8, 0x14, 0x65, 0x4b, 0x33, 0xd8, + 0x8f, 0x1f, 0xb6, 0xd1, 0x51, 0x4d, 0x1d, 0xa1, 0x35, 0x94, 0xb5, 0xe8, 0xce, 0xd1, 0x87, 0xfd, + 0x28, 0x41, 0x4d, 0xd1, 0x95, 0x21, 0x4a, 0xe1, 0x3d, 0xc0, 0x9a, 0x32, 0x90, 0xbb, 0xda, 0xe4, + 0x6c, 0xa4, 0xe8, 0xc3, 0x89, 0x7c, 0xa6, 0xa8, 0xc3, 0xf0, 0x6a, 0x19, 0xc8, 0x23, 0x5d, 0x41, + 0x19, 0x61, 0x27, 0x8f, 0x15, 0x94, 0x2d, 0xfd, 0x43, 0x7a, 0xf9, 0x8d, 0xf8, 0xc9, 0x0b, 0xde, + 0x5e, 0x9c, 0x4c, 0x46, 0xea, 0xb9, 0xda, 0xbf, 0x54, 0xd1, 0x0a, 0x9f, 0x99, 0x84, 0xec, 0x54, + 0xee, 0x5e, 0x28, 0x1d, 0x24, 0xe1, 0xd7, 0x50, 0x48, 0x88, 0xf4, 0x51, 0xbb, 0xad, 0x28, 0x1d, + 0xa5, 0x83, 0x52, 0xcf, 0x38, 0x1d, 0x28, 0x6a, 0xa7, 0xab, 0x9e, 0xa1, 0xf4, 0x33, 0x96, 0x9a, + 0x72, 0xd2, 0xef, 0x0f, 0xb9, 0x34, 0x53, 0xfa, 0x11, 0x36, 0x64, 0xcf, 0xbc, 0xb6, 0x18, 0x31, + 0x59, 0xe0, 0x11, 0x5e, 0xdf, 0xdb, 0x56, 0x33, 0x2c, 0x4a, 0xaf, 0xcb, 0xbb, 0x2b, 0x2e, 0xce, + 0x85, 0x7b, 0x6d, 0xa0, 0x14, 0x6f, 0x85, 0xe8, 0xd2, 0xa0, 0x8d, 0xd2, 0x7c, 0x60, 0x65, 0xad, + 0x37, 0x79, 0x6c, 0x8e, 0xb2, 0xdc, 0xce, 0x32, 0xf8, 0x2d, 0x2b, 0x5c, 0x35, 0x1b, 0x28, 0xcf, + 0x4b, 0x29, 0x6e, 0xde, 0xb8, 0xea, 0x46, 0xe9, 0x3d, 0x6c, 0xe8, 0xc4, 0x0c, 0x3c, 0x8b, 0xdd, + 0x89, 0xa1, 0xd9, 0x81, 0x4d, 0xb5, 0x3f, 0x6c, 0xf7, 0xd5, 0xd3, 0xee, 0xd9, 0x48, 0x53, 0x3a, + 0x68, 0x85, 0xa3, 0xa1, 0x36, 0xd2, 0x87, 0x4a, 0xe7, 0x42, 0x1e, 0xa9, 0xed, 0xf7, 0x48, 0xe2, + 0xb7, 0xa0, 0x50, 0xe9, 0x28, 0xea, 0xb0, 0x2b, 0x5f, 0x8c, 0x7b, 0x28, 0xf5, 0xfd, 0x39, 0x20, + 0x9f, 0x38, 0xbe, 0xc5, 0xac, 0x1b, 0x12, 0x7d, 0xfd, 0xe2, 0xcf, 0xca, 0xe1, 0xd7, 0x6e, 0x79, + 0xf9, 0xb5, 0x5b, 0x3e, 0xb5, 0xc8, 0x62, 0xda, 0x77, 0x79, 0x21, 0xfc, 0xc2, 0xbf, 0xfe, 0x98, + 0x16, 0xaf, 0x4b, 0x4f, 0x0c, 0xbf, 0x57, 0x60, 0xf3, 0x9e, 0xfd, 0xce, 0xa7, 0xce, 0xff, 0xf3, + 0xf4, 0xef, 0xc8, 0x53, 0xdc, 0xea, 0xe4, 0xcb, 0xdf, 0x7c, 0x31, 0xb7, 0xd8, 0x75, 0x70, 0x55, + 0x36, 0xa9, 0x7d, 0x6c, 0x5b, 0xa6, 0x47, 0x7d, 0x3a, 0x63, 0xc7, 0x36, 0x35, 0x8f, 0x3d, 0xd7, + 0x3c, 0x0e, 0x3f, 0xcf, 0xaf, 0x56, 0x85, 0xd3, 0xfa, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2c, + 0x31, 0x79, 0xc0, 0xc1, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 03240f89..37648ced 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -110,12 +110,14 @@ enum AssignmentType { } message Gpu { + reserved 2; AssignmentType assignment = 1; - uint64 partitionSizeMB = 2; - string name = 3; + uint64 partitionSizeMB = 3; + string name = 4; } message VirtualMachineCustomSize { + reserved 4; int32 cpuCount = 1; int32 memoryMB = 2; int32 gpuCount = 3; diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index d14c37e7..10483db4 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -466,7 +466,6 @@ func (m *NodeInfo) GetOsInfo() *OperatingSystem { type Resources struct { Processor *Processor `protobuf:"bytes,1,opt,name=processor,proto3" json:"processor,omitempty"` Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` - Gpu *HostGPU `protobuf:"bytes,3,opt,name=gpu,proto3" json:"gpu,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` GpuList []*HostGPU `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -513,13 +512,6 @@ func (m *Resources) GetMemory() *PhysicalMemory { return nil } -func (m *Resources) GetGpu() *HostGPU { - if m != nil { - return m.Gpu - } - return nil -} - func (m *Resources) GetVmCapabilities() *VirtualMachineCapabilities { if m != nil { return m.VmCapabilities @@ -548,53 +540,53 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 768 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x48, - 0x14, 0xdd, 0x38, 0x8e, 0x93, 0xdc, 0xb4, 0xd9, 0x76, 0xda, 0xdd, 0xf5, 0x76, 0x57, 0x10, 0xb9, - 0x6a, 0x55, 0x21, 0x48, 0x50, 0xa2, 0x0a, 0x78, 0xa4, 0x3c, 0x14, 0x10, 0xa5, 0xd5, 0xb4, 0xf0, - 0xc0, 0x4b, 0xe5, 0x3a, 0x93, 0x64, 0x44, 0xec, 0x19, 0xcd, 0x8c, 0x23, 0xb9, 0x7f, 0xc2, 0xff, - 0x20, 0x3e, 0x80, 0x9f, 0xe0, 0x37, 0x90, 0xaf, 0x9d, 0xc4, 0x4e, 0x43, 0xc5, 0x53, 0x3c, 0xf7, - 0x9e, 0x3b, 0xf7, 0xcc, 0x39, 0x73, 0x27, 0xf0, 0x6f, 0x28, 0x82, 0xeb, 0x40, 0x84, 0xa1, 0x88, - 0xae, 0x23, 0x31, 0x64, 0x3c, 0x1a, 0x89, 0xae, 0x54, 0xc2, 0x08, 0x02, 0xa1, 0x08, 0xba, 0x59, - 0x6a, 0xef, 0x9f, 0x02, 0x2c, 0xfb, 0xc9, 0x40, 0x7b, 0x0f, 0xca, 0x09, 0x19, 0x1b, 0x56, 0xcc, - 0x7b, 0xe7, 0xb0, 0x7b, 0xae, 0x29, 0x1b, 0x73, 0x6d, 0x94, 0x6f, 0xb8, 0x88, 0x2e, 0x8d, 0x6f, - 0x62, 0x4d, 0x9e, 0x81, 0xa3, 0xf1, 0xcb, 0xad, 0x74, 0x2a, 0x47, 0xed, 0xfe, 0xc3, 0xee, 0xb2, - 0x5b, 0xf7, 0x6e, 0x05, 0xa3, 0x39, 0xdc, 0xfb, 0x6e, 0x41, 0xf3, 0x42, 0x89, 0x80, 0x69, 0x2d, - 0x14, 0x21, 0x60, 0x47, 0x7e, 0xc8, 0x70, 0x93, 0x26, 0xc5, 0x6f, 0xb2, 0x0b, 0xb5, 0x40, 0x28, - 0xa6, 0x5d, 0xab, 0x53, 0x39, 0xda, 0xa4, 0xd9, 0x22, 0x8d, 0x6a, 0xc9, 0xd8, 0xd0, 0xad, 0x22, - 0x34, 0x5b, 0x90, 0x43, 0xb0, 0x4d, 0x22, 0x99, 0x6b, 0x23, 0x09, 0x82, 0x24, 0x16, 0xbb, 0x5f, - 0x25, 0x92, 0x51, 0xcc, 0x93, 0x43, 0x68, 0xcf, 0xb8, 0x32, 0xb1, 0x3f, 0xe5, 0xb7, 0x48, 0xca, - 0xad, 0x75, 0x2a, 0x47, 0x0d, 0xba, 0x12, 0x25, 0x8f, 0x61, 0x7b, 0x2a, 0xc6, 0x3c, 0xf0, 0xa7, - 0x72, 0xbe, 0x8b, 0x76, 0x1d, 0xe4, 0x71, 0x37, 0x91, 0xa2, 0x27, 0x89, 0x64, 0x6a, 0xc6, 0xb5, - 0x50, 0x52, 0x31, 0xcd, 0x22, 0xe3, 0xd6, 0x71, 0xe3, 0xbb, 0x09, 0xe2, 0xc1, 0x46, 0xe8, 0x47, - 0xf1, 0xc8, 0x0f, 0x4c, 0xac, 0x98, 0x72, 0x1b, 0x78, 0x90, 0x52, 0x8c, 0x1c, 0xc3, 0x86, 0xaf, - 0x82, 0x09, 0x37, 0x0c, 0x03, 0x6e, 0x13, 0xcf, 0xb5, 0x8d, 0xe7, 0x7a, 0x59, 0x48, 0xd0, 0x12, - 0xcc, 0xeb, 0x42, 0xfb, 0x62, 0x92, 0xe8, 0x94, 0xde, 0x19, 0x0b, 0x85, 0x4a, 0xc8, 0xff, 0xd0, - 0xd4, 0xfc, 0x96, 0x9d, 0x24, 0x86, 0x65, 0x16, 0xd9, 0x74, 0x19, 0xf0, 0xbe, 0x55, 0xa0, 0xfe, - 0x5a, 0x68, 0x73, 0x7a, 0xf1, 0x61, 0xad, 0x05, 0xa5, 0xea, 0xcc, 0x86, 0x65, 0x20, 0x33, 0x28, - 0x8e, 0x0c, 0x5a, 0x81, 0x06, 0xc5, 0x91, 0x21, 0x5d, 0x20, 0xd2, 0x57, 0x86, 0xa3, 0xe5, 0x8b, - 0x62, 0x1b, 0x5b, 0xaf, 0xc9, 0x90, 0x01, 0x80, 0xaf, 0x35, 0x1f, 0x47, 0x61, 0xaa, 0x5a, 0x0d, - 0x0f, 0xba, 0x93, 0x1d, 0x74, 0x11, 0x46, 0x07, 0x0b, 0x30, 0xd2, 0x06, 0x8b, 0x0f, 0xd1, 0x90, - 0x26, 0xb5, 0xf8, 0xd0, 0xfb, 0x51, 0x81, 0x3f, 0xcf, 0x25, 0x4b, 0x2f, 0x5a, 0x34, 0xbe, 0x4c, - 0xb4, 0x61, 0x61, 0x4a, 0x44, 0xcc, 0x43, 0x1a, 0x43, 0xfa, 0x73, 0x9c, 0x6b, 0xb0, 0x26, 0x43, - 0x9e, 0x82, 0x23, 0x34, 0xde, 0x22, 0x0b, 0x49, 0xb8, 0x48, 0x62, 0x65, 0x57, 0x64, 0x92, 0xe3, - 0x52, 0x79, 0x84, 0x9e, 0x31, 0xa5, 0xd3, 0x8b, 0x94, 0xdd, 0xc7, 0x65, 0x80, 0x5c, 0xc1, 0xae, - 0x58, 0x33, 0x32, 0x28, 0x45, 0xab, 0xdf, 0xb9, 0x7f, 0x50, 0x62, 0x4d, 0xd7, 0x56, 0x7b, 0x5f, - 0x2d, 0x68, 0xbc, 0x17, 0x43, 0xf6, 0x26, 0x1a, 0x89, 0xb5, 0x9e, 0x65, 0xd2, 0x58, 0x73, 0x69, - 0xc8, 0x31, 0x40, 0xe0, 0x4b, 0xff, 0x86, 0x4f, 0xb9, 0x49, 0x90, 0x65, 0xab, 0xff, 0x57, 0xb1, - 0x39, 0x65, 0x5a, 0xc4, 0x2a, 0x60, 0x9a, 0x16, 0x80, 0xe4, 0x05, 0x6c, 0xf8, 0x33, 0x9f, 0x4f, - 0xe7, 0x85, 0xf6, 0x7d, 0x85, 0x25, 0x68, 0x41, 0x48, 0xe7, 0x37, 0x85, 0xdc, 0x5f, 0xbc, 0x22, - 0x75, 0x6c, 0xd3, 0xc2, 0x8a, 0x5c, 0x87, 0x3c, 0x45, 0xfe, 0x06, 0x27, 0x96, 0x86, 0x87, 0x0c, - 0x27, 0xa6, 0x4a, 0xf3, 0x15, 0x19, 0xa4, 0xed, 0x52, 0x39, 0x70, 0x4a, 0x5a, 0xfd, 0xff, 0x4a, - 0xca, 0x96, 0xbb, 0xd2, 0x1c, 0xea, 0x7d, 0xb1, 0xa0, 0xb9, 0xe0, 0x4f, 0x06, 0xd0, 0x5c, 0x8c, - 0x33, 0x8a, 0xb9, 0x72, 0xd2, 0xc5, 0x53, 0x42, 0x97, 0x38, 0xd2, 0x07, 0x27, 0xc4, 0x21, 0x43, - 0xb1, 0x5b, 0xfd, 0xbd, 0x52, 0x45, 0x69, 0x0c, 0x69, 0x8e, 0x24, 0x07, 0x50, 0x1d, 0xcb, 0x38, - 0x77, 0x61, 0xa7, 0x58, 0x90, 0x8f, 0x21, 0x4d, 0xf3, 0xe4, 0x14, 0xda, 0xb3, 0xf0, 0xd5, 0xdc, - 0x0c, 0xce, 0x34, 0xce, 0x45, 0x2b, 0x7f, 0x5d, 0x3f, 0x66, 0x6f, 0xd5, 0x99, 0x1f, 0x4c, 0x78, - 0xc4, 0x8a, 0x30, 0xba, 0x52, 0x46, 0x9e, 0x40, 0x7d, 0x2c, 0xe3, 0x77, 0x5c, 0x1b, 0xd7, 0xe9, - 0x54, 0x7f, 0xd5, 0x73, 0x8e, 0x79, 0x6b, 0x37, 0xec, 0xad, 0xda, 0xa3, 0xe7, 0xb0, 0xb3, 0xe6, - 0xe5, 0x26, 0xdb, 0xb0, 0x19, 0x09, 0x93, 0xc5, 0x99, 0x62, 0xc3, 0xad, 0x3f, 0x48, 0x1b, 0x40, - 0x2d, 0xd7, 0x95, 0x93, 0x83, 0x4f, 0xfb, 0x63, 0x6e, 0x26, 0xf1, 0x4d, 0xda, 0xa1, 0x17, 0xf2, - 0x40, 0x09, 0x2d, 0x46, 0xa6, 0x17, 0x8a, 0xa0, 0xa7, 0x64, 0xd0, 0xcb, 0xfa, 0xde, 0x38, 0xf8, - 0x9f, 0x32, 0xf8, 0x19, 0x00, 0x00, 0xff, 0xff, 0x18, 0xc8, 0x6a, 0x70, 0xb5, 0x06, 0x00, 0x00, + // 765 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xda, 0x48, + 0x14, 0x5d, 0x83, 0x31, 0x70, 0x49, 0xd8, 0x64, 0x92, 0xdd, 0xf5, 0x66, 0x57, 0xbb, 0xc8, 0x51, + 0x23, 0x54, 0xb5, 0x50, 0x81, 0xa2, 0xb6, 0x8f, 0x4d, 0x1f, 0xd2, 0x46, 0x4d, 0x13, 0x4d, 0xd2, + 0x3e, 0xf4, 0x25, 0x9a, 0x98, 0x01, 0x46, 0xc5, 0x1e, 0x6b, 0x66, 0x8c, 0xe4, 0x7c, 0x5f, 0xd5, + 0x0f, 0xe8, 0x4f, 0xf4, 0x17, 0xfa, 0x58, 0xf9, 0xda, 0x80, 0x4d, 0x50, 0xd4, 0x27, 0x3c, 0xe7, + 0x9e, 0x3b, 0xf7, 0xcc, 0xb9, 0x73, 0x07, 0xf8, 0x3b, 0x90, 0xfe, 0x8d, 0x2f, 0x83, 0x40, 0x86, + 0x37, 0xa1, 0x1c, 0x71, 0x11, 0x8e, 0x65, 0x2f, 0x52, 0xd2, 0x48, 0x02, 0x81, 0xf4, 0x7b, 0x59, + 0xe8, 0xe0, 0xaf, 0x02, 0x2d, 0xfb, 0xc9, 0x48, 0x07, 0xff, 0x95, 0x03, 0x51, 0x6c, 0x78, 0x31, + 0xee, 0x5d, 0xc0, 0xfe, 0x85, 0xa6, 0x7c, 0x22, 0xb4, 0x51, 0xcc, 0x08, 0x19, 0x5e, 0x19, 0x66, + 0x62, 0x4d, 0x9e, 0x83, 0xa3, 0xf1, 0xcb, 0xb5, 0x3a, 0x56, 0xb7, 0x3d, 0xf8, 0xbf, 0xb7, 0xaa, + 0xd6, 0xbb, 0x9f, 0xc1, 0x69, 0x4e, 0xf7, 0xbe, 0x55, 0xa0, 0x79, 0xa9, 0xa4, 0xcf, 0xb5, 0x96, + 0x8a, 0x10, 0xb0, 0x43, 0x16, 0x70, 0xdc, 0xa4, 0x49, 0xf1, 0x9b, 0xec, 0x43, 0xcd, 0x97, 0x8a, + 0x6b, 0xb7, 0xd2, 0xb1, 0xba, 0xdb, 0x34, 0x5b, 0xa4, 0xa8, 0x8e, 0x38, 0x1f, 0xb9, 0x55, 0xa4, + 0x66, 0x0b, 0x72, 0x04, 0xb6, 0x49, 0x22, 0xee, 0xda, 0x28, 0x82, 0xa0, 0x88, 0xe5, 0xee, 0xd7, + 0x49, 0xc4, 0x29, 0xc6, 0xc9, 0x11, 0xb4, 0xe7, 0x42, 0x99, 0x98, 0xcd, 0xc4, 0x1d, 0x8a, 0x72, + 0x6b, 0x1d, 0xab, 0xdb, 0xa0, 0x6b, 0x28, 0x79, 0x02, 0xbb, 0x33, 0x39, 0x11, 0x3e, 0x9b, 0x45, + 0x8b, 0x5d, 0xb4, 0xeb, 0xa0, 0x8e, 0xfb, 0x81, 0x94, 0x3d, 0x4d, 0x22, 0xae, 0xe6, 0x42, 0x4b, + 0x15, 0x29, 0xae, 0x79, 0x68, 0xdc, 0x3a, 0x6e, 0x7c, 0x3f, 0x40, 0x3c, 0xd8, 0x0a, 0x58, 0x18, + 0x8f, 0x99, 0x6f, 0x62, 0xc5, 0x95, 0xdb, 0xc0, 0x83, 0x94, 0x30, 0x72, 0x0c, 0x5b, 0x4c, 0xf9, + 0x53, 0x61, 0x38, 0x02, 0x6e, 0x13, 0xcf, 0xb5, 0x8b, 0xe7, 0x7a, 0x55, 0x08, 0xd0, 0x12, 0xcd, + 0xeb, 0x41, 0xfb, 0x72, 0x9a, 0xe8, 0x54, 0xde, 0x39, 0x0f, 0xa4, 0x4a, 0xc8, 0xbf, 0xd0, 0xd4, + 0xe2, 0x8e, 0x9f, 0x24, 0x86, 0x67, 0x2d, 0xb2, 0xe9, 0x0a, 0xf0, 0xbe, 0x5a, 0x50, 0x7f, 0x23, + 0xb5, 0x39, 0xbd, 0xfc, 0xb0, 0xb1, 0x05, 0xa5, 0xec, 0xac, 0x0d, 0x2b, 0x20, 0x6b, 0x50, 0x1c, + 0x1a, 0x6c, 0x05, 0x36, 0x28, 0x0e, 0x0d, 0xe9, 0x01, 0x89, 0x98, 0x32, 0x02, 0x5b, 0xbe, 0x4c, + 0xb6, 0xb1, 0xf4, 0x86, 0x08, 0x19, 0x02, 0x30, 0xad, 0xc5, 0x24, 0x0c, 0x52, 0xd7, 0x6a, 0x78, + 0xd0, 0xbd, 0xec, 0xa0, 0x4b, 0x18, 0x3b, 0x58, 0xa0, 0x91, 0x36, 0x54, 0xc4, 0x08, 0x1b, 0xd2, + 0xa4, 0x15, 0x31, 0xf2, 0xbe, 0x5b, 0xf0, 0xfb, 0x45, 0xc4, 0xd3, 0x8b, 0x16, 0x4e, 0xae, 0x12, + 0x6d, 0x78, 0x90, 0x0a, 0x91, 0x0b, 0x48, 0x23, 0xa4, 0x3f, 0xc7, 0xb9, 0x07, 0x1b, 0x22, 0xe4, + 0x19, 0x38, 0x52, 0xe3, 0x2d, 0xaa, 0xa0, 0x08, 0x17, 0x45, 0xac, 0xed, 0x8a, 0x4a, 0x72, 0x5e, + 0x6a, 0x8f, 0xd4, 0x73, 0xae, 0x74, 0x7a, 0x91, 0xb2, 0xfb, 0xb8, 0x02, 0xc8, 0x35, 0xec, 0xcb, + 0x0d, 0x23, 0x83, 0x56, 0xb4, 0x06, 0x9d, 0x87, 0x07, 0x25, 0xd6, 0x74, 0x63, 0xb6, 0xf7, 0xa5, + 0x02, 0x8d, 0xf7, 0x72, 0xc4, 0xdf, 0x86, 0x63, 0xb9, 0xb1, 0x67, 0x99, 0x35, 0x95, 0x85, 0x35, + 0xe4, 0x18, 0xc0, 0x67, 0x11, 0xbb, 0x15, 0x33, 0x61, 0x12, 0x54, 0xd9, 0x1a, 0xfc, 0x51, 0x2c, + 0x4e, 0xb9, 0x96, 0xb1, 0xf2, 0xb9, 0xa6, 0x05, 0x22, 0x79, 0x09, 0x5b, 0x6c, 0xce, 0xc4, 0x6c, + 0x91, 0x68, 0x3f, 0x94, 0x58, 0xa2, 0x16, 0x8c, 0x74, 0x7e, 0xd1, 0xc8, 0xc3, 0xe5, 0x2b, 0x52, + 0xc7, 0x32, 0x2d, 0xcc, 0xc8, 0x7d, 0xc8, 0x43, 0xe4, 0x4f, 0x70, 0xe2, 0xc8, 0x88, 0x80, 0xe3, + 0xc4, 0x54, 0x69, 0xbe, 0x22, 0xc3, 0xb4, 0x5c, 0x6a, 0x07, 0x4e, 0x49, 0x6b, 0xf0, 0x4f, 0xc9, + 0xd9, 0x72, 0x55, 0x9a, 0x53, 0xbd, 0x1f, 0x16, 0x34, 0x97, 0xfa, 0xc9, 0x10, 0x9a, 0xcb, 0x71, + 0x46, 0x33, 0xd7, 0x4e, 0xba, 0x7c, 0x4a, 0xe8, 0x8a, 0x47, 0x06, 0xe0, 0x04, 0x38, 0x64, 0x68, + 0x76, 0x6b, 0x70, 0x50, 0xca, 0x28, 0x8d, 0x21, 0xcd, 0x99, 0xe4, 0x14, 0xda, 0xf3, 0xe0, 0xf5, + 0xc2, 0x65, 0xc1, 0x35, 0x5e, 0xf8, 0x56, 0xfe, 0x6c, 0x7e, 0xcc, 0x1e, 0xa1, 0x73, 0xe6, 0x4f, + 0x45, 0xc8, 0x8b, 0x34, 0xba, 0x96, 0x46, 0x9e, 0x42, 0x7d, 0x12, 0xc5, 0xef, 0x84, 0x36, 0xae, + 0xd3, 0xa9, 0x76, 0x5b, 0xf9, 0xc8, 0xe4, 0xd5, 0xf3, 0x99, 0xa6, 0x0b, 0xce, 0x99, 0xdd, 0xa8, + 0xee, 0xd8, 0x67, 0x76, 0xc3, 0xde, 0xa9, 0x3d, 0x7e, 0x01, 0x7b, 0x1b, 0x1e, 0x66, 0xb2, 0x0b, + 0xdb, 0xa1, 0x34, 0x19, 0xce, 0x15, 0x1f, 0xed, 0xfc, 0x46, 0xda, 0x00, 0x6a, 0xb5, 0xb6, 0x4e, + 0x1e, 0x7d, 0x3a, 0x9c, 0x08, 0x33, 0x8d, 0x6f, 0xd3, 0x3a, 0xfd, 0x40, 0xf8, 0x4a, 0x6a, 0x39, + 0x36, 0xfd, 0x40, 0xfa, 0x7d, 0x15, 0xf9, 0xfd, 0xac, 0xfa, 0xad, 0x83, 0x7f, 0x19, 0xc3, 0x9f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xa4, 0xb4, 0x28, 0x94, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index 7452eb09..838b69d5 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -61,10 +61,10 @@ message NodeInfo { } message Resources { + reserved 3; reserved 4; Processor processor = 1; PhysicalMemory memory = 2; - HostGPU gpu = 3; VirtualMachineCapabilities vmCapabilities = 5; repeated HostGPU gpuList = 6; } \ No newline at end of file From dd1263489bbb6ef4518e330974f7c9b00b21810a Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Wed, 1 May 2024 14:01:56 -0700 Subject: [PATCH 10/13] Reserve 6 since we are using HostGPU for Resources now --- rpc/common/moc_common_nodeinfo.pb.go | 101 ++++++++++++++------------- rpc/common/moc_common_nodeinfo.proto | 3 +- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index 10483db4..6e7be6be 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -467,7 +467,7 @@ type Resources struct { Processor *Processor `protobuf:"bytes,1,opt,name=processor,proto3" json:"processor,omitempty"` Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` - GpuList []*HostGPU `protobuf:"bytes,6,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + GpuList []*HostGPU `protobuf:"bytes,7,rep,name=gpuList,proto3" json:"gpuList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -540,53 +540,54 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 765 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xda, 0x48, - 0x14, 0x5d, 0x83, 0x31, 0x70, 0x49, 0xd8, 0x64, 0x92, 0xdd, 0xf5, 0x66, 0x57, 0xbb, 0xc8, 0x51, - 0x23, 0x54, 0xb5, 0x50, 0x81, 0xa2, 0xb6, 0x8f, 0x4d, 0x1f, 0xd2, 0x46, 0x4d, 0x13, 0x4d, 0xd2, - 0x3e, 0xf4, 0x25, 0x9a, 0x98, 0x01, 0x46, 0xc5, 0x1e, 0x6b, 0x66, 0x8c, 0xe4, 0x7c, 0x5f, 0xd5, - 0x0f, 0xe8, 0x4f, 0xf4, 0x17, 0xfa, 0x58, 0xf9, 0xda, 0x80, 0x4d, 0x50, 0xd4, 0x27, 0x3c, 0xe7, - 0x9e, 0x3b, 0xf7, 0xcc, 0xb9, 0x73, 0x07, 0xf8, 0x3b, 0x90, 0xfe, 0x8d, 0x2f, 0x83, 0x40, 0x86, - 0x37, 0xa1, 0x1c, 0x71, 0x11, 0x8e, 0x65, 0x2f, 0x52, 0xd2, 0x48, 0x02, 0x81, 0xf4, 0x7b, 0x59, - 0xe8, 0xe0, 0xaf, 0x02, 0x2d, 0xfb, 0xc9, 0x48, 0x07, 0xff, 0x95, 0x03, 0x51, 0x6c, 0x78, 0x31, - 0xee, 0x5d, 0xc0, 0xfe, 0x85, 0xa6, 0x7c, 0x22, 0xb4, 0x51, 0xcc, 0x08, 0x19, 0x5e, 0x19, 0x66, - 0x62, 0x4d, 0x9e, 0x83, 0xa3, 0xf1, 0xcb, 0xb5, 0x3a, 0x56, 0xb7, 0x3d, 0xf8, 0xbf, 0xb7, 0xaa, - 0xd6, 0xbb, 0x9f, 0xc1, 0x69, 0x4e, 0xf7, 0xbe, 0x55, 0xa0, 0x79, 0xa9, 0xa4, 0xcf, 0xb5, 0x96, - 0x8a, 0x10, 0xb0, 0x43, 0x16, 0x70, 0xdc, 0xa4, 0x49, 0xf1, 0x9b, 0xec, 0x43, 0xcd, 0x97, 0x8a, - 0x6b, 0xb7, 0xd2, 0xb1, 0xba, 0xdb, 0x34, 0x5b, 0xa4, 0xa8, 0x8e, 0x38, 0x1f, 0xb9, 0x55, 0xa4, - 0x66, 0x0b, 0x72, 0x04, 0xb6, 0x49, 0x22, 0xee, 0xda, 0x28, 0x82, 0xa0, 0x88, 0xe5, 0xee, 0xd7, - 0x49, 0xc4, 0x29, 0xc6, 0xc9, 0x11, 0xb4, 0xe7, 0x42, 0x99, 0x98, 0xcd, 0xc4, 0x1d, 0x8a, 0x72, - 0x6b, 0x1d, 0xab, 0xdb, 0xa0, 0x6b, 0x28, 0x79, 0x02, 0xbb, 0x33, 0x39, 0x11, 0x3e, 0x9b, 0x45, - 0x8b, 0x5d, 0xb4, 0xeb, 0xa0, 0x8e, 0xfb, 0x81, 0x94, 0x3d, 0x4d, 0x22, 0xae, 0xe6, 0x42, 0x4b, - 0x15, 0x29, 0xae, 0x79, 0x68, 0xdc, 0x3a, 0x6e, 0x7c, 0x3f, 0x40, 0x3c, 0xd8, 0x0a, 0x58, 0x18, - 0x8f, 0x99, 0x6f, 0x62, 0xc5, 0x95, 0xdb, 0xc0, 0x83, 0x94, 0x30, 0x72, 0x0c, 0x5b, 0x4c, 0xf9, - 0x53, 0x61, 0x38, 0x02, 0x6e, 0x13, 0xcf, 0xb5, 0x8b, 0xe7, 0x7a, 0x55, 0x08, 0xd0, 0x12, 0xcd, - 0xeb, 0x41, 0xfb, 0x72, 0x9a, 0xe8, 0x54, 0xde, 0x39, 0x0f, 0xa4, 0x4a, 0xc8, 0xbf, 0xd0, 0xd4, - 0xe2, 0x8e, 0x9f, 0x24, 0x86, 0x67, 0x2d, 0xb2, 0xe9, 0x0a, 0xf0, 0xbe, 0x5a, 0x50, 0x7f, 0x23, - 0xb5, 0x39, 0xbd, 0xfc, 0xb0, 0xb1, 0x05, 0xa5, 0xec, 0xac, 0x0d, 0x2b, 0x20, 0x6b, 0x50, 0x1c, - 0x1a, 0x6c, 0x05, 0x36, 0x28, 0x0e, 0x0d, 0xe9, 0x01, 0x89, 0x98, 0x32, 0x02, 0x5b, 0xbe, 0x4c, - 0xb6, 0xb1, 0xf4, 0x86, 0x08, 0x19, 0x02, 0x30, 0xad, 0xc5, 0x24, 0x0c, 0x52, 0xd7, 0x6a, 0x78, - 0xd0, 0xbd, 0xec, 0xa0, 0x4b, 0x18, 0x3b, 0x58, 0xa0, 0x91, 0x36, 0x54, 0xc4, 0x08, 0x1b, 0xd2, - 0xa4, 0x15, 0x31, 0xf2, 0xbe, 0x5b, 0xf0, 0xfb, 0x45, 0xc4, 0xd3, 0x8b, 0x16, 0x4e, 0xae, 0x12, - 0x6d, 0x78, 0x90, 0x0a, 0x91, 0x0b, 0x48, 0x23, 0xa4, 0x3f, 0xc7, 0xb9, 0x07, 0x1b, 0x22, 0xe4, - 0x19, 0x38, 0x52, 0xe3, 0x2d, 0xaa, 0xa0, 0x08, 0x17, 0x45, 0xac, 0xed, 0x8a, 0x4a, 0x72, 0x5e, - 0x6a, 0x8f, 0xd4, 0x73, 0xae, 0x74, 0x7a, 0x91, 0xb2, 0xfb, 0xb8, 0x02, 0xc8, 0x35, 0xec, 0xcb, - 0x0d, 0x23, 0x83, 0x56, 0xb4, 0x06, 0x9d, 0x87, 0x07, 0x25, 0xd6, 0x74, 0x63, 0xb6, 0xf7, 0xa5, - 0x02, 0x8d, 0xf7, 0x72, 0xc4, 0xdf, 0x86, 0x63, 0xb9, 0xb1, 0x67, 0x99, 0x35, 0x95, 0x85, 0x35, - 0xe4, 0x18, 0xc0, 0x67, 0x11, 0xbb, 0x15, 0x33, 0x61, 0x12, 0x54, 0xd9, 0x1a, 0xfc, 0x51, 0x2c, - 0x4e, 0xb9, 0x96, 0xb1, 0xf2, 0xb9, 0xa6, 0x05, 0x22, 0x79, 0x09, 0x5b, 0x6c, 0xce, 0xc4, 0x6c, - 0x91, 0x68, 0x3f, 0x94, 0x58, 0xa2, 0x16, 0x8c, 0x74, 0x7e, 0xd1, 0xc8, 0xc3, 0xe5, 0x2b, 0x52, - 0xc7, 0x32, 0x2d, 0xcc, 0xc8, 0x7d, 0xc8, 0x43, 0xe4, 0x4f, 0x70, 0xe2, 0xc8, 0x88, 0x80, 0xe3, - 0xc4, 0x54, 0x69, 0xbe, 0x22, 0xc3, 0xb4, 0x5c, 0x6a, 0x07, 0x4e, 0x49, 0x6b, 0xf0, 0x4f, 0xc9, - 0xd9, 0x72, 0x55, 0x9a, 0x53, 0xbd, 0x1f, 0x16, 0x34, 0x97, 0xfa, 0xc9, 0x10, 0x9a, 0xcb, 0x71, - 0x46, 0x33, 0xd7, 0x4e, 0xba, 0x7c, 0x4a, 0xe8, 0x8a, 0x47, 0x06, 0xe0, 0x04, 0x38, 0x64, 0x68, - 0x76, 0x6b, 0x70, 0x50, 0xca, 0x28, 0x8d, 0x21, 0xcd, 0x99, 0xe4, 0x14, 0xda, 0xf3, 0xe0, 0xf5, - 0xc2, 0x65, 0xc1, 0x35, 0x5e, 0xf8, 0x56, 0xfe, 0x6c, 0x7e, 0xcc, 0x1e, 0xa1, 0x73, 0xe6, 0x4f, - 0x45, 0xc8, 0x8b, 0x34, 0xba, 0x96, 0x46, 0x9e, 0x42, 0x7d, 0x12, 0xc5, 0xef, 0x84, 0x36, 0xae, - 0xd3, 0xa9, 0x76, 0x5b, 0xf9, 0xc8, 0xe4, 0xd5, 0xf3, 0x99, 0xa6, 0x0b, 0xce, 0x99, 0xdd, 0xa8, - 0xee, 0xd8, 0x67, 0x76, 0xc3, 0xde, 0xa9, 0x3d, 0x7e, 0x01, 0x7b, 0x1b, 0x1e, 0x66, 0xb2, 0x0b, - 0xdb, 0xa1, 0x34, 0x19, 0xce, 0x15, 0x1f, 0xed, 0xfc, 0x46, 0xda, 0x00, 0x6a, 0xb5, 0xb6, 0x4e, - 0x1e, 0x7d, 0x3a, 0x9c, 0x08, 0x33, 0x8d, 0x6f, 0xd3, 0x3a, 0xfd, 0x40, 0xf8, 0x4a, 0x6a, 0x39, - 0x36, 0xfd, 0x40, 0xfa, 0x7d, 0x15, 0xf9, 0xfd, 0xac, 0xfa, 0xad, 0x83, 0x7f, 0x19, 0xc3, 0x9f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xa4, 0xb4, 0x28, 0x94, 0x06, 0x00, 0x00, + // 769 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x51, 0x6f, 0xda, 0x48, + 0x10, 0x3e, 0x83, 0x31, 0x30, 0x24, 0x1c, 0xd9, 0xe4, 0xee, 0x7c, 0xb9, 0xd3, 0x1d, 0x72, 0x74, + 0x11, 0x3a, 0xdd, 0x41, 0x05, 0x8a, 0xda, 0x3e, 0x36, 0x7d, 0x48, 0x1b, 0x35, 0x4d, 0xb4, 0x49, + 0xfb, 0xd0, 0x97, 0x68, 0x63, 0x16, 0x58, 0x15, 0x7b, 0xad, 0xdd, 0x35, 0x92, 0xf3, 0xfb, 0xaa, + 0xfe, 0x80, 0xfe, 0x89, 0xfe, 0x8b, 0xaa, 0xf2, 0xd8, 0x80, 0x4d, 0x50, 0xd4, 0x27, 0xbc, 0x33, + 0xdf, 0xec, 0x7c, 0xf3, 0xcd, 0xce, 0x00, 0xbf, 0x07, 0xd2, 0xbf, 0xf5, 0x65, 0x10, 0xc8, 0xf0, + 0x36, 0x94, 0x63, 0x2e, 0xc2, 0x89, 0xec, 0x47, 0x4a, 0x1a, 0x49, 0x20, 0x90, 0x7e, 0x3f, 0x73, + 0x1d, 0xfe, 0x56, 0x80, 0x65, 0x3f, 0x19, 0xe8, 0xf0, 0xaf, 0xb2, 0x23, 0x8a, 0x0d, 0x2f, 0xfa, + 0xbd, 0x4b, 0x38, 0xb8, 0xd4, 0x94, 0x4f, 0x85, 0x36, 0x8a, 0x19, 0x21, 0xc3, 0x6b, 0xc3, 0x4c, + 0xac, 0xc9, 0x53, 0x70, 0x34, 0x7e, 0xb9, 0x56, 0xd7, 0xea, 0xb5, 0x87, 0x7f, 0xf7, 0xd7, 0xd9, + 0xfa, 0x0f, 0x23, 0x38, 0xcd, 0xe1, 0xde, 0x97, 0x0a, 0x34, 0xaf, 0x94, 0xf4, 0xb9, 0xd6, 0x52, + 0x11, 0x02, 0x76, 0xc8, 0x02, 0x8e, 0x97, 0x34, 0x29, 0x7e, 0x93, 0x03, 0xa8, 0xf9, 0x52, 0x71, + 0xed, 0x56, 0xba, 0x56, 0x6f, 0x97, 0x66, 0x87, 0xd4, 0xaa, 0x23, 0xce, 0xc7, 0x6e, 0x15, 0xa1, + 0xd9, 0x81, 0x1c, 0x83, 0x6d, 0x92, 0x88, 0xbb, 0x36, 0x92, 0x20, 0x48, 0x62, 0x75, 0xfb, 0x4d, + 0x12, 0x71, 0x8a, 0x7e, 0x72, 0x0c, 0xed, 0x85, 0x50, 0x26, 0x66, 0x73, 0x71, 0x8f, 0xa4, 0xdc, + 0x5a, 0xd7, 0xea, 0x35, 0xe8, 0x86, 0x95, 0xfc, 0x07, 0x7b, 0x73, 0x39, 0x15, 0x3e, 0x9b, 0x47, + 0xcb, 0x5b, 0xb4, 0xeb, 0x20, 0x8f, 0x87, 0x8e, 0x14, 0x3d, 0x4b, 0x22, 0xae, 0x16, 0x42, 0x4b, + 0x15, 0x29, 0xae, 0x79, 0x68, 0xdc, 0x3a, 0x5e, 0xfc, 0xd0, 0x41, 0x3c, 0xd8, 0x09, 0x58, 0x18, + 0x4f, 0x98, 0x6f, 0x62, 0xc5, 0x95, 0xdb, 0xc0, 0x42, 0x4a, 0x36, 0x72, 0x02, 0x3b, 0x4c, 0xf9, + 0x33, 0x61, 0x38, 0x1a, 0xdc, 0x26, 0xd6, 0xb5, 0x87, 0x75, 0xbd, 0x28, 0x38, 0x68, 0x09, 0xe6, + 0xf5, 0xa1, 0x7d, 0x35, 0x4b, 0x74, 0x4a, 0xef, 0x82, 0x07, 0x52, 0x25, 0xe4, 0x4f, 0x68, 0x6a, + 0x71, 0xcf, 0x4f, 0x13, 0xc3, 0xb3, 0x16, 0xd9, 0x74, 0x6d, 0xf0, 0x3e, 0x5b, 0x50, 0x7f, 0x25, + 0xb5, 0x39, 0xbb, 0x7a, 0xb7, 0xb5, 0x05, 0xa5, 0xe8, 0xac, 0x0d, 0x6b, 0x43, 0xd6, 0xa0, 0x38, + 0x34, 0xd8, 0x0a, 0x6c, 0x50, 0x1c, 0x1a, 0xd2, 0x07, 0x12, 0x31, 0x65, 0x04, 0xb6, 0x7c, 0x15, + 0x6c, 0x63, 0xea, 0x2d, 0x1e, 0x32, 0x02, 0x60, 0x5a, 0x8b, 0x69, 0x18, 0xa4, 0xaa, 0xd5, 0xb0, + 0xd0, 0xfd, 0xac, 0xd0, 0x95, 0x19, 0x3b, 0x58, 0x80, 0x91, 0x36, 0x54, 0xc4, 0x18, 0x1b, 0xd2, + 0xa4, 0x15, 0x31, 0xf6, 0xbe, 0x5a, 0xf0, 0xf3, 0x65, 0xc4, 0xd3, 0x87, 0x16, 0x4e, 0xaf, 0x13, + 0x6d, 0x78, 0x90, 0x12, 0x91, 0x4b, 0x93, 0x46, 0x93, 0xfe, 0x18, 0xe7, 0x1a, 0x6c, 0xf1, 0x90, + 0x27, 0xe0, 0x48, 0x8d, 0xaf, 0xa8, 0x82, 0x24, 0x5c, 0x24, 0xb1, 0x71, 0x2b, 0x32, 0xc9, 0x71, + 0xa9, 0x3c, 0x52, 0x2f, 0xb8, 0xd2, 0xe9, 0x43, 0xca, 0xde, 0xe3, 0xda, 0x40, 0x6e, 0xe0, 0x40, + 0x6e, 0x19, 0x19, 0x94, 0xa2, 0x35, 0xec, 0x3e, 0x3e, 0x28, 0xb1, 0xa6, 0x5b, 0xa3, 0xbd, 0x4f, + 0x15, 0x68, 0xbc, 0x95, 0x63, 0xfe, 0x3a, 0x9c, 0xc8, 0xad, 0x3d, 0xcb, 0xa4, 0xa9, 0x2c, 0xa5, + 0x21, 0x27, 0x00, 0x3e, 0x8b, 0xd8, 0x9d, 0x98, 0x0b, 0x93, 0x20, 0xcb, 0xd6, 0xf0, 0x97, 0x62, + 0x72, 0xca, 0xb5, 0x8c, 0x95, 0xcf, 0x35, 0x2d, 0x00, 0xc9, 0x73, 0xd8, 0x61, 0x0b, 0x26, 0xe6, + 0xcb, 0x40, 0xfb, 0xb1, 0xc0, 0x12, 0xb4, 0x20, 0xa4, 0xf3, 0x83, 0x42, 0x1e, 0xad, 0xb6, 0x48, + 0x1d, 0xd3, 0xb4, 0x30, 0x22, 0xd7, 0x21, 0x77, 0x91, 0x5f, 0xc1, 0x89, 0x23, 0x23, 0x02, 0x8e, + 0x13, 0x53, 0xa5, 0xf9, 0x89, 0x8c, 0xd2, 0x74, 0xa9, 0x1c, 0x38, 0x25, 0xad, 0xe1, 0x1f, 0x25, + 0x65, 0xcb, 0x59, 0x69, 0x0e, 0xf5, 0xbe, 0x59, 0xd0, 0x5c, 0xf1, 0x27, 0x23, 0x68, 0xae, 0xc6, + 0x19, 0xc5, 0xdc, 0xa8, 0x74, 0xb5, 0x4a, 0xe8, 0x1a, 0x47, 0x86, 0xe0, 0x04, 0x38, 0x64, 0x28, + 0x76, 0x6b, 0x78, 0x58, 0x8a, 0x28, 0x8d, 0x21, 0xcd, 0x91, 0xe4, 0x0c, 0xda, 0x8b, 0xe0, 0xe5, + 0x52, 0x65, 0xc1, 0x35, 0x3e, 0xf8, 0x56, 0xbe, 0x36, 0xdf, 0x67, 0x4b, 0xe8, 0x82, 0xf9, 0x33, + 0x11, 0xf2, 0x22, 0x8c, 0x6e, 0x84, 0x91, 0xff, 0xa1, 0x3e, 0x8d, 0xe2, 0x37, 0x42, 0xa7, 0x8b, + 0xa6, 0xda, 0x6b, 0xe5, 0x23, 0x93, 0x67, 0xcf, 0x67, 0x9a, 0x2e, 0x31, 0xe7, 0x76, 0xa3, 0xda, + 0xb1, 0xcf, 0xed, 0x86, 0xdd, 0xa9, 0x9d, 0xdb, 0x0d, 0xa7, 0x53, 0xff, 0xf7, 0x19, 0xec, 0x6f, + 0x59, 0xcf, 0x64, 0x0f, 0x76, 0x43, 0x69, 0x32, 0x3b, 0x57, 0x7c, 0xdc, 0xf9, 0x89, 0xb4, 0x01, + 0xd4, 0xfa, 0x6c, 0x9d, 0xfe, 0xf3, 0xe1, 0x68, 0x2a, 0xcc, 0x2c, 0xbe, 0x4b, 0xb3, 0x0d, 0x02, + 0xe1, 0x2b, 0xa9, 0xe5, 0xc4, 0x0c, 0x02, 0xe9, 0x0f, 0x54, 0xe4, 0x0f, 0x32, 0x0e, 0x77, 0x0e, + 0xfe, 0x71, 0x8c, 0xbe, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xad, 0x69, 0xd4, 0x9a, 0x06, 0x00, + 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index 838b69d5..21241d23 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -63,8 +63,9 @@ message NodeInfo { message Resources { reserved 3; reserved 4; + reserved 6; Processor processor = 1; PhysicalMemory memory = 2; VirtualMachineCapabilities vmCapabilities = 5; - repeated HostGPU gpuList = 6; + repeated HostGPU gpuList = 7; } \ No newline at end of file From 6d5e25bc2a3bef50a5208f35d8fb051b51114fda Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Thu, 2 May 2024 10:30:42 -0700 Subject: [PATCH 11/13] Rename Gpu to VirtualMachineGPU --- .../moc_cloudagent_virtualmachine.pb.go | 224 +++++++------- .../moc_cloudagent_virtualmachine.proto | 2 +- rpc/common/moc_common_computecommon.pb.go | 276 +++++++++--------- rpc/common/moc_common_computecommon.proto | 7 +- rpc/common/moc_common_nodeinfo.pb.go | 105 ++++--- rpc/common/moc_common_nodeinfo.proto | 2 +- .../moc_nodeagent_virtualmachine.pb.go | 222 +++++++------- .../moc_nodeagent_virtualmachine.proto | 2 +- 8 files changed, 419 insertions(+), 421 deletions(-) diff --git a/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go b/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go index 8369cfa4..9e90d755 100644 --- a/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go +++ b/rpc/cloudagent/compute/moc_cloudagent_virtualmachine.pb.go @@ -697,7 +697,7 @@ type HardwareConfiguration struct { VMSize common.VirtualMachineSizeType `protobuf:"varint,1,opt,name=VMSize,proto3,enum=moc.VirtualMachineSizeType" json:"VMSize,omitempty"` CustomSize *common.VirtualMachineCustomSize `protobuf:"bytes,2,opt,name=customSize,proto3" json:"customSize,omitempty"` DynamicMemoryConfiguration *common.DynamicMemoryConfiguration `protobuf:"bytes,3,opt,name=dynamicMemoryConfiguration,proto3" json:"dynamicMemoryConfiguration,omitempty"` - GpuList []*common.Gpu `protobuf:"bytes,4,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + VirtualMachineGPUs []*common.VirtualMachineGPU `protobuf:"bytes,4,rep,name=virtualMachineGPUs,proto3" json:"virtualMachineGPUs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -749,9 +749,9 @@ func (m *HardwareConfiguration) GetDynamicMemoryConfiguration() *common.DynamicM return nil } -func (m *HardwareConfiguration) GetGpuList() []*common.Gpu { +func (m *HardwareConfiguration) GetVirtualMachineGPUs() []*common.VirtualMachineGPU { if m != nil { - return m.GpuList + return m.VirtualMachineGPUs } return nil } @@ -1339,117 +1339,117 @@ func init() { } var fileDescriptor_a65ab853cd24c92b = []byte{ - // 1757 bytes of a gzipped FileDescriptorProto + // 1760 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x4f, 0x6f, 0xe3, 0xc6, 0x15, 0x8f, 0x64, 0x5b, 0xb6, 0x9e, 0xff, 0xac, 0x3d, 0x6b, 0x7b, 0x59, 0xd7, 0xeb, 0x18, 0xdc, - 0x20, 0x70, 0xb6, 0x89, 0x94, 0x3a, 0xdb, 0x6d, 0x50, 0xa4, 0x08, 0x64, 0x4b, 0x59, 0x1b, 0xb1, - 0x65, 0x75, 0xa4, 0xdd, 0x05, 0x8c, 0x02, 0x0e, 0x4d, 0x8e, 0xe5, 0x81, 0x45, 0x0e, 0x3b, 0x33, - 0xb4, 0xa2, 0xa2, 0x97, 0xe6, 0xd4, 0xa2, 0x87, 0xf6, 0x1b, 0xf4, 0x4b, 0xb4, 0xbd, 0xf5, 0xd0, - 0x7b, 0x3f, 0x47, 0xaf, 0xfd, 0x0a, 0xc5, 0x0c, 0x49, 0x89, 0xa4, 0x48, 0xc1, 0x0b, 0x34, 0x87, - 0x9c, 0x24, 0xbe, 0xf7, 0x7e, 0xbf, 0x79, 0xf3, 0xe6, 0xfd, 0x99, 0x81, 0x67, 0x2e, 0xb3, 0xaf, - 0xec, 0x01, 0x0b, 0x1c, 0xab, 0x4f, 0x3c, 0x79, 0x75, 0x4f, 0xb9, 0x0c, 0xac, 0x81, 0x6b, 0xd9, - 0xb7, 0xd4, 0x23, 0x35, 0x9f, 0x33, 0xc9, 0xd0, 0xb6, 0xcb, 0xec, 0xda, 0xc4, 0xa8, 0x66, 0x33, - 0xd7, 0x0f, 0x24, 0xd9, 0xd9, 0xeb, 0x33, 0xd6, 0x1f, 0x90, 0xba, 0xb6, 0xba, 0x0e, 0x6e, 0xea, - 0x43, 0x6e, 0xf9, 0x3e, 0xe1, 0x22, 0xc4, 0xed, 0x3c, 0xd1, 0xe4, 0xcc, 0x75, 0x99, 0x17, 0xfd, - 0x44, 0x8a, 0xbd, 0xb4, 0x42, 0x91, 0x25, 0xf5, 0xe6, 0x5f, 0x4b, 0xb0, 0xf5, 0x26, 0xf4, 0xe4, - 0x3c, 0xf4, 0x04, 0x93, 0xdf, 0x04, 0x44, 0x48, 0xd4, 0x81, 0x47, 0x69, 0x85, 0x30, 0x4a, 0xfb, - 0x73, 0x07, 0xcb, 0x87, 0x1f, 0xd6, 0xf2, 0x9d, 0xac, 0x65, 0x78, 0xb2, 0x70, 0xf4, 0x02, 0x56, - 0x2f, 0x7c, 0xc2, 0x2d, 0x49, 0x99, 0xd7, 0x1b, 0xf9, 0xc4, 0x28, 0xef, 0x97, 0x0e, 0xd6, 0x0e, - 0xd7, 0x34, 0xdf, 0x58, 0x83, 0xd3, 0x46, 0xe6, 0xdf, 0x4a, 0xb0, 0x9d, 0xf5, 0x50, 0xf8, 0xcc, - 0x13, 0xe4, 0x7b, 0x70, 0xf1, 0x10, 0x2a, 0x98, 0x88, 0x60, 0x20, 0xb5, 0x6f, 0xcb, 0x87, 0x3b, - 0xb5, 0x30, 0xf0, 0xb5, 0x38, 0xf0, 0xb5, 0x23, 0xc6, 0x06, 0x6f, 0xac, 0x41, 0x40, 0x70, 0x64, - 0x89, 0x36, 0x61, 0xa1, 0xc5, 0x39, 0xe3, 0xc6, 0xdc, 0x7e, 0xe9, 0xa0, 0x8a, 0xc3, 0x0f, 0xb3, - 0x06, 0x2b, 0xdd, 0xee, 0x49, 0x27, 0xb8, 0x1e, 0x50, 0xfb, 0x6b, 0x32, 0x42, 0x7b, 0xb0, 0x78, - 0x47, 0x46, 0x8e, 0x25, 0x2d, 0xa3, 0xa4, 0xec, 0x8e, 0xe6, 0xff, 0xf0, 0x77, 0xa3, 0x84, 0x63, - 0xa1, 0x69, 0xc2, 0x7c, 0x93, 0x8a, 0x3b, 0xb4, 0x03, 0x4b, 0x0e, 0x15, 0x77, 0x9e, 0xe5, 0x92, - 0xd0, 0x10, 0x8f, 0xbf, 0xcd, 0xff, 0x94, 0x60, 0xb3, 0x2b, 0x19, 0xb7, 0xfa, 0xe4, 0x98, 0x79, - 0x37, 0xb4, 0x1f, 0x84, 0x71, 0x42, 0x2f, 0xa0, 0xc2, 0x84, 0x32, 0xd3, 0x90, 0xe5, 0xc3, 0xdd, - 0xa2, 0xfd, 0xab, 0x25, 0x70, 0x64, 0x8b, 0x7e, 0x01, 0x55, 0xb5, 0xb4, 0xfa, 0x2f, 0x8c, 0xb2, - 0x0e, 0xdc, 0x6c, 0xe0, 0xc4, 0x1c, 0x7d, 0x08, 0x6b, 0xd4, 0xb5, 0xfa, 0x04, 0x93, 0x1b, 0xc2, - 0x89, 0x67, 0x93, 0x68, 0xf7, 0x19, 0x29, 0x7a, 0x01, 0x5b, 0xf7, 0x6e, 0xe8, 0xec, 0x31, 0xf3, - 0xa4, 0x45, 0x3d, 0xc2, 0xdb, 0x6a, 0x6f, 0xf3, 0xda, 0x3c, 0x5f, 0x69, 0x7e, 0x05, 0xeb, 0x6d, - 0x22, 0x87, 0x8c, 0xdf, 0x9d, 0x7a, 0x92, 0xf0, 0x1b, 0xcb, 0x26, 0xe8, 0x10, 0x36, 0xbd, 0x8c, - 0xac, 0x3d, 0x09, 0x52, 0xae, 0xce, 0xfc, 0x06, 0x36, 0x23, 0x9e, 0x74, 0xbc, 0x4e, 0x00, 0x68, - 0x6c, 0x18, 0xe7, 0xcc, 0x41, 0xd1, 0xd6, 0xb3, 0x9e, 0xe0, 0x04, 0xd6, 0xfc, 0xae, 0x04, 0x1b, - 0xaf, 0x05, 0xe1, 0x69, 0xfe, 0x7d, 0x58, 0x0a, 0x04, 0xe1, 0x93, 0x43, 0x8c, 0x4e, 0x7b, 0x2c, - 0x55, 0x16, 0xbe, 0x25, 0xc4, 0x90, 0x71, 0x47, 0xa7, 0xda, 0xd8, 0x22, 0x96, 0xa2, 0x8f, 0x42, - 0x0e, 0xa9, 0x0a, 0x65, 0x4e, 0x17, 0xca, 0xaa, 0xf6, 0x50, 0xad, 0xa6, 0x0a, 0x03, 0x8f, 0xd5, - 0x2a, 0x5c, 0xb8, 0xd9, 0x49, 0xbb, 0xb0, 0x07, 0xe0, 0x50, 0x61, 0x5d, 0x0f, 0x08, 0x6e, 0x76, - 0xb4, 0x13, 0x4b, 0x38, 0x21, 0x41, 0x08, 0xe6, 0x7d, 0xc6, 0xc3, 0x3c, 0x5f, 0xc5, 0xfa, 0xbf, - 0x79, 0x09, 0xe8, 0x8c, 0x7a, 0xc1, 0xb7, 0x69, 0xa6, 0x26, 0x3c, 0x8d, 0x70, 0x9d, 0xc8, 0xb7, - 0x46, 0x20, 0x6f, 0x89, 0x27, 0xa9, 0xad, 0x0d, 0x22, 0xf2, 0xd9, 0x46, 0xe6, 0x1f, 0xcb, 0xb0, - 0xf9, 0x96, 0x7a, 0x0e, 0x1b, 0x8a, 0x34, 0xfd, 0x4b, 0xd8, 0x26, 0x9e, 0x02, 0x36, 0x02, 0xc9, - 0x5c, 0x4b, 0x52, 0xfb, 0xb5, 0xef, 0x58, 0x52, 0x9f, 0x8b, 0xe2, 0x2d, 0xd0, 0xaa, 0x42, 0x91, - 0xd4, 0x25, 0x97, 0xcc, 0x0b, 0x1b, 0x49, 0x15, 0x8f, 0xbf, 0x51, 0x6f, 0x3a, 0x20, 0x3a, 0x86, - 0x33, 0x4e, 0x39, 0x6b, 0x8f, 0xa7, 0x43, 0xfa, 0x0a, 0xd0, 0x5b, 0xea, 0xe1, 0xf3, 0x34, 0xef, - 0xbc, 0xe6, 0x7d, 0xa2, 0x79, 0xa7, 0xd5, 0x38, 0x07, 0x62, 0xfe, 0x7b, 0x01, 0x76, 0xa3, 0x26, - 0xe7, 0xf5, 0xbb, 0x23, 0x21, 0x89, 0x9b, 0x5e, 0xc9, 0x84, 0x95, 0xc8, 0x2f, 0x9e, 0xc8, 0xf1, - 0x94, 0x0c, 0x5d, 0xc0, 0xaa, 0xe5, 0xb8, 0xd4, 0xa3, 0x42, 0x72, 0x4b, 0x32, 0x1e, 0x75, 0xac, - 0x8f, 0x8a, 0x36, 0x38, 0x95, 0xa5, 0x38, 0x8d, 0x47, 0x5f, 0xc2, 0x82, 0xca, 0x28, 0x61, 0xcc, - 0xe9, 0x7a, 0x78, 0x07, 0xa2, 0x10, 0x87, 0x3e, 0x00, 0xb0, 0x03, 0x21, 0x99, 0xdb, 0x54, 0x5d, - 0x6e, 0x3e, 0x91, 0xd5, 0x09, 0x39, 0x6a, 0x02, 0xf8, 0xba, 0x2b, 0xde, 0x91, 0x91, 0x30, 0x16, - 0xf4, 0x5a, 0x1f, 0x14, 0xad, 0x95, 0x6c, 0xa1, 0x38, 0x81, 0x43, 0x9f, 0xaa, 0x8e, 0xa7, 0x6b, - 0xa3, 0xa2, 0x6b, 0xc3, 0x48, 0x0e, 0x91, 0x38, 0xa8, 0xba, 0x4c, 0x22, 0x3b, 0xf4, 0x2b, 0xd8, - 0x60, 0xe2, 0x88, 0x31, 0xa9, 0xf6, 0xeb, 0xb7, 0xbc, 0x3e, 0xf5, 0x88, 0xb1, 0xa8, 0xc1, 0xcf, - 0xf2, 0xc0, 0x19, 0x53, 0x3c, 0x8d, 0x46, 0x97, 0x80, 0x06, 0x53, 0xf5, 0x62, 0x2c, 0xe9, 0x73, - 0x78, 0x5e, 0xb4, 0xa5, 0xe9, 0x0a, 0xc3, 0x39, 0x2c, 0xe8, 0x1b, 0xd8, 0x1c, 0xe6, 0x94, 0x8b, - 0x51, 0xd5, 0xec, 0x1f, 0x17, 0xb1, 0xe7, 0x95, 0x18, 0xce, 0x65, 0x52, 0xe9, 0xec, 0x73, 0xf6, - 0xed, 0x28, 0xcd, 0x0f, 0x89, 0x74, 0xee, 0x4c, 0xa9, 0x71, 0x0e, 0xc4, 0xfc, 0x4b, 0x19, 0xb6, - 0x4e, 0x2c, 0xee, 0x0c, 0x2d, 0x9e, 0x99, 0x4b, 0x9f, 0x41, 0xe5, 0xcd, 0x79, 0x97, 0xfe, 0x36, - 0xcc, 0xe0, 0xb5, 0xc3, 0x1f, 0x6b, 0xda, 0xf4, 0xd0, 0x55, 0xea, 0xf0, 0xa0, 0x42, 0x53, 0xf4, - 0xcb, 0x38, 0x8d, 0x34, 0x30, 0xcc, 0xea, 0xa7, 0x39, 0xc0, 0xe3, 0xb1, 0x11, 0x4e, 0x00, 0xd0, - 0x15, 0xec, 0x38, 0x23, 0xcf, 0x72, 0xa9, 0x7d, 0x4e, 0x5c, 0xc6, 0x47, 0x79, 0x5d, 0xe0, 0x7d, - 0x4d, 0xd7, 0x2c, 0x34, 0xc3, 0x33, 0x28, 0x90, 0x09, 0x8b, 0x7d, 0x3f, 0x38, 0xa3, 0x42, 0x1a, - 0xf3, 0x3a, 0x7b, 0x97, 0x34, 0xdb, 0x2b, 0x3f, 0xc0, 0xb1, 0xc2, 0xfc, 0x02, 0x56, 0x5e, 0x93, - 0x1b, 0xda, 0x25, 0x52, 0x25, 0x94, 0x40, 0x1f, 0xc3, 0x86, 0x20, 0x76, 0xc0, 0x89, 0x4a, 0xa1, - 0x96, 0x6e, 0x68, 0x4e, 0xd4, 0xdf, 0xa6, 0x15, 0xe6, 0x3f, 0x4a, 0xb0, 0xd5, 0x55, 0x52, 0x2a, - 0x33, 0x6b, 0xef, 0x42, 0x35, 0x6c, 0x87, 0xbd, 0xce, 0x79, 0x84, 0x9f, 0x08, 0xd0, 0x09, 0xac, - 0x04, 0x89, 0x55, 0xa3, 0xd8, 0x15, 0x16, 0x57, 0xd2, 0x43, 0x9c, 0x42, 0xa2, 0x9f, 0xc1, 0x8a, - 0x88, 0x1c, 0xe8, 0x4d, 0x06, 0xd0, 0x86, 0x66, 0xea, 0x26, 0x14, 0x38, 0x65, 0x66, 0x9e, 0x81, - 0xd1, 0xb8, 0xb7, 0xe8, 0xc0, 0xba, 0xa6, 0x03, 0x2a, 0x47, 0x5d, 0x22, 0x27, 0x37, 0x81, 0x5d, - 0xa8, 0xf6, 0x39, 0x0b, 0xfc, 0x44, 0x43, 0x9b, 0x08, 0xd4, 0x38, 0xd2, 0xd3, 0x32, 0xec, 0xe4, - 0xfa, 0xbf, 0xf9, 0xa7, 0x25, 0x58, 0x4b, 0x1f, 0xf9, 0xd8, 0xac, 0x34, 0x31, 0x43, 0x6b, 0x50, - 0xa6, 0xd1, 0x10, 0xc5, 0x65, 0xea, 0xa0, 0xaf, 0x60, 0x51, 0x84, 0x97, 0xa4, 0xe8, 0xb4, 0x0b, - 0x8b, 0x25, 0xef, 0x2e, 0x85, 0x63, 0x30, 0x6a, 0x42, 0x99, 0x89, 0xa8, 0xbd, 0xbf, 0x28, 0xa2, - 0x98, 0xd5, 0xc6, 0x71, 0x99, 0x09, 0xe5, 0x4d, 0x74, 0x35, 0x31, 0x16, 0x66, 0x7b, 0x93, 0x77, - 0x53, 0xc1, 0x31, 0x58, 0x8d, 0x3b, 0x8f, 0x39, 0xe1, 0x95, 0xa7, 0x12, 0x8e, 0xbb, 0xf8, 0x3b, - 0x1d, 0xda, 0xc5, 0x6c, 0x68, 0x9f, 0x41, 0x45, 0x48, 0x4b, 0x06, 0x22, 0xea, 0x4c, 0xcb, 0xe1, - 0x29, 0x6a, 0x11, 0x8e, 0x54, 0x6a, 0xe2, 0x0c, 0x58, 0x38, 0xaa, 0x35, 0x4b, 0x35, 0x9c, 0x38, - 0x49, 0x19, 0xfa, 0x1c, 0x9e, 0x44, 0x33, 0xfe, 0x84, 0xf6, 0x6f, 0x93, 0x07, 0xad, 0xbb, 0xc6, - 0x12, 0x2e, 0x52, 0xa3, 0x97, 0x50, 0xb9, 0xd7, 0xdd, 0xd8, 0x58, 0xd6, 0x89, 0xb4, 0x57, 0x78, - 0x3f, 0x3f, 0x0f, 0x5b, 0x41, 0x68, 0x8d, 0x4e, 0x61, 0xe9, 0x36, 0x6a, 0x2c, 0xc6, 0x8a, 0x76, - 0xfe, 0x93, 0x22, 0x64, 0x6e, 0x03, 0xc2, 0x63, 0xb8, 0xaa, 0x40, 0x6b, 0x30, 0x60, 0x43, 0xe2, - 0x5c, 0x0c, 0xd5, 0x35, 0x93, 0x39, 0x44, 0x18, 0xab, 0xfb, 0x73, 0x07, 0x55, 0x3c, 0xad, 0x40, - 0x75, 0x00, 0x9f, 0x0d, 0x09, 0x57, 0x51, 0x22, 0xc6, 0x9a, 0x76, 0xfa, 0x51, 0xd8, 0x13, 0xc7, - 0x62, 0x9c, 0x30, 0x51, 0x9e, 0xc6, 0x95, 0x60, 0x3c, 0x9a, 0xed, 0x69, 0x6e, 0x65, 0xe3, 0x31, - 0x1c, 0x3d, 0x85, 0x79, 0x69, 0xf5, 0x85, 0xb1, 0xae, 0x69, 0xaa, 0x9a, 0xa6, 0x67, 0xf5, 0x05, - 0xd6, 0x62, 0xf4, 0x05, 0x40, 0x5f, 0x3d, 0xd0, 0x1a, 0x8a, 0xd4, 0xd8, 0x48, 0xdc, 0xf7, 0x5f, - 0x8d, 0xc5, 0x69, 0xea, 0x84, 0x3d, 0xfa, 0x35, 0x6c, 0x4f, 0xbe, 0x4e, 0x3d, 0x21, 0x2d, 0xcf, - 0x26, 0x6f, 0x28, 0x19, 0x1a, 0x28, 0xd1, 0x2c, 0xd2, 0x55, 0x37, 0x65, 0x8b, 0x0b, 0x38, 0xd0, - 0x25, 0x3c, 0xb2, 0xd2, 0xf5, 0x6f, 0x3c, 0xd6, 0xb4, 0x9f, 0x16, 0x05, 0xa3, 0xa8, 0x5d, 0xe0, - 0x2c, 0x91, 0xf9, 0xe7, 0x32, 0xec, 0xa5, 0xfd, 0x9a, 0x3c, 0x19, 0xbf, 0xb7, 0x27, 0xeb, 0x5b, - 0xd8, 0xbe, 0x38, 0xea, 0x5e, 0x9c, 0xb5, 0x7a, 0xad, 0xab, 0xbc, 0xb7, 0xeb, 0x6e, 0x4e, 0xb8, - 0xc6, 0x76, 0x47, 0x65, 0xa3, 0x84, 0xb7, 0x62, 0x7c, 0x0a, 0x8e, 0x8e, 0xb2, 0x6f, 0xe1, 0xb9, - 0x04, 0x5f, 0x87, 0xb3, 0x7b, 0xea, 0x10, 0xde, 0xb0, 0x6d, 0x22, 0x44, 0xe1, 0xcb, 0xf8, 0x9f, - 0x25, 0x78, 0xbf, 0x30, 0x22, 0x3f, 0x80, 0x27, 0xf2, 0x7f, 0xcb, 0x59, 0xff, 0x71, 0xe0, 0x1d, - 0x33, 0xd7, 0xb5, 0x3c, 0x27, 0x3e, 0xd2, 0x76, 0x76, 0x04, 0x44, 0x2f, 0xdc, 0x87, 0xba, 0x9f, - 0x1d, 0x20, 0x0d, 0xa8, 0x74, 0x59, 0xc0, 0x6d, 0x92, 0xba, 0x2e, 0x17, 0x79, 0xd1, 0xb5, 0x39, - 0xf5, 0x65, 0x08, 0xc0, 0x11, 0x10, 0x51, 0xf8, 0xd1, 0xc4, 0xe2, 0xd4, 0xf3, 0x03, 0xd9, 0xb1, - 0xb8, 0xe5, 0x12, 0x39, 0xb9, 0x3b, 0xff, 0x64, 0x26, 0x6b, 0x1a, 0x83, 0x8b, 0xd9, 0x90, 0x09, - 0x55, 0x1c, 0x78, 0x0d, 0xa1, 0xae, 0xdc, 0xa9, 0x0b, 0xf5, 0x44, 0x8c, 0x9e, 0xc3, 0xaa, 0xfe, - 0x88, 0xdf, 0x5d, 0x7a, 0xcc, 0xc4, 0x76, 0x69, 0x95, 0xf9, 0xaf, 0x12, 0xec, 0x17, 0x47, 0x3c, - 0x4a, 0x99, 0xff, 0x77, 0xc8, 0xcf, 0x61, 0x25, 0xd5, 0x68, 0x1e, 0x12, 0xf8, 0x54, 0xb7, 0x49, - 0xc1, 0x9f, 0x7f, 0xa9, 0xee, 0x94, 0xba, 0x86, 0x00, 0x2a, 0xbd, 0x56, 0xbb, 0xd1, 0xee, 0xad, - 0xbf, 0x87, 0xd6, 0x61, 0xe5, 0xec, 0xa2, 0xd1, 0x3c, 0x6a, 0x9c, 0x35, 0xda, 0xc7, 0x2d, 0xbc, - 0x5e, 0x42, 0x4f, 0xe0, 0x71, 0xb7, 0xd7, 0x38, 0xfe, 0xba, 0xd5, 0x3c, 0xbe, 0x68, 0xf7, 0xf0, - 0xc5, 0x59, 0xe7, 0xac, 0xd1, 0x6e, 0xad, 0x97, 0x0f, 0xbf, 0x9b, 0x83, 0xc7, 0x39, 0x0d, 0x0e, - 0x51, 0xa8, 0x9c, 0x7a, 0xf7, 0xec, 0x8e, 0xa0, 0x4f, 0x1e, 0xb8, 0xd3, 0x30, 0x47, 0x77, 0x6a, - 0x0f, 0x35, 0x0f, 0x03, 0x6c, 0xbe, 0x87, 0x7e, 0x07, 0x8b, 0x61, 0xa9, 0x12, 0xf4, 0xf2, 0x61, - 0xe0, 0x6c, 0xaf, 0xdb, 0xf9, 0xf9, 0x3b, 0xe3, 0xc6, 0xab, 0xff, 0xbe, 0x04, 0x30, 0x09, 0x35, - 0x7a, 0x20, 0xd3, 0x54, 0x6d, 0xee, 0x7c, 0xfe, 0xee, 0xc0, 0xd8, 0x87, 0xa3, 0x9f, 0x5e, 0xd6, - 0xfb, 0x54, 0xde, 0x06, 0xd7, 0x0a, 0x54, 0x77, 0xa9, 0xcd, 0x99, 0x60, 0x37, 0xb2, 0xee, 0x32, - 0xbb, 0xce, 0x7d, 0xbb, 0x3e, 0x61, 0xad, 0x47, 0xac, 0xd7, 0x15, 0xdd, 0x60, 0x3e, 0xfb, 0x5f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x7a, 0xbf, 0x84, 0x49, 0x15, 0x00, 0x00, + 0x20, 0x70, 0xb6, 0x89, 0x94, 0x3a, 0xdb, 0x6d, 0x50, 0xa4, 0x08, 0x64, 0x4b, 0xbb, 0x36, 0x62, + 0xcb, 0xea, 0x48, 0xde, 0x05, 0x8c, 0x02, 0xce, 0x98, 0x1a, 0xcb, 0x03, 0x8b, 0x1c, 0x76, 0x66, + 0x68, 0x45, 0x45, 0x2f, 0xcd, 0xa9, 0x45, 0x0f, 0xfd, 0x08, 0xfd, 0x12, 0x69, 0x6f, 0x3d, 0xf4, + 0xde, 0xcf, 0xd1, 0x6b, 0xbf, 0x42, 0x31, 0x43, 0x4a, 0x22, 0x29, 0xd2, 0xf0, 0x02, 0xdd, 0x43, + 0x4e, 0x12, 0xdf, 0xfb, 0xfd, 0x7e, 0x7c, 0x7c, 0xf3, 0xde, 0x9b, 0x19, 0x78, 0xe6, 0x72, 0xe7, + 0xd2, 0xe9, 0xf3, 0xa0, 0x4b, 0x7a, 0xd4, 0x53, 0x97, 0x77, 0x4c, 0xa8, 0x80, 0xf4, 0x5d, 0xe2, + 0xdc, 0x30, 0x8f, 0x56, 0x7c, 0xc1, 0x15, 0x47, 0x9b, 0x2e, 0x77, 0x2a, 0x13, 0x50, 0xc5, 0xe1, + 0xae, 0x1f, 0x28, 0xba, 0xb5, 0xd3, 0xe3, 0xbc, 0xd7, 0xa7, 0x55, 0x83, 0xba, 0x0a, 0xae, 0xab, + 0x03, 0x41, 0x7c, 0x9f, 0x0a, 0x19, 0xf2, 0xb6, 0x9e, 0x18, 0x71, 0xee, 0xba, 0xdc, 0x8b, 0x7e, + 0x22, 0xc7, 0x4e, 0xd2, 0xa1, 0xc5, 0xe2, 0x7e, 0xfb, 0x6f, 0x05, 0xd8, 0x78, 0x13, 0x46, 0x72, + 0x1a, 0x46, 0x82, 0xe9, 0xef, 0x02, 0x2a, 0x15, 0x6a, 0xc1, 0xa3, 0xa4, 0x43, 0x5a, 0x85, 0xdd, + 0x99, 0xbd, 0xc5, 0xfd, 0x8f, 0x2b, 0xd9, 0x41, 0x56, 0x52, 0x3a, 0x69, 0x3a, 0x7a, 0x01, 0xcb, + 0x67, 0x3e, 0x15, 0x44, 0x31, 0xee, 0x75, 0x86, 0x3e, 0xb5, 0x8a, 0xbb, 0x85, 0xbd, 0x95, 0xfd, + 0x15, 0xa3, 0x37, 0xf6, 0xe0, 0x24, 0xc8, 0xfe, 0xa1, 0x00, 0x9b, 0xe9, 0x08, 0xa5, 0xcf, 0x3d, + 0x49, 0xdf, 0x43, 0x88, 0xfb, 0x50, 0xc2, 0x54, 0x06, 0x7d, 0x65, 0x62, 0x5b, 0xdc, 0xdf, 0xaa, + 0x84, 0x89, 0xaf, 0x8c, 0x12, 0x5f, 0x39, 0xe0, 0xbc, 0xff, 0x86, 0xf4, 0x03, 0x8a, 0x23, 0x24, + 0x5a, 0x87, 0xb9, 0x86, 0x10, 0x5c, 0x58, 0x33, 0xbb, 0x85, 0xbd, 0x32, 0x0e, 0x1f, 0xec, 0x0a, + 0x2c, 0xb5, 0xdb, 0x47, 0xad, 0xe0, 0xaa, 0xcf, 0x9c, 0x6f, 0xe8, 0x10, 0xed, 0xc0, 0xfc, 0x2d, + 0x1d, 0x76, 0x89, 0x22, 0x56, 0x41, 0xe3, 0x0e, 0x66, 0xff, 0xf4, 0x77, 0xab, 0x80, 0x47, 0x46, + 0xdb, 0x86, 0xd9, 0x3a, 0x93, 0xb7, 0x68, 0x0b, 0x16, 0xba, 0x4c, 0xde, 0x7a, 0xc4, 0xa5, 0x21, + 0x10, 0x8f, 0x9f, 0xed, 0xff, 0x14, 0x60, 0xbd, 0xad, 0xb8, 0x20, 0x3d, 0x7a, 0xc8, 0xbd, 0x6b, + 0xd6, 0x0b, 0xc2, 0x3c, 0xa1, 0x17, 0x50, 0xe2, 0x52, 0xc3, 0x0c, 0x65, 0x71, 0x7f, 0x3b, 0xef, + 0xfb, 0xf5, 0x2b, 0x70, 0x84, 0x45, 0xbf, 0x82, 0xb2, 0x7e, 0xb5, 0xfe, 0x2f, 0xad, 0xa2, 0x49, + 0xdc, 0xfd, 0xc4, 0x09, 0x1c, 0x7d, 0x0c, 0x2b, 0xcc, 0x25, 0x3d, 0x8a, 0xe9, 0x35, 0x15, 0xd4, + 0x73, 0x68, 0xf4, 0xf5, 0x29, 0x2b, 0x7a, 0x01, 0x1b, 0x77, 0x6e, 0x18, 0xec, 0x21, 0xf7, 0x14, + 0x61, 0x1e, 0x15, 0x4d, 0xfd, 0x6d, 0xb3, 0x06, 0x9e, 0xed, 0xb4, 0x5f, 0xc1, 0x6a, 0x93, 0xaa, + 0x01, 0x17, 0xb7, 0xc7, 0x9e, 0xa2, 0xe2, 0x9a, 0x38, 0x14, 0xed, 0xc3, 0xba, 0x97, 0xb2, 0x35, + 0x27, 0x49, 0xca, 0xf4, 0xd9, 0xdf, 0xc2, 0x7a, 0xa4, 0x93, 0xcc, 0xd7, 0x11, 0x00, 0x1b, 0x01, + 0x47, 0x35, 0xb3, 0x97, 0xf7, 0xe9, 0xe9, 0x48, 0x70, 0x8c, 0x6b, 0x7f, 0x5f, 0x80, 0xb5, 0x73, + 0x49, 0x45, 0x52, 0x7f, 0x17, 0x16, 0x02, 0x49, 0xc5, 0x64, 0x11, 0xa3, 0xd5, 0x1e, 0x5b, 0x35, + 0xc2, 0x27, 0x52, 0x0e, 0xb8, 0xe8, 0x9a, 0x52, 0x1b, 0x23, 0x46, 0x56, 0xf4, 0x49, 0xa8, 0xa1, + 0x74, 0xa3, 0xcc, 0x98, 0x46, 0x59, 0x36, 0x11, 0xea, 0xb7, 0xe9, 0xc6, 0xc0, 0x63, 0xb7, 0x4e, + 0x17, 0xae, 0xb7, 0x92, 0x21, 0xec, 0x00, 0x74, 0x99, 0x24, 0x57, 0x7d, 0x8a, 0xeb, 0x2d, 0x13, + 0xc4, 0x02, 0x8e, 0x59, 0x10, 0x82, 0x59, 0x9f, 0x8b, 0xb0, 0xce, 0x97, 0xb1, 0xf9, 0x6f, 0x5f, + 0x00, 0x3a, 0x61, 0x5e, 0xf0, 0x5d, 0x52, 0xa9, 0x0e, 0x4f, 0x23, 0x5e, 0x2b, 0x8a, 0xad, 0x16, + 0xa8, 0x1b, 0xea, 0x29, 0xe6, 0x18, 0x40, 0x24, 0x7e, 0x3f, 0xc8, 0xfe, 0x73, 0x11, 0xd6, 0xdf, + 0x32, 0xaf, 0xcb, 0x07, 0x32, 0x29, 0xff, 0x12, 0x36, 0xa9, 0xa7, 0x89, 0xb5, 0x40, 0x71, 0x97, + 0x28, 0xe6, 0x9c, 0xfb, 0x5d, 0xa2, 0xcc, 0xba, 0x68, 0xdd, 0x1c, 0xaf, 0x6e, 0x14, 0xc5, 0x5c, + 0x7a, 0xc1, 0xbd, 0x70, 0x90, 0x94, 0xf1, 0xf8, 0x19, 0x75, 0xa6, 0x13, 0x62, 0x72, 0x78, 0xcf, + 0x2a, 0xa7, 0xf1, 0x78, 0x3a, 0xa5, 0xaf, 0x01, 0xbd, 0x65, 0x1e, 0x3e, 0x4d, 0xea, 0xce, 0x1a, + 0xdd, 0x27, 0x46, 0x77, 0xda, 0x8d, 0x33, 0x28, 0xf6, 0xbf, 0xe7, 0x60, 0x3b, 0x1a, 0x72, 0x5e, + 0xaf, 0x3d, 0x94, 0x8a, 0xba, 0xc9, 0x37, 0xd9, 0xb0, 0x14, 0xc5, 0x25, 0x62, 0x35, 0x9e, 0xb0, + 0xa1, 0x33, 0x58, 0x26, 0x5d, 0x97, 0x79, 0x4c, 0x2a, 0x41, 0x14, 0x17, 0xd1, 0xc4, 0xfa, 0x24, + 0xef, 0x03, 0xa7, 0xaa, 0x14, 0x27, 0xf9, 0xe8, 0x6b, 0x98, 0xd3, 0x15, 0x25, 0xad, 0x19, 0xd3, + 0x0f, 0xef, 0x20, 0x14, 0xf2, 0xd0, 0x47, 0x00, 0x4e, 0x20, 0x15, 0x77, 0xeb, 0x7a, 0xca, 0xcd, + 0xc6, 0xaa, 0x3a, 0x66, 0x47, 0x75, 0x00, 0xdf, 0x4c, 0xc5, 0x5b, 0x3a, 0x94, 0xd6, 0x9c, 0x79, + 0xd7, 0x47, 0x79, 0xef, 0x8a, 0x8f, 0x50, 0x1c, 0xe3, 0xa1, 0xcf, 0xf5, 0xc4, 0x33, 0xbd, 0x51, + 0x32, 0xbd, 0x61, 0xc5, 0x37, 0x91, 0x51, 0x52, 0x4d, 0x9b, 0x44, 0x38, 0xf4, 0x1b, 0x58, 0xe3, + 0xf2, 0x80, 0x73, 0xa5, 0xbf, 0xd7, 0x6f, 0x78, 0x3d, 0xe6, 0x51, 0x6b, 0xde, 0x90, 0x9f, 0x65, + 0x91, 0x53, 0x50, 0x3c, 0xcd, 0x46, 0x17, 0x80, 0xfa, 0x53, 0xfd, 0x62, 0x2d, 0x98, 0x75, 0x78, + 0x9e, 0xf7, 0x49, 0xd3, 0x1d, 0x86, 0x33, 0x54, 0xd0, 0xb7, 0xb0, 0x3e, 0xc8, 0x68, 0x17, 0xab, + 0x6c, 0xd4, 0x3f, 0xcd, 0x53, 0xcf, 0x6a, 0x31, 0x9c, 0xa9, 0xa4, 0xcb, 0xd9, 0x17, 0xfc, 0xbb, + 0x61, 0x52, 0x1f, 0x62, 0xe5, 0xdc, 0x9a, 0x72, 0xe3, 0x0c, 0x8a, 0xfd, 0x43, 0x11, 0x36, 0x8e, + 0x88, 0xe8, 0x0e, 0x88, 0x48, 0xed, 0x4b, 0x5f, 0x40, 0xe9, 0xcd, 0x69, 0x9b, 0xfd, 0x3e, 0xac, + 0xe0, 0x95, 0xfd, 0x9f, 0x1a, 0xd9, 0xe4, 0xa6, 0xab, 0xdd, 0xe1, 0x42, 0x85, 0x50, 0xf4, 0xeb, + 0x51, 0x19, 0x19, 0x62, 0x58, 0xd5, 0x4f, 0x33, 0x88, 0x87, 0x63, 0x10, 0x8e, 0x11, 0xd0, 0x25, + 0x6c, 0x75, 0x87, 0x1e, 0x71, 0x99, 0x73, 0x4a, 0x5d, 0x2e, 0x86, 0x59, 0x53, 0xe0, 0x43, 0x23, + 0x57, 0xcf, 0x85, 0xe1, 0x7b, 0x24, 0xd0, 0x2b, 0x40, 0x77, 0x89, 0x40, 0x5e, 0xb7, 0xce, 0xa5, + 0x35, 0x6b, 0x0a, 0x79, 0x33, 0x23, 0xce, 0xd7, 0xad, 0x73, 0x9c, 0xc1, 0xb0, 0xbf, 0x82, 0xa5, + 0x73, 0x7a, 0xcd, 0xda, 0x54, 0xe9, 0xa2, 0x93, 0xe8, 0x53, 0x58, 0x93, 0xd4, 0x09, 0x04, 0xd5, + 0x65, 0xd6, 0x30, 0x43, 0xaf, 0x1b, 0xcd, 0xc0, 0x69, 0x87, 0xfd, 0x8f, 0x02, 0x6c, 0xb4, 0xb5, + 0x95, 0xa9, 0x54, 0x7c, 0xdb, 0x50, 0x0e, 0x47, 0x66, 0xa7, 0x75, 0x1a, 0xf1, 0x27, 0x06, 0x74, + 0x04, 0x4b, 0x41, 0xec, 0xad, 0x51, 0x7e, 0x73, 0x1b, 0x30, 0x1e, 0x21, 0x4e, 0x30, 0xd1, 0x2f, + 0x60, 0x49, 0x46, 0x01, 0x74, 0x26, 0x9b, 0xd4, 0x9a, 0x51, 0x6a, 0xc7, 0x1c, 0x38, 0x01, 0xb3, + 0x4f, 0xc0, 0xaa, 0xdd, 0x11, 0xd6, 0x27, 0x57, 0xac, 0xcf, 0xd4, 0xb0, 0x4d, 0xd5, 0xe4, 0xb4, + 0xb0, 0x0d, 0xe5, 0x9e, 0xe0, 0x81, 0x1f, 0x1b, 0x7a, 0x13, 0x83, 0xde, 0xb2, 0xcc, 0x8e, 0x1a, + 0x4e, 0x7b, 0xf3, 0xdf, 0xfe, 0xcb, 0x02, 0xac, 0x24, 0xd3, 0x3d, 0x86, 0x15, 0x26, 0x30, 0xb4, + 0x02, 0x45, 0x16, 0x6d, 0xb4, 0xb8, 0xc8, 0xba, 0xe8, 0x15, 0xcc, 0xcb, 0xf0, 0x20, 0x15, 0x55, + 0x44, 0x6e, 0x43, 0x65, 0x9d, 0xb7, 0xf0, 0x88, 0x8c, 0xea, 0x50, 0xe4, 0x32, 0xda, 0x02, 0x5e, + 0xe4, 0x49, 0xdc, 0x37, 0xea, 0x71, 0x91, 0x4b, 0x1d, 0x4d, 0x74, 0x7c, 0xb1, 0xe6, 0xee, 0x8f, + 0x26, 0xeb, 0x34, 0x83, 0x47, 0x64, 0xbd, 0x25, 0x7a, 0xbc, 0x1b, 0x1e, 0x8b, 0x4a, 0xe1, 0x96, + 0x38, 0x7a, 0x4e, 0xa6, 0x76, 0x3e, 0x9d, 0xda, 0x67, 0x50, 0x92, 0x8a, 0xa8, 0x40, 0x46, 0xd3, + 0x6b, 0x31, 0x5c, 0x45, 0x63, 0xc2, 0x91, 0x4b, 0xef, 0x4a, 0x7d, 0x1e, 0x6e, 0xe7, 0x46, 0xa5, + 0x1c, 0xee, 0x4a, 0x71, 0x1b, 0xfa, 0x12, 0x9e, 0x44, 0xe7, 0x80, 0x23, 0xd6, 0xbb, 0x89, 0x2f, + 0xb4, 0x99, 0x2c, 0x0b, 0x38, 0xcf, 0x8d, 0x5e, 0x42, 0xe9, 0xce, 0x4c, 0x6c, 0x6b, 0xd1, 0x14, + 0xd2, 0x4e, 0xee, 0x19, 0xfe, 0x34, 0x1c, 0x17, 0x21, 0x1a, 0x1d, 0xc3, 0xc2, 0x4d, 0x34, 0x7c, + 0xac, 0x25, 0x13, 0xfc, 0x67, 0x79, 0xcc, 0xcc, 0x21, 0x85, 0xc7, 0x74, 0xdd, 0x81, 0xa4, 0xdf, + 0xe7, 0x03, 0xda, 0x3d, 0x1b, 0xe8, 0xa3, 0x28, 0xef, 0x52, 0x69, 0x2d, 0xef, 0xce, 0xec, 0x95, + 0xf1, 0xb4, 0x03, 0x55, 0x01, 0x7c, 0x3e, 0xa0, 0x42, 0x67, 0x89, 0x5a, 0x2b, 0x26, 0xe8, 0x47, + 0xe1, 0xdc, 0x1c, 0x9b, 0x71, 0x0c, 0xa2, 0x23, 0x1d, 0x75, 0x82, 0xf5, 0xe8, 0xfe, 0x48, 0x33, + 0x3b, 0x1b, 0x8f, 0xe9, 0xe8, 0x29, 0xcc, 0x2a, 0xd2, 0x93, 0xd6, 0xaa, 0x91, 0x29, 0x1b, 0x99, + 0x0e, 0xe9, 0x49, 0x6c, 0xcc, 0xe8, 0x2b, 0x80, 0x9e, 0xbe, 0xc4, 0xd5, 0xb4, 0xa8, 0xb5, 0x16, + 0xbb, 0x13, 0xbc, 0x1e, 0x9b, 0x93, 0xd2, 0x31, 0x3c, 0xfa, 0x2d, 0x6c, 0x4e, 0x9e, 0x8e, 0x3d, + 0xa9, 0x88, 0xe7, 0xd0, 0x37, 0x8c, 0x0e, 0x2c, 0x14, 0x1b, 0x16, 0xc9, 0xae, 0x9b, 0xc2, 0xe2, + 0x1c, 0x0d, 0x74, 0x01, 0x8f, 0x48, 0xb2, 0xff, 0xad, 0xc7, 0x46, 0xf6, 0xf3, 0xbc, 0x64, 0xe4, + 0x8d, 0x0b, 0x9c, 0x16, 0xb2, 0xff, 0x5a, 0x84, 0x9d, 0x64, 0x5c, 0x93, 0x6b, 0xe5, 0x7b, 0xbb, + 0xd6, 0xbe, 0x85, 0xcd, 0xb3, 0x83, 0xf6, 0xd9, 0x49, 0xa3, 0xd3, 0xb8, 0xcc, 0xba, 0xdf, 0x6e, + 0x67, 0xa4, 0x6b, 0x8c, 0x3b, 0x28, 0x5a, 0x05, 0xbc, 0x31, 0xe2, 0x27, 0xe8, 0xe8, 0x20, 0x7d, + 0x5f, 0x9e, 0x89, 0xe9, 0xb5, 0x04, 0xbf, 0x63, 0x5d, 0x2a, 0x6a, 0x8e, 0x43, 0xa5, 0xcc, 0xbd, + 0x3d, 0xff, 0xb3, 0x00, 0x1f, 0xe6, 0x66, 0xe4, 0x47, 0x70, 0x8d, 0xfe, 0x6f, 0x31, 0x1d, 0x3f, + 0x0e, 0xbc, 0x43, 0xee, 0xba, 0xc4, 0xeb, 0x8e, 0x96, 0xb4, 0x99, 0xde, 0x02, 0xa2, 0x5b, 0xf0, + 0x43, 0xc3, 0x4f, 0x6f, 0x20, 0x35, 0x28, 0xb5, 0x79, 0x20, 0x1c, 0x9a, 0x38, 0x52, 0xe7, 0x45, + 0xd1, 0x76, 0x04, 0xf3, 0x55, 0x48, 0xc0, 0x11, 0x11, 0x31, 0xf8, 0xc9, 0x04, 0x71, 0xec, 0xf9, + 0x81, 0x6a, 0x11, 0x41, 0x5c, 0xaa, 0x26, 0xe7, 0xeb, 0x9f, 0xdd, 0xab, 0x9a, 0xe4, 0xe0, 0x7c, + 0x35, 0x64, 0x43, 0x19, 0x07, 0x5e, 0x4d, 0xea, 0x63, 0x79, 0xe2, 0xd0, 0x3d, 0x31, 0xa3, 0xe7, + 0xb0, 0x6c, 0x1e, 0x46, 0x77, 0x33, 0xb3, 0xcd, 0x8c, 0x70, 0x49, 0x97, 0xfd, 0xaf, 0x02, 0xec, + 0xe6, 0x67, 0x3c, 0x2a, 0x99, 0xff, 0x77, 0xca, 0x4f, 0x61, 0x29, 0x31, 0x68, 0x1e, 0x92, 0xf8, + 0xc4, 0xb4, 0x49, 0xd0, 0x9f, 0x7f, 0xad, 0xcf, 0x9d, 0xa6, 0x87, 0x00, 0x4a, 0x9d, 0x46, 0xb3, + 0xd6, 0xec, 0xac, 0x7e, 0x80, 0x56, 0x61, 0xe9, 0xe4, 0xac, 0x56, 0x3f, 0xa8, 0x9d, 0xd4, 0x9a, + 0x87, 0x0d, 0xbc, 0x5a, 0x40, 0x4f, 0xe0, 0x71, 0xbb, 0x53, 0x3b, 0xfc, 0xa6, 0x51, 0x3f, 0x3c, + 0x6b, 0x76, 0xf0, 0xd9, 0x49, 0xeb, 0xa4, 0xd6, 0x6c, 0xac, 0x16, 0xf7, 0xbf, 0x9f, 0x81, 0xc7, + 0x19, 0x03, 0x0e, 0x31, 0x28, 0x1d, 0x7b, 0x77, 0xfc, 0x96, 0xa2, 0xcf, 0x1e, 0xf8, 0xa5, 0x61, + 0x8d, 0x6e, 0x55, 0x1e, 0x0a, 0x0f, 0x13, 0x6c, 0x7f, 0x80, 0xfe, 0x00, 0xf3, 0x61, 0xab, 0x52, + 0xf4, 0xf2, 0x61, 0xe4, 0xf4, 0xac, 0xdb, 0xfa, 0xe5, 0x3b, 0xf3, 0xc6, 0x6f, 0xff, 0x63, 0x01, + 0x60, 0x92, 0x6a, 0xf4, 0x40, 0xa5, 0xa9, 0xde, 0xdc, 0xfa, 0xf2, 0xdd, 0x89, 0xa3, 0x18, 0x0e, + 0x7e, 0x7e, 0x51, 0xed, 0x31, 0x75, 0x13, 0x5c, 0x69, 0x52, 0xd5, 0x65, 0x8e, 0xe0, 0x92, 0x5f, + 0xab, 0xaa, 0xcb, 0x9d, 0xaa, 0xf0, 0x9d, 0xea, 0x44, 0xb5, 0x1a, 0xa9, 0x5e, 0x95, 0xcc, 0x80, + 0xf9, 0xe2, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x54, 0xff, 0xfb, 0xc5, 0x6d, 0x15, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto b/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto index 9f6922b4..fd19ce9b 100644 --- a/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto +++ b/rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto @@ -91,7 +91,7 @@ message HardwareConfiguration { VirtualMachineSizeType VMSize = 1; VirtualMachineCustomSize customSize = 2; DynamicMemoryConfiguration dynamicMemoryConfiguration = 3; - repeated Gpu gpuList = 4; + repeated VirtualMachineGPU virtualMachineGPUs = 4; } message UefiSettings { diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index 23724426..f7c583c6 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -661,55 +661,55 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { return nil } -type Gpu struct { +type VirtualMachineGPU struct { Assignment AssignmentType `protobuf:"varint,1,opt,name=assignment,proto3,enum=moc.AssignmentType" json:"assignment,omitempty"` - PartitionSizeMB uint64 `protobuf:"varint,3,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` - Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` + PartitionSizeMB uint64 `protobuf:"varint,2,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *Gpu) Reset() { *m = Gpu{} } -func (m *Gpu) String() string { return proto.CompactTextString(m) } -func (*Gpu) ProtoMessage() {} -func (*Gpu) Descriptor() ([]byte, []int) { +func (m *VirtualMachineGPU) Reset() { *m = VirtualMachineGPU{} } +func (m *VirtualMachineGPU) String() string { return proto.CompactTextString(m) } +func (*VirtualMachineGPU) ProtoMessage() {} +func (*VirtualMachineGPU) Descriptor() ([]byte, []int) { return fileDescriptor_7d1a061f6c82445b, []int{2} } -func (m *Gpu) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Gpu.Unmarshal(m, b) +func (m *VirtualMachineGPU) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_VirtualMachineGPU.Unmarshal(m, b) } -func (m *Gpu) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Gpu.Marshal(b, m, deterministic) +func (m *VirtualMachineGPU) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_VirtualMachineGPU.Marshal(b, m, deterministic) } -func (m *Gpu) XXX_Merge(src proto.Message) { - xxx_messageInfo_Gpu.Merge(m, src) +func (m *VirtualMachineGPU) XXX_Merge(src proto.Message) { + xxx_messageInfo_VirtualMachineGPU.Merge(m, src) } -func (m *Gpu) XXX_Size() int { - return xxx_messageInfo_Gpu.Size(m) +func (m *VirtualMachineGPU) XXX_Size() int { + return xxx_messageInfo_VirtualMachineGPU.Size(m) } -func (m *Gpu) XXX_DiscardUnknown() { - xxx_messageInfo_Gpu.DiscardUnknown(m) +func (m *VirtualMachineGPU) XXX_DiscardUnknown() { + xxx_messageInfo_VirtualMachineGPU.DiscardUnknown(m) } -var xxx_messageInfo_Gpu proto.InternalMessageInfo +var xxx_messageInfo_VirtualMachineGPU proto.InternalMessageInfo -func (m *Gpu) GetAssignment() AssignmentType { +func (m *VirtualMachineGPU) GetAssignment() AssignmentType { if m != nil { return m.Assignment } return AssignmentType_GpuDDA } -func (m *Gpu) GetPartitionSizeMB() uint64 { +func (m *VirtualMachineGPU) GetPartitionSizeMB() uint64 { if m != nil { return m.PartitionSizeMB } return 0 } -func (m *Gpu) GetName() string { +func (m *VirtualMachineGPU) GetName() string { if m != nil { return m.Name } @@ -1288,7 +1288,7 @@ func init() { proto.RegisterEnum("moc.InstanceViewStatus_StatusLevelType", InstanceViewStatus_StatusLevelType_name, InstanceViewStatus_StatusLevelType_value) proto.RegisterType((*WinRMListener)(nil), "moc.WinRMListener") proto.RegisterType((*WinRMConfiguration)(nil), "moc.WinRMConfiguration") - proto.RegisterType((*Gpu)(nil), "moc.Gpu") + proto.RegisterType((*VirtualMachineGPU)(nil), "moc.VirtualMachineGPU") proto.RegisterType((*VirtualMachineCustomSize)(nil), "moc.VirtualMachineCustomSize") proto.RegisterType((*DynamicMemoryConfiguration)(nil), "moc.DynamicMemoryConfiguration") proto.RegisterType((*VirtualMachineRunCommandInputParameter)(nil), "moc.VirtualMachineRunCommandInputParameter") @@ -1306,120 +1306,120 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1831 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x52, 0xeb, 0xc8, - 0x15, 0x80, 0x91, 0x7f, 0xc0, 0x3e, 0xfc, 0x35, 0xcd, 0x1d, 0xf0, 0x90, 0x3b, 0x77, 0x88, 0xe7, - 0xce, 0x1d, 0xe2, 0x99, 0x31, 0xfe, 0x1b, 0x97, 0x6b, 0xaa, 0x52, 0x15, 0x61, 0x0b, 0xae, 0x2f, - 0x58, 0x76, 0x49, 0xb6, 0x99, 0x64, 0xe3, 0x08, 0xb9, 0x6d, 0x94, 0x58, 0x6a, 0x95, 0xd4, 0xe2, - 0xc2, 0x2c, 0xa6, 0xb2, 0xca, 0x3a, 0xcb, 0x2c, 0xb2, 0xc8, 0x32, 0x2f, 0x90, 0xca, 0x13, 0xe4, - 0x05, 0x92, 0xe7, 0x49, 0x55, 0xaa, 0x5b, 0x32, 0x20, 0x01, 0xc9, 0xca, 0xdd, 0xdf, 0xf9, 0xf5, - 0x39, 0x47, 0xdd, 0x12, 0xbc, 0xb1, 0xa9, 0x39, 0x31, 0xa9, 0x6d, 0x53, 0x87, 0xff, 0xb8, 0x01, - 0x23, 0xe1, 0xae, 0xec, 0x7a, 0x94, 0x51, 0x9c, 0xb6, 0xa9, 0x79, 0x70, 0x38, 0xa7, 0x74, 0xbe, - 0x20, 0xc7, 0x02, 0x5d, 0x05, 0xb3, 0xe3, 0x29, 0xf1, 0x4d, 0xcf, 0x72, 0x19, 0xf5, 0x42, 0xb5, - 0x62, 0x1b, 0x36, 0x2f, 0x2d, 0x47, 0xeb, 0x5d, 0x58, 0x3e, 0x23, 0x0e, 0xf1, 0x70, 0x0d, 0x72, - 0x03, 0x2e, 0x31, 0xe9, 0xa2, 0x20, 0x1d, 0x4a, 0x47, 0x5b, 0xb5, 0xbd, 0xb2, 0x4d, 0xcd, 0xb2, - 0xd0, 0x5a, 0x4a, 0x86, 0x77, 0x2e, 0xd1, 0xee, 0xf5, 0x8a, 0xa7, 0x80, 0x85, 0xb8, 0x4d, 0x9d, - 0x99, 0x35, 0x0f, 0x3c, 0x83, 0x59, 0xd4, 0xc1, 0x15, 0xc8, 0x2f, 0xbd, 0xfa, 0x05, 0xe9, 0x30, - 0x7d, 0xb4, 0x5e, 0xc3, 0x0f, 0xae, 0x96, 0x22, 0xed, 0x41, 0xa9, 0xf8, 0x13, 0xa4, 0xcf, 0xdc, - 0x00, 0xd7, 0x01, 0x0c, 0xdf, 0xb7, 0xe6, 0x8e, 0x4d, 0x1c, 0x16, 0x25, 0xb1, 0x2b, 0x2c, 0xe5, - 0x7b, 0x2c, 0x32, 0x78, 0xa4, 0x86, 0x8f, 0x60, 0xdb, 0x35, 0x3c, 0x66, 0xf1, 0xd0, 0xba, 0xf5, - 0x23, 0xe9, 0x9d, 0x14, 0xd2, 0x87, 0xd2, 0x51, 0x46, 0x4b, 0x62, 0x8c, 0x21, 0xe3, 0x18, 0x36, - 0x29, 0x64, 0x0e, 0xa5, 0xa3, 0xbc, 0x26, 0xd6, 0x1f, 0x32, 0xb9, 0x14, 0x4a, 0x17, 0x19, 0x14, - 0xc6, 0x96, 0xc7, 0x02, 0x63, 0xd1, 0x33, 0xcc, 0x6b, 0xcb, 0x21, 0xed, 0xc0, 0x67, 0xd4, 0xe6, - 0x76, 0xf8, 0x00, 0x72, 0xa6, 0x1b, 0xb4, 0x69, 0x10, 0xa5, 0x94, 0xd5, 0xee, 0xf7, 0x5c, 0x66, - 0x13, 0x9b, 0x7a, 0x77, 0xbd, 0x93, 0x42, 0x2a, 0x94, 0x2d, 0xf7, 0x5c, 0x36, 0x5f, 0xda, 0xa5, - 0x43, 0xd9, 0x72, 0xff, 0x21, 0x93, 0xcb, 0xa0, 0x6c, 0xf1, 0xaf, 0x12, 0x1c, 0x74, 0xee, 0x1c, - 0xc3, 0xb6, 0xcc, 0x9e, 0xb0, 0x8a, 0x97, 0xf1, 0x08, 0xb6, 0x6d, 0xe3, 0xd6, 0xb2, 0x03, 0xbb, - 0xb7, 0x8c, 0x21, 0x85, 0x7f, 0x2c, 0x81, 0x85, 0xa6, 0xe5, 0xc4, 0x34, 0x53, 0x91, 0x66, 0x1c, - 0xe3, 0x32, 0x60, 0x66, 0x78, 0x73, 0xc2, 0x42, 0x72, 0x12, 0xcc, 0x66, 0xc4, 0x13, 0xe9, 0x6d, - 0x6a, 0xcf, 0x48, 0x8a, 0x3f, 0xc0, 0xbb, 0x78, 0x61, 0xb4, 0xc0, 0x69, 0x53, 0xdb, 0x36, 0x9c, - 0x69, 0xd7, 0x71, 0x03, 0x36, 0x30, 0x3c, 0xc3, 0x26, 0x8c, 0x78, 0xbc, 0xb8, 0x2a, 0x2f, 0xae, - 0x14, 0x16, 0x97, 0xaf, 0xf1, 0x01, 0x64, 0xc7, 0xc6, 0x22, 0x20, 0x22, 0x9b, 0xfc, 0x49, 0xe6, - 0xcf, 0x7f, 0x2f, 0x48, 0x5a, 0x88, 0x8a, 0x7f, 0x90, 0xe0, 0xed, 0x4b, 0xae, 0x75, 0x31, 0xaa, - 0x3a, 0x0d, 0x3c, 0x93, 0xe0, 0xd7, 0xb0, 0x1a, 0xee, 0x43, 0xd7, 0x27, 0x99, 0x3f, 0x71, 0x2f, - 0x11, 0xc3, 0xaf, 0x21, 0x1f, 0xae, 0x46, 0x5a, 0x37, 0x0c, 0xa3, 0x3d, 0x00, 0x2e, 0x5d, 0x66, - 0xdb, 0x11, 0xff, 0x32, 0xaf, 0x3d, 0x80, 0xe2, 0x3f, 0xff, 0x47, 0x0a, 0x5d, 0xc7, 0x67, 0x86, - 0x63, 0x92, 0xb1, 0x45, 0x3e, 0x62, 0x1d, 0xb6, 0x94, 0x5b, 0x62, 0x06, 0x62, 0x96, 0x98, 0xc1, - 0x48, 0x34, 0x9b, 0x5f, 0x8b, 0xd9, 0x7c, 0xc9, 0x45, 0xdc, 0x44, 0x4b, 0xb8, 0xe0, 0xf3, 0xa1, - 0xdc, 0x5a, 0xac, 0x4d, 0xa7, 0x64, 0x39, 0x3b, 0xcb, 0x3d, 0xde, 0x83, 0xd5, 0x7e, 0xc0, 0xdc, - 0x80, 0x45, 0x49, 0x47, 0x3b, 0xfc, 0x0a, 0xb2, 0x8a, 0xe7, 0x51, 0x2f, 0x1a, 0xe1, 0x70, 0x53, - 0xfc, 0x00, 0x07, 0x89, 0xe9, 0x35, 0x5c, 0xe3, 0xca, 0x5a, 0x58, 0xcc, 0x22, 0x3e, 0xfe, 0x06, - 0x76, 0xba, 0x3e, 0x5d, 0x18, 0x8c, 0x4c, 0xc7, 0xb6, 0x90, 0x2c, 0xc2, 0xfc, 0x73, 0xda, 0x53, - 0x41, 0xf1, 0x3f, 0x12, 0xe0, 0xc7, 0xff, 0x9d, 0xe7, 0x1a, 0xf8, 0xbc, 0xbb, 0x26, 0x4f, 0x34, - 0xea, 0x2e, 0x5f, 0xe3, 0x5f, 0x42, 0x76, 0x41, 0x6e, 0xc8, 0x42, 0x64, 0xbf, 0x55, 0xfb, 0x4a, - 0x14, 0xe3, 0xa9, 0x6d, 0x39, 0xfc, 0xb9, 0xe0, 0xaa, 0xe2, 0xe1, 0x0d, 0xad, 0xf0, 0x5b, 0xd8, - 0x9c, 0x5a, 0xbe, 0xbb, 0x30, 0xee, 0x42, 0x85, 0xe8, 0xaf, 0xc6, 0x21, 0x2e, 0xc0, 0x9a, 0x4d, - 0x7c, 0xdf, 0x98, 0x2f, 0x1f, 0xdb, 0xe5, 0x96, 0xa7, 0xc4, 0x2c, 0x9b, 0x14, 0xb2, 0x61, 0x4a, - 0x7c, 0x5d, 0xfc, 0x15, 0x6c, 0x27, 0xa2, 0xe1, 0x75, 0x58, 0x1b, 0x39, 0xbf, 0x77, 0xe8, 0x47, - 0x07, 0xad, 0xe0, 0x1c, 0x64, 0xba, 0xce, 0x8c, 0x22, 0x89, 0xe3, 0x4b, 0xc3, 0x73, 0x2c, 0x67, - 0x8e, 0x52, 0x38, 0x1f, 0x95, 0x15, 0xa5, 0x8b, 0x3f, 0xc1, 0xe7, 0xf1, 0x5a, 0xca, 0x73, 0xe2, - 0xb0, 0xd8, 0x34, 0xbc, 0x83, 0xad, 0x1b, 0x5b, 0xe0, 0x31, 0xf1, 0x7c, 0x8b, 0x3a, 0x51, 0x55, - 0x12, 0x14, 0xd7, 0x21, 0xe7, 0x8b, 0x64, 0x88, 0x5f, 0x48, 0x89, 0x53, 0x70, 0xff, 0x85, 0x12, - 0x69, 0xf7, 0x8a, 0xc5, 0x3a, 0xec, 0x9f, 0x05, 0xc4, 0x67, 0xc2, 0x53, 0xfc, 0x3c, 0x28, 0xc0, - 0x1a, 0x71, 0x78, 0x93, 0xa6, 0x51, 0xfb, 0x96, 0xdb, 0xe2, 0x5f, 0x24, 0xc0, 0x03, 0x8f, 0xde, - 0x26, 0x0e, 0x90, 0x22, 0xe4, 0xaf, 0x19, 0x73, 0x85, 0x24, 0xf6, 0xf0, 0x3c, 0x60, 0xfc, 0x16, - 0x80, 0x6f, 0xfc, 0x50, 0x29, 0xf5, 0x48, 0xe9, 0x11, 0xe7, 0xa1, 0x1d, 0x1a, 0xaa, 0xa4, 0x0f, - 0xd3, 0xbc, 0x0b, 0xd1, 0x96, 0xc7, 0x60, 0x5e, 0xe0, 0x33, 0x32, 0x6d, 0x1b, 0x61, 0x87, 0x96, - 0x31, 0xee, 0x71, 0xe9, 0x0d, 0xe4, 0x46, 0x3e, 0xf1, 0x44, 0x3b, 0x72, 0x90, 0xd1, 0xfa, 0xfd, - 0x61, 0xd8, 0x8b, 0x91, 0xae, 0x68, 0x48, 0x2a, 0xfd, 0x1a, 0x36, 0x07, 0x1e, 0x35, 0x89, 0xef, - 0xd3, 0x7b, 0x25, 0x95, 0x3a, 0x04, 0xad, 0xf0, 0xce, 0x74, 0x1d, 0x46, 0x16, 0x61, 0xc7, 0xc4, - 0xb2, 0xd9, 0x40, 0x29, 0xbc, 0x06, 0x69, 0xb9, 0xd7, 0x41, 0x69, 0xae, 0x20, 0xf7, 0x3a, 0xcd, - 0x06, 0xca, 0x08, 0xa6, 0xf5, 0x50, 0x56, 0x30, 0xad, 0xd7, 0x6c, 0xa0, 0xd5, 0xd2, 0x07, 0x78, - 0xd3, 0x77, 0x09, 0xaf, 0x87, 0x33, 0xd7, 0xef, 0x7c, 0x46, 0xec, 0x13, 0x4a, 0x99, 0xcf, 0x3c, - 0xc3, 0x55, 0x9c, 0xb9, 0xe5, 0x10, 0xbc, 0x05, 0xd0, 0xbe, 0xe8, 0x8f, 0x3a, 0x93, 0xae, 0xda, - 0xe5, 0x69, 0x15, 0xe0, 0xd5, 0x65, 0x57, 0xed, 0xf4, 0x2f, 0xf5, 0x89, 0xac, 0xea, 0x97, 0x8a, - 0x36, 0x39, 0xed, 0x5e, 0x28, 0x3a, 0x92, 0x4a, 0xdf, 0xc2, 0x6e, 0xc2, 0xd7, 0x72, 0xc0, 0x22, - 0x83, 0x30, 0xdf, 0x8b, 0xae, 0x3a, 0xfa, 0x01, 0x49, 0xa5, 0xbf, 0xe5, 0x61, 0x2f, 0x3e, 0x4a, - 0xfc, 0x3a, 0x59, 0x9a, 0x74, 0xc8, 0xcc, 0x08, 0x16, 0x0c, 0xad, 0x60, 0x0c, 0x5b, 0x3a, 0x33, - 0x9c, 0xa9, 0xe1, 0x4d, 0x27, 0x72, 0x6d, 0x72, 0x53, 0x43, 0xa9, 0x38, 0x6b, 0x70, 0x96, 0xc6, - 0xbb, 0x62, 0xb6, 0x43, 0xd6, 0xa9, 0xf9, 0x93, 0x9b, 0x3a, 0xca, 0xc4, 0x61, 0x43, 0xc0, 0x6c, - 0x1c, 0xb6, 0x04, 0x5c, 0xc5, 0xaf, 0x00, 0x3d, 0xc0, 0x6a, 0x53, 0xd0, 0xb5, 0x38, 0xad, 0x87, - 0x5e, 0x73, 0x71, 0x07, 0xba, 0xc8, 0x29, 0x9f, 0x80, 0x75, 0x0e, 0x21, 0x01, 0x45, 0xa6, 0xeb, - 0x09, 0xf8, 0x1d, 0x87, 0x1b, 0xf1, 0x48, 0x7a, 0x55, 0xd8, 0x6f, 0xc6, 0x54, 0xcf, 0x5b, 0xfa, - 0xe4, 0xa6, 0x8a, 0xb6, 0x62, 0xaa, 0xe7, 0x2d, 0x1e, 0xbf, 0x8a, 0xb6, 0x93, 0xb4, 0xce, 0x29, - 0x4a, 0xd2, 0x06, 0xa7, 0x3b, 0x18, 0xc1, 0xc6, 0x3d, 0x55, 0xcf, 0x9b, 0x08, 0xe3, 0x1d, 0xd8, - 0x7c, 0x44, 0xaa, 0x35, 0xb4, 0x1b, 0x57, 0x1a, 0x37, 0xd1, 0xab, 0xb8, 0xd2, 0xb8, 0x5a, 0x43, - 0x9f, 0x24, 0xfd, 0x7f, 0xc7, 0xfd, 0xef, 0xe1, 0x7d, 0xd8, 0x4d, 0x14, 0x68, 0xf2, 0x7e, 0xa0, - 0xa2, 0xfd, 0x84, 0xa0, 0xbe, 0x14, 0x14, 0x12, 0x82, 0xc6, 0x52, 0xf0, 0x69, 0x2c, 0xc0, 0x69, - 0xcd, 0x17, 0xf4, 0x20, 0x4e, 0x1b, 0x21, 0xfd, 0x59, 0x9c, 0xb6, 0x42, 0xfa, 0x1a, 0x7f, 0x02, - 0x3b, 0x0f, 0x94, 0x77, 0x96, 0xe3, 0xcf, 0x62, 0xa5, 0x55, 0xdb, 0x8d, 0x89, 0x5c, 0x43, 0x6f, - 0x12, 0xb0, 0xc5, 0xe1, 0xe7, 0x31, 0xb7, 0x6a, 0xbb, 0xda, 0xe4, 0xf4, 0x30, 0x41, 0xeb, 0x35, - 0x4e, 0x7f, 0x9e, 0xa0, 0x8d, 0x89, 0x5c, 0xaf, 0xa0, 0x62, 0x82, 0xb6, 0x04, 0xfd, 0x22, 0x96, - 0x58, 0xe8, 0xb7, 0x5e, 0x41, 0x6f, 0x13, 0x98, 0x3b, 0xae, 0x57, 0xd0, 0x97, 0xfc, 0xc1, 0x8b, - 0x7b, 0xae, 0x56, 0x2a, 0x93, 0x46, 0x05, 0xbd, 0x4b, 0x48, 0x5a, 0xf7, 0x92, 0xaf, 0xf0, 0xa7, - 0xf0, 0x49, 0x22, 0x42, 0x24, 0x3a, 0x4a, 0x88, 0x78, 0x94, 0x48, 0xf4, 0x8b, 0xe7, 0x23, 0xb5, - 0x2a, 0xa8, 0xf4, 0x7c, 0xa4, 0x56, 0x05, 0x7d, 0xfd, 0x42, 0xa4, 0x56, 0x05, 0x7d, 0xf3, 0x42, - 0xa4, 0x56, 0x05, 0x7d, 0xfb, 0xb4, 0x5a, 0xd5, 0x26, 0x2a, 0x3f, 0xad, 0x56, 0xb5, 0x89, 0x8e, - 0x9f, 0xa9, 0x56, 0xb5, 0x89, 0x2a, 0xcf, 0x54, 0xab, 0xda, 0x44, 0x55, 0xbc, 0x09, 0xf9, 0xf0, - 0x1d, 0x95, 0xb7, 0x65, 0xf2, 0x68, 0xab, 0x9e, 0xa3, 0xdf, 0xf2, 0xd1, 0x8e, 0xb6, 0x67, 0x6e, - 0xe0, 0xde, 0x20, 0x03, 0x03, 0xac, 0x86, 0x04, 0x5d, 0xe1, 0x6d, 0x58, 0x1f, 0x39, 0x7e, 0xe0, - 0xba, 0xd4, 0x63, 0x64, 0x8a, 0xcc, 0xd2, 0x11, 0xec, 0x3c, 0x79, 0xcb, 0xe7, 0x87, 0xf0, 0xfb, - 0xe1, 0x70, 0x10, 0x1e, 0x6a, 0x7c, 0xc5, 0xcf, 0x40, 0x19, 0xb6, 0xe2, 0xaf, 0xe2, 0xdc, 0xf1, - 0x99, 0x1b, 0x74, 0x3a, 0x72, 0x78, 0xa4, 0x9f, 0xb9, 0xc1, 0x00, 0x49, 0xdc, 0x84, 0xaf, 0xc6, - 0x28, 0xc5, 0x0f, 0x58, 0xae, 0x10, 0x9d, 0x77, 0xe9, 0xd2, 0x10, 0x60, 0x40, 0x3f, 0x12, 0x2f, - 0x7c, 0x0b, 0x8a, 0x5d, 0xcf, 0xeb, 0xb0, 0xa6, 0x05, 0x8e, 0xb8, 0x94, 0x25, 0x7e, 0x9c, 0xf7, - 0x67, 0x33, 0x94, 0xe2, 0x11, 0x06, 0x46, 0xe0, 0x93, 0x29, 0x4a, 0xe3, 0x0d, 0xc8, 0xb5, 0x3d, - 0x8b, 0x59, 0xa6, 0xb1, 0x40, 0x19, 0x1e, 0x45, 0x37, 0x6e, 0xc8, 0x14, 0x65, 0x4b, 0x33, 0xd8, - 0x8f, 0x1f, 0xb6, 0xd1, 0x51, 0x4d, 0x1d, 0xa1, 0x35, 0x94, 0xb5, 0xe8, 0xce, 0xd1, 0x87, 0xfd, - 0x28, 0x41, 0x4d, 0xd1, 0x95, 0x21, 0x4a, 0xe1, 0x3d, 0xc0, 0x9a, 0x32, 0x90, 0xbb, 0xda, 0xe4, - 0x6c, 0xa4, 0xe8, 0xc3, 0x89, 0x7c, 0xa6, 0xa8, 0xc3, 0xf0, 0x6a, 0x19, 0xc8, 0x23, 0x5d, 0x41, - 0x19, 0x61, 0x27, 0x8f, 0x15, 0x94, 0x2d, 0xfd, 0x43, 0x7a, 0xf9, 0x8d, 0xf8, 0xc9, 0x0b, 0xde, - 0x5e, 0x9c, 0x4c, 0x46, 0xea, 0xb9, 0xda, 0xbf, 0x54, 0xd1, 0x0a, 0x9f, 0x99, 0x84, 0xec, 0x54, - 0xee, 0x5e, 0x28, 0x1d, 0x24, 0xe1, 0xd7, 0x50, 0x48, 0x88, 0xf4, 0x51, 0xbb, 0xad, 0x28, 0x1d, - 0xa5, 0x83, 0x52, 0xcf, 0x38, 0x1d, 0x28, 0x6a, 0xa7, 0xab, 0x9e, 0xa1, 0xf4, 0x33, 0x96, 0x9a, - 0x72, 0xd2, 0xef, 0x0f, 0xb9, 0x34, 0x53, 0xfa, 0x11, 0x36, 0x64, 0xcf, 0xbc, 0xb6, 0x18, 0x31, - 0x59, 0xe0, 0x11, 0x5e, 0xdf, 0xdb, 0x56, 0x33, 0x2c, 0x4a, 0xaf, 0xcb, 0xbb, 0x2b, 0x2e, 0xce, - 0x85, 0x7b, 0x6d, 0xa0, 0x14, 0x6f, 0x85, 0xe8, 0xd2, 0xa0, 0x8d, 0xd2, 0x7c, 0x60, 0x65, 0xad, - 0x37, 0x79, 0x6c, 0x8e, 0xb2, 0xdc, 0xce, 0x32, 0xf8, 0x2d, 0x2b, 0x5c, 0x35, 0x1b, 0x28, 0xcf, - 0x4b, 0x29, 0x6e, 0xde, 0xb8, 0xea, 0x46, 0xe9, 0x3d, 0x6c, 0xe8, 0xc4, 0x0c, 0x3c, 0x8b, 0xdd, - 0x89, 0xa1, 0xd9, 0x81, 0x4d, 0xb5, 0x3f, 0x6c, 0xf7, 0xd5, 0xd3, 0xee, 0xd9, 0x48, 0x53, 0x3a, - 0x68, 0x85, 0xa3, 0xa1, 0x36, 0xd2, 0x87, 0x4a, 0xe7, 0x42, 0x1e, 0xa9, 0xed, 0xf7, 0x48, 0xe2, - 0xb7, 0xa0, 0x50, 0xe9, 0x28, 0xea, 0xb0, 0x2b, 0x5f, 0x8c, 0x7b, 0x28, 0xf5, 0xfd, 0x39, 0x20, - 0x9f, 0x38, 0xbe, 0xc5, 0xac, 0x1b, 0x12, 0x7d, 0xfd, 0xe2, 0xcf, 0xca, 0xe1, 0xd7, 0x6e, 0x79, - 0xf9, 0xb5, 0x5b, 0x3e, 0xb5, 0xc8, 0x62, 0xda, 0x77, 0x79, 0x21, 0xfc, 0xc2, 0xbf, 0xfe, 0x98, - 0x16, 0xaf, 0x4b, 0x4f, 0x0c, 0xbf, 0x57, 0x60, 0xf3, 0x9e, 0xfd, 0xce, 0xa7, 0xce, 0xff, 0xf3, - 0xf4, 0xef, 0xc8, 0x53, 0xdc, 0xea, 0xe4, 0xcb, 0xdf, 0x7c, 0x31, 0xb7, 0xd8, 0x75, 0x70, 0x55, - 0x36, 0xa9, 0x7d, 0x6c, 0x5b, 0xa6, 0x47, 0x7d, 0x3a, 0x63, 0xc7, 0x36, 0x35, 0x8f, 0x3d, 0xd7, - 0x3c, 0x0e, 0x3f, 0xcf, 0xaf, 0x56, 0x85, 0xd3, 0xfa, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2c, - 0x31, 0x79, 0xc0, 0xc1, 0x0f, 0x00, 0x00, + // 1827 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x97, 0xcd, 0x72, 0xe3, 0xc6, + 0x11, 0x80, 0x17, 0xfc, 0x91, 0xc8, 0x5e, 0xfd, 0x8c, 0x46, 0x6b, 0x89, 0x56, 0xd6, 0x6b, 0x85, + 0x5e, 0xaf, 0x15, 0xda, 0xa6, 0xf8, 0x67, 0x16, 0xcb, 0x55, 0xa9, 0x0a, 0x44, 0x42, 0x5a, 0xae, + 0x44, 0x90, 0x05, 0x90, 0x94, 0x93, 0x0b, 0x03, 0x81, 0x43, 0x0a, 0x09, 0x81, 0x41, 0x01, 0x03, + 0xad, 0xe4, 0x43, 0x2a, 0x27, 0x9f, 0x73, 0xcc, 0x21, 0x87, 0x1c, 0xf3, 0x02, 0xa9, 0x3c, 0x41, + 0x5e, 0x20, 0x79, 0x9e, 0x54, 0xa5, 0x66, 0x00, 0x52, 0x02, 0x24, 0x25, 0x27, 0xce, 0x7c, 0xfd, + 0x8b, 0xee, 0xe6, 0x0c, 0x00, 0x6f, 0x6c, 0x6a, 0x4e, 0x4c, 0x6a, 0xdb, 0xd4, 0xe1, 0x3f, 0x6e, + 0xc0, 0x48, 0xb8, 0x2b, 0xbb, 0x1e, 0x65, 0x14, 0xa7, 0x6d, 0x6a, 0x1e, 0x1c, 0xce, 0x29, 0x9d, + 0x2f, 0xc8, 0xb1, 0x40, 0x57, 0xc1, 0xec, 0x78, 0x4a, 0x7c, 0xd3, 0xb3, 0x5c, 0x46, 0xbd, 0x50, + 0xad, 0xd8, 0x86, 0xcd, 0x4b, 0xcb, 0xd1, 0x7a, 0x17, 0x96, 0xcf, 0x88, 0x43, 0x3c, 0x5c, 0x83, + 0xdc, 0x80, 0x4b, 0x4c, 0xba, 0x28, 0x48, 0x87, 0xd2, 0xd1, 0x56, 0x6d, 0xaf, 0x6c, 0x53, 0xb3, + 0x2c, 0xb4, 0x96, 0x92, 0xe1, 0x9d, 0x4b, 0xb4, 0x95, 0x5e, 0xf1, 0x14, 0xb0, 0x10, 0xb7, 0xa9, + 0x33, 0xb3, 0xe6, 0x81, 0x67, 0x30, 0x8b, 0x3a, 0xb8, 0x02, 0xf9, 0xa5, 0x57, 0xbf, 0x20, 0x1d, + 0xa6, 0x8f, 0x5e, 0xd6, 0xf0, 0xbd, 0xab, 0xa5, 0x48, 0xbb, 0x57, 0x2a, 0xfe, 0x24, 0xc1, 0xce, + 0xd8, 0xf2, 0x58, 0x60, 0x2c, 0x7a, 0x86, 0x79, 0x6d, 0x39, 0xe4, 0x6c, 0x30, 0xc2, 0x75, 0x00, + 0xc3, 0xf7, 0xad, 0xb9, 0x63, 0x13, 0x87, 0x45, 0x39, 0xed, 0x0a, 0x47, 0xf2, 0x0a, 0x8b, 0x84, + 0x1e, 0xa8, 0xe1, 0x23, 0xd8, 0x76, 0x0d, 0x8f, 0x59, 0x3c, 0x13, 0xdd, 0xfa, 0x91, 0xf4, 0x4e, + 0x0a, 0xa9, 0x43, 0xe9, 0x28, 0xa3, 0x25, 0x31, 0xc6, 0x90, 0x71, 0x0c, 0x9b, 0x14, 0xd2, 0x87, + 0xd2, 0x51, 0x5e, 0x13, 0xeb, 0x22, 0x83, 0x42, 0x3c, 0x8f, 0x76, 0xe0, 0x33, 0x6a, 0x73, 0x0b, + 0x7c, 0x00, 0x39, 0xd3, 0x0d, 0xda, 0x34, 0x88, 0x92, 0xc9, 0x6a, 0xab, 0x3d, 0x97, 0xd9, 0xc4, + 0xa6, 0xde, 0x5d, 0x14, 0x2e, 0xab, 0xad, 0xf6, 0x5c, 0x36, 0x5f, 0xda, 0xa5, 0x43, 0xd9, 0x72, + 0xff, 0x21, 0x93, 0xcb, 0xa0, 0x6c, 0xf1, 0xaf, 0x12, 0x1c, 0x74, 0xee, 0x1c, 0xc3, 0xb6, 0xcc, + 0x9e, 0xb0, 0x8a, 0xd7, 0xf3, 0x08, 0xb6, 0x6d, 0xe3, 0xd6, 0xb2, 0x03, 0xbb, 0xb7, 0x8c, 0x21, + 0x85, 0x8f, 0x94, 0xc0, 0x42, 0xd3, 0x72, 0x62, 0x9a, 0xd1, 0xc3, 0x27, 0x30, 0x2e, 0x03, 0x66, + 0x86, 0x37, 0x27, 0x2c, 0x24, 0x27, 0xc1, 0x6c, 0x46, 0x3c, 0x91, 0xde, 0xa6, 0xf6, 0x84, 0xa4, + 0xf8, 0x03, 0xbc, 0x8b, 0x17, 0x46, 0x0b, 0x9c, 0x36, 0xb5, 0x6d, 0xc3, 0x99, 0x76, 0x1d, 0x37, + 0x60, 0x03, 0xc3, 0x33, 0x6c, 0xc2, 0x88, 0xc7, 0xcb, 0xaa, 0xf2, 0xb2, 0x4a, 0x61, 0x59, 0xf9, + 0x1a, 0x1f, 0x40, 0x76, 0x6c, 0x2c, 0x02, 0x22, 0xb2, 0xc9, 0x9f, 0x64, 0xfe, 0xfc, 0xf7, 0x82, + 0xa4, 0x85, 0xa8, 0xf8, 0x47, 0x09, 0xde, 0x3e, 0xe7, 0x5a, 0x17, 0x33, 0xab, 0xd3, 0xc0, 0x33, + 0x09, 0x7e, 0x0d, 0x6b, 0xe1, 0x3e, 0x74, 0x7d, 0x92, 0xf9, 0x13, 0xf7, 0x12, 0x31, 0xfc, 0x1a, + 0xf2, 0xe1, 0x6a, 0xa4, 0x75, 0xc3, 0x30, 0xda, 0x3d, 0xe0, 0xd2, 0x65, 0xb6, 0x9d, 0xa8, 0xe1, + 0xf7, 0xa0, 0xf8, 0xcf, 0xff, 0x91, 0x42, 0xd7, 0xf1, 0x99, 0xe1, 0x98, 0x64, 0x6c, 0x91, 0x8f, + 0x58, 0x87, 0x2d, 0xe5, 0x96, 0x98, 0x81, 0x98, 0x22, 0x66, 0x30, 0x12, 0x4d, 0xe5, 0xd7, 0x62, + 0x2a, 0x9f, 0x73, 0x11, 0x37, 0xd1, 0x12, 0x2e, 0xf8, 0x7c, 0x28, 0xb7, 0x16, 0x6b, 0xd3, 0x29, + 0x59, 0xce, 0xce, 0x72, 0x8f, 0xf7, 0x60, 0xad, 0x1f, 0x30, 0x37, 0x60, 0x51, 0xd2, 0xd1, 0x0e, + 0xbf, 0x82, 0xac, 0xe2, 0x79, 0xd4, 0x2b, 0x64, 0x04, 0x0e, 0x37, 0xc5, 0x0f, 0x70, 0x90, 0x98, + 0x5e, 0xc3, 0x35, 0xae, 0xac, 0x85, 0xc5, 0x2c, 0xe2, 0xe3, 0x6f, 0x60, 0xa7, 0xeb, 0xd3, 0x85, + 0xc1, 0xc8, 0x74, 0x6c, 0x0b, 0xc9, 0x22, 0xcc, 0x3f, 0xa7, 0x3d, 0x16, 0x14, 0xff, 0x23, 0x01, + 0x7e, 0xf8, 0xec, 0x3c, 0xd7, 0xc0, 0xe7, 0xdd, 0x35, 0x79, 0xa2, 0x51, 0x77, 0xf9, 0x1a, 0xff, + 0x12, 0xb2, 0x0b, 0x72, 0x43, 0x16, 0x22, 0xfb, 0xad, 0xda, 0x57, 0xa2, 0x18, 0x8f, 0x6d, 0xcb, + 0xe1, 0xcf, 0x05, 0x57, 0x15, 0x7f, 0xdb, 0xd0, 0x0a, 0xbf, 0x85, 0xcd, 0xa9, 0xe5, 0xbb, 0x0b, + 0xe3, 0x2e, 0x54, 0x88, 0x1e, 0x35, 0x0e, 0x71, 0x01, 0xd6, 0x6d, 0xe2, 0xfb, 0xc6, 0x9c, 0x44, + 0xcf, 0xbc, 0xdc, 0xf2, 0x94, 0x98, 0x65, 0x93, 0x42, 0x36, 0x4c, 0x89, 0xaf, 0x8b, 0xbf, 0x82, + 0xed, 0x44, 0x34, 0xfc, 0x12, 0xd6, 0x47, 0xce, 0xef, 0x1d, 0xfa, 0xd1, 0x41, 0x2f, 0x70, 0x0e, + 0x32, 0x5d, 0x67, 0x46, 0x91, 0xc4, 0xf1, 0xa5, 0xe1, 0x39, 0x96, 0x33, 0x47, 0x29, 0x9c, 0x8f, + 0xca, 0x8a, 0xd2, 0xc5, 0x3f, 0xc0, 0xe7, 0xf1, 0x5a, 0xca, 0x73, 0xe2, 0xb0, 0xd8, 0x34, 0xbc, + 0x83, 0xad, 0x1b, 0x5b, 0xe0, 0x31, 0xf1, 0x7c, 0x8b, 0x3a, 0x51, 0x55, 0x12, 0x14, 0xd7, 0x21, + 0xe7, 0x8b, 0x64, 0x88, 0x5f, 0x48, 0x89, 0xe3, 0x70, 0xff, 0x99, 0x12, 0x69, 0x2b, 0xc5, 0x62, + 0x1d, 0xf6, 0xcf, 0x02, 0xe2, 0x33, 0xe1, 0x29, 0x7e, 0x1e, 0x14, 0x60, 0x9d, 0x38, 0xbc, 0x49, + 0xd3, 0xa8, 0x7d, 0xcb, 0x6d, 0xf1, 0x2f, 0x12, 0xe0, 0x81, 0x47, 0x6f, 0x13, 0x07, 0x48, 0x11, + 0xf2, 0xd7, 0x8c, 0xb9, 0x42, 0x12, 0xfb, 0xf3, 0xdc, 0x63, 0xfc, 0x16, 0x80, 0x6f, 0xfc, 0x50, + 0x29, 0xf5, 0x40, 0xe9, 0x01, 0xe7, 0xa1, 0x1d, 0x1a, 0xaa, 0xa4, 0x0f, 0xd3, 0xbc, 0x0b, 0xd1, + 0x96, 0xc7, 0x60, 0x5e, 0xe0, 0x33, 0x32, 0x6d, 0x1b, 0x61, 0x87, 0x96, 0x31, 0x56, 0xb8, 0xf4, + 0x06, 0x72, 0x23, 0x9f, 0x78, 0xa2, 0x1d, 0x39, 0xc8, 0x68, 0xfd, 0xfe, 0x30, 0xec, 0xc5, 0x48, + 0x57, 0x34, 0x24, 0x95, 0x7e, 0x0d, 0x9b, 0x03, 0x8f, 0x9a, 0xc4, 0xf7, 0xe9, 0x4a, 0x49, 0xa5, + 0x0e, 0x41, 0x2f, 0x78, 0x67, 0xba, 0x0e, 0x23, 0x8b, 0xb0, 0x63, 0x62, 0xd9, 0x6c, 0xa0, 0x14, + 0x5e, 0x87, 0xb4, 0xdc, 0xeb, 0xa0, 0x34, 0x57, 0x90, 0x7b, 0x9d, 0x66, 0x03, 0x65, 0x04, 0xd3, + 0x7a, 0x28, 0x2b, 0x98, 0xd6, 0x6b, 0x36, 0xd0, 0x5a, 0xe9, 0x03, 0xbc, 0xe9, 0xbb, 0x84, 0xd7, + 0xc3, 0x99, 0xeb, 0x77, 0x3e, 0x23, 0xf6, 0x09, 0xa5, 0xcc, 0x67, 0x9e, 0xe1, 0x2a, 0xce, 0xdc, + 0x72, 0x08, 0xde, 0x02, 0x68, 0x5f, 0xf4, 0x47, 0x9d, 0x49, 0x57, 0xed, 0xf2, 0xb4, 0x0a, 0xf0, + 0xea, 0xb2, 0xab, 0x76, 0xfa, 0x97, 0xfa, 0x44, 0x56, 0xf5, 0x4b, 0x45, 0x9b, 0x9c, 0x76, 0x2f, + 0x14, 0x1d, 0x49, 0xa5, 0x6f, 0x61, 0x37, 0xe1, 0x6b, 0x39, 0x60, 0x91, 0x41, 0x98, 0xef, 0x45, + 0x57, 0x1d, 0xfd, 0x80, 0xa4, 0xd2, 0xdf, 0xf2, 0xb0, 0x17, 0x1f, 0x25, 0x7e, 0x9d, 0x2c, 0x4d, + 0x3a, 0x64, 0x66, 0x04, 0x0b, 0x86, 0x5e, 0x60, 0x0c, 0x5b, 0x3a, 0x33, 0x9c, 0xa9, 0xe1, 0x4d, + 0x27, 0x72, 0x6d, 0x72, 0x53, 0x43, 0xa9, 0x38, 0x6b, 0x70, 0x96, 0xc6, 0xbb, 0x62, 0xb6, 0x43, + 0xd6, 0xa9, 0xf9, 0x93, 0x9b, 0x3a, 0xca, 0xc4, 0x61, 0x43, 0xc0, 0x6c, 0x1c, 0xb6, 0x04, 0x5c, + 0xc3, 0xaf, 0x00, 0xdd, 0xc3, 0x6a, 0x53, 0xd0, 0xf5, 0x38, 0xad, 0x87, 0x5e, 0x73, 0x71, 0x07, + 0xba, 0xc8, 0x29, 0x9f, 0x80, 0x75, 0x0e, 0x21, 0x01, 0x45, 0xa6, 0x2f, 0x13, 0xf0, 0x3b, 0x0e, + 0x37, 0xe2, 0x91, 0xf4, 0xaa, 0xb0, 0xdf, 0x8c, 0xa9, 0x9e, 0xb7, 0xf4, 0xc9, 0x4d, 0x15, 0x6d, + 0xc5, 0x54, 0xcf, 0x5b, 0x3c, 0x7e, 0x15, 0x6d, 0x27, 0x69, 0x9d, 0x53, 0x94, 0xa4, 0x0d, 0x4e, + 0x77, 0x30, 0x82, 0x8d, 0x15, 0x55, 0xcf, 0x9b, 0x08, 0xe3, 0x1d, 0xd8, 0x7c, 0x40, 0xaa, 0x35, + 0xb4, 0x1b, 0x57, 0x1a, 0x37, 0xd1, 0xab, 0xb8, 0xd2, 0xb8, 0x5a, 0x43, 0x9f, 0x24, 0xfd, 0x7f, + 0xc7, 0xfd, 0xef, 0xe1, 0x7d, 0xd8, 0x4d, 0x14, 0x68, 0xf2, 0x7e, 0xa0, 0xa2, 0xfd, 0x84, 0xa0, + 0xbe, 0x14, 0x14, 0x12, 0x82, 0xc6, 0x52, 0xf0, 0x69, 0x2c, 0xc0, 0x69, 0xcd, 0x17, 0xf4, 0x20, + 0x4e, 0x1b, 0x21, 0xfd, 0x59, 0x9c, 0xb6, 0x42, 0xfa, 0x1a, 0x7f, 0x02, 0x3b, 0xf7, 0x94, 0x77, + 0x96, 0xe3, 0xcf, 0x62, 0xa5, 0x55, 0xdb, 0x8d, 0x89, 0x5c, 0x43, 0x6f, 0x12, 0xb0, 0xc5, 0xe1, + 0xe7, 0x31, 0xb7, 0x6a, 0xbb, 0xda, 0xe4, 0xf4, 0x30, 0x41, 0xeb, 0x35, 0x4e, 0x7f, 0x9e, 0xa0, + 0x8d, 0x89, 0x5c, 0xaf, 0xa0, 0x62, 0x82, 0xb6, 0x04, 0xfd, 0x22, 0x96, 0x58, 0xe8, 0xb7, 0x5e, + 0x41, 0x6f, 0x13, 0x98, 0x3b, 0xae, 0x57, 0xd0, 0x97, 0xfc, 0x8f, 0x17, 0xf7, 0x5c, 0xad, 0x54, + 0x26, 0x8d, 0x0a, 0x7a, 0x97, 0x90, 0xb4, 0x56, 0x92, 0xaf, 0xf0, 0xa7, 0xf0, 0x49, 0x22, 0x42, + 0x24, 0x3a, 0x4a, 0x88, 0x78, 0x94, 0x48, 0xf4, 0x8b, 0xa7, 0x23, 0xb5, 0x2a, 0xa8, 0xf4, 0x74, + 0xa4, 0x56, 0x05, 0x7d, 0xfd, 0x4c, 0xa4, 0x56, 0x05, 0x7d, 0xf3, 0x4c, 0xa4, 0x56, 0x05, 0x7d, + 0xfb, 0xb8, 0x5a, 0xd5, 0x26, 0x2a, 0x3f, 0xae, 0x56, 0xb5, 0x89, 0x8e, 0x9f, 0xa8, 0x56, 0xb5, + 0x89, 0x2a, 0x4f, 0x54, 0xab, 0xda, 0x44, 0x55, 0xbc, 0x09, 0xf9, 0xf0, 0x1d, 0x95, 0xb7, 0x65, + 0xf2, 0x60, 0xab, 0x9e, 0xa3, 0xdf, 0xf2, 0xd1, 0x8e, 0xb6, 0x67, 0x6e, 0xe0, 0xde, 0x20, 0x03, + 0x03, 0xac, 0x85, 0x04, 0x5d, 0xe1, 0x6d, 0x78, 0x39, 0x72, 0xfc, 0xc0, 0x75, 0xa9, 0xc7, 0xc8, + 0x14, 0x99, 0xa5, 0x23, 0xd8, 0x79, 0xf4, 0xba, 0xcf, 0x0f, 0xe1, 0xf7, 0xc3, 0xe1, 0x20, 0x3c, + 0xd4, 0xf8, 0x8a, 0x9f, 0x81, 0x32, 0x6c, 0xc5, 0x5f, 0xc2, 0xb9, 0xe3, 0x33, 0x37, 0xe8, 0x74, + 0xe4, 0xf0, 0x48, 0x3f, 0x73, 0x83, 0x01, 0x92, 0xb8, 0x09, 0x5f, 0x8d, 0x51, 0x8a, 0x1f, 0xb0, + 0x5c, 0x21, 0x3a, 0xef, 0xd2, 0xa5, 0x21, 0xc0, 0x80, 0x7e, 0x24, 0x5e, 0xf8, 0x16, 0x14, 0xbb, + 0x9e, 0x5f, 0xc2, 0xba, 0x16, 0x38, 0xe2, 0x52, 0x96, 0xf8, 0x71, 0xde, 0x9f, 0xcd, 0x50, 0x8a, + 0x47, 0x18, 0x18, 0x81, 0x4f, 0xa6, 0x28, 0x8d, 0x37, 0x20, 0xd7, 0xf6, 0x2c, 0x66, 0x99, 0xc6, + 0x02, 0x65, 0x78, 0x14, 0xdd, 0xb8, 0x21, 0x53, 0x94, 0x2d, 0xcd, 0x60, 0x3f, 0x7e, 0xd8, 0x46, + 0x47, 0x35, 0x75, 0x84, 0xd6, 0x50, 0xd6, 0xa2, 0x3b, 0x47, 0x1f, 0xf6, 0xa3, 0x04, 0x35, 0x45, + 0x57, 0x86, 0x28, 0x85, 0xf7, 0x00, 0x6b, 0xca, 0x40, 0xee, 0x6a, 0x93, 0xb3, 0x91, 0xa2, 0x0f, + 0x27, 0xf2, 0x99, 0xa2, 0x0e, 0xc3, 0xab, 0x65, 0x20, 0x8f, 0x74, 0x05, 0x65, 0x84, 0x9d, 0x3c, + 0x56, 0x50, 0xb6, 0xf4, 0x0f, 0xe9, 0xf9, 0x37, 0xe2, 0x47, 0x2f, 0x78, 0x7b, 0x71, 0x32, 0x19, + 0xa9, 0xe7, 0x6a, 0xff, 0x52, 0x45, 0x2f, 0xf8, 0xcc, 0x24, 0x64, 0xa7, 0x72, 0xf7, 0x42, 0xe9, + 0x20, 0x09, 0xbf, 0x86, 0x42, 0x42, 0xa4, 0x8f, 0xda, 0x6d, 0x45, 0xe9, 0x28, 0x1d, 0x94, 0x7a, + 0xc2, 0xe9, 0x40, 0x51, 0x3b, 0x5d, 0xf5, 0x0c, 0xa5, 0x9f, 0xb0, 0xd4, 0x94, 0x93, 0x7e, 0x7f, + 0xc8, 0xa5, 0x99, 0xd2, 0x8f, 0xb0, 0x21, 0x7b, 0xe6, 0xb5, 0xc5, 0x88, 0xc9, 0x02, 0x8f, 0xf0, + 0xfa, 0xde, 0xb6, 0x9a, 0x61, 0x51, 0x7a, 0x5d, 0xde, 0x5d, 0x71, 0x71, 0x2e, 0xdc, 0x6b, 0x03, + 0xa5, 0x78, 0x2b, 0x44, 0x97, 0x06, 0x6d, 0x94, 0xe6, 0x03, 0x2b, 0x6b, 0xbd, 0xc9, 0x43, 0x73, + 0x94, 0xe5, 0x76, 0x96, 0xc1, 0x6f, 0x59, 0xe1, 0xaa, 0xd9, 0x40, 0x79, 0x5e, 0x4a, 0x71, 0xf3, + 0xc6, 0x55, 0x37, 0x4a, 0xef, 0x61, 0x43, 0x27, 0x66, 0xe0, 0x59, 0xec, 0x4e, 0x0c, 0xcd, 0x0e, + 0x6c, 0xaa, 0xfd, 0x61, 0xbb, 0xaf, 0x9e, 0x76, 0xcf, 0x46, 0x9a, 0xd2, 0x41, 0x2f, 0x38, 0x1a, + 0x6a, 0x23, 0x7d, 0xa8, 0x74, 0x2e, 0xe4, 0x91, 0xda, 0x7e, 0x8f, 0x24, 0x7e, 0x0b, 0x0a, 0x95, + 0x8e, 0xa2, 0x0e, 0xbb, 0xf2, 0xc5, 0xb8, 0x87, 0x52, 0xdf, 0x9f, 0x03, 0xf2, 0x89, 0xe3, 0x5b, + 0xcc, 0xba, 0x21, 0xd1, 0x67, 0x30, 0xfe, 0xac, 0x1c, 0x7e, 0xf6, 0x96, 0x97, 0x9f, 0xbd, 0xe5, + 0x53, 0x8b, 0x2c, 0xa6, 0x7d, 0x97, 0x17, 0xc2, 0x2f, 0xfc, 0xeb, 0xa7, 0xb4, 0x78, 0x5d, 0x7a, + 0x64, 0xf8, 0xbd, 0x02, 0x9b, 0x2b, 0xf6, 0x3b, 0x9f, 0x3a, 0xff, 0xcf, 0xd3, 0xbf, 0x23, 0x4f, + 0x71, 0xab, 0x93, 0x2f, 0x7f, 0xf3, 0xc5, 0xdc, 0x62, 0xd7, 0xc1, 0x55, 0xd9, 0xa4, 0xf6, 0xb1, + 0x6d, 0x99, 0x1e, 0xf5, 0xe9, 0x8c, 0x1d, 0xdb, 0xd4, 0x3c, 0xf6, 0x5c, 0xf3, 0x38, 0xfc, 0x4e, + 0xbf, 0x5a, 0x13, 0x4e, 0xeb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x62, 0xbc, 0xf5, 0xca, + 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 37648ced..48a72376 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -109,11 +109,10 @@ enum AssignmentType { GpuDefault = 3; // default is used when customer do not pass GPU Assign Type and moc will decide the assign type based on the underlying configuration. } -message Gpu { - reserved 2; +message VirtualMachineGPU { AssignmentType assignment = 1; - uint64 partitionSizeMB = 3; - string name = 4; + uint64 partitionSizeMB = 2; + string name = 3; } message VirtualMachineCustomSize { diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index 6e7be6be..c4547be2 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -467,7 +467,7 @@ type Resources struct { Processor *Processor `protobuf:"bytes,1,opt,name=processor,proto3" json:"processor,omitempty"` Memory *PhysicalMemory `protobuf:"bytes,2,opt,name=memory,proto3" json:"memory,omitempty"` VmCapabilities *VirtualMachineCapabilities `protobuf:"bytes,5,opt,name=vmCapabilities,proto3" json:"vmCapabilities,omitempty"` - GpuList []*HostGPU `protobuf:"bytes,7,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + HostGPUs []*HostGPU `protobuf:"bytes,7,rep,name=hostGPUs,proto3" json:"hostGPUs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -519,9 +519,9 @@ func (m *Resources) GetVmCapabilities() *VirtualMachineCapabilities { return nil } -func (m *Resources) GetGpuList() []*HostGPU { +func (m *Resources) GetHostGPUs() []*HostGPU { if m != nil { - return m.GpuList + return m.HostGPUs } return nil } @@ -540,54 +540,53 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 769 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x51, 0x6f, 0xda, 0x48, - 0x10, 0x3e, 0x83, 0x31, 0x30, 0x24, 0x1c, 0xd9, 0xe4, 0xee, 0x7c, 0xb9, 0xd3, 0x1d, 0x72, 0x74, - 0x11, 0x3a, 0xdd, 0x41, 0x05, 0x8a, 0xda, 0x3e, 0x36, 0x7d, 0x48, 0x1b, 0x35, 0x4d, 0xb4, 0x49, - 0xfb, 0xd0, 0x97, 0x68, 0x63, 0x16, 0x58, 0x15, 0x7b, 0xad, 0xdd, 0x35, 0x92, 0xf3, 0xfb, 0xaa, - 0xfe, 0x80, 0xfe, 0x89, 0xfe, 0x8b, 0xaa, 0xf2, 0xd8, 0x80, 0x4d, 0x50, 0xd4, 0x27, 0xbc, 0x33, - 0xdf, 0xec, 0x7c, 0xf3, 0xcd, 0xce, 0x00, 0xbf, 0x07, 0xd2, 0xbf, 0xf5, 0x65, 0x10, 0xc8, 0xf0, - 0x36, 0x94, 0x63, 0x2e, 0xc2, 0x89, 0xec, 0x47, 0x4a, 0x1a, 0x49, 0x20, 0x90, 0x7e, 0x3f, 0x73, - 0x1d, 0xfe, 0x56, 0x80, 0x65, 0x3f, 0x19, 0xe8, 0xf0, 0xaf, 0xb2, 0x23, 0x8a, 0x0d, 0x2f, 0xfa, - 0xbd, 0x4b, 0x38, 0xb8, 0xd4, 0x94, 0x4f, 0x85, 0x36, 0x8a, 0x19, 0x21, 0xc3, 0x6b, 0xc3, 0x4c, - 0xac, 0xc9, 0x53, 0x70, 0x34, 0x7e, 0xb9, 0x56, 0xd7, 0xea, 0xb5, 0x87, 0x7f, 0xf7, 0xd7, 0xd9, - 0xfa, 0x0f, 0x23, 0x38, 0xcd, 0xe1, 0xde, 0x97, 0x0a, 0x34, 0xaf, 0x94, 0xf4, 0xb9, 0xd6, 0x52, - 0x11, 0x02, 0x76, 0xc8, 0x02, 0x8e, 0x97, 0x34, 0x29, 0x7e, 0x93, 0x03, 0xa8, 0xf9, 0x52, 0x71, - 0xed, 0x56, 0xba, 0x56, 0x6f, 0x97, 0x66, 0x87, 0xd4, 0xaa, 0x23, 0xce, 0xc7, 0x6e, 0x15, 0xa1, - 0xd9, 0x81, 0x1c, 0x83, 0x6d, 0x92, 0x88, 0xbb, 0x36, 0x92, 0x20, 0x48, 0x62, 0x75, 0xfb, 0x4d, - 0x12, 0x71, 0x8a, 0x7e, 0x72, 0x0c, 0xed, 0x85, 0x50, 0x26, 0x66, 0x73, 0x71, 0x8f, 0xa4, 0xdc, - 0x5a, 0xd7, 0xea, 0x35, 0xe8, 0x86, 0x95, 0xfc, 0x07, 0x7b, 0x73, 0x39, 0x15, 0x3e, 0x9b, 0x47, - 0xcb, 0x5b, 0xb4, 0xeb, 0x20, 0x8f, 0x87, 0x8e, 0x14, 0x3d, 0x4b, 0x22, 0xae, 0x16, 0x42, 0x4b, - 0x15, 0x29, 0xae, 0x79, 0x68, 0xdc, 0x3a, 0x5e, 0xfc, 0xd0, 0x41, 0x3c, 0xd8, 0x09, 0x58, 0x18, - 0x4f, 0x98, 0x6f, 0x62, 0xc5, 0x95, 0xdb, 0xc0, 0x42, 0x4a, 0x36, 0x72, 0x02, 0x3b, 0x4c, 0xf9, - 0x33, 0x61, 0x38, 0x1a, 0xdc, 0x26, 0xd6, 0xb5, 0x87, 0x75, 0xbd, 0x28, 0x38, 0x68, 0x09, 0xe6, - 0xf5, 0xa1, 0x7d, 0x35, 0x4b, 0x74, 0x4a, 0xef, 0x82, 0x07, 0x52, 0x25, 0xe4, 0x4f, 0x68, 0x6a, - 0x71, 0xcf, 0x4f, 0x13, 0xc3, 0xb3, 0x16, 0xd9, 0x74, 0x6d, 0xf0, 0x3e, 0x5b, 0x50, 0x7f, 0x25, - 0xb5, 0x39, 0xbb, 0x7a, 0xb7, 0xb5, 0x05, 0xa5, 0xe8, 0xac, 0x0d, 0x6b, 0x43, 0xd6, 0xa0, 0x38, - 0x34, 0xd8, 0x0a, 0x6c, 0x50, 0x1c, 0x1a, 0xd2, 0x07, 0x12, 0x31, 0x65, 0x04, 0xb6, 0x7c, 0x15, - 0x6c, 0x63, 0xea, 0x2d, 0x1e, 0x32, 0x02, 0x60, 0x5a, 0x8b, 0x69, 0x18, 0xa4, 0xaa, 0xd5, 0xb0, - 0xd0, 0xfd, 0xac, 0xd0, 0x95, 0x19, 0x3b, 0x58, 0x80, 0x91, 0x36, 0x54, 0xc4, 0x18, 0x1b, 0xd2, - 0xa4, 0x15, 0x31, 0xf6, 0xbe, 0x5a, 0xf0, 0xf3, 0x65, 0xc4, 0xd3, 0x87, 0x16, 0x4e, 0xaf, 0x13, - 0x6d, 0x78, 0x90, 0x12, 0x91, 0x4b, 0x93, 0x46, 0x93, 0xfe, 0x18, 0xe7, 0x1a, 0x6c, 0xf1, 0x90, - 0x27, 0xe0, 0x48, 0x8d, 0xaf, 0xa8, 0x82, 0x24, 0x5c, 0x24, 0xb1, 0x71, 0x2b, 0x32, 0xc9, 0x71, - 0xa9, 0x3c, 0x52, 0x2f, 0xb8, 0xd2, 0xe9, 0x43, 0xca, 0xde, 0xe3, 0xda, 0x40, 0x6e, 0xe0, 0x40, - 0x6e, 0x19, 0x19, 0x94, 0xa2, 0x35, 0xec, 0x3e, 0x3e, 0x28, 0xb1, 0xa6, 0x5b, 0xa3, 0xbd, 0x4f, - 0x15, 0x68, 0xbc, 0x95, 0x63, 0xfe, 0x3a, 0x9c, 0xc8, 0xad, 0x3d, 0xcb, 0xa4, 0xa9, 0x2c, 0xa5, - 0x21, 0x27, 0x00, 0x3e, 0x8b, 0xd8, 0x9d, 0x98, 0x0b, 0x93, 0x20, 0xcb, 0xd6, 0xf0, 0x97, 0x62, - 0x72, 0xca, 0xb5, 0x8c, 0x95, 0xcf, 0x35, 0x2d, 0x00, 0xc9, 0x73, 0xd8, 0x61, 0x0b, 0x26, 0xe6, - 0xcb, 0x40, 0xfb, 0xb1, 0xc0, 0x12, 0xb4, 0x20, 0xa4, 0xf3, 0x83, 0x42, 0x1e, 0xad, 0xb6, 0x48, - 0x1d, 0xd3, 0xb4, 0x30, 0x22, 0xd7, 0x21, 0x77, 0x91, 0x5f, 0xc1, 0x89, 0x23, 0x23, 0x02, 0x8e, - 0x13, 0x53, 0xa5, 0xf9, 0x89, 0x8c, 0xd2, 0x74, 0xa9, 0x1c, 0x38, 0x25, 0xad, 0xe1, 0x1f, 0x25, - 0x65, 0xcb, 0x59, 0x69, 0x0e, 0xf5, 0xbe, 0x59, 0xd0, 0x5c, 0xf1, 0x27, 0x23, 0x68, 0xae, 0xc6, - 0x19, 0xc5, 0xdc, 0xa8, 0x74, 0xb5, 0x4a, 0xe8, 0x1a, 0x47, 0x86, 0xe0, 0x04, 0x38, 0x64, 0x28, - 0x76, 0x6b, 0x78, 0x58, 0x8a, 0x28, 0x8d, 0x21, 0xcd, 0x91, 0xe4, 0x0c, 0xda, 0x8b, 0xe0, 0xe5, - 0x52, 0x65, 0xc1, 0x35, 0x3e, 0xf8, 0x56, 0xbe, 0x36, 0xdf, 0x67, 0x4b, 0xe8, 0x82, 0xf9, 0x33, - 0x11, 0xf2, 0x22, 0x8c, 0x6e, 0x84, 0x91, 0xff, 0xa1, 0x3e, 0x8d, 0xe2, 0x37, 0x42, 0xa7, 0x8b, - 0xa6, 0xda, 0x6b, 0xe5, 0x23, 0x93, 0x67, 0xcf, 0x67, 0x9a, 0x2e, 0x31, 0xe7, 0x76, 0xa3, 0xda, - 0xb1, 0xcf, 0xed, 0x86, 0xdd, 0xa9, 0x9d, 0xdb, 0x0d, 0xa7, 0x53, 0xff, 0xf7, 0x19, 0xec, 0x6f, - 0x59, 0xcf, 0x64, 0x0f, 0x76, 0x43, 0x69, 0x32, 0x3b, 0x57, 0x7c, 0xdc, 0xf9, 0x89, 0xb4, 0x01, - 0xd4, 0xfa, 0x6c, 0x9d, 0xfe, 0xf3, 0xe1, 0x68, 0x2a, 0xcc, 0x2c, 0xbe, 0x4b, 0xb3, 0x0d, 0x02, - 0xe1, 0x2b, 0xa9, 0xe5, 0xc4, 0x0c, 0x02, 0xe9, 0x0f, 0x54, 0xe4, 0x0f, 0x32, 0x0e, 0x77, 0x0e, - 0xfe, 0x71, 0x8c, 0xbe, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xad, 0x69, 0xd4, 0x9a, 0x06, 0x00, - 0x00, + // 764 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x3c, + 0x14, 0xfe, 0x9b, 0xa6, 0x69, 0x7b, 0xba, 0xf5, 0xef, 0xbc, 0x01, 0x61, 0x20, 0xa8, 0x32, 0x31, + 0x55, 0x08, 0xb5, 0xa8, 0xd5, 0x04, 0x5c, 0x32, 0x2e, 0x06, 0x93, 0xc6, 0x26, 0x6f, 0x70, 0xc1, + 0xcd, 0x94, 0xa5, 0x6e, 0x6b, 0xd1, 0xc4, 0x91, 0xed, 0x54, 0xca, 0xae, 0x78, 0x38, 0xc4, 0x03, + 0xf0, 0x12, 0xbc, 0x06, 0xca, 0x49, 0x9a, 0x26, 0x5d, 0x35, 0x71, 0xd5, 0xf8, 0x3b, 0xdf, 0xf1, + 0xf9, 0xfc, 0x1d, 0x1f, 0x17, 0x1e, 0xfb, 0xc2, 0xbb, 0xf6, 0x84, 0xef, 0x8b, 0xe0, 0x3a, 0x10, + 0x63, 0xc6, 0x83, 0x89, 0xe8, 0x87, 0x52, 0x68, 0x41, 0xc0, 0x17, 0x5e, 0x3f, 0x0d, 0xed, 0x3f, + 0x2a, 0xd0, 0xd2, 0x9f, 0x94, 0xb4, 0xff, 0xac, 0x1c, 0x08, 0x23, 0xcd, 0x8a, 0x71, 0xe7, 0x1c, + 0xf6, 0xce, 0x15, 0x65, 0x53, 0xae, 0xb4, 0x74, 0x35, 0x17, 0xc1, 0xa5, 0x76, 0x75, 0xa4, 0xc8, + 0x1b, 0xb0, 0x14, 0x7e, 0xd9, 0x95, 0x6e, 0xa5, 0xd7, 0x1e, 0x3e, 0xef, 0xaf, 0xaa, 0xf5, 0xef, + 0x66, 0x30, 0x9a, 0xd1, 0x9d, 0xdf, 0x06, 0x34, 0x2f, 0xa4, 0xf0, 0x98, 0x52, 0x42, 0x12, 0x02, + 0x66, 0xe0, 0xfa, 0x0c, 0x37, 0x69, 0x52, 0xfc, 0x26, 0x7b, 0x50, 0xf3, 0x84, 0x64, 0xca, 0x36, + 0xba, 0x95, 0xde, 0x36, 0x4d, 0x17, 0x09, 0xaa, 0x42, 0xc6, 0xc6, 0x76, 0x15, 0xa9, 0xe9, 0x82, + 0x1c, 0x82, 0xa9, 0xe3, 0x90, 0xd9, 0x26, 0x8a, 0x20, 0x28, 0x22, 0xdf, 0xfd, 0x2a, 0x0e, 0x19, + 0xc5, 0x38, 0x39, 0x84, 0xf6, 0x82, 0x4b, 0x1d, 0xb9, 0x73, 0x7e, 0x8b, 0xa2, 0xec, 0x5a, 0xb7, + 0xd2, 0x6b, 0xd0, 0x35, 0x94, 0xbc, 0x82, 0x9d, 0xb9, 0x98, 0x72, 0xcf, 0x9d, 0x87, 0xcb, 0x5d, + 0x94, 0x6d, 0xa1, 0x8e, 0xbb, 0x81, 0x84, 0x3d, 0x8b, 0x43, 0x26, 0x17, 0x5c, 0x09, 0x19, 0x4a, + 0xa6, 0x58, 0xa0, 0xed, 0x3a, 0x6e, 0x7c, 0x37, 0x40, 0x1c, 0xd8, 0xf2, 0xdd, 0x20, 0x9a, 0xb8, + 0x9e, 0x8e, 0x24, 0x93, 0x76, 0x03, 0x0f, 0x52, 0xc2, 0xc8, 0x11, 0x6c, 0xb9, 0xd2, 0x9b, 0x71, + 0xcd, 0x10, 0xb0, 0x9b, 0x78, 0xae, 0x1d, 0x3c, 0xd7, 0xfb, 0x42, 0x80, 0x96, 0x68, 0x4e, 0x1f, + 0xda, 0x17, 0xb3, 0x58, 0x25, 0xf2, 0xce, 0x98, 0x2f, 0x64, 0x4c, 0x9e, 0x42, 0x53, 0xf1, 0x5b, + 0x76, 0x1c, 0x6b, 0x96, 0xb6, 0xc8, 0xa4, 0x2b, 0xc0, 0xf9, 0x55, 0x81, 0xfa, 0x47, 0xa1, 0xf4, + 0xc9, 0xc5, 0x97, 0x8d, 0x2d, 0x28, 0x65, 0xa7, 0x6d, 0x58, 0x01, 0x69, 0x83, 0xa2, 0x40, 0x63, + 0x2b, 0xb0, 0x41, 0x51, 0xa0, 0x49, 0x1f, 0x48, 0xe8, 0x4a, 0xcd, 0xb1, 0xe5, 0x79, 0xb2, 0x89, + 0xa5, 0x37, 0x44, 0xc8, 0x08, 0xc0, 0x55, 0x8a, 0x4f, 0x03, 0x3f, 0x71, 0xad, 0x86, 0x07, 0xdd, + 0x4d, 0x0f, 0x9a, 0xc3, 0xd8, 0xc1, 0x02, 0x8d, 0xb4, 0xc1, 0xe0, 0x63, 0x6c, 0x48, 0x93, 0x1a, + 0x7c, 0xec, 0xfc, 0xa9, 0xc0, 0xff, 0xe7, 0x21, 0x4b, 0x2e, 0x5a, 0x30, 0xbd, 0x8c, 0x95, 0x66, + 0x7e, 0x22, 0x44, 0x2c, 0x21, 0x85, 0x90, 0xfa, 0x1e, 0x65, 0x1e, 0x6c, 0x88, 0x90, 0xd7, 0x60, + 0x09, 0x85, 0xb7, 0xc8, 0x40, 0x11, 0x36, 0x8a, 0x58, 0xdb, 0x15, 0x95, 0x64, 0xbc, 0xc4, 0x1e, + 0xa1, 0x16, 0x4c, 0xaa, 0xe4, 0x22, 0xa5, 0xf7, 0x71, 0x05, 0x90, 0x2b, 0xd8, 0x13, 0x1b, 0x46, + 0x06, 0xad, 0x68, 0x0d, 0xbb, 0xf7, 0x0f, 0x4a, 0xa4, 0xe8, 0xc6, 0x6c, 0xe7, 0xa7, 0x01, 0x8d, + 0xcf, 0x62, 0xcc, 0x3e, 0x05, 0x13, 0xb1, 0xb1, 0x67, 0xa9, 0x35, 0xc6, 0xd2, 0x1a, 0x72, 0x04, + 0xe0, 0xb9, 0xa1, 0x7b, 0xc3, 0xe7, 0x5c, 0xc7, 0xa8, 0xb2, 0x35, 0x7c, 0x50, 0x2c, 0x4e, 0x99, + 0x12, 0x91, 0xf4, 0x98, 0xa2, 0x05, 0x22, 0x79, 0x07, 0x5b, 0xee, 0xc2, 0xe5, 0xf3, 0x65, 0xa2, + 0x79, 0x5f, 0x62, 0x89, 0x5a, 0x30, 0xd2, 0xfa, 0x47, 0x23, 0x0f, 0xf2, 0x57, 0xa4, 0x8e, 0x65, + 0x5a, 0x98, 0x91, 0xf9, 0x90, 0x85, 0xc8, 0x43, 0xb0, 0xa2, 0x50, 0x73, 0x9f, 0xe1, 0xc4, 0x54, + 0x69, 0xb6, 0x22, 0xa3, 0xa4, 0x5c, 0x62, 0x07, 0x4e, 0x49, 0x6b, 0xf8, 0xa4, 0xe4, 0x6c, 0xb9, + 0x2a, 0xcd, 0xa8, 0xce, 0x0f, 0x03, 0x9a, 0xb9, 0x7e, 0x32, 0x82, 0x66, 0x3e, 0xce, 0x68, 0xe6, + 0xda, 0x49, 0xf3, 0xa7, 0x84, 0xae, 0x78, 0x64, 0x08, 0x96, 0x8f, 0x43, 0x86, 0x66, 0xb7, 0x86, + 0xfb, 0xa5, 0x8c, 0xd2, 0x18, 0xd2, 0x8c, 0x49, 0x4e, 0xa0, 0xbd, 0xf0, 0x3f, 0x2c, 0x5d, 0xe6, + 0x4c, 0xe1, 0x85, 0x6f, 0x65, 0xcf, 0xe6, 0xd7, 0xf4, 0x11, 0x3a, 0x73, 0xbd, 0x19, 0x0f, 0x58, + 0x91, 0x46, 0xd7, 0xd2, 0xc8, 0x00, 0x1a, 0xb3, 0x74, 0x70, 0x13, 0xcf, 0xaa, 0xbd, 0x56, 0x36, + 0x33, 0x59, 0xf9, 0x6c, 0xa8, 0x69, 0x4e, 0x3a, 0x35, 0x1b, 0xd5, 0x8e, 0x79, 0x6a, 0x36, 0xcc, + 0x4e, 0xed, 0xd4, 0x6c, 0x58, 0x9d, 0xfa, 0xcb, 0xb7, 0xb0, 0xbb, 0xe1, 0x81, 0x26, 0x3b, 0xb0, + 0x1d, 0x08, 0x9d, 0xe2, 0x4c, 0xb2, 0x71, 0xe7, 0x3f, 0xd2, 0x06, 0x90, 0xab, 0x75, 0xe5, 0xf8, + 0xc5, 0xb7, 0x83, 0x29, 0xd7, 0xb3, 0xe8, 0x26, 0x29, 0x37, 0xf0, 0xb9, 0x27, 0x85, 0x12, 0x13, + 0x3d, 0xf0, 0x85, 0x37, 0x90, 0xa1, 0x37, 0x48, 0x45, 0xdc, 0x58, 0xf8, 0xd7, 0x31, 0xfa, 0x1b, + 0x00, 0x00, 0xff, 0xff, 0x85, 0x80, 0xb0, 0x18, 0x9c, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index 21241d23..04986cf5 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -67,5 +67,5 @@ message Resources { Processor processor = 1; PhysicalMemory memory = 2; VirtualMachineCapabilities vmCapabilities = 5; - repeated HostGPU gpuList = 7; + repeated HostGPU hostGPUs = 7; } \ No newline at end of file diff --git a/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go b/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go index d63cee66..5f2ed1ce 100644 --- a/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go +++ b/rpc/nodeagent/compute/moc_nodeagent_virtualmachine.pb.go @@ -726,7 +726,7 @@ type HardwareConfiguration struct { VMSize common.VirtualMachineSizeType `protobuf:"varint,1,opt,name=VMSize,proto3,enum=moc.VirtualMachineSizeType" json:"VMSize,omitempty"` CustomSize *common.VirtualMachineCustomSize `protobuf:"bytes,2,opt,name=customSize,proto3" json:"customSize,omitempty"` DynamicMemoryConfiguration *common.DynamicMemoryConfiguration `protobuf:"bytes,3,opt,name=dynamicMemoryConfiguration,proto3" json:"dynamicMemoryConfiguration,omitempty"` - GpuList []*common.Gpu `protobuf:"bytes,4,rep,name=gpuList,proto3" json:"gpuList,omitempty"` + VirtualMachineGPUs []*common.VirtualMachineGPU `protobuf:"bytes,4,rep,name=virtualMachineGPUs,proto3" json:"virtualMachineGPUs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -778,9 +778,9 @@ func (m *HardwareConfiguration) GetDynamicMemoryConfiguration() *common.DynamicM return nil } -func (m *HardwareConfiguration) GetGpuList() []*common.Gpu { +func (m *HardwareConfiguration) GetVirtualMachineGPUs() []*common.VirtualMachineGPU { if m != nil { - return m.GpuList + return m.VirtualMachineGPUs } return nil } @@ -1288,114 +1288,114 @@ func init() { var fileDescriptor_9f3eecb05bcac3b7 = []byte{ // 1726 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0x1c, 0xb7, - 0xf1, 0xff, 0xde, 0xe9, 0xe7, 0x8d, 0x7e, 0x38, 0x62, 0x24, 0x7b, 0x73, 0xb1, 0x1d, 0x61, 0x9d, - 0x6f, 0xab, 0x34, 0xee, 0x29, 0x38, 0x27, 0x69, 0x0b, 0xa4, 0x05, 0xf4, 0x2b, 0x96, 0xda, 0x48, - 0x56, 0x79, 0xb6, 0x83, 0xa6, 0x05, 0x04, 0x6a, 0x97, 0xba, 0x23, 0x74, 0x4b, 0x6e, 0x49, 0xae, - 0x2f, 0xe7, 0x97, 0x02, 0x7d, 0x69, 0x80, 0xbe, 0xf4, 0xaf, 0xe8, 0x43, 0xdf, 0xf3, 0x56, 0xa0, - 0x7d, 0x29, 0xfa, 0xdf, 0xf4, 0x6f, 0x28, 0xc8, 0xe5, 0xde, 0xed, 0xee, 0xed, 0x0a, 0x32, 0xe0, - 0x3e, 0xe9, 0x76, 0x66, 0x3e, 0x1f, 0xce, 0x0c, 0x67, 0x86, 0xa4, 0xc0, 0x8f, 0x44, 0x70, 0xc1, - 0x45, 0x48, 0x49, 0x9f, 0x72, 0x7d, 0xf1, 0x8a, 0x49, 0x9d, 0x90, 0x61, 0x44, 0x82, 0x01, 0xe3, - 0xb4, 0x13, 0x4b, 0xa1, 0x05, 0xda, 0x8a, 0x44, 0xd0, 0x99, 0xd8, 0x74, 0x02, 0x11, 0xc5, 0x89, - 0xa6, 0xed, 0xf7, 0xfb, 0x42, 0xf4, 0x87, 0x74, 0xd7, 0x1a, 0x5d, 0x26, 0x57, 0xbb, 0x34, 0x8a, - 0xf5, 0x38, 0xc5, 0xb4, 0x1f, 0x96, 0x95, 0x23, 0x49, 0xe2, 0x98, 0x4a, 0xe5, 0xf4, 0xf7, 0xcc, - 0xba, 0x81, 0x88, 0x22, 0xc1, 0xdd, 0x9f, 0x0c, 0x58, 0x54, 0x98, 0x95, 0x0a, 0xfa, 0x07, 0x39, - 0x3d, 0x17, 0x9a, 0x5d, 0xb1, 0x80, 0x68, 0x96, 0xa9, 0xfd, 0xbf, 0x35, 0x60, 0xeb, 0x65, 0x1a, - 0xc4, 0x69, 0x1a, 0x04, 0xa6, 0xbf, 0x4f, 0xa8, 0xd2, 0xe8, 0xb7, 0x65, 0x45, 0x6f, 0xac, 0x34, - 0x8d, 0x94, 0xd7, 0xd8, 0x9e, 0xdb, 0x59, 0xe9, 0xfe, 0x7f, 0xa7, 0x32, 0xca, 0x4e, 0x89, 0xac, - 0x9a, 0x03, 0x7d, 0x0a, 0x6b, 0xcf, 0x62, 0x2a, 0xad, 0x27, 0xcf, 0xc7, 0x31, 0xf5, 0x9a, 0xdb, - 0x8d, 0x9d, 0xf5, 0xee, 0xba, 0x25, 0x9d, 0x68, 0x70, 0xd1, 0xc8, 0xff, 0x47, 0x03, 0xee, 0x96, - 0x9d, 0x55, 0xb1, 0xe0, 0x8a, 0xfe, 0x6f, 0xbd, 0xed, 0xc2, 0x22, 0xa6, 0x2a, 0x19, 0x6a, 0xeb, - 0xe6, 0x4a, 0xb7, 0xdd, 0x49, 0x77, 0xab, 0x93, 0xed, 0x56, 0x67, 0x5f, 0x88, 0xe1, 0x4b, 0x32, - 0x4c, 0x28, 0x76, 0x96, 0x68, 0x13, 0x16, 0x8e, 0xa4, 0x14, 0xd2, 0x9b, 0xdb, 0x6e, 0xec, 0xb4, - 0x70, 0xfa, 0xe1, 0x77, 0x60, 0xb5, 0xd7, 0x3b, 0x3e, 0x4f, 0x2e, 0x87, 0x2c, 0xf8, 0x15, 0x1d, - 0xa3, 0x87, 0xb0, 0x74, 0x4d, 0xc7, 0x21, 0xd1, 0xc4, 0x6b, 0x18, 0xbb, 0xfd, 0xf9, 0xef, 0xbe, - 0xf7, 0x1a, 0x38, 0x13, 0xfa, 0x3e, 0xcc, 0x1f, 0x32, 0x75, 0x8d, 0xda, 0xb0, 0x1c, 0x32, 0x75, - 0xcd, 0x49, 0x44, 0x53, 0x43, 0x3c, 0xf9, 0xf6, 0x87, 0xb0, 0xda, 0x1b, 0x10, 0x49, 0xc3, 0x2f, - 0xc5, 0x30, 0xa4, 0x12, 0x7d, 0x0a, 0x5b, 0xca, 0x7e, 0x5f, 0xd9, 0x6f, 0x49, 0xaf, 0xa8, 0xa4, - 0x3c, 0xc8, 0x80, 0xd5, 0x4a, 0xf4, 0x03, 0x58, 0xef, 0x9b, 0x7d, 0x8f, 0x44, 0xc2, 0x75, 0x4c, - 0xf4, 0xc0, 0xc6, 0xda, 0xc2, 0x25, 0xa9, 0xff, 0xa7, 0x26, 0x6c, 0xf6, 0xb4, 0x90, 0xa4, 0x4f, - 0x0f, 0x04, 0xbf, 0x62, 0xfd, 0x24, 0xdd, 0x20, 0xf4, 0x04, 0x16, 0x85, 0x32, 0x4e, 0xd9, 0x75, - 0x56, 0xba, 0xef, 0xd7, 0xa4, 0xdc, 0xc4, 0x83, 0x9d, 0x29, 0xfa, 0x19, 0xb4, 0x4c, 0x9c, 0xe6, - 0xb7, 0xf2, 0x9a, 0x76, 0xab, 0x6e, 0xc4, 0x4d, 0xad, 0x4d, 0x98, 0xaf, 0xa2, 0xd4, 0x85, 0x03, - 0xc1, 0x35, 0x61, 0x9c, 0xca, 0x33, 0x93, 0x9f, 0x34, 0xe1, 0xd5, 0x4a, 0x74, 0x02, 0x6b, 0x2a, - 0x97, 0x2c, 0xe5, 0xcd, 0xdb, 0x45, 0x1f, 0xd5, 0x2c, 0x9a, 0x4f, 0x2c, 0x2e, 0x22, 0xfd, 0x2f, - 0xe1, 0x9d, 0x33, 0xaa, 0x47, 0x42, 0x5e, 0x9f, 0x70, 0x4d, 0xe5, 0x15, 0x09, 0x28, 0xea, 0xc2, - 0x26, 0x2f, 0xc9, 0xce, 0xa6, 0x7b, 0x56, 0xa9, 0xf3, 0x2f, 0x60, 0xd3, 0xf1, 0x14, 0x13, 0xfa, - 0x14, 0x80, 0x65, 0x86, 0x59, 0x1d, 0xff, 0xb0, 0xc6, 0xcf, 0xb2, 0x23, 0x38, 0x07, 0xf5, 0xff, - 0xd8, 0x80, 0x8d, 0x17, 0x8a, 0xca, 0x22, 0xfd, 0x36, 0x2c, 0x27, 0x8a, 0xca, 0x69, 0x49, 0xb9, - 0xda, 0x9b, 0x48, 0x8d, 0x45, 0x4c, 0x94, 0x1a, 0x09, 0x19, 0xa6, 0xc5, 0x90, 0x59, 0x64, 0x52, - 0xf4, 0x51, 0xca, 0xa1, 0x4d, 0x07, 0xcf, 0xd9, 0x0e, 0x5e, 0xb3, 0x0e, 0x9a, 0xd5, 0x4c, 0xc7, - 0xe2, 0x89, 0xda, 0x64, 0x0b, 0x1f, 0x9e, 0x17, 0x5d, 0x78, 0x08, 0x10, 0x32, 0x45, 0x2e, 0x87, - 0x14, 0x1f, 0x9e, 0x5b, 0x27, 0x96, 0x71, 0x4e, 0x82, 0x10, 0xcc, 0xc7, 0x42, 0xa6, 0x5d, 0xb7, - 0x86, 0xed, 0x6f, 0xff, 0xaf, 0x0d, 0x40, 0x5f, 0x31, 0x9e, 0x7c, 0x5b, 0xa4, 0x3a, 0x84, 0x07, - 0x0e, 0x78, 0xee, 0x9c, 0xdb, 0x4b, 0xf4, 0x80, 0x72, 0xed, 0xc6, 0x9d, 0x63, 0xbf, 0xd9, 0x08, - 0xfd, 0x12, 0xde, 0x0d, 0x86, 0x22, 0x09, 0x4f, 0x38, 0xd3, 0x87, 0x44, 0x93, 0x9e, 0x48, 0x64, - 0x90, 0x0d, 0x27, 0xcf, 0x86, 0x76, 0x30, 0xab, 0xc7, 0x55, 0x20, 0xff, 0xbb, 0x26, 0x6c, 0x7e, - 0xcd, 0x78, 0x28, 0x46, 0xaa, 0xe8, 0xea, 0xe7, 0x70, 0x97, 0x72, 0xe3, 0xc4, 0x5e, 0xa2, 0x45, - 0x44, 0x34, 0x0b, 0x5e, 0xc4, 0x21, 0xd1, 0x76, 0x8f, 0x8d, 0x8f, 0x35, 0x5a, 0x33, 0x03, 0x34, - 0x8b, 0xe8, 0x37, 0x82, 0x53, 0xd7, 0x9b, 0x93, 0x6f, 0xd4, 0x9b, 0xcd, 0xae, 0xdd, 0x90, 0xfa, - 0x8a, 0x29, 0x9b, 0xe3, 0xd9, 0xed, 0x79, 0x0a, 0xe8, 0x6b, 0xc6, 0xf1, 0x69, 0x91, 0x76, 0xde, - 0xd2, 0xde, 0xb3, 0xb4, 0xb3, 0x6a, 0x5c, 0x01, 0xf1, 0xff, 0xbd, 0x00, 0xf7, 0xdd, 0x24, 0xe7, - 0xfd, 0x74, 0xa8, 0x16, 0x57, 0xf2, 0x61, 0xd5, 0xf9, 0x25, 0x73, 0xed, 0x52, 0x90, 0xa1, 0x33, - 0x58, 0x23, 0x61, 0xc4, 0x38, 0x53, 0x5a, 0x12, 0x2d, 0xa4, 0x9b, 0xc5, 0x3b, 0x35, 0xf1, 0xcd, - 0x14, 0x3c, 0x2e, 0xc2, 0xd1, 0x2f, 0x60, 0xc1, 0x14, 0xa7, 0xf2, 0xe6, 0x6c, 0x67, 0xdd, 0x9e, - 0x27, 0x85, 0xa1, 0x0f, 0x01, 0x82, 0x44, 0x69, 0x11, 0x99, 0x3d, 0xb7, 0x59, 0xc9, 0xfa, 0x23, - 0x27, 0x47, 0x07, 0x00, 0xb1, 0x9d, 0xf6, 0xd7, 0x74, 0xac, 0xbc, 0x85, 0x9b, 0x87, 0x4d, 0xee, - 0x64, 0xc0, 0x39, 0x18, 0xfa, 0xc4, 0x8c, 0x56, 0xdb, 0x64, 0x8b, 0xb9, 0x4a, 0x2c, 0x65, 0xd4, - 0xf6, 0x9b, 0xb3, 0x43, 0xbf, 0x86, 0x0d, 0xa1, 0xf6, 0x85, 0xd0, 0x26, 0xda, 0xf8, 0x88, 0xf7, - 0x19, 0xa7, 0xde, 0x92, 0x05, 0x3f, 0xaa, 0x02, 0x97, 0x4c, 0xf1, 0x2c, 0x1a, 0xfd, 0x06, 0xd0, - 0x70, 0xa6, 0xef, 0xbc, 0x65, 0xbb, 0x09, 0x1f, 0xd5, 0x44, 0x34, 0xdb, 0xa8, 0xb8, 0x82, 0x04, - 0x5d, 0xc0, 0xe6, 0xa8, 0xa2, 0x53, 0xbc, 0x96, 0x25, 0xff, 0xb8, 0x86, 0xbc, 0xaa, 0xb9, 0x70, - 0x25, 0x91, 0xa9, 0xe4, 0x58, 0x8a, 0x6f, 0xc7, 0x45, 0x7a, 0xc8, 0x55, 0xf2, 0xf9, 0x8c, 0x1a, - 0x57, 0x40, 0xfc, 0xbf, 0x34, 0x61, 0xeb, 0x98, 0xc8, 0x70, 0x44, 0xe4, 0xec, 0xf1, 0xf7, 0xf2, - 0xb4, 0xc7, 0x5e, 0xa7, 0xc5, 0xbb, 0xee, 0x8e, 0xb1, 0xd2, 0x7d, 0x82, 0xbd, 0xa6, 0xe9, 0x36, - 0xa5, 0xa6, 0xe8, 0xe7, 0x59, 0x0d, 0x59, 0x60, 0x5a, 0xd0, 0x0f, 0x2a, 0x80, 0x07, 0x13, 0x23, - 0x9c, 0x03, 0xa0, 0x0b, 0x68, 0x87, 0x63, 0x4e, 0x22, 0x16, 0x9c, 0xd2, 0x48, 0xc8, 0x71, 0x55, - 0xff, 0x7f, 0x60, 0xe9, 0x0e, 0x6b, 0xcd, 0xf0, 0x0d, 0x14, 0xc8, 0x87, 0xa5, 0x7e, 0x9c, 0x7c, - 0xc5, 0x94, 0x76, 0xe7, 0xe4, 0xb2, 0x65, 0x7b, 0x1a, 0x27, 0x38, 0x53, 0xf8, 0x5f, 0xc0, 0xea, - 0x0b, 0x7a, 0xc5, 0x7a, 0x54, 0x9b, 0x72, 0x52, 0xe8, 0x31, 0x6c, 0x28, 0x1a, 0x24, 0x92, 0x9a, - 0x02, 0x3a, 0xb2, 0xa3, 0x2c, 0x74, 0x93, 0x6d, 0x56, 0xe1, 0x7f, 0xdf, 0x80, 0xad, 0x9e, 0x91, - 0x32, 0x5d, 0x5a, 0xfb, 0x3e, 0xb4, 0xd2, 0x41, 0xf8, 0xfc, 0xfc, 0xd4, 0xe1, 0xa7, 0x02, 0xf4, - 0x14, 0x56, 0x93, 0xdc, 0xaa, 0x2e, 0x77, 0x75, 0x9d, 0x95, 0x77, 0x10, 0x17, 0x80, 0xe8, 0x33, - 0x58, 0x55, 0x6e, 0xfd, 0xe7, 0xd3, 0x63, 0x6c, 0xc3, 0x12, 0xf5, 0x72, 0x0a, 0x5c, 0x30, 0xf3, - 0xff, 0xbc, 0x04, 0xeb, 0xc5, 0x3d, 0x32, 0xa7, 0x55, 0xee, 0x7e, 0x66, 0x7f, 0xa3, 0x75, 0x68, - 0x32, 0x77, 0x78, 0xe2, 0x26, 0x0b, 0xd1, 0x11, 0x2c, 0xa9, 0xf4, 0xf2, 0xe4, 0xb6, 0xa7, 0xae, - 0xb8, 0xab, 0xae, 0x58, 0x38, 0xc3, 0xa2, 0x03, 0x68, 0x0a, 0xe5, 0x26, 0xf1, 0x93, 0x1a, 0x86, - 0x9b, 0x06, 0x2e, 0x6e, 0x0a, 0x65, 0x7c, 0x71, 0xf7, 0x11, 0x6f, 0xe1, 0x46, 0x5f, 0xaa, 0x6e, - 0x27, 0x38, 0xc3, 0xa2, 0x63, 0x58, 0x1e, 0xb8, 0x8e, 0xb0, 0xe3, 0x69, 0xa5, 0xfb, 0xb8, 0x86, - 0xa7, 0xb2, 0x71, 0xf0, 0x04, 0x8d, 0x1e, 0xc1, 0xa2, 0xd2, 0x44, 0x27, 0xca, 0x4e, 0xaa, 0x95, - 0xee, 0x4a, 0xba, 0x09, 0x56, 0x84, 0x9d, 0x0a, 0xfd, 0x14, 0xee, 0xb9, 0x33, 0xfc, 0x98, 0xf5, - 0x07, 0x7b, 0xaf, 0x08, 0x1b, 0x92, 0x4b, 0x36, 0x64, 0x7a, 0x6c, 0x67, 0xd1, 0x32, 0xae, 0x53, - 0x9b, 0xc2, 0x24, 0xc3, 0xa1, 0x18, 0xd1, 0xf0, 0xd9, 0xc8, 0x5c, 0x07, 0x45, 0x48, 0x95, 0xd7, - 0xda, 0x9e, 0xdb, 0x69, 0xe1, 0x59, 0x05, 0xda, 0x05, 0x88, 0xc5, 0x88, 0x4a, 0xb3, 0x3c, 0xb5, - 0xa3, 0x62, 0xbd, 0x7b, 0x27, 0x1d, 0x15, 0x13, 0x31, 0xce, 0x99, 0x98, 0x3c, 0x64, 0x15, 0xe2, - 0xad, 0xdc, 0x98, 0x87, 0xca, 0x7a, 0xc7, 0x13, 0xb4, 0xc9, 0x83, 0xb9, 0x93, 0xe8, 0xb1, 0xb7, - 0x9a, 0xcb, 0xc3, 0x91, 0x15, 0x61, 0xa7, 0x42, 0xe7, 0xb0, 0x35, 0x28, 0x45, 0x98, 0xba, 0xba, - 0x66, 0x5d, 0x6d, 0x5b, 0xcc, 0x71, 0x95, 0x05, 0xae, 0x06, 0xa2, 0x07, 0x30, 0xaf, 0x49, 0x5f, - 0x79, 0xeb, 0x76, 0xd1, 0x96, 0x25, 0x78, 0x4e, 0xfa, 0x0a, 0x5b, 0x31, 0xfa, 0x02, 0xc0, 0x3e, - 0x05, 0xf6, 0x4c, 0x2c, 0xde, 0x1d, 0x6b, 0x74, 0x3f, 0x1d, 0x07, 0x13, 0x71, 0x31, 0xa2, 0x9c, - 0x3d, 0xfa, 0x1d, 0xdc, 0x9d, 0x7e, 0x9d, 0x70, 0xa5, 0x09, 0x0f, 0xe8, 0x4b, 0x46, 0x47, 0xde, - 0x3b, 0x96, 0xe9, 0xc3, 0x8a, 0xa9, 0x37, 0x63, 0x8b, 0x6b, 0x38, 0xcc, 0x14, 0x79, 0x58, 0xc4, - 0x4e, 0xdf, 0x90, 0xee, 0x39, 0xfb, 0x0c, 0xee, 0x14, 0x2d, 0xde, 0xf0, 0x69, 0x58, 0x46, 0xa3, - 0xfd, 0xea, 0x27, 0xec, 0xfd, 0x8a, 0x40, 0x6a, 0x1f, 0xb4, 0x7f, 0x6f, 0xc0, 0x07, 0xb5, 0x7e, - 0xbb, 0x97, 0xed, 0x5b, 0x77, 0xfc, 0xed, 0xbd, 0x66, 0xff, 0xd3, 0x2c, 0xbb, 0x8f, 0x13, 0x7e, - 0x20, 0xa2, 0x88, 0xf0, 0x30, 0xcb, 0xfb, 0x69, 0x79, 0x4e, 0xba, 0xe7, 0xe1, 0x2d, 0xbd, 0x2f, - 0x0f, 0xd9, 0x3d, 0x58, 0xcc, 0x5d, 0xca, 0xb3, 0x9b, 0x47, 0x9d, 0x13, 0xbd, 0x40, 0xb2, 0x58, - 0xbb, 0x5b, 0xba, 0x03, 0x22, 0x06, 0xef, 0x4d, 0x2d, 0x4e, 0x78, 0x9c, 0xe8, 0x73, 0x22, 0x49, - 0x44, 0xf5, 0xf4, 0x32, 0xf8, 0xf1, 0x8d, 0xac, 0x45, 0x0c, 0xae, 0x67, 0x43, 0x3e, 0xb4, 0x70, - 0xc2, 0xf7, 0x94, 0xb9, 0x44, 0x16, 0xae, 0x88, 0x53, 0x31, 0xfa, 0x11, 0xac, 0xd9, 0x8f, 0xec, - 0x49, 0x62, 0x87, 0x71, 0x66, 0x57, 0x54, 0xf9, 0xff, 0x6c, 0xc0, 0x76, 0x7d, 0xc2, 0x5d, 0xc1, - 0xbc, 0xe5, 0x8c, 0x9f, 0xc2, 0x6a, 0xa1, 0x5f, 0x6f, 0x93, 0xf7, 0x42, 0xd3, 0x16, 0xe0, 0xdd, - 0x7f, 0xcd, 0xc1, 0xbb, 0x15, 0x6d, 0x8e, 0xfa, 0xb0, 0x78, 0xc2, 0x5f, 0x89, 0x6b, 0x8a, 0x1e, - 0xdf, 0xce, 0xcf, 0xb4, 0xbe, 0xda, 0x3f, 0xbe, 0xa5, 0x75, 0x9a, 0x1c, 0xff, 0xff, 0xd0, 0x6b, - 0x58, 0x4a, 0x9b, 0x8c, 0xa2, 0xcf, 0x6e, 0x85, 0x2d, 0x8f, 0x92, 0xf6, 0xe7, 0x6f, 0x0a, 0x9b, - 0xac, 0x7d, 0x0c, 0x1b, 0x07, 0x03, 0x1a, 0x5c, 0x9f, 0xe5, 0xfe, 0x11, 0x87, 0xee, 0xce, 0xf4, - 0xdf, 0x51, 0x14, 0xeb, 0x71, 0xfb, 0x3d, 0xbb, 0x4c, 0xde, 0x34, 0xc7, 0xf4, 0x07, 0x80, 0x69, - 0xba, 0xd1, 0xed, 0x3c, 0x9a, 0x69, 0xce, 0xf6, 0x4f, 0xde, 0x18, 0x97, 0x39, 0xb0, 0xff, 0xc9, - 0x37, 0x9d, 0x3e, 0xd3, 0x83, 0xe4, 0xd2, 0x80, 0x76, 0x23, 0x16, 0x48, 0xa1, 0xc4, 0x95, 0xde, - 0x8d, 0x44, 0xb0, 0x2b, 0xe3, 0x60, 0x77, 0x42, 0xba, 0xeb, 0x48, 0x2f, 0x17, 0x6d, 0x7c, 0x4f, - 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x43, 0x9c, 0x19, 0x13, 0x43, 0x15, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x5f, 0x6f, 0x24, 0x47, + 0x11, 0x67, 0xd7, 0x7f, 0xb7, 0xfc, 0xe7, 0xe2, 0x8e, 0xed, 0x9b, 0x6c, 0xee, 0x2e, 0xd6, 0x5c, + 0x00, 0x87, 0x1c, 0xeb, 0x68, 0x2f, 0x09, 0x20, 0x05, 0x24, 0xff, 0x3b, 0xdb, 0x80, 0x7d, 0x4b, + 0xef, 0xd9, 0x11, 0x01, 0xc9, 0x6a, 0xcf, 0xb4, 0x77, 0x5b, 0xde, 0x99, 0x1e, 0xba, 0x7b, 0xbc, + 0xd9, 0x7b, 0x41, 0xe2, 0x85, 0x48, 0x7c, 0x0f, 0x1e, 0x78, 0xe6, 0xde, 0x90, 0xe0, 0x05, 0xf1, + 0x6d, 0xf8, 0x0c, 0xa8, 0x7b, 0x7a, 0x76, 0x67, 0x66, 0x67, 0x2c, 0x9f, 0x74, 0x3c, 0x79, 0xa7, + 0xaa, 0x7e, 0xd5, 0xbf, 0xaa, 0xae, 0xaa, 0xee, 0x36, 0xb8, 0x01, 0xf7, 0x2e, 0x43, 0xee, 0x53, + 0xd2, 0xa3, 0xa1, 0xba, 0xbc, 0x65, 0x42, 0xc5, 0x64, 0x10, 0x10, 0xaf, 0xcf, 0x42, 0xda, 0x8a, + 0x04, 0x57, 0x1c, 0x6d, 0x04, 0xdc, 0x6b, 0x8d, 0x6d, 0x5a, 0x1e, 0x0f, 0xa2, 0x58, 0xd1, 0xe6, + 0x87, 0x3d, 0xce, 0x7b, 0x03, 0xba, 0x63, 0x8c, 0xae, 0xe2, 0xeb, 0x1d, 0x1a, 0x44, 0x6a, 0x94, + 0x60, 0x9a, 0x4f, 0x8a, 0xca, 0xa1, 0x20, 0x51, 0x44, 0x85, 0xb4, 0xfa, 0x87, 0x7a, 0x5d, 0x8f, + 0x07, 0x01, 0x0f, 0xed, 0x9f, 0x14, 0x98, 0x57, 0xe8, 0x95, 0x72, 0xfa, 0xc7, 0x19, 0x7d, 0xc8, + 0x15, 0xbb, 0x66, 0x1e, 0x51, 0x2c, 0x55, 0xbb, 0x7f, 0xab, 0xc1, 0xc6, 0x45, 0x12, 0xc4, 0x69, + 0x12, 0x04, 0xa6, 0x7f, 0x88, 0xa9, 0x54, 0xe8, 0x77, 0x45, 0x45, 0x77, 0x24, 0x15, 0x0d, 0xa4, + 0x53, 0xdb, 0x9a, 0xd9, 0x5e, 0x6a, 0x7f, 0xbf, 0x55, 0x1a, 0x65, 0xab, 0xe0, 0xac, 0xdc, 0x07, + 0xfa, 0x1c, 0x56, 0x5e, 0x46, 0x54, 0x18, 0x26, 0xaf, 0x46, 0x11, 0x75, 0xea, 0x5b, 0xb5, 0xed, + 0xd5, 0xf6, 0xaa, 0x71, 0x3a, 0xd6, 0xe0, 0xbc, 0x91, 0xfb, 0xcf, 0x1a, 0x6c, 0x16, 0xc9, 0xca, + 0x88, 0x87, 0x92, 0xfe, 0x7f, 0xd9, 0xb6, 0x61, 0x1e, 0x53, 0x19, 0x0f, 0x94, 0xa1, 0xb9, 0xd4, + 0x6e, 0xb6, 0x92, 0xdd, 0x6a, 0xa5, 0xbb, 0xd5, 0xda, 0xe3, 0x7c, 0x70, 0x41, 0x06, 0x31, 0xc5, + 0xd6, 0x12, 0xad, 0xc3, 0xdc, 0xa1, 0x10, 0x5c, 0x38, 0x33, 0x5b, 0xb5, 0xed, 0x06, 0x4e, 0x3e, + 0xdc, 0x16, 0x2c, 0x77, 0xbb, 0xc7, 0x9d, 0xf8, 0x6a, 0xc0, 0xbc, 0x5f, 0xd1, 0x11, 0x7a, 0x02, + 0x0b, 0x37, 0x74, 0xe4, 0x13, 0x45, 0x9c, 0x9a, 0xb6, 0xdb, 0x9b, 0xfd, 0xee, 0x8d, 0x53, 0xc3, + 0xa9, 0xd0, 0x75, 0x61, 0xf6, 0x80, 0xc9, 0x1b, 0xd4, 0x84, 0x45, 0x9f, 0xc9, 0x9b, 0x90, 0x04, + 0x34, 0x31, 0xc4, 0xe3, 0x6f, 0x77, 0x00, 0xcb, 0xdd, 0x3e, 0x11, 0xd4, 0x7f, 0xc1, 0x07, 0x3e, + 0x15, 0xe8, 0x73, 0xd8, 0x90, 0xe6, 0xfb, 0xda, 0x7c, 0x0b, 0x7a, 0x4d, 0x05, 0x0d, 0xbd, 0x14, + 0x58, 0xae, 0x44, 0x3f, 0x80, 0xd5, 0x9e, 0xde, 0xf7, 0x80, 0xc7, 0xa1, 0x8a, 0x88, 0xea, 0x9b, + 0x58, 0x1b, 0xb8, 0x20, 0x75, 0xff, 0x5c, 0x87, 0xf5, 0xae, 0xe2, 0x82, 0xf4, 0xe8, 0x3e, 0x0f, + 0xaf, 0x59, 0x2f, 0x4e, 0x36, 0x08, 0x3d, 0x87, 0x79, 0x2e, 0x35, 0x29, 0xb3, 0xce, 0x52, 0xfb, + 0xc3, 0x8a, 0x94, 0xeb, 0x78, 0xb0, 0x35, 0x45, 0x3f, 0x83, 0x86, 0x8e, 0x53, 0xff, 0x96, 0x4e, + 0xdd, 0x6c, 0xd5, 0x9d, 0xb8, 0x89, 0xb5, 0x0e, 0xf3, 0x36, 0x48, 0x28, 0xec, 0xf3, 0x50, 0x11, + 0x16, 0x52, 0x71, 0xa6, 0xf3, 0x93, 0x24, 0xbc, 0x5c, 0x89, 0x4e, 0x60, 0x45, 0x66, 0x92, 0x25, + 0x9d, 0x59, 0xb3, 0xe8, 0xd3, 0x8a, 0x45, 0xb3, 0x89, 0xc5, 0x79, 0xa4, 0xfb, 0x02, 0xde, 0x3b, + 0xa3, 0x6a, 0xc8, 0xc5, 0xcd, 0x49, 0xa8, 0xa8, 0xb8, 0x26, 0x1e, 0x45, 0x6d, 0x58, 0x0f, 0x0b, + 0xb2, 0xb3, 0xc9, 0x9e, 0x95, 0xea, 0xdc, 0x4b, 0x58, 0xb7, 0x7e, 0xf2, 0x09, 0x3d, 0x02, 0x60, + 0xa9, 0x61, 0x5a, 0xc7, 0x3f, 0xac, 0xe0, 0x59, 0x24, 0x82, 0x33, 0x50, 0xf7, 0x4f, 0x35, 0x58, + 0x3b, 0x97, 0x54, 0xe4, 0xdd, 0x6f, 0xc1, 0x62, 0x2c, 0xa9, 0x98, 0x94, 0x94, 0xad, 0xbd, 0xb1, + 0x54, 0x5b, 0x44, 0x44, 0xca, 0x21, 0x17, 0x7e, 0x52, 0x0c, 0xa9, 0x45, 0x2a, 0x45, 0x9f, 0x24, + 0x3e, 0x94, 0xee, 0xe0, 0x19, 0xd3, 0xc1, 0x2b, 0x86, 0xa0, 0x5e, 0x4d, 0x77, 0x2c, 0x1e, 0xab, + 0x75, 0xb6, 0xf0, 0x41, 0x27, 0x4f, 0xe1, 0x09, 0x80, 0xcf, 0x24, 0xb9, 0x1a, 0x50, 0x7c, 0xd0, + 0x31, 0x24, 0x16, 0x71, 0x46, 0x82, 0x10, 0xcc, 0x46, 0x5c, 0x24, 0x5d, 0xb7, 0x82, 0xcd, 0x6f, + 0xf7, 0xaf, 0x35, 0x40, 0xbf, 0x66, 0x61, 0xfc, 0x6d, 0xde, 0xd5, 0x01, 0x3c, 0xb6, 0xc0, 0x8e, + 0x25, 0xb7, 0x1b, 0xab, 0x3e, 0x0d, 0x95, 0x1d, 0x77, 0xd6, 0xfb, 0xdd, 0x46, 0xe8, 0x97, 0xf0, + 0xbe, 0x37, 0xe0, 0xb1, 0x7f, 0x12, 0x32, 0x75, 0x40, 0x14, 0xe9, 0xf2, 0x58, 0x78, 0xe9, 0x70, + 0x72, 0x4c, 0x68, 0xfb, 0xd3, 0x7a, 0x5c, 0x06, 0x72, 0xbf, 0xab, 0xc3, 0xfa, 0xd7, 0x2c, 0xf4, + 0xf9, 0x50, 0xe6, 0xa9, 0x7e, 0x09, 0x9b, 0x34, 0xd4, 0x24, 0x76, 0x63, 0xc5, 0x03, 0xa2, 0x98, + 0x77, 0x1e, 0xf9, 0x44, 0x99, 0x3d, 0xd6, 0x1c, 0x2b, 0xb4, 0x7a, 0x06, 0x28, 0x16, 0xd0, 0x6f, + 0x78, 0x48, 0x6d, 0x6f, 0x8e, 0xbf, 0x51, 0x77, 0x3a, 0xbb, 0x66, 0x43, 0xaa, 0x2b, 0xa6, 0x68, + 0x8e, 0xa7, 0xb7, 0xe7, 0x08, 0xd0, 0xd7, 0x2c, 0xc4, 0xa7, 0x79, 0xb7, 0xb3, 0xc6, 0xed, 0x43, + 0xe3, 0x76, 0x5a, 0x8d, 0x4b, 0x20, 0xee, 0x7f, 0xe6, 0xe0, 0x91, 0x9d, 0xe4, 0x61, 0x2f, 0x19, + 0xaa, 0xf9, 0x95, 0x5c, 0x58, 0xb6, 0xbc, 0x44, 0xa6, 0x5d, 0x72, 0x32, 0x74, 0x06, 0x2b, 0xc4, + 0x0f, 0x58, 0xc8, 0xa4, 0x12, 0x44, 0x71, 0x61, 0x67, 0xf1, 0x76, 0x45, 0x7c, 0x53, 0x05, 0x8f, + 0xf3, 0x70, 0xf4, 0x0b, 0x98, 0xd3, 0xc5, 0x29, 0x9d, 0x19, 0xd3, 0x59, 0xf7, 0xf7, 0x93, 0xc0, + 0xd0, 0xc7, 0x00, 0x5e, 0x2c, 0x15, 0x0f, 0xf4, 0x9e, 0x9b, 0xac, 0xa4, 0xfd, 0x91, 0x91, 0xa3, + 0x7d, 0x80, 0xc8, 0x4c, 0xfb, 0x1b, 0x3a, 0x92, 0xce, 0xdc, 0xdd, 0xc3, 0x26, 0x73, 0x32, 0xe0, + 0x0c, 0x0c, 0x7d, 0xa6, 0x47, 0xab, 0x69, 0xb2, 0xf9, 0x4c, 0x25, 0x16, 0x32, 0x6a, 0xfa, 0xcd, + 0xda, 0xa1, 0xdf, 0xc0, 0x1a, 0x97, 0x7b, 0x9c, 0x2b, 0x1d, 0x6d, 0x74, 0x18, 0xf6, 0x58, 0x48, + 0x9d, 0x05, 0x03, 0x7e, 0x5a, 0x06, 0x2e, 0x98, 0xe2, 0x69, 0x34, 0xfa, 0x2d, 0xa0, 0xc1, 0x54, + 0xdf, 0x39, 0x8b, 0x66, 0x13, 0x3e, 0xa9, 0x88, 0x68, 0xba, 0x51, 0x71, 0x89, 0x13, 0x74, 0x09, + 0xeb, 0xc3, 0x92, 0x4e, 0x71, 0x1a, 0xc6, 0xf9, 0xa7, 0x15, 0xce, 0xcb, 0x9a, 0x0b, 0x97, 0x3a, + 0xd2, 0x95, 0x1c, 0x09, 0xfe, 0xed, 0x28, 0xef, 0x1e, 0x32, 0x95, 0xdc, 0x99, 0x52, 0xe3, 0x12, + 0x88, 0xfb, 0xf7, 0x3a, 0x6c, 0x1c, 0x13, 0xe1, 0x0f, 0x89, 0x98, 0x3e, 0xfe, 0x2e, 0x4e, 0xbb, + 0xec, 0x75, 0x52, 0xbc, 0xab, 0xf6, 0x18, 0x2b, 0xdc, 0x27, 0xd8, 0x6b, 0x9a, 0x6c, 0x53, 0x62, + 0x8a, 0x7e, 0x9e, 0xd6, 0x90, 0x01, 0x26, 0x05, 0xfd, 0xb8, 0x04, 0xb8, 0x3f, 0x36, 0xc2, 0x19, + 0x00, 0xba, 0x84, 0xa6, 0x3f, 0x0a, 0x49, 0xc0, 0xbc, 0x53, 0x1a, 0x70, 0x31, 0x2a, 0xeb, 0xff, + 0x8f, 0x8c, 0xbb, 0x83, 0x4a, 0x33, 0x7c, 0x87, 0x0b, 0xf4, 0x02, 0xd0, 0x6d, 0x8e, 0xc8, 0x51, + 0xe7, 0x3c, 0x3d, 0x32, 0x37, 0x4b, 0x78, 0x1e, 0x75, 0xce, 0x71, 0x09, 0xc2, 0xfd, 0x0a, 0x96, + 0xcf, 0xe9, 0x35, 0xeb, 0x52, 0xa5, 0x4b, 0x4e, 0xa2, 0x67, 0xb0, 0x26, 0xa9, 0x17, 0x0b, 0xaa, + 0x8b, 0xec, 0xd0, 0x8c, 0x3b, 0xdf, 0x4e, 0xbf, 0x69, 0x85, 0xfb, 0xa6, 0x06, 0x1b, 0x5d, 0x2d, + 0x65, 0xaa, 0xc0, 0xef, 0x11, 0x34, 0x92, 0x61, 0xf9, 0xaa, 0x73, 0x6a, 0xf1, 0x13, 0x01, 0x3a, + 0x82, 0xe5, 0x38, 0xb3, 0xaa, 0xcd, 0x6f, 0x55, 0xf7, 0x65, 0x09, 0xe2, 0x1c, 0x10, 0x7d, 0x01, + 0xcb, 0xd2, 0xae, 0xff, 0x6a, 0x72, 0xd4, 0xad, 0x19, 0x47, 0xdd, 0x8c, 0x02, 0xe7, 0xcc, 0xdc, + 0xbf, 0x2c, 0xc0, 0x6a, 0x3e, 0x3f, 0xfa, 0x44, 0xcb, 0xdc, 0xe1, 0xcc, 0x6f, 0xb4, 0x0a, 0x75, + 0x66, 0x0f, 0x58, 0x5c, 0x67, 0x3e, 0x3a, 0x84, 0x05, 0x99, 0x5c, 0xb0, 0xec, 0x16, 0x56, 0x35, + 0x40, 0xd9, 0x35, 0x0c, 0xa7, 0x58, 0xb4, 0x0f, 0x75, 0x2e, 0xed, 0xb4, 0x7e, 0x5e, 0xe1, 0xe1, + 0xae, 0xa1, 0x8c, 0xeb, 0x5c, 0x6a, 0x2e, 0xf6, 0xce, 0xe2, 0xcc, 0xdd, 0xc9, 0xa5, 0xec, 0x06, + 0x83, 0x53, 0x2c, 0x3a, 0x86, 0xc5, 0xbe, 0xed, 0x1a, 0x33, 0xc2, 0x96, 0xda, 0xcf, 0x2a, 0xfc, + 0x94, 0x36, 0x17, 0x1e, 0xa3, 0xd1, 0x53, 0x98, 0x97, 0x8a, 0xa8, 0x58, 0x9a, 0x69, 0xb6, 0xd4, + 0x5e, 0x4a, 0x36, 0xc1, 0x88, 0xb0, 0x55, 0xa1, 0x9f, 0xc2, 0x43, 0x7b, 0xce, 0x1f, 0xb3, 0x5e, + 0x7f, 0xf7, 0x96, 0xb0, 0x01, 0xb9, 0x62, 0x03, 0xa6, 0x46, 0x66, 0x5e, 0x2d, 0xe2, 0x2a, 0xb5, + 0x2e, 0x4c, 0x32, 0x18, 0xf0, 0x21, 0xf5, 0x5f, 0x0e, 0xf5, 0x95, 0x91, 0xfb, 0x54, 0x3a, 0x8d, + 0xad, 0x99, 0xed, 0x06, 0x9e, 0x56, 0xa0, 0x1d, 0x80, 0x88, 0x0f, 0xa9, 0xd0, 0xcb, 0x53, 0x33, + 0x4e, 0x56, 0xdb, 0x0f, 0x92, 0x71, 0x32, 0x16, 0xe3, 0x8c, 0x89, 0xce, 0x43, 0x5a, 0x21, 0xce, + 0xd2, 0x9d, 0x79, 0x28, 0xad, 0x77, 0x3c, 0x46, 0xeb, 0x3c, 0xe8, 0x7b, 0x8b, 0x1a, 0x39, 0xcb, + 0x99, 0x3c, 0x1c, 0x1a, 0x11, 0xb6, 0x2a, 0xd4, 0x81, 0x8d, 0x7e, 0x21, 0xc2, 0x84, 0xea, 0x8a, + 0xa1, 0xda, 0x34, 0x98, 0xe3, 0x32, 0x0b, 0x5c, 0x0e, 0x44, 0x8f, 0x61, 0x56, 0x91, 0x9e, 0x74, + 0x56, 0xcd, 0xa2, 0x0d, 0xe3, 0xe0, 0x15, 0xe9, 0x49, 0x6c, 0xc4, 0xe8, 0x2b, 0x00, 0xf3, 0x5c, + 0xd8, 0xd5, 0xb1, 0x38, 0x0f, 0x8c, 0xd1, 0x23, 0x63, 0x74, 0x34, 0x16, 0xe7, 0x23, 0xca, 0xd8, + 0xa3, 0xdf, 0xc3, 0xe6, 0xe4, 0xeb, 0x24, 0x94, 0x8a, 0x84, 0x1e, 0xbd, 0x60, 0x74, 0xe8, 0xbc, + 0x67, 0x3c, 0x7d, 0x5c, 0x32, 0x71, 0xa6, 0x6c, 0x71, 0x85, 0x0f, 0x3d, 0x45, 0x9e, 0xe4, 0xb1, + 0x93, 0x77, 0xa6, 0x7d, 0xf2, 0xbe, 0x84, 0x07, 0x79, 0x8b, 0xb7, 0x7c, 0x3e, 0x16, 0xd1, 0x68, + 0xaf, 0xfc, 0x99, 0xfb, 0xa8, 0x24, 0x90, 0xca, 0x47, 0xef, 0x3f, 0x6a, 0xf0, 0x51, 0x25, 0x6f, + 0xfb, 0xfa, 0x7d, 0xe7, 0xc4, 0xdf, 0xdd, 0x8b, 0xf7, 0xbf, 0xf5, 0x22, 0x7d, 0x1c, 0x87, 0xfb, + 0x3c, 0x08, 0x48, 0xe8, 0xa7, 0x79, 0x3f, 0x2d, 0xce, 0x49, 0xfb, 0x84, 0xbc, 0x27, 0xfb, 0xe2, + 0x90, 0xdd, 0x85, 0xf9, 0xcc, 0xc5, 0x3d, 0xbd, 0x9d, 0x54, 0x91, 0xe8, 0x7a, 0x82, 0x45, 0xca, + 0xde, 0xe4, 0x2d, 0x10, 0x31, 0xf8, 0x60, 0x62, 0x71, 0x12, 0x46, 0xb1, 0xea, 0x10, 0x41, 0x02, + 0xaa, 0x26, 0x17, 0xc6, 0x4f, 0xef, 0xf4, 0x9a, 0xc7, 0xe0, 0x6a, 0x6f, 0xc8, 0x85, 0x06, 0x8e, + 0xc3, 0x5d, 0xa9, 0x2f, 0x9a, 0xb9, 0x6b, 0xe4, 0x44, 0x8c, 0x7e, 0x04, 0x2b, 0xe6, 0x23, 0x7d, + 0xb6, 0x98, 0x61, 0x9c, 0xda, 0xe5, 0x55, 0xee, 0xbf, 0x6a, 0xb0, 0x55, 0x9d, 0x70, 0x5b, 0x30, + 0xef, 0x38, 0xe3, 0xa7, 0xb0, 0x9c, 0xeb, 0xd7, 0xfb, 0xe4, 0x3d, 0xd7, 0xb4, 0x39, 0x78, 0xfb, + 0xdf, 0x33, 0xf0, 0x7e, 0x49, 0x9b, 0xa3, 0x1e, 0xcc, 0x9f, 0x84, 0xb7, 0xfc, 0x86, 0xa2, 0x67, + 0xf7, 0xe3, 0x99, 0xd4, 0x57, 0xf3, 0xc7, 0xf7, 0xb4, 0x4e, 0x92, 0xe3, 0x7e, 0x0f, 0xbd, 0x86, + 0x85, 0xa4, 0xc9, 0x28, 0xfa, 0xe2, 0x5e, 0xd8, 0xe2, 0x28, 0x69, 0x7e, 0xf9, 0xb6, 0xb0, 0xf1, + 0xda, 0xc7, 0xb0, 0xb6, 0xdf, 0xa7, 0xde, 0xcd, 0x59, 0xe6, 0x9f, 0x75, 0x68, 0x73, 0xaa, 0xff, + 0x0e, 0x83, 0x48, 0x8d, 0x9a, 0x1f, 0x98, 0x65, 0xb2, 0xa6, 0x19, 0x4f, 0x7f, 0x04, 0x98, 0xa4, + 0x1b, 0xdd, 0x8f, 0xd1, 0x54, 0x73, 0x36, 0x7f, 0xf2, 0xd6, 0xb8, 0x94, 0xc0, 0xde, 0x67, 0xdf, + 0xb4, 0x7a, 0x4c, 0xf5, 0xe3, 0x2b, 0x0d, 0xda, 0x09, 0x98, 0x27, 0xb8, 0xe4, 0xd7, 0x6a, 0x27, + 0xe0, 0xde, 0x8e, 0x88, 0xbc, 0x9d, 0xb1, 0xd3, 0x1d, 0xeb, 0xf4, 0x6a, 0xde, 0xc4, 0xf7, 0xfc, + 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x22, 0xb5, 0xde, 0x7e, 0x67, 0x15, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto b/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto index 7d73a88a..43bcb8dd 100644 --- a/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto +++ b/rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto @@ -94,7 +94,7 @@ message HardwareConfiguration { VirtualMachineSizeType VMSize = 1; VirtualMachineCustomSize customSize = 2; DynamicMemoryConfiguration dynamicMemoryConfiguration = 3; - repeated Gpu gpuList = 4; + repeated VirtualMachineGPU virtualMachineGPUs = 4; } message UefiSettings { From 8cb05b8e12c5e1c044f1132ab7cb3934645dde4c Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Thu, 2 May 2024 11:56:09 -0700 Subject: [PATCH 12/13] Using partitonsize mb instead of bytes in HostGPU based on discussion with MOC team --- rpc/common/moc_common_nodeinfo.pb.go | 135 ++++++++++++--------------- rpc/common/moc_common_nodeinfo.proto | 10 +- 2 files changed, 63 insertions(+), 82 deletions(-) diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index c4547be2..6ae721e5 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -227,12 +227,10 @@ func (m *PhysicalMemory) GetSizeBytes() uint64 { } type HostGPU struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SizeBytes uint32 `protobuf:"varint,2,opt,name=sizeBytes,proto3" json:"sizeBytes,omitempty"` - Count uint32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` - PartitionSizeBytes uint64 `protobuf:"varint,4,opt,name=partitionSizeBytes,proto3" json:"partitionSizeBytes,omitempty"` - Assignment AssignmentType `protobuf:"varint,5,opt,name=assignment,proto3,enum=moc.AssignmentType" json:"assignment,omitempty"` - Id string `protobuf:"bytes,6,opt,name=id,proto3" json:"id,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + PartitionSizeMB uint64 `protobuf:"varint,3,opt,name=partitionSizeMB,proto3" json:"partitionSizeMB,omitempty"` + Assignment AssignmentType `protobuf:"varint,4,opt,name=assignment,proto3,enum=moc.AssignmentType" json:"assignment,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -263,30 +261,23 @@ func (m *HostGPU) XXX_DiscardUnknown() { var xxx_messageInfo_HostGPU proto.InternalMessageInfo -func (m *HostGPU) GetName() string { +func (m *HostGPU) GetId() string { if m != nil { - return m.Name + return m.Id } return "" } -func (m *HostGPU) GetSizeBytes() uint32 { - if m != nil { - return m.SizeBytes - } - return 0 -} - -func (m *HostGPU) GetCount() uint32 { +func (m *HostGPU) GetName() string { if m != nil { - return m.Count + return m.Name } - return 0 + return "" } -func (m *HostGPU) GetPartitionSizeBytes() uint64 { +func (m *HostGPU) GetPartitionSizeMB() uint64 { if m != nil { - return m.PartitionSizeBytes + return m.PartitionSizeMB } return 0 } @@ -298,13 +289,6 @@ func (m *HostGPU) GetAssignment() AssignmentType { return AssignmentType_GpuDDA } -func (m *HostGPU) GetId() string { - if m != nil { - return m.Id - } - return "" -} - type OperatingSystem struct { Operatingsystemsku uint64 `protobuf:"varint,1,opt,name=operatingsystemsku,proto3" json:"operatingsystemsku,omitempty"` Ostype OperatingSystemType `protobuf:"varint,2,opt,name=ostype,proto3,enum=moc.OperatingSystemType" json:"ostype,omitempty"` @@ -540,53 +524,52 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 764 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x3c, - 0x14, 0xfe, 0x9b, 0xa6, 0x69, 0x7b, 0xba, 0xf5, 0xef, 0xbc, 0x01, 0x61, 0x20, 0xa8, 0x32, 0x31, - 0x55, 0x08, 0xb5, 0xa8, 0xd5, 0x04, 0x5c, 0x32, 0x2e, 0x06, 0x93, 0xc6, 0x26, 0x6f, 0x70, 0xc1, - 0xcd, 0x94, 0xa5, 0x6e, 0x6b, 0xd1, 0xc4, 0x91, 0xed, 0x54, 0xca, 0xae, 0x78, 0x38, 0xc4, 0x03, - 0xf0, 0x12, 0xbc, 0x06, 0xca, 0x49, 0x9a, 0x26, 0x5d, 0x35, 0x71, 0xd5, 0xf8, 0x3b, 0xdf, 0xf1, - 0xf9, 0xfc, 0x1d, 0x1f, 0x17, 0x1e, 0xfb, 0xc2, 0xbb, 0xf6, 0x84, 0xef, 0x8b, 0xe0, 0x3a, 0x10, - 0x63, 0xc6, 0x83, 0x89, 0xe8, 0x87, 0x52, 0x68, 0x41, 0xc0, 0x17, 0x5e, 0x3f, 0x0d, 0xed, 0x3f, - 0x2a, 0xd0, 0xd2, 0x9f, 0x94, 0xb4, 0xff, 0xac, 0x1c, 0x08, 0x23, 0xcd, 0x8a, 0x71, 0xe7, 0x1c, - 0xf6, 0xce, 0x15, 0x65, 0x53, 0xae, 0xb4, 0x74, 0x35, 0x17, 0xc1, 0xa5, 0x76, 0x75, 0xa4, 0xc8, - 0x1b, 0xb0, 0x14, 0x7e, 0xd9, 0x95, 0x6e, 0xa5, 0xd7, 0x1e, 0x3e, 0xef, 0xaf, 0xaa, 0xf5, 0xef, - 0x66, 0x30, 0x9a, 0xd1, 0x9d, 0xdf, 0x06, 0x34, 0x2f, 0xa4, 0xf0, 0x98, 0x52, 0x42, 0x12, 0x02, - 0x66, 0xe0, 0xfa, 0x0c, 0x37, 0x69, 0x52, 0xfc, 0x26, 0x7b, 0x50, 0xf3, 0x84, 0x64, 0xca, 0x36, - 0xba, 0x95, 0xde, 0x36, 0x4d, 0x17, 0x09, 0xaa, 0x42, 0xc6, 0xc6, 0x76, 0x15, 0xa9, 0xe9, 0x82, - 0x1c, 0x82, 0xa9, 0xe3, 0x90, 0xd9, 0x26, 0x8a, 0x20, 0x28, 0x22, 0xdf, 0xfd, 0x2a, 0x0e, 0x19, - 0xc5, 0x38, 0x39, 0x84, 0xf6, 0x82, 0x4b, 0x1d, 0xb9, 0x73, 0x7e, 0x8b, 0xa2, 0xec, 0x5a, 0xb7, - 0xd2, 0x6b, 0xd0, 0x35, 0x94, 0xbc, 0x82, 0x9d, 0xb9, 0x98, 0x72, 0xcf, 0x9d, 0x87, 0xcb, 0x5d, - 0x94, 0x6d, 0xa1, 0x8e, 0xbb, 0x81, 0x84, 0x3d, 0x8b, 0x43, 0x26, 0x17, 0x5c, 0x09, 0x19, 0x4a, - 0xa6, 0x58, 0xa0, 0xed, 0x3a, 0x6e, 0x7c, 0x37, 0x40, 0x1c, 0xd8, 0xf2, 0xdd, 0x20, 0x9a, 0xb8, - 0x9e, 0x8e, 0x24, 0x93, 0x76, 0x03, 0x0f, 0x52, 0xc2, 0xc8, 0x11, 0x6c, 0xb9, 0xd2, 0x9b, 0x71, - 0xcd, 0x10, 0xb0, 0x9b, 0x78, 0xae, 0x1d, 0x3c, 0xd7, 0xfb, 0x42, 0x80, 0x96, 0x68, 0x4e, 0x1f, - 0xda, 0x17, 0xb3, 0x58, 0x25, 0xf2, 0xce, 0x98, 0x2f, 0x64, 0x4c, 0x9e, 0x42, 0x53, 0xf1, 0x5b, - 0x76, 0x1c, 0x6b, 0x96, 0xb6, 0xc8, 0xa4, 0x2b, 0xc0, 0xf9, 0x55, 0x81, 0xfa, 0x47, 0xa1, 0xf4, - 0xc9, 0xc5, 0x97, 0x8d, 0x2d, 0x28, 0x65, 0xa7, 0x6d, 0x58, 0x01, 0x69, 0x83, 0xa2, 0x40, 0x63, - 0x2b, 0xb0, 0x41, 0x51, 0xa0, 0x49, 0x1f, 0x48, 0xe8, 0x4a, 0xcd, 0xb1, 0xe5, 0x79, 0xb2, 0x89, - 0xa5, 0x37, 0x44, 0xc8, 0x08, 0xc0, 0x55, 0x8a, 0x4f, 0x03, 0x3f, 0x71, 0xad, 0x86, 0x07, 0xdd, - 0x4d, 0x0f, 0x9a, 0xc3, 0xd8, 0xc1, 0x02, 0x8d, 0xb4, 0xc1, 0xe0, 0x63, 0x6c, 0x48, 0x93, 0x1a, - 0x7c, 0xec, 0xfc, 0xa9, 0xc0, 0xff, 0xe7, 0x21, 0x4b, 0x2e, 0x5a, 0x30, 0xbd, 0x8c, 0x95, 0x66, - 0x7e, 0x22, 0x44, 0x2c, 0x21, 0x85, 0x90, 0xfa, 0x1e, 0x65, 0x1e, 0x6c, 0x88, 0x90, 0xd7, 0x60, - 0x09, 0x85, 0xb7, 0xc8, 0x40, 0x11, 0x36, 0x8a, 0x58, 0xdb, 0x15, 0x95, 0x64, 0xbc, 0xc4, 0x1e, - 0xa1, 0x16, 0x4c, 0xaa, 0xe4, 0x22, 0xa5, 0xf7, 0x71, 0x05, 0x90, 0x2b, 0xd8, 0x13, 0x1b, 0x46, - 0x06, 0xad, 0x68, 0x0d, 0xbb, 0xf7, 0x0f, 0x4a, 0xa4, 0xe8, 0xc6, 0x6c, 0xe7, 0xa7, 0x01, 0x8d, - 0xcf, 0x62, 0xcc, 0x3e, 0x05, 0x13, 0xb1, 0xb1, 0x67, 0xa9, 0x35, 0xc6, 0xd2, 0x1a, 0x72, 0x04, - 0xe0, 0xb9, 0xa1, 0x7b, 0xc3, 0xe7, 0x5c, 0xc7, 0xa8, 0xb2, 0x35, 0x7c, 0x50, 0x2c, 0x4e, 0x99, - 0x12, 0x91, 0xf4, 0x98, 0xa2, 0x05, 0x22, 0x79, 0x07, 0x5b, 0xee, 0xc2, 0xe5, 0xf3, 0x65, 0xa2, - 0x79, 0x5f, 0x62, 0x89, 0x5a, 0x30, 0xd2, 0xfa, 0x47, 0x23, 0x0f, 0xf2, 0x57, 0xa4, 0x8e, 0x65, - 0x5a, 0x98, 0x91, 0xf9, 0x90, 0x85, 0xc8, 0x43, 0xb0, 0xa2, 0x50, 0x73, 0x9f, 0xe1, 0xc4, 0x54, - 0x69, 0xb6, 0x22, 0xa3, 0xa4, 0x5c, 0x62, 0x07, 0x4e, 0x49, 0x6b, 0xf8, 0xa4, 0xe4, 0x6c, 0xb9, - 0x2a, 0xcd, 0xa8, 0xce, 0x0f, 0x03, 0x9a, 0xb9, 0x7e, 0x32, 0x82, 0x66, 0x3e, 0xce, 0x68, 0xe6, - 0xda, 0x49, 0xf3, 0xa7, 0x84, 0xae, 0x78, 0x64, 0x08, 0x96, 0x8f, 0x43, 0x86, 0x66, 0xb7, 0x86, - 0xfb, 0xa5, 0x8c, 0xd2, 0x18, 0xd2, 0x8c, 0x49, 0x4e, 0xa0, 0xbd, 0xf0, 0x3f, 0x2c, 0x5d, 0xe6, - 0x4c, 0xe1, 0x85, 0x6f, 0x65, 0xcf, 0xe6, 0xd7, 0xf4, 0x11, 0x3a, 0x73, 0xbd, 0x19, 0x0f, 0x58, - 0x91, 0x46, 0xd7, 0xd2, 0xc8, 0x00, 0x1a, 0xb3, 0x74, 0x70, 0x13, 0xcf, 0xaa, 0xbd, 0x56, 0x36, - 0x33, 0x59, 0xf9, 0x6c, 0xa8, 0x69, 0x4e, 0x3a, 0x35, 0x1b, 0xd5, 0x8e, 0x79, 0x6a, 0x36, 0xcc, - 0x4e, 0xed, 0xd4, 0x6c, 0x58, 0x9d, 0xfa, 0xcb, 0xb7, 0xb0, 0xbb, 0xe1, 0x81, 0x26, 0x3b, 0xb0, - 0x1d, 0x08, 0x9d, 0xe2, 0x4c, 0xb2, 0x71, 0xe7, 0x3f, 0xd2, 0x06, 0x90, 0xab, 0x75, 0xe5, 0xf8, - 0xc5, 0xb7, 0x83, 0x29, 0xd7, 0xb3, 0xe8, 0x26, 0x29, 0x37, 0xf0, 0xb9, 0x27, 0x85, 0x12, 0x13, - 0x3d, 0xf0, 0x85, 0x37, 0x90, 0xa1, 0x37, 0x48, 0x45, 0xdc, 0x58, 0xf8, 0xd7, 0x31, 0xfa, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0x85, 0x80, 0xb0, 0x18, 0x9c, 0x06, 0x00, 0x00, + // 752 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0x26, 0x8e, 0xeb, 0x24, 0x93, 0x36, 0x4d, 0xb7, 0x05, 0x4c, 0x41, 0x10, 0xb9, 0xa2, 0x8a, + 0x10, 0x4a, 0x50, 0xa2, 0x0a, 0x38, 0x52, 0x0e, 0x85, 0x4a, 0xa5, 0xd5, 0xb6, 0x70, 0xe0, 0x52, + 0xb9, 0xce, 0x26, 0x59, 0x11, 0x7b, 0xad, 0xdd, 0x75, 0x24, 0xf7, 0xc4, 0x03, 0xf0, 0x58, 0x3c, + 0x01, 0x2f, 0xc1, 0x6b, 0x20, 0x8f, 0x1d, 0xc7, 0x4e, 0xa3, 0x8a, 0x53, 0xbc, 0xdf, 0x7c, 0xb3, + 0x33, 0xfb, 0xcd, 0x4f, 0xe0, 0x89, 0x2f, 0xbc, 0x6b, 0x4f, 0xf8, 0xbe, 0x08, 0xae, 0x03, 0x31, + 0x62, 0x3c, 0x18, 0x8b, 0x5e, 0x28, 0x85, 0x16, 0x04, 0x7c, 0xe1, 0xf5, 0x52, 0xd3, 0xfe, 0xe3, + 0x02, 0x2d, 0xfd, 0x49, 0x49, 0xfb, 0xcf, 0xcb, 0x86, 0x30, 0xd2, 0xac, 0x68, 0x77, 0xce, 0x61, + 0xef, 0x5c, 0x51, 0x36, 0xe1, 0x4a, 0x4b, 0x57, 0x73, 0x11, 0x5c, 0x6a, 0x57, 0x47, 0x8a, 0xbc, + 0x05, 0x4b, 0xe1, 0x97, 0x5d, 0xe9, 0x54, 0xba, 0xad, 0xc1, 0x8b, 0xde, 0x32, 0x5a, 0xef, 0xae, + 0x07, 0xa3, 0x19, 0xdd, 0xf9, 0x63, 0x40, 0xe3, 0x42, 0x0a, 0x8f, 0x29, 0x25, 0x24, 0x21, 0x60, + 0x06, 0xae, 0xcf, 0xf0, 0x92, 0x06, 0xc5, 0x6f, 0xb2, 0x07, 0x1b, 0x9e, 0x90, 0x4c, 0xd9, 0x46, + 0xa7, 0xd2, 0xdd, 0xa2, 0xe9, 0x21, 0x41, 0x55, 0xc8, 0xd8, 0xc8, 0xae, 0x22, 0x35, 0x3d, 0x90, + 0x43, 0x30, 0x75, 0x1c, 0x32, 0xdb, 0xc4, 0x24, 0x08, 0x26, 0x91, 0xdf, 0x7e, 0x15, 0x87, 0x8c, + 0xa2, 0x9d, 0x1c, 0x42, 0x6b, 0xce, 0xa5, 0x8e, 0xdc, 0x19, 0xbf, 0xc5, 0xa4, 0xec, 0x8d, 0x4e, + 0xa5, 0x5b, 0xa7, 0x2b, 0x28, 0x79, 0x0d, 0x3b, 0x33, 0x31, 0xe1, 0x9e, 0x3b, 0x0b, 0x17, 0xb7, + 0x28, 0xdb, 0xc2, 0x3c, 0xee, 0x1a, 0x12, 0xf6, 0x34, 0x0e, 0x99, 0x9c, 0x73, 0x25, 0x64, 0x28, + 0x99, 0x62, 0x81, 0xb6, 0x6b, 0x78, 0xf1, 0x5d, 0x03, 0x71, 0x60, 0xd3, 0x77, 0x83, 0x68, 0xec, + 0x7a, 0x3a, 0x92, 0x4c, 0xda, 0x75, 0x7c, 0x48, 0x09, 0x23, 0x47, 0xb0, 0xe9, 0x4a, 0x6f, 0xca, + 0x35, 0x43, 0xc0, 0x6e, 0xe0, 0xbb, 0x76, 0xf0, 0x5d, 0x1f, 0x0a, 0x06, 0x5a, 0xa2, 0x39, 0x3d, + 0x68, 0x5d, 0x4c, 0x63, 0x95, 0xa4, 0x77, 0xc6, 0x7c, 0x21, 0x63, 0xf2, 0x0c, 0x1a, 0x8a, 0xdf, + 0xb2, 0xe3, 0x58, 0xb3, 0xb4, 0x44, 0x26, 0x5d, 0x02, 0xce, 0xaf, 0x0a, 0xd4, 0x3e, 0x09, 0xa5, + 0x4f, 0x2e, 0xbe, 0x92, 0x16, 0x18, 0x7c, 0x94, 0x15, 0xc0, 0xe0, 0xa3, 0xbc, 0x24, 0x46, 0xa1, + 0x24, 0x5d, 0xd8, 0x0e, 0x5d, 0xa9, 0x39, 0x96, 0x93, 0xdf, 0xb2, 0xb3, 0x63, 0x2c, 0x83, 0x49, + 0x57, 0x61, 0x32, 0x04, 0x70, 0x95, 0xe2, 0x93, 0xc0, 0x4f, 0xb4, 0x48, 0xcb, 0xb2, 0x9b, 0xa6, + 0x9f, 0xc3, 0x58, 0x97, 0x02, 0xcd, 0xf9, 0x5b, 0x81, 0xed, 0xf3, 0x90, 0x25, 0xed, 0x12, 0x4c, + 0x2e, 0x63, 0xa5, 0x99, 0x4f, 0x7a, 0x40, 0xc4, 0x02, 0x52, 0x08, 0xa9, 0x1f, 0x51, 0xf6, 0x92, + 0x35, 0x16, 0xf2, 0x06, 0x2c, 0xa1, 0xb0, 0x17, 0x0c, 0x0c, 0x6a, 0x63, 0xd0, 0x95, 0x5b, 0x31, + 0x72, 0xc6, 0x4b, 0x24, 0x12, 0x6a, 0xce, 0xa4, 0x4a, 0xda, 0x21, 0xed, 0xaa, 0x25, 0x40, 0xae, + 0x60, 0x4f, 0xac, 0x69, 0x7c, 0x7c, 0x52, 0x73, 0xd0, 0xb9, 0xbf, 0xdd, 0x23, 0x45, 0xd7, 0x7a, + 0x3b, 0xbf, 0x0d, 0xa8, 0x7f, 0x11, 0x23, 0xf6, 0x39, 0x18, 0x8b, 0xb5, 0xcd, 0x9f, 0x56, 0xc3, + 0xc8, 0xab, 0x71, 0x04, 0xe0, 0xb9, 0xa1, 0x7b, 0xc3, 0x67, 0x5c, 0xc7, 0x98, 0x65, 0x73, 0xf0, + 0xb0, 0x18, 0x9c, 0x32, 0x25, 0x22, 0xe9, 0x31, 0x45, 0x0b, 0x44, 0xf2, 0x1e, 0x36, 0xdd, 0xb9, + 0xcb, 0x67, 0x0b, 0x47, 0xf3, 0x3e, 0xc7, 0x12, 0xb5, 0x20, 0xa4, 0xf5, 0x9f, 0x42, 0x1e, 0xe4, + 0xbb, 0xa0, 0x86, 0x61, 0x9a, 0xe8, 0x91, 0xe9, 0x90, 0x99, 0xc8, 0x23, 0xb0, 0xa2, 0x50, 0x73, + 0x9f, 0x61, 0xdf, 0x57, 0x69, 0x76, 0x22, 0xc3, 0x24, 0x5c, 0x22, 0x07, 0xf6, 0x7a, 0x73, 0xf0, + 0xb4, 0xa4, 0x6c, 0x39, 0x2a, 0xcd, 0xa8, 0xce, 0x4f, 0x03, 0x1a, 0x79, 0xfe, 0x64, 0x08, 0x8d, + 0x7c, 0x28, 0x51, 0xcc, 0x95, 0x97, 0xe6, 0x0b, 0x81, 0x2e, 0x79, 0x64, 0x00, 0x96, 0x8f, 0xa3, + 0x82, 0x62, 0x37, 0x07, 0xfb, 0x25, 0x8f, 0xd2, 0x30, 0xd1, 0x8c, 0x49, 0x4e, 0xa0, 0x35, 0xf7, + 0x3f, 0x2e, 0x54, 0xe6, 0x4c, 0xe1, 0x16, 0x69, 0x66, 0xcb, 0xef, 0x5b, 0xba, 0x4a, 0xce, 0x5c, + 0x6f, 0xca, 0x03, 0x56, 0xa4, 0xd1, 0x15, 0x37, 0xd2, 0x87, 0xfa, 0x34, 0x1d, 0xbf, 0x44, 0xb3, + 0x6a, 0xb7, 0x99, 0xcd, 0x48, 0x16, 0x3e, 0x1b, 0x4d, 0x9a, 0x93, 0x4e, 0xcd, 0x7a, 0xb5, 0x6d, + 0x9e, 0x9a, 0x75, 0xb3, 0xbd, 0x71, 0x6a, 0xd6, 0xad, 0x76, 0xed, 0xd5, 0x3b, 0xd8, 0x5d, 0xb3, + 0x66, 0xc9, 0x0e, 0x6c, 0x05, 0x42, 0xa7, 0x38, 0x93, 0x6c, 0xd4, 0x7e, 0x40, 0x5a, 0x00, 0x72, + 0x79, 0xae, 0x1c, 0xbf, 0xfc, 0x7e, 0x30, 0xe1, 0x7a, 0x1a, 0xdd, 0x24, 0xe1, 0xfa, 0x3e, 0xf7, + 0xa4, 0x50, 0x62, 0xac, 0xfb, 0xbe, 0xf0, 0xfa, 0x32, 0xf4, 0xfa, 0x69, 0x12, 0x37, 0x16, 0xfe, + 0x01, 0x0c, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x03, 0x44, 0xa2, 0xcd, 0x62, 0x06, 0x00, 0x00, } diff --git a/rpc/common/moc_common_nodeinfo.proto b/rpc/common/moc_common_nodeinfo.proto index 04986cf5..704f84a8 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -34,12 +34,10 @@ message PhysicalMemory { } message HostGPU { - string name = 1; - uint32 sizeBytes = 2; - uint32 count = 3; - uint64 partitionSizeBytes = 4; - AssignmentType assignment = 5; - string id = 6; + string id = 1; + string name = 2; + uint64 partitionSizeMB = 3; + AssignmentType assignment = 4; } message OperatingSystem { From 6d76a2408443a3eb2027224f1fc487e5468398c9 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Mon, 6 May 2024 10:46:02 -0700 Subject: [PATCH 13/13] Update gpu list in VM Size --- common/virtualmachineconstants.go | 2 +- go.mod | 4 ++-- go.sum | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/virtualmachineconstants.go b/common/virtualmachineconstants.go index 56cde773..289b2084 100644 --- a/common/virtualmachineconstants.go +++ b/common/virtualmachineconstants.go @@ -32,7 +32,7 @@ type VmSize struct { GpuName string MemoryMB int GpuAssignMode GpuAssignType - GpuList []*pb.Gpu + GpuList []*pb.VirtualMachineGPU } // innerMap is captured in the closure returned below diff --git a/go.mod b/go.mod index 0c183ee3..0d7f846e 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,9 @@ require ( ) require ( - golang.org/x/net v0.24.0 // indirect + golang.org/x/net v0.25.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect - google.golang.org/protobuf v1.34.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect ) replace ( diff --git a/go.sum b/go.sum index a9ae0d40..ee306694 100644 --- a/go.sum +++ b/go.sum @@ -1113,8 +1113,8 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1174,7 +1174,7 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -1192,8 +1192,9 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1529,8 +1530,8 @@ google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= -google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=