From 785af3da6ca64385d91ff1506df356e90bfc3214 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Tue, 13 Feb 2024 11:16:14 -0800 Subject: [PATCH 1/4] Added GpuList to custom size --- common/virtualmachineconstants.go | 7 + go.mod | 5 +- go.sum | 4 +- rpc/common/moc_common_computecommon.pb.go | 325 ++++++++++++++-------- rpc/common/moc_common_computecommon.proto | 11 + 5 files changed, 231 insertions(+), 121 deletions(-) diff --git a/common/virtualmachineconstants.go b/common/virtualmachineconstants.go index 6dca7f4d..ca14b58f 100644 --- a/common/virtualmachineconstants.go +++ b/common/virtualmachineconstants.go @@ -13,6 +13,7 @@ const ( GpuAssignTypeNone GpuAssignType = 0 GpuAssignTypeDDA GpuAssignType = 1 GpuAssignTypeGpuPv GpuAssignType = 2 + GpuAssignTypeGpuP GpuAssignType = 3 ) // GPU Type names for Moc @@ -26,12 +27,18 @@ const ( NvidiaM60Name = "NVIDIA Tesla M60" ) +type Gpu struct { + Assignment GpuAssignType + PartitionSizeGB int +} + type VmSize struct { CpuCount int GpuCount int GpuName string MemoryMB int GpuAssignMode GpuAssignType + GpuList []Gpu } // innerMap is captured in the closure returned below diff --git a/go.mod b/go.mod index 0f5f14a6..9261d5c9 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,10 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) -require google.golang.org/protobuf v1.32.0 // indirect +require ( + golang.org/x/net v0.21.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect +) replace ( github.com/golang/mock => github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index ca3435b5..1ae924e6 100644 --- a/go.sum +++ b/go.sum @@ -1111,8 +1111,9 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= 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 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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= @@ -1172,6 +1173,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.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= 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= diff --git a/rpc/common/moc_common_computecommon.pb.go b/rpc/common/moc_common_computecommon.pb.go index a397f4a2..3c5daade 100644 --- a/rpc/common/moc_common_computecommon.pb.go +++ b/rpc/common/moc_common_computecommon.pb.go @@ -521,6 +521,31 @@ 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} +} + type InstanceViewStatus_StatusLevelType int32 const ( @@ -549,7 +574,7 @@ func (x InstanceViewStatus_StatusLevelType) String() string { } func (InstanceViewStatus_StatusLevelType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{8, 0} + return fileDescriptor_7d1a061f6c82445b, []int{9, 0} } type WinRMListener struct { @@ -630,10 +655,58 @@ func (m *WinRMConfiguration) GetListeners() []*WinRMListener { return nil } +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:"-"` +} + +func (m *Gpu) Reset() { *m = Gpu{} } +func (m *Gpu) String() string { return proto.CompactTextString(m) } +func (*Gpu) ProtoMessage() {} +func (*Gpu) 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 *Gpu) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Gpu.Marshal(b, m, deterministic) +} +func (m *Gpu) XXX_Merge(src proto.Message) { + xxx_messageInfo_Gpu.Merge(m, src) +} +func (m *Gpu) XXX_Size() int { + return xxx_messageInfo_Gpu.Size(m) +} +func (m *Gpu) XXX_DiscardUnknown() { + xxx_messageInfo_Gpu.DiscardUnknown(m) +} + +var xxx_messageInfo_Gpu proto.InternalMessageInfo + +func (m *Gpu) GetAssignment() Gpu_AssignmentType { + if m != nil { + return m.Assignment + } + return Gpu_GpuDDA +} + +func (m *Gpu) GetPartitionSizeGB() int32 { + if m != nil { + return m.PartitionSizeGB + } + 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:"-"` @@ -643,7 +716,7 @@ func (m *VirtualMachineCustomSize) Reset() { *m = VirtualMachineCustomSi func (m *VirtualMachineCustomSize) String() string { return proto.CompactTextString(m) } func (*VirtualMachineCustomSize) ProtoMessage() {} func (*VirtualMachineCustomSize) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{2} + return fileDescriptor_7d1a061f6c82445b, []int{3} } func (m *VirtualMachineCustomSize) XXX_Unmarshal(b []byte) error { @@ -685,6 +758,13 @@ 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"` @@ -698,7 +778,7 @@ func (m *DynamicMemoryConfiguration) Reset() { *m = DynamicMemoryConfigu func (m *DynamicMemoryConfiguration) String() string { return proto.CompactTextString(m) } func (*DynamicMemoryConfiguration) ProtoMessage() {} func (*DynamicMemoryConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{3} + return fileDescriptor_7d1a061f6c82445b, []int{4} } func (m *DynamicMemoryConfiguration) XXX_Unmarshal(b []byte) error { @@ -754,7 +834,7 @@ func (m *VirtualMachineRunCommandInputParameter) Reset() { func (m *VirtualMachineRunCommandInputParameter) String() string { return proto.CompactTextString(m) } func (*VirtualMachineRunCommandInputParameter) ProtoMessage() {} func (*VirtualMachineRunCommandInputParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{4} + return fileDescriptor_7d1a061f6c82445b, []int{5} } func (m *VirtualMachineRunCommandInputParameter) XXX_Unmarshal(b []byte) error { @@ -802,7 +882,7 @@ func (m *VirtualMachineRunCommandScriptSource) Reset() { *m = VirtualMac func (m *VirtualMachineRunCommandScriptSource) String() string { return proto.CompactTextString(m) } func (*VirtualMachineRunCommandScriptSource) ProtoMessage() {} func (*VirtualMachineRunCommandScriptSource) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{5} + return fileDescriptor_7d1a061f6c82445b, []int{6} } func (m *VirtualMachineRunCommandScriptSource) XXX_Unmarshal(b []byte) error { @@ -858,7 +938,7 @@ func (m *VirtualMachineRunCommandInstanceView) Reset() { *m = VirtualMac func (m *VirtualMachineRunCommandInstanceView) String() string { return proto.CompactTextString(m) } func (*VirtualMachineRunCommandInstanceView) ProtoMessage() {} func (*VirtualMachineRunCommandInstanceView) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{6} + return fileDescriptor_7d1a061f6c82445b, []int{7} } func (m *VirtualMachineRunCommandInstanceView) XXX_Unmarshal(b []byte) error { @@ -920,7 +1000,7 @@ func (m *VirtualMachineCapabilities) Reset() { *m = VirtualMachineCapabi func (m *VirtualMachineCapabilities) String() string { return proto.CompactTextString(m) } func (*VirtualMachineCapabilities) ProtoMessage() {} func (*VirtualMachineCapabilities) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{7} + return fileDescriptor_7d1a061f6c82445b, []int{8} } func (m *VirtualMachineCapabilities) XXX_Unmarshal(b []byte) error { @@ -963,7 +1043,7 @@ func (m *InstanceViewStatus) Reset() { *m = InstanceViewStatus{} } func (m *InstanceViewStatus) String() string { return proto.CompactTextString(m) } func (*InstanceViewStatus) ProtoMessage() {} func (*InstanceViewStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{8} + return fileDescriptor_7d1a061f6c82445b, []int{9} } func (m *InstanceViewStatus) XXX_Unmarshal(b []byte) error { @@ -1031,7 +1111,7 @@ func (m *VirtualMachineAgentInstanceView) Reset() { *m = VirtualMachineA func (m *VirtualMachineAgentInstanceView) String() string { return proto.CompactTextString(m) } func (*VirtualMachineAgentInstanceView) ProtoMessage() {} func (*VirtualMachineAgentInstanceView) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{9} + return fileDescriptor_7d1a061f6c82445b, []int{10} } func (m *VirtualMachineAgentInstanceView) XXX_Unmarshal(b []byte) error { @@ -1077,7 +1157,7 @@ func (m *GuestAgentConfiguration) Reset() { *m = GuestAgentConfiguration func (m *GuestAgentConfiguration) String() string { return proto.CompactTextString(m) } func (*GuestAgentConfiguration) ProtoMessage() {} func (*GuestAgentConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{10} + return fileDescriptor_7d1a061f6c82445b, []int{11} } func (m *GuestAgentConfiguration) XXX_Unmarshal(b []byte) error { @@ -1119,7 +1199,7 @@ func (m *ProxyConfiguration) Reset() { *m = ProxyConfiguration{} } func (m *ProxyConfiguration) String() string { return proto.CompactTextString(m) } func (*ProxyConfiguration) ProtoMessage() {} func (*ProxyConfiguration) Descriptor() ([]byte, []int) { - return fileDescriptor_7d1a061f6c82445b, []int{11} + return fileDescriptor_7d1a061f6c82445b, []int{12} } func (m *ProxyConfiguration) XXX_Unmarshal(b []byte) error { @@ -1189,9 +1269,11 @@ func init() { 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") + proto.RegisterType((*Gpu)(nil), "moc.Gpu") proto.RegisterType((*VirtualMachineCustomSize)(nil), "moc.VirtualMachineCustomSize") proto.RegisterType((*DynamicMemoryConfiguration)(nil), "moc.DynamicMemoryConfiguration") proto.RegisterType((*VirtualMachineRunCommandInputParameter)(nil), "moc.VirtualMachineRunCommandInputParameter") @@ -1208,113 +1290,118 @@ func init() { func init() { proto.RegisterFile("moc_common_computecommon.proto", fileDescriptor_7d1a061f6c82445b) } var fileDescriptor_7d1a061f6c82445b = []byte{ - // 1714 bytes of a gzipped FileDescriptorProto + // 1802 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x97, 0xcd, 0x72, 0xe3, 0xc6, - 0x11, 0x80, 0xc5, 0x3f, 0x89, 0x6c, 0xfd, 0xec, 0x68, 0x76, 0x2d, 0xd1, 0xca, 0x7a, 0xad, 0xd0, - 0xeb, 0xb5, 0x42, 0xdb, 0x14, 0xff, 0xcc, 0x62, 0xa5, 0x2a, 0x55, 0xa1, 0x48, 0x48, 0x4b, 0x4b, - 0x04, 0x59, 0x00, 0x49, 0x39, 0xb9, 0x30, 0x10, 0x38, 0xa4, 0x50, 0x21, 0x30, 0x28, 0x60, 0xa0, - 0x95, 0x7c, 0x48, 0xe5, 0x94, 0x73, 0x1e, 0x20, 0x87, 0x1c, 0xf3, 0x02, 0xa9, 0x3c, 0x41, 0x5e, - 0x20, 0xef, 0x93, 0xaa, 0xd4, 0xcc, 0x00, 0x92, 0x00, 0x49, 0x39, 0x11, 0xfd, 0x75, 0x4f, 0x77, - 0xa3, 0xbb, 0x39, 0x33, 0x80, 0x77, 0x36, 0x35, 0x67, 0x26, 0xb5, 0x6d, 0xea, 0xf0, 0x1f, 0x37, - 0x60, 0x44, 0x4a, 0x15, 0xd7, 0xa3, 0x8c, 0xe2, 0x8c, 0x4d, 0xcd, 0x83, 0xc3, 0x25, 0xa5, 0xcb, - 0x15, 0x39, 0x16, 0xe8, 0x2a, 0x58, 0x1c, 0xcf, 0x89, 0x6f, 0x7a, 0x96, 0xcb, 0xa8, 0x27, 0xcd, - 0x4a, 0x5d, 0xd8, 0xbe, 0xb4, 0x1c, 0x6d, 0x70, 0x61, 0xf9, 0x8c, 0x38, 0xc4, 0xc3, 0x75, 0xc8, - 0x8f, 0xb8, 0xc6, 0xa4, 0xab, 0x62, 0xea, 0x30, 0x75, 0xb4, 0x53, 0xdf, 0xab, 0xd8, 0xd4, 0xac, - 0x08, 0xab, 0x48, 0x33, 0xbe, 0x73, 0x89, 0x76, 0x6f, 0x57, 0x3a, 0x05, 0x2c, 0xd4, 0x5d, 0xea, - 0x2c, 0xac, 0x65, 0xe0, 0x19, 0xcc, 0xa2, 0x0e, 0xae, 0x42, 0x21, 0xf2, 0xea, 0x17, 0x53, 0x87, - 0x99, 0xa3, 0xcd, 0x3a, 0x7e, 0x70, 0x15, 0xa9, 0xb4, 0x07, 0xa3, 0x92, 0x03, 0xc5, 0xa9, 0xe5, - 0xb1, 0xc0, 0x58, 0x0d, 0x0c, 0xf3, 0xda, 0x72, 0x48, 0x37, 0xf0, 0x19, 0xb5, 0x75, 0xeb, 0x67, - 0x82, 0x0f, 0x20, 0x6f, 0xba, 0x41, 0x97, 0x06, 0x0e, 0x13, 0x79, 0xe5, 0xb4, 0x7b, 0x99, 0xeb, - 0x6c, 0x62, 0x53, 0xef, 0x6e, 0x70, 0x52, 0x4c, 0x4b, 0x5d, 0x24, 0x73, 0xdd, 0x32, 0x5a, 0x97, - 0x91, 0xba, 0x48, 0x2e, 0xfd, 0x3d, 0x05, 0x07, 0xbd, 0x3b, 0xc7, 0xb0, 0x2d, 0x73, 0x20, 0xec, - 0xe3, 0x2f, 0x70, 0x04, 0xaf, 0x6c, 0xe3, 0xd6, 0xb2, 0x03, 0x7b, 0x10, 0x79, 0xe7, 0x91, 0xb3, - 0x5a, 0x12, 0x0b, 0x4b, 0xcb, 0x89, 0x59, 0xa6, 0x43, 0xcb, 0x38, 0xc6, 0x15, 0xc0, 0xcc, 0xf0, - 0x96, 0x84, 0x49, 0x72, 0x12, 0x2c, 0x16, 0xc4, 0x13, 0x89, 0x6d, 0x6b, 0xcf, 0x68, 0x4a, 0x3f, - 0xc1, 0x87, 0x78, 0x49, 0xb4, 0xc0, 0xe9, 0x52, 0xdb, 0x36, 0x9c, 0x79, 0xdf, 0x71, 0x03, 0x36, - 0x32, 0x3c, 0xc3, 0x26, 0x8c, 0x78, 0x18, 0x43, 0x56, 0x35, 0x6c, 0x22, 0x52, 0x2c, 0x68, 0xe2, - 0x19, 0x1f, 0x40, 0x6e, 0x6a, 0xac, 0x02, 0x22, 0xb2, 0x29, 0x9c, 0x64, 0xff, 0xfa, 0xcf, 0x62, - 0x4a, 0x93, 0xa8, 0xf4, 0xe7, 0x14, 0xbc, 0x7f, 0xc9, 0xb5, 0x2e, 0x86, 0x44, 0xa7, 0x81, 0x67, - 0x12, 0xfc, 0x16, 0xd6, 0xa5, 0x2c, 0x5d, 0x87, 0x5e, 0x42, 0x86, 0xdf, 0x42, 0x41, 0x3e, 0x4d, - 0xb4, 0xbe, 0x0c, 0xa3, 0x3d, 0x00, 0xae, 0x8d, 0xb2, 0xed, 0x89, 0xb7, 0x2c, 0x68, 0x0f, 0xa0, - 0xf4, 0xef, 0xff, 0x93, 0x42, 0xdf, 0xf1, 0x99, 0xe1, 0x98, 0x64, 0x6a, 0x91, 0x4f, 0x58, 0x87, - 0x1d, 0xe5, 0x96, 0x98, 0x01, 0x6f, 0x8b, 0xce, 0x0c, 0x46, 0xc2, 0xd1, 0xfc, 0x56, 0xcc, 0xd3, - 0x4b, 0x2e, 0xe2, 0x4b, 0xb4, 0x84, 0x0b, 0x3e, 0x19, 0xca, 0xad, 0xc5, 0xba, 0x74, 0x4e, 0xa2, - 0xa9, 0x89, 0x64, 0xbc, 0x07, 0xeb, 0xc3, 0x80, 0xb9, 0x01, 0x0b, 0x93, 0x0e, 0x25, 0xfc, 0x06, - 0x72, 0x8a, 0xe7, 0x51, 0xaf, 0x98, 0x15, 0x58, 0x0a, 0xa5, 0x1f, 0xe1, 0x20, 0x31, 0xb7, 0x86, - 0x6b, 0x5c, 0x59, 0x2b, 0x8b, 0x59, 0xc4, 0xc7, 0xdf, 0xc1, 0x6e, 0xdf, 0xa7, 0x2b, 0x83, 0x91, - 0xf9, 0xd4, 0x16, 0x9a, 0x95, 0xcc, 0x3f, 0xaf, 0x3d, 0x55, 0x94, 0xfe, 0x9b, 0x02, 0xfc, 0xf8, - 0xdd, 0x79, 0xae, 0x81, 0xcf, 0xbb, 0x6b, 0xf2, 0x44, 0xc3, 0xee, 0xf2, 0x67, 0xfc, 0x1b, 0xc8, - 0xad, 0xc8, 0x0d, 0x59, 0x89, 0xec, 0x77, 0xea, 0xdf, 0x88, 0x62, 0x3c, 0x5d, 0x5b, 0x91, 0x3f, - 0x17, 0xdc, 0x54, 0xfc, 0x71, 0xe5, 0x2a, 0xfc, 0x1e, 0xb6, 0xe7, 0x96, 0xef, 0xae, 0x8c, 0x3b, - 0x69, 0x10, 0xbe, 0x6a, 0x1c, 0xe2, 0x22, 0x6c, 0xd8, 0xc4, 0xf7, 0x8d, 0x25, 0x09, 0xdf, 0x39, - 0x12, 0x79, 0x4a, 0xcc, 0xb2, 0x49, 0x31, 0x27, 0x53, 0xe2, 0xcf, 0xa5, 0xdf, 0xc2, 0xab, 0x44, - 0x34, 0xbc, 0x09, 0x1b, 0x13, 0xe7, 0x8f, 0x0e, 0xfd, 0xe4, 0xa0, 0x35, 0x9c, 0x87, 0x6c, 0xdf, - 0x59, 0x50, 0x94, 0xe2, 0xf8, 0xd2, 0xf0, 0x1c, 0xcb, 0x59, 0xa2, 0x34, 0x2e, 0x84, 0x65, 0x45, - 0x99, 0xd2, 0x9f, 0xe0, 0xcb, 0x78, 0x2d, 0x3b, 0x4b, 0xe2, 0xb0, 0xd8, 0x34, 0x7c, 0x80, 0x9d, - 0x1b, 0x5b, 0xe0, 0x29, 0xf1, 0x7c, 0x8b, 0x3a, 0x61, 0x55, 0x12, 0x14, 0x37, 0x20, 0xef, 0x8b, - 0x64, 0x88, 0x5f, 0x4c, 0x8b, 0xfd, 0x67, 0xff, 0x85, 0x12, 0x69, 0xf7, 0x86, 0xa5, 0x06, 0xec, - 0x9f, 0x05, 0xc4, 0x67, 0xc2, 0x53, 0x7c, 0x3f, 0x28, 0xc2, 0x06, 0x71, 0x78, 0x93, 0xe6, 0x61, - 0xfb, 0x22, 0xb1, 0xf4, 0xb7, 0x14, 0xe0, 0x91, 0x47, 0x6f, 0x13, 0x1b, 0x48, 0x09, 0x0a, 0xd7, - 0x8c, 0xb9, 0x42, 0x13, 0xfb, 0xf3, 0x3c, 0x60, 0xfc, 0x1e, 0x80, 0x0b, 0xbe, 0x34, 0x7a, 0xfc, - 0x3f, 0x7d, 0xc4, 0x79, 0x68, 0x87, 0x4a, 0x93, 0xcc, 0x61, 0x86, 0x77, 0x21, 0x14, 0x79, 0x0c, - 0xe6, 0x05, 0x3e, 0x23, 0xf3, 0xae, 0x21, 0x3b, 0x14, 0xc5, 0xb8, 0xc7, 0xe5, 0x77, 0x90, 0x9f, - 0xf8, 0xc4, 0x13, 0xed, 0xc8, 0x43, 0x56, 0x1b, 0x0e, 0xc7, 0xb2, 0x17, 0x13, 0x5d, 0xd1, 0x50, - 0xaa, 0xfc, 0x3b, 0xd8, 0x1e, 0x79, 0xd4, 0x24, 0xbe, 0x4f, 0xef, 0x8d, 0x54, 0xea, 0x10, 0xb4, - 0xc6, 0x3b, 0xd3, 0x77, 0x18, 0x59, 0xc9, 0x8e, 0x89, 0xc7, 0x56, 0x13, 0xa5, 0xf1, 0x06, 0x64, - 0x3a, 0x83, 0x1e, 0xca, 0x70, 0x83, 0xce, 0xa0, 0xd7, 0x6a, 0xa2, 0xac, 0x60, 0xda, 0x00, 0xe5, - 0x04, 0xd3, 0x06, 0xad, 0x26, 0x5a, 0x2f, 0xff, 0x08, 0xef, 0x86, 0x2e, 0xe1, 0xf5, 0x70, 0x96, - 0xfa, 0x9d, 0xcf, 0x88, 0x7d, 0x42, 0x29, 0xf3, 0x99, 0x67, 0xb8, 0x8a, 0xb3, 0xb4, 0x1c, 0x82, - 0x77, 0x00, 0xba, 0x17, 0xc3, 0x49, 0x6f, 0xd6, 0x57, 0xfb, 0x3c, 0xad, 0x22, 0xbc, 0xb9, 0xec, - 0xab, 0xbd, 0xe1, 0xa5, 0x3e, 0xeb, 0xa8, 0xfa, 0xa5, 0xa2, 0xcd, 0x4e, 0xfb, 0x17, 0x8a, 0x8e, - 0x52, 0xe5, 0xef, 0xe1, 0x75, 0xc2, 0x57, 0x34, 0x60, 0xe1, 0x02, 0x99, 0xef, 0x45, 0x5f, 0x9d, - 0xfc, 0x84, 0x52, 0xe5, 0x7f, 0x14, 0x60, 0x2f, 0x3e, 0x4a, 0xfc, 0x20, 0x89, 0x96, 0xf4, 0xc8, - 0xc2, 0x08, 0x56, 0x0c, 0xad, 0x61, 0x0c, 0x3b, 0x3a, 0x33, 0x9c, 0xb9, 0xe1, 0xcd, 0x67, 0x9d, - 0xfa, 0xec, 0xa6, 0x8e, 0xd2, 0x71, 0xd6, 0xe4, 0x2c, 0x83, 0x5f, 0x8b, 0xd9, 0x96, 0xac, 0x57, - 0xf7, 0x67, 0x37, 0x0d, 0x94, 0x8d, 0xc3, 0xa6, 0x80, 0xb9, 0x38, 0x6c, 0x0b, 0xb8, 0x8e, 0xdf, - 0x00, 0x7a, 0x80, 0xb5, 0x96, 0xa0, 0x1b, 0x71, 0xda, 0x90, 0x5e, 0xf3, 0x71, 0x07, 0xba, 0xc8, - 0xa9, 0x90, 0x80, 0x0d, 0x0e, 0x21, 0x01, 0x45, 0xa6, 0x9b, 0x09, 0xf8, 0x03, 0x87, 0x5b, 0xf1, - 0x48, 0x7a, 0x4d, 0xac, 0xdf, 0x8e, 0x99, 0x9e, 0xb7, 0xf5, 0xd9, 0x4d, 0x0d, 0xed, 0xc4, 0x4c, - 0xcf, 0xdb, 0x3c, 0x7e, 0x0d, 0xbd, 0x4a, 0xd2, 0x06, 0xa7, 0x28, 0x49, 0x9b, 0x9c, 0xee, 0x62, - 0x04, 0x5b, 0xf7, 0x54, 0x3d, 0x6f, 0x21, 0x8c, 0x77, 0x61, 0xfb, 0x11, 0xa9, 0xd5, 0xd1, 0xeb, - 0xb8, 0xd1, 0xb4, 0x85, 0xde, 0xc4, 0x8d, 0xa6, 0xb5, 0x3a, 0xfa, 0x2c, 0xe9, 0xff, 0x07, 0xee, - 0x7f, 0x0f, 0xef, 0xc3, 0xeb, 0x44, 0x81, 0x66, 0x1f, 0x47, 0x2a, 0xda, 0x4f, 0x28, 0x1a, 0x91, - 0xa2, 0x98, 0x50, 0x34, 0x23, 0xc5, 0xe7, 0xb1, 0x00, 0xa7, 0x75, 0x5f, 0xd0, 0x83, 0x38, 0x6d, - 0x4a, 0xfa, 0x8b, 0x38, 0x6d, 0x4b, 0xfa, 0x16, 0x7f, 0x06, 0xbb, 0x0f, 0x94, 0x77, 0x96, 0xe3, - 0x2f, 0x62, 0xa5, 0x55, 0xbb, 0xcd, 0x59, 0xa7, 0x8e, 0xde, 0x25, 0x60, 0x9b, 0xc3, 0x2f, 0x63, - 0x6e, 0xd5, 0x6e, 0xad, 0xc5, 0xe9, 0x61, 0x82, 0x36, 0xea, 0x9c, 0xfe, 0x32, 0x41, 0x9b, 0xb3, - 0x4e, 0xa3, 0x8a, 0x4a, 0x09, 0xda, 0x16, 0xf4, 0xab, 0x58, 0x62, 0xd2, 0x6f, 0xa3, 0x8a, 0xde, - 0x27, 0x30, 0x77, 0xdc, 0xa8, 0xa2, 0xaf, 0xf9, 0x1f, 0x2f, 0xee, 0xb9, 0x56, 0xad, 0xce, 0x9a, - 0x55, 0xf4, 0x21, 0xa1, 0x69, 0xdf, 0x6b, 0xbe, 0xc1, 0x9f, 0xc3, 0x67, 0x89, 0x08, 0xa1, 0xea, - 0x28, 0xa1, 0xe2, 0x51, 0x42, 0xd5, 0xaf, 0x9e, 0x8f, 0xd4, 0xae, 0xa2, 0xf2, 0xf3, 0x91, 0xda, - 0x55, 0xf4, 0xed, 0x0b, 0x91, 0xda, 0x55, 0xf4, 0xdd, 0x0b, 0x91, 0xda, 0x55, 0xf4, 0xfd, 0xd3, - 0x6a, 0xd5, 0x5a, 0xa8, 0xf2, 0xb4, 0x5a, 0xb5, 0x16, 0x3a, 0x7e, 0xa6, 0x5a, 0xb5, 0x16, 0xaa, - 0x3e, 0x53, 0xad, 0x5a, 0x0b, 0xd5, 0xf0, 0x36, 0x14, 0xe4, 0xed, 0x94, 0xb7, 0x65, 0xf6, 0x48, - 0x54, 0xcf, 0xd1, 0x1f, 0xf8, 0x68, 0x87, 0xe2, 0x99, 0x1b, 0xb8, 0x37, 0xc8, 0xc0, 0x00, 0xeb, - 0x92, 0xa0, 0x2b, 0xfc, 0x0a, 0x36, 0x27, 0x8e, 0x1f, 0xb8, 0x2e, 0xf5, 0x18, 0x99, 0x23, 0xb3, - 0x7c, 0x04, 0xbb, 0x4f, 0xee, 0xd7, 0x7c, 0x13, 0xfe, 0x38, 0x1e, 0x8f, 0xe4, 0xa6, 0xc6, 0x9f, - 0xf8, 0x1e, 0x38, 0x06, 0x18, 0xd1, 0x4f, 0xc4, 0x93, 0x57, 0x98, 0xd8, 0xd9, 0xba, 0x09, 0x1b, - 0x5a, 0xe0, 0x88, 0x13, 0x35, 0xc5, 0xf7, 0xe2, 0xe1, 0x62, 0x81, 0xd2, 0x3c, 0xee, 0xc8, 0x08, - 0x7c, 0x32, 0x47, 0x19, 0xbc, 0x05, 0xf9, 0xae, 0x67, 0x31, 0xcb, 0x34, 0x56, 0x28, 0xcb, 0xbd, - 0xea, 0xc6, 0x0d, 0x99, 0xa3, 0x5c, 0x79, 0x01, 0xfb, 0xf1, 0x9d, 0x32, 0xdc, 0x67, 0xa9, 0x23, - 0xac, 0xc6, 0x1d, 0x2d, 0x3c, 0x30, 0xf4, 0xf1, 0x70, 0x84, 0x52, 0x1c, 0x6a, 0x8a, 0xae, 0x8c, - 0x51, 0x1a, 0xef, 0x01, 0xd6, 0x94, 0x51, 0xa7, 0xaf, 0xcd, 0xce, 0x26, 0x8a, 0x3e, 0x9e, 0x75, - 0xce, 0x14, 0x75, 0x2c, 0xcf, 0x85, 0x51, 0x67, 0xa2, 0x2b, 0x28, 0x2b, 0xd6, 0x75, 0xa6, 0x0a, - 0xca, 0x95, 0xff, 0x95, 0x7a, 0xf9, 0x3a, 0xfb, 0xe4, 0x76, 0xb6, 0x17, 0x27, 0xb3, 0x89, 0x7a, - 0xae, 0x0e, 0x2f, 0x55, 0xb4, 0xc6, 0x1b, 0x9e, 0xd0, 0x9d, 0x76, 0xfa, 0x17, 0x4a, 0x0f, 0xa5, - 0xf0, 0x5b, 0x28, 0x26, 0x54, 0xfa, 0xa4, 0xdb, 0x55, 0x94, 0x9e, 0xd2, 0x43, 0xe9, 0x67, 0x9c, - 0x8e, 0x14, 0xb5, 0xd7, 0x57, 0xcf, 0x50, 0xe6, 0x99, 0x95, 0x9a, 0x72, 0x32, 0x1c, 0x8e, 0xb9, - 0x36, 0x5b, 0xfe, 0x19, 0xb6, 0x3a, 0x9e, 0x79, 0x6d, 0x31, 0x62, 0xb2, 0xc0, 0x23, 0xbc, 0xbe, - 0xb7, 0xed, 0x96, 0x2c, 0xca, 0xa0, 0xcf, 0x5b, 0x23, 0x4e, 0xbd, 0x95, 0x7b, 0x6d, 0xa0, 0x34, - 0x6f, 0x85, 0xe8, 0xd2, 0xa8, 0x8b, 0x32, 0x7c, 0xda, 0x3a, 0xda, 0x60, 0xf6, 0x78, 0x39, 0xca, - 0xf1, 0x75, 0x96, 0xc1, 0x8f, 0x48, 0xe1, 0xaa, 0xd5, 0x44, 0x05, 0x5e, 0x4a, 0x71, 0x6c, 0xc6, - 0x4d, 0xb7, 0xca, 0x1f, 0x61, 0x4b, 0x27, 0x66, 0xe0, 0x59, 0xec, 0x4e, 0x0c, 0xc6, 0x2e, 0x6c, - 0xab, 0xc3, 0x71, 0x77, 0xa8, 0x9e, 0xf6, 0xcf, 0x26, 0x9a, 0xd2, 0x43, 0x6b, 0x1c, 0x8d, 0xb5, - 0x89, 0x3e, 0x56, 0x7a, 0x17, 0x9d, 0x89, 0xda, 0xfd, 0x88, 0x52, 0xfc, 0x08, 0x13, 0x26, 0x3d, - 0x45, 0x1d, 0xf7, 0x3b, 0x17, 0xd3, 0x01, 0x4a, 0xff, 0xfa, 0x1c, 0x90, 0x4f, 0x1c, 0xdf, 0x62, - 0xd6, 0x0d, 0x09, 0x3f, 0x1a, 0xf1, 0x17, 0x15, 0xf9, 0x91, 0x58, 0x89, 0x3e, 0x12, 0x2b, 0xa7, - 0x16, 0x59, 0xcd, 0x87, 0x2e, 0x2f, 0x84, 0x5f, 0xfc, 0xcf, 0x5f, 0x32, 0xe2, 0xae, 0xf3, 0x64, - 0xe1, 0xc9, 0xd7, 0xbf, 0xff, 0x6a, 0x69, 0xb1, 0xeb, 0xe0, 0xaa, 0x62, 0x52, 0xfb, 0xd8, 0xb6, - 0x4c, 0x8f, 0xfa, 0x74, 0xc1, 0x8e, 0x6d, 0x6a, 0x1e, 0x7b, 0xae, 0x79, 0x2c, 0x3f, 0x47, 0xaf, - 0xd6, 0x85, 0xdf, 0xc6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x1e, 0xd7, 0x15, 0xb1, 0x0e, - 0x00, 0x00, + 0xf1, 0xc0, 0x17, 0xfc, 0x90, 0xc8, 0x5e, 0x7d, 0x8c, 0x66, 0x77, 0x25, 0x5a, 0xff, 0xf5, 0x5a, + 0x7f, 0x7a, 0xbd, 0x56, 0x68, 0x9b, 0xe2, 0x97, 0x19, 0x56, 0xaa, 0x52, 0x15, 0x88, 0x84, 0xb8, + 0xb4, 0x44, 0x90, 0x05, 0x90, 0x92, 0x93, 0x0b, 0x03, 0x81, 0x43, 0x0a, 0x15, 0x02, 0x83, 0x02, + 0x06, 0x5a, 0xc9, 0x87, 0x54, 0x4e, 0x39, 0xbb, 0x72, 0xce, 0x21, 0xc7, 0xbc, 0x40, 0x2a, 0x4f, + 0x90, 0x17, 0xc8, 0xfb, 0xa4, 0x2a, 0x35, 0x03, 0x40, 0x12, 0x20, 0x29, 0x27, 0xa2, 0x7f, 0xdd, + 0xd3, 0xdd, 0xe8, 0x6e, 0xce, 0x0c, 0xe0, 0x9d, 0x4d, 0xcd, 0x99, 0x49, 0x6d, 0x9b, 0x3a, 0xfc, + 0xc7, 0x0d, 0x18, 0x09, 0xa5, 0xaa, 0xeb, 0x51, 0x46, 0x71, 0xd6, 0xa6, 0xe6, 0xfe, 0xc1, 0x92, + 0xd2, 0xe5, 0x8a, 0x1c, 0x09, 0x74, 0x19, 0x2c, 0x8e, 0xe6, 0xc4, 0x37, 0x3d, 0xcb, 0x65, 0xd4, + 0x0b, 0xcd, 0xca, 0x5d, 0xd8, 0xbc, 0xb0, 0x1c, 0x6d, 0x78, 0x66, 0xf9, 0x8c, 0x38, 0xc4, 0xc3, + 0x0d, 0x28, 0x8c, 0xb9, 0xc6, 0xa4, 0xab, 0x92, 0x74, 0x20, 0x1d, 0x6e, 0x35, 0x76, 0xab, 0x36, + 0x35, 0xab, 0xc2, 0x2a, 0xd6, 0x4c, 0x6e, 0x5d, 0xa2, 0xdd, 0xd9, 0x95, 0x4f, 0x00, 0x0b, 0x75, + 0x97, 0x3a, 0x0b, 0x6b, 0x19, 0x78, 0x06, 0xb3, 0xa8, 0x83, 0x6b, 0x50, 0x8c, 0xbd, 0xfa, 0x25, + 0xe9, 0x20, 0x7b, 0xf8, 0xb2, 0x81, 0xef, 0x5d, 0xc5, 0x2a, 0xed, 0xde, 0xa8, 0xfc, 0xb3, 0x04, + 0xd9, 0xbe, 0x1b, 0xe0, 0x5f, 0x02, 0x18, 0xbe, 0x6f, 0x2d, 0x1d, 0x9b, 0x38, 0x2c, 0xca, 0x62, + 0x4f, 0x2c, 0xed, 0xbb, 0x41, 0x55, 0xbe, 0x53, 0x89, 0x34, 0x1e, 0x98, 0xe2, 0x43, 0xd8, 0x76, + 0x0d, 0x8f, 0x59, 0x3c, 0xbe, 0x6e, 0xfd, 0x44, 0xfa, 0xc7, 0xa5, 0xcc, 0x81, 0x74, 0x98, 0xd7, + 0xd2, 0xb8, 0xfc, 0x01, 0xb6, 0x92, 0x7e, 0x30, 0xc0, 0x5a, 0xdf, 0x0d, 0x7a, 0x3d, 0x19, 0xbd, + 0xc0, 0x05, 0xc8, 0xf5, 0xdd, 0x60, 0x8c, 0xa4, 0xf2, 0x5f, 0x24, 0x28, 0x9d, 0x5b, 0x1e, 0x0b, + 0x8c, 0xd5, 0xd0, 0x30, 0xaf, 0x2c, 0x87, 0x74, 0x03, 0x9f, 0x51, 0x9b, 0xbb, 0xc1, 0xfb, 0x50, + 0x30, 0xdd, 0xa0, 0x4b, 0x83, 0x28, 0xcb, 0xbc, 0x76, 0x27, 0x73, 0x9d, 0x4d, 0x6c, 0xea, 0xdd, + 0x0e, 0xe3, 0x1c, 0xee, 0x64, 0xae, 0x5b, 0xc6, 0xeb, 0xb2, 0xa1, 0x2e, 0x96, 0x71, 0x19, 0xd6, + 0x97, 0x6e, 0xc0, 0x6b, 0x52, 0xca, 0x89, 0x9a, 0x15, 0xe2, 0x17, 0xd7, 0x62, 0x45, 0xf9, 0x6f, + 0x12, 0xec, 0xf7, 0x6e, 0x1d, 0xc3, 0xb6, 0xcc, 0xa1, 0xf0, 0x99, 0x2c, 0xfc, 0x21, 0x6c, 0xdb, + 0xc6, 0x8d, 0x65, 0x07, 0xf6, 0x30, 0xce, 0x80, 0x67, 0x97, 0xd3, 0xd2, 0x58, 0x58, 0x5a, 0x4e, + 0xc2, 0x32, 0x13, 0x59, 0x26, 0x31, 0xae, 0x02, 0x66, 0x86, 0xb7, 0x24, 0x2c, 0x24, 0xc7, 0xc1, + 0x62, 0x41, 0x3c, 0x91, 0xfc, 0xa6, 0xf6, 0x84, 0xa6, 0xfc, 0x23, 0x7c, 0x48, 0x96, 0x4d, 0x0b, + 0x9c, 0x2e, 0xb5, 0x6d, 0xc3, 0x99, 0x0f, 0x1c, 0x37, 0x60, 0x63, 0xc3, 0x33, 0x6c, 0xc2, 0x88, + 0x87, 0x31, 0xe4, 0x54, 0xc3, 0x26, 0x22, 0xc5, 0xa2, 0x26, 0x9e, 0xf1, 0x3e, 0xe4, 0xcf, 0x8d, + 0x55, 0x40, 0x44, 0x36, 0xc5, 0xe3, 0xdc, 0xcf, 0xff, 0x28, 0x49, 0x5a, 0x88, 0xca, 0x7f, 0x92, + 0xe0, 0xfd, 0x73, 0xae, 0x75, 0x31, 0xdc, 0x3a, 0x0d, 0x3c, 0x93, 0xe0, 0xb7, 0xb0, 0x16, 0xca, + 0xa1, 0xeb, 0xc8, 0x4b, 0xc4, 0xf0, 0x5b, 0x28, 0x86, 0x4f, 0x53, 0x6d, 0x10, 0x86, 0xd1, 0xee, + 0x01, 0xd7, 0xc6, 0xd9, 0xf6, 0xc4, 0x5b, 0x16, 0xb5, 0x7b, 0x50, 0xfe, 0xd7, 0xff, 0x48, 0x61, + 0xe0, 0xf8, 0xcc, 0x70, 0x4c, 0x72, 0x6e, 0x91, 0x4f, 0x58, 0x87, 0x2d, 0xe5, 0x86, 0x98, 0x81, + 0x18, 0x3c, 0x66, 0x30, 0x12, 0x0d, 0xf3, 0x37, 0xa2, 0xa7, 0xcf, 0xb9, 0x48, 0x2e, 0xd1, 0x52, + 0x2e, 0xf8, 0xf4, 0x28, 0x37, 0x16, 0xeb, 0xd2, 0x39, 0x89, 0x27, 0x2b, 0x96, 0xf1, 0x2e, 0xac, + 0x8d, 0x02, 0xe6, 0x06, 0x2c, 0x4a, 0x3a, 0x92, 0xf0, 0x6b, 0xc8, 0x2b, 0x9e, 0x47, 0xbd, 0x52, + 0x4e, 0xe0, 0x50, 0x28, 0xff, 0x00, 0xfb, 0xa9, 0xd9, 0x36, 0x5c, 0xe3, 0xd2, 0x5a, 0x59, 0xcc, + 0x22, 0x3e, 0xfe, 0x16, 0x76, 0x06, 0x3e, 0x5d, 0x19, 0x8c, 0xcc, 0xcf, 0x6d, 0xa1, 0x59, 0x85, + 0xf9, 0x17, 0xb4, 0xc7, 0x8a, 0xf2, 0x7f, 0x24, 0xc0, 0x0f, 0xdf, 0x9d, 0xe7, 0x1a, 0xf8, 0xbc, + 0xbb, 0x26, 0x4f, 0x34, 0xea, 0x2e, 0x7f, 0xc6, 0xbf, 0x86, 0xfc, 0x8a, 0x5c, 0x93, 0x95, 0xc8, + 0x7e, 0xab, 0xf1, 0xb5, 0x28, 0xc6, 0xe3, 0xb5, 0xd5, 0xf0, 0xe7, 0x8c, 0x9b, 0x8a, 0x7f, 0x7a, + 0xb8, 0x0a, 0xbf, 0x87, 0xcd, 0xb9, 0xe5, 0xbb, 0x2b, 0xe3, 0x36, 0x34, 0x88, 0x5e, 0x35, 0x09, + 0x71, 0x09, 0xd6, 0x6d, 0xe2, 0xfb, 0xc6, 0x92, 0x44, 0xef, 0x1c, 0x8b, 0x3c, 0x25, 0x66, 0xd9, + 0xa4, 0x94, 0x0f, 0x53, 0xe2, 0xcf, 0xe5, 0xdf, 0xc0, 0x76, 0x2a, 0x1a, 0x7e, 0x09, 0xeb, 0x53, + 0xe7, 0x0f, 0x0e, 0xfd, 0xe4, 0x84, 0x1b, 0xc2, 0xc0, 0x59, 0x50, 0x24, 0x71, 0x7c, 0x61, 0x78, + 0x8e, 0xe5, 0x2c, 0x51, 0x06, 0x17, 0xa3, 0xb2, 0xa2, 0x6c, 0xf9, 0x8f, 0xf0, 0x45, 0xb2, 0x96, + 0xf2, 0x92, 0x38, 0x2c, 0x31, 0x0d, 0x1f, 0x60, 0xeb, 0xda, 0x16, 0xf8, 0x9c, 0x78, 0xbe, 0x45, + 0x9d, 0xa8, 0x2a, 0x29, 0x8a, 0x9b, 0x50, 0xf0, 0x45, 0x32, 0xc4, 0x2f, 0x65, 0xc4, 0x1e, 0xb0, + 0xf7, 0x4c, 0x89, 0xb4, 0x3b, 0xc3, 0x72, 0x13, 0xf6, 0xfa, 0x01, 0xf1, 0x99, 0xf0, 0x94, 0xdc, + 0x0f, 0x4a, 0xb0, 0x4e, 0x1c, 0xde, 0xa4, 0x79, 0xd4, 0xbe, 0x58, 0x2c, 0xff, 0x55, 0x02, 0x3c, + 0xf6, 0xe8, 0x4d, 0x6a, 0x03, 0x29, 0x43, 0xf1, 0x8a, 0x31, 0x57, 0x68, 0x12, 0x7f, 0x9e, 0x7b, + 0x8c, 0xdf, 0x03, 0x70, 0xc1, 0x0f, 0x8d, 0x1e, 0xfe, 0x4f, 0x1f, 0x70, 0x1e, 0xda, 0xa1, 0xa1, + 0x49, 0xf6, 0x20, 0xcb, 0xbb, 0x10, 0x89, 0x3c, 0x06, 0xf3, 0x02, 0x9f, 0x91, 0x79, 0xd7, 0x08, + 0x3b, 0x14, 0xc7, 0xb8, 0xc3, 0x95, 0x77, 0x50, 0x98, 0xfa, 0xc4, 0x13, 0xed, 0x28, 0x40, 0x4e, + 0x1b, 0x8d, 0x26, 0x61, 0x2f, 0xa6, 0xba, 0xa2, 0x21, 0xa9, 0xf2, 0x5b, 0xd8, 0x1c, 0x7b, 0xd4, + 0x24, 0xbe, 0x4f, 0xef, 0x8c, 0x54, 0xea, 0x10, 0xf4, 0x82, 0x77, 0x66, 0xe0, 0x30, 0xb2, 0x0a, + 0x3b, 0x26, 0x1e, 0xdb, 0x2d, 0x94, 0xc1, 0xeb, 0x90, 0x95, 0x87, 0x3d, 0x94, 0xe5, 0x06, 0xf2, + 0xb0, 0xd7, 0x6e, 0xa1, 0x9c, 0x60, 0xda, 0x10, 0xe5, 0x05, 0xd3, 0x86, 0xed, 0x16, 0x5a, 0xab, + 0xfc, 0x00, 0xef, 0x46, 0x2e, 0xe1, 0xf5, 0x70, 0x96, 0xfa, 0xad, 0xcf, 0x88, 0x7d, 0x4c, 0x29, + 0xf3, 0x99, 0x67, 0xb8, 0x8a, 0xb3, 0xb4, 0x1c, 0x82, 0xb7, 0x00, 0xba, 0x67, 0xa3, 0x69, 0x6f, + 0x36, 0x50, 0x07, 0x3c, 0xad, 0x12, 0xbc, 0xbe, 0x18, 0xa8, 0xbd, 0xd1, 0x85, 0x3e, 0x93, 0x55, + 0xfd, 0x42, 0xd1, 0x66, 0x27, 0x83, 0x33, 0x45, 0x47, 0x52, 0xe5, 0x3b, 0x78, 0x95, 0xf2, 0x15, + 0x0f, 0x58, 0xb4, 0x20, 0xcc, 0xf7, 0x6c, 0xa0, 0x4e, 0x7f, 0x44, 0x52, 0xe5, 0xef, 0x45, 0xd8, + 0x4d, 0x8e, 0x12, 0x3f, 0x6c, 0xe2, 0x25, 0x3d, 0xb2, 0x30, 0x82, 0x15, 0x43, 0x2f, 0x30, 0x86, + 0x2d, 0x9d, 0x19, 0xce, 0xdc, 0xf0, 0xe6, 0x33, 0xb9, 0x31, 0xbb, 0x6e, 0xa0, 0x4c, 0x92, 0xb5, + 0x38, 0xcb, 0xe2, 0x57, 0x62, 0xb6, 0x43, 0xd6, 0x6b, 0xf8, 0xb3, 0xeb, 0x26, 0xca, 0x25, 0x61, + 0x4b, 0xc0, 0x7c, 0x12, 0x76, 0x04, 0x5c, 0xc3, 0xaf, 0x01, 0xdd, 0xc3, 0x7a, 0x5b, 0xd0, 0xf5, + 0x24, 0x6d, 0x86, 0x5e, 0x0b, 0x49, 0x07, 0xba, 0xc8, 0xa9, 0x98, 0x82, 0x4d, 0x0e, 0x21, 0x05, + 0x45, 0xa6, 0x2f, 0x53, 0xf0, 0x7b, 0x0e, 0x37, 0x92, 0x91, 0xf4, 0xba, 0x58, 0xbf, 0x99, 0x30, + 0x3d, 0xed, 0xe8, 0xb3, 0xeb, 0x3a, 0xda, 0x4a, 0x98, 0x9e, 0x76, 0x78, 0xfc, 0x3a, 0xda, 0x4e, + 0xd3, 0x26, 0xa7, 0x28, 0x4d, 0x5b, 0x9c, 0xee, 0x60, 0x04, 0x1b, 0x77, 0x54, 0x3d, 0x6d, 0x23, + 0x8c, 0x77, 0x60, 0xf3, 0x01, 0xa9, 0x37, 0xd0, 0xab, 0xa4, 0xd1, 0x79, 0x1b, 0xbd, 0x4e, 0x1a, + 0x9d, 0xd7, 0x1b, 0xe8, 0x4d, 0xda, 0xff, 0xf7, 0xdc, 0xff, 0x2e, 0xde, 0x83, 0x57, 0xa9, 0x02, + 0xcd, 0x3e, 0x8e, 0x55, 0xb4, 0x97, 0x52, 0x34, 0x63, 0x45, 0x29, 0xa5, 0x68, 0xc5, 0x8a, 0xcf, + 0x12, 0x01, 0x4e, 0x1a, 0xbe, 0xa0, 0xfb, 0x49, 0xda, 0x0a, 0xe9, 0xff, 0x25, 0x69, 0x27, 0xa4, + 0x6f, 0xf1, 0x1b, 0xd8, 0xb9, 0xa7, 0xbc, 0xb3, 0x1c, 0x7f, 0x9e, 0x28, 0xad, 0xda, 0x6d, 0xcd, + 0xe4, 0x06, 0x7a, 0x97, 0x82, 0x1d, 0x0e, 0xbf, 0x48, 0xb8, 0x55, 0xbb, 0xf5, 0x36, 0xa7, 0x07, + 0x29, 0xda, 0x6c, 0x70, 0xfa, 0xff, 0x29, 0xda, 0x9a, 0xc9, 0xcd, 0x1a, 0x2a, 0xa7, 0x68, 0x47, + 0xd0, 0x2f, 0x13, 0x89, 0x85, 0x7e, 0x9b, 0x35, 0xf4, 0x3e, 0x85, 0xb9, 0xe3, 0x66, 0x0d, 0x7d, + 0xc5, 0xff, 0x78, 0x49, 0xcf, 0xf5, 0x5a, 0x6d, 0xd6, 0xaa, 0xa1, 0x0f, 0x29, 0x4d, 0xe7, 0x4e, + 0xf3, 0x35, 0xfe, 0x0c, 0xde, 0xa4, 0x22, 0x44, 0xaa, 0xc3, 0x94, 0x8a, 0x47, 0x89, 0x54, 0xbf, + 0x78, 0x3a, 0x52, 0xa7, 0x86, 0x2a, 0x4f, 0x47, 0xea, 0xd4, 0xd0, 0x37, 0xcf, 0x44, 0xea, 0xd4, + 0xd0, 0xb7, 0xcf, 0x44, 0xea, 0xd4, 0xd0, 0x77, 0x8f, 0xab, 0x55, 0x6f, 0xa3, 0xea, 0xe3, 0x6a, + 0xd5, 0xdb, 0xe8, 0xe8, 0x89, 0x6a, 0xd5, 0xdb, 0xa8, 0xf6, 0x44, 0xb5, 0xea, 0x6d, 0x54, 0xc7, + 0x9b, 0x50, 0x0c, 0x6f, 0xb0, 0xbc, 0x2d, 0xb3, 0x07, 0xa2, 0x7a, 0x8a, 0x7e, 0xcf, 0x47, 0x3b, + 0x12, 0xfb, 0x6e, 0xe0, 0x5e, 0x23, 0x83, 0x5f, 0x8b, 0x43, 0x82, 0x2e, 0xf1, 0x36, 0xbc, 0x9c, + 0x3a, 0x7e, 0xe0, 0xba, 0xd4, 0x63, 0x64, 0x8e, 0xcc, 0xca, 0x21, 0xec, 0x3c, 0xfa, 0x2e, 0xe0, + 0x9b, 0xf0, 0xc7, 0xc9, 0x64, 0x1c, 0x6e, 0x6a, 0xfc, 0x89, 0xef, 0x81, 0x13, 0x80, 0x31, 0xfd, + 0x44, 0xbc, 0xf0, 0x0a, 0x93, 0x38, 0x5b, 0x5f, 0xc2, 0xba, 0x16, 0x38, 0xe2, 0x44, 0x95, 0xf8, + 0x5e, 0x3c, 0x5a, 0x2c, 0x50, 0x86, 0xc7, 0x1d, 0x1b, 0x81, 0x4f, 0xe6, 0x28, 0x8b, 0x37, 0xa0, + 0xd0, 0xf5, 0x2c, 0x66, 0x99, 0xc6, 0x0a, 0xe5, 0xb8, 0x57, 0xdd, 0xb8, 0x26, 0x73, 0x94, 0xaf, + 0x2c, 0x60, 0x2f, 0xb9, 0x53, 0x46, 0xfb, 0x2c, 0x75, 0x84, 0xd5, 0x44, 0xd6, 0xa2, 0x03, 0x43, + 0x9f, 0x8c, 0xc6, 0x48, 0xe2, 0x50, 0x53, 0x74, 0x65, 0x82, 0x32, 0x78, 0x17, 0xb0, 0xa6, 0x8c, + 0xe5, 0x81, 0x36, 0xeb, 0x4f, 0x15, 0x7d, 0x32, 0x93, 0xfb, 0x8a, 0x3a, 0x09, 0xcf, 0x85, 0xb1, + 0x3c, 0xd5, 0x15, 0x94, 0x13, 0xeb, 0xe4, 0x73, 0x05, 0xe5, 0x2b, 0xff, 0x94, 0x9e, 0xbf, 0xce, + 0x3e, 0xba, 0x9d, 0xed, 0x26, 0xc9, 0x6c, 0xaa, 0x9e, 0xaa, 0xa3, 0x0b, 0x15, 0xbd, 0xe0, 0x0d, + 0x4f, 0xe9, 0x4e, 0xe4, 0xc1, 0x99, 0xd2, 0x43, 0x12, 0x7e, 0x0b, 0xa5, 0x94, 0x4a, 0x9f, 0x76, + 0xbb, 0x8a, 0xd2, 0x53, 0x7a, 0x28, 0xf3, 0x84, 0xd3, 0xb1, 0xa2, 0xf6, 0x06, 0x6a, 0x1f, 0x65, + 0x9f, 0x58, 0xa9, 0x29, 0xc7, 0xa3, 0xd1, 0x84, 0x6b, 0x73, 0x95, 0x9f, 0x60, 0x43, 0xf6, 0xcc, + 0x2b, 0x8b, 0x11, 0x93, 0x05, 0x1e, 0xe1, 0xf5, 0xbd, 0xe9, 0xb4, 0xc3, 0xa2, 0x0c, 0x07, 0xbc, + 0x35, 0xe2, 0xd4, 0x5b, 0xb9, 0x57, 0x06, 0xca, 0xf0, 0x56, 0x88, 0x2e, 0x8d, 0xbb, 0x28, 0xcb, + 0xa7, 0x4d, 0xd6, 0x86, 0xb3, 0x87, 0xcb, 0x51, 0x9e, 0xaf, 0xb3, 0x0c, 0x7e, 0x44, 0x0a, 0x57, + 0xed, 0x16, 0x2a, 0xf2, 0x52, 0x8a, 0x63, 0x33, 0x69, 0xba, 0x51, 0xf9, 0x08, 0x1b, 0x3a, 0x31, + 0x03, 0xcf, 0x62, 0xb7, 0x62, 0x30, 0x76, 0x60, 0x53, 0x1d, 0x4d, 0xba, 0x23, 0xf5, 0x64, 0xd0, + 0x9f, 0x6a, 0x4a, 0x0f, 0xbd, 0xe0, 0x68, 0xa2, 0x4d, 0xf5, 0x89, 0xd2, 0x3b, 0x93, 0xa7, 0x6a, + 0xf7, 0x23, 0x92, 0xf8, 0x11, 0x26, 0x4c, 0x7a, 0x8a, 0x3a, 0x19, 0xc8, 0x67, 0xe7, 0x43, 0x94, + 0xf9, 0xd5, 0x29, 0x20, 0x9f, 0x38, 0xbe, 0xc5, 0xac, 0x6b, 0x12, 0x7d, 0xec, 0xe2, 0xcf, 0xab, + 0xe1, 0xc7, 0x6d, 0x35, 0xfe, 0xb8, 0xad, 0x9e, 0x58, 0x64, 0x35, 0x1f, 0xb9, 0xbc, 0x10, 0x7e, + 0xe9, 0xdf, 0x7f, 0xce, 0x8a, 0xbb, 0xce, 0xa3, 0x85, 0xc7, 0x5f, 0xfd, 0xee, 0xcb, 0xa5, 0xc5, + 0xae, 0x82, 0xcb, 0xaa, 0x49, 0xed, 0x23, 0xdb, 0x32, 0x3d, 0xea, 0xd3, 0x05, 0x3b, 0xb2, 0xa9, + 0x79, 0xe4, 0xb9, 0xe6, 0x51, 0xf8, 0x19, 0x7d, 0xb9, 0x26, 0xfc, 0x36, 0xff, 0x1b, 0x00, 0x00, + 0xff, 0xff, 0x7b, 0x9a, 0x8b, 0xc5, 0x69, 0x0f, 0x00, 0x00, } diff --git a/rpc/common/moc_common_computecommon.proto b/rpc/common/moc_common_computecommon.proto index 8e79af81..7c69de3a 100644 --- a/rpc/common/moc_common_computecommon.proto +++ b/rpc/common/moc_common_computecommon.proto @@ -102,10 +102,21 @@ message WinRMConfiguration { repeated WinRMListener Listeners = 1; } +message Gpu { + enum AssignmentType { + GpuDDA = 0; + GpuP = 1; + } + + AssignmentType assignment = 1; + int32 partitionSizeGB = 2; +} + message VirtualMachineCustomSize { int32 cpuCount = 1; int32 memoryMB = 2; int32 gpuCount = 3; + repeated Gpu gpuList = 4; } message DynamicMemoryConfiguration { From 0b6388b5f832d86e9c6c386aeef41e83abab4655 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Wed, 14 Feb 2024 14:16:43 -0800 Subject: [PATCH 2/4] Remove duplicate gpu type --- common/virtualmachineconstants.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/common/virtualmachineconstants.go b/common/virtualmachineconstants.go index ca14b58f..6445028e 100644 --- a/common/virtualmachineconstants.go +++ b/common/virtualmachineconstants.go @@ -13,7 +13,6 @@ const ( GpuAssignTypeNone GpuAssignType = 0 GpuAssignTypeDDA GpuAssignType = 1 GpuAssignTypeGpuPv GpuAssignType = 2 - GpuAssignTypeGpuP GpuAssignType = 3 ) // GPU Type names for Moc @@ -27,18 +26,13 @@ const ( NvidiaM60Name = "NVIDIA Tesla M60" ) -type Gpu struct { - Assignment GpuAssignType - PartitionSizeGB int -} - type VmSize struct { CpuCount int GpuCount int GpuName string MemoryMB int GpuAssignMode GpuAssignType - GpuList []Gpu + GpuList []pb.Gpu } // innerMap is captured in the closure returned below From 8add90c2ccb3ea6d4184f0090e827375f162f374 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Wed, 14 Feb 2024 14:24:41 -0800 Subject: [PATCH 3/4] Use list of gpu pointers --- common/virtualmachineconstants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/virtualmachineconstants.go b/common/virtualmachineconstants.go index 6445028e..933c1e08 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.Gpu } // innerMap is captured in the closure returned below From 5ebc478eafff1f16f7b4067a73ed6cb9a6ee6f95 Mon Sep 17 00:00:00 2001 From: Dhaval Popat Date: Wed, 14 Feb 2024 14:53:52 -0800 Subject: [PATCH 4/4] Added gpu list in node resources --- rpc/common/moc_common_nodeinfo.pb.go | 100 +++++++++++++++------------ rpc/common/moc_common_nodeinfo.proto | 1 + 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/rpc/common/moc_common_nodeinfo.pb.go b/rpc/common/moc_common_nodeinfo.pb.go index 1b84087b..d56c20ed 100644 --- a/rpc/common/moc_common_nodeinfo.pb.go +++ b/rpc/common/moc_common_nodeinfo.pb.go @@ -444,6 +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"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -502,6 +503,13 @@ 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") @@ -516,49 +524,51 @@ func init() { func init() { proto.RegisterFile("moc_common_nodeinfo.proto", fileDescriptor_7c83f03f7e6831a3) } var fileDescriptor_7c83f03f7e6831a3 = []byte{ - // 702 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x30, - 0x14, 0xa6, 0x3f, 0xeb, 0xda, 0xd3, 0xad, 0xdb, 0xcc, 0x80, 0x30, 0x10, 0x94, 0x4c, 0x4c, 0x13, - 0x42, 0x2d, 0xea, 0x34, 0x01, 0x97, 0x8c, 0x8b, 0x09, 0xa4, 0xb1, 0xca, 0xdb, 0xb8, 0xe0, 0x66, - 0xca, 0xdc, 0xd3, 0xd6, 0xa2, 0x89, 0x23, 0xdb, 0xa9, 0x94, 0x3d, 0x1f, 0x4f, 0xc0, 0x43, 0xc0, - 0x6b, 0xa0, 0x9c, 0xa4, 0x6d, 0xd2, 0x55, 0x13, 0x57, 0x89, 0xcf, 0xf7, 0x1d, 0xfb, 0x3b, 0xe7, - 0x3b, 0x36, 0x3c, 0xf5, 0x95, 0xb8, 0x16, 0xca, 0xf7, 0x55, 0x70, 0x1d, 0xa8, 0x01, 0xca, 0x60, - 0xa8, 0x3a, 0xa1, 0x56, 0x56, 0x31, 0xf0, 0x95, 0xe8, 0xa4, 0xd0, 0xde, 0x93, 0x1c, 0x2d, 0xfd, - 0xa4, 0xa4, 0xbd, 0x17, 0x45, 0x20, 0x8c, 0x2c, 0xe6, 0x71, 0xf7, 0x1c, 0x76, 0xcf, 0x0d, 0xc7, - 0x91, 0x34, 0x56, 0x7b, 0x56, 0xaa, 0xe0, 0xc2, 0x7a, 0x36, 0x32, 0xec, 0x3d, 0xd4, 0x0c, 0xfd, - 0x39, 0xa5, 0x76, 0xe9, 0xb0, 0xd5, 0x7b, 0xd9, 0x59, 0x9c, 0xd6, 0xb9, 0x9b, 0x81, 0x3c, 0xa3, - 0xbb, 0xbf, 0xcb, 0xd0, 0xe8, 0x6b, 0x25, 0xd0, 0x18, 0xa5, 0x19, 0x83, 0x6a, 0xe0, 0xf9, 0x48, - 0x9b, 0x34, 0x38, 0xfd, 0xb3, 0x5d, 0x58, 0x13, 0x4a, 0xa3, 0x71, 0xca, 0xed, 0xd2, 0xe1, 0x26, - 0x4f, 0x17, 0x49, 0xd4, 0x84, 0x88, 0x03, 0xa7, 0x42, 0xd4, 0x74, 0xc1, 0x0e, 0xa0, 0x6a, 0xe3, - 0x10, 0x9d, 0x2a, 0x89, 0x60, 0x24, 0x62, 0xbe, 0xfb, 0x65, 0x1c, 0x22, 0x27, 0x9c, 0x1d, 0x40, - 0x6b, 0x2a, 0xb5, 0x8d, 0xbc, 0x89, 0xbc, 0x25, 0x51, 0xce, 0x5a, 0xbb, 0x74, 0x58, 0xe7, 0x4b, - 0x51, 0xf6, 0x16, 0x76, 0x26, 0x6a, 0x24, 0x85, 0x37, 0x09, 0x67, 0xbb, 0x18, 0xa7, 0x46, 0x3a, - 0xee, 0x02, 0x09, 0x7b, 0x1c, 0x87, 0xa8, 0xa7, 0xd2, 0x28, 0x1d, 0x6a, 0x34, 0x18, 0x58, 0x67, - 0x9d, 0x36, 0xbe, 0x0b, 0x30, 0x17, 0x36, 0x7c, 0x2f, 0x88, 0x86, 0x9e, 0xb0, 0x91, 0x46, 0xed, - 0xd4, 0xa9, 0x90, 0x42, 0x8c, 0x1d, 0xc3, 0x86, 0xa7, 0xc5, 0x58, 0x5a, 0xa4, 0x80, 0xd3, 0xa0, - 0xba, 0x76, 0xa8, 0xae, 0x4f, 0x39, 0x80, 0x17, 0x68, 0x6e, 0x07, 0x5a, 0xfd, 0x71, 0x6c, 0x12, - 0x79, 0x67, 0xe8, 0x2b, 0x1d, 0xb3, 0xe7, 0xd0, 0x30, 0xf2, 0x16, 0x4f, 0x62, 0x8b, 0xa9, 0x45, - 0x55, 0xbe, 0x08, 0xb8, 0x67, 0x50, 0x39, 0xed, 0x5f, 0xad, 0xec, 0x7e, 0x21, 0x31, 0x75, 0x60, - 0x11, 0x48, 0xbd, 0x89, 0x02, 0x4b, 0x2e, 0x90, 0x37, 0x51, 0x60, 0xdd, 0xbf, 0x25, 0xd8, 0x3a, - 0x0f, 0x31, 0xb1, 0x3b, 0x18, 0x5d, 0xc4, 0xc6, 0xa2, 0xcf, 0x3a, 0xc0, 0xd4, 0x2c, 0x64, 0x28, - 0x64, 0x7e, 0x46, 0x99, 0x92, 0x15, 0x08, 0x7b, 0x07, 0x35, 0x65, 0xc8, 0xcb, 0x32, 0xd5, 0xec, - 0x50, 0xcd, 0x4b, 0xbb, 0x92, 0xa3, 0x19, 0x2f, 0x51, 0xaa, 0xcc, 0x14, 0xb5, 0x49, 0xec, 0x4c, - 0xa7, 0x62, 0x11, 0x60, 0x97, 0xb0, 0xab, 0x56, 0x0c, 0x2e, 0x4d, 0x4a, 0xb3, 0xd7, 0xbe, 0x7f, - 0x5c, 0x23, 0xc3, 0x57, 0x66, 0xbb, 0xbf, 0xca, 0x50, 0xff, 0xa6, 0x06, 0xf8, 0x25, 0x18, 0xaa, - 0x95, 0xed, 0x6b, 0x41, 0x59, 0x0e, 0xa8, 0x84, 0x06, 0x2f, 0xcb, 0x01, 0x3b, 0x06, 0x10, 0x5e, - 0xe8, 0xdd, 0xc8, 0x89, 0xb4, 0x31, 0xa9, 0x6c, 0xf6, 0x1e, 0xe5, 0x0f, 0xe7, 0x68, 0x54, 0xa4, - 0x05, 0x1a, 0x9e, 0x23, 0xb2, 0x8f, 0xb0, 0xe1, 0x4d, 0x3d, 0x39, 0x99, 0x25, 0x56, 0xef, 0x4b, - 0x2c, 0x50, 0x73, 0x8d, 0xac, 0xfd, 0x67, 0x23, 0xf7, 0xe7, 0x77, 0x79, 0x9d, 0x8e, 0x69, 0x52, - 0x46, 0xd6, 0x87, 0x0c, 0x62, 0x8f, 0xa1, 0x16, 0x85, 0x56, 0xfa, 0x48, 0x73, 0x5b, 0xe1, 0xd9, - 0x8a, 0x1d, 0x25, 0xc7, 0x25, 0xed, 0xa0, 0x59, 0x6d, 0xf6, 0x9e, 0x15, 0x3a, 0x5b, 0x3c, 0x95, - 0x67, 0x54, 0xf7, 0x4f, 0x09, 0x1a, 0x73, 0xfd, 0xec, 0x08, 0x1a, 0xf3, 0x4b, 0x45, 0xcd, 0x5c, - 0xaa, 0x74, 0x7e, 0xa1, 0xf9, 0x82, 0xc7, 0x7a, 0x50, 0xf3, 0x69, 0xd4, 0xa9, 0xd9, 0xcd, 0xde, - 0x5e, 0x21, 0xa3, 0x70, 0x19, 0x78, 0xc6, 0x64, 0xaf, 0xa0, 0x32, 0x0a, 0xa3, 0xcc, 0x85, 0xad, - 0x7c, 0xc2, 0x69, 0xff, 0x8a, 0x27, 0x18, 0x3b, 0x85, 0xd6, 0xd4, 0xff, 0x3c, 0x33, 0x42, 0xa2, - 0xa1, 0x87, 0xa2, 0x99, 0xbd, 0x6f, 0xdf, 0xd3, 0xd7, 0xe2, 0xcc, 0x13, 0x63, 0x19, 0x60, 0x9e, - 0xc6, 0x97, 0xd2, 0xbe, 0x56, 0xeb, 0xd5, 0xed, 0xb5, 0x37, 0x1f, 0xe0, 0xe1, 0x8a, 0xc7, 0x90, - 0xed, 0xc0, 0x66, 0xa0, 0x6c, 0x1a, 0x47, 0x8d, 0x83, 0xed, 0x07, 0xac, 0x05, 0xa0, 0x17, 0xeb, - 0xd2, 0xc9, 0xeb, 0x1f, 0xfb, 0x23, 0x69, 0xc7, 0xd1, 0x4d, 0x22, 0xb1, 0xeb, 0x4b, 0xa1, 0x95, - 0x51, 0x43, 0xdb, 0xf5, 0x95, 0xe8, 0xea, 0x50, 0x74, 0x53, 0xe1, 0x37, 0x35, 0x7a, 0xa6, 0x8f, - 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xf8, 0x3e, 0xea, 0x08, 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 4f00ce92..364b64e2 100644 --- a/rpc/common/moc_common_nodeinfo.proto +++ b/rpc/common/moc_common_nodeinfo.proto @@ -63,4 +63,5 @@ message Resources { PhysicalMemory memory = 2; GPU gpu = 3; VirtualMachineCapabilities vmCapabilities = 5; + repeated Gpu gpuList = 6; } \ No newline at end of file