diff --git a/inventory/inventory.proto b/inventory/inventory.proto index d0afaffa..e8df7f46 100644 --- a/inventory/inventory.proto +++ b/inventory/inventory.proto @@ -144,13 +144,13 @@ message CPUInfo { // to 0. For core counts of 256 or greater, the Core // Count field is set to FFh and the Core Count 2 // field is set to the number of cores. - int32 total_cores = 1; + uint32 total_cores = 1; // Number of threads per processor socket // See 7.5.8. If the value is unknown, the field is set // to 0. For thread counts of 256 or greater, the // Thread Count field is set to FFh and the Thread // Count 2 field is set to the number of threads. - int32 total_threads = 2; + uint32 total_threads = 2; } // Physical Memory Array (Type 16) diff --git a/v1/gen/go/inventory/inventory.pb.go b/v1/gen/go/inventory/inventory.pb.go index fd1d70ca..9673139a 100644 --- a/v1/gen/go/inventory/inventory.pb.go +++ b/v1/gen/go/inventory/inventory.pb.go @@ -427,13 +427,13 @@ type CPUInfo struct { // to 0. For core counts of 256 or greater, the Core // Count field is set to FFh and the Core Count 2 // field is set to the number of cores. - TotalCores int32 `protobuf:"varint,1,opt,name=total_cores,json=totalCores,proto3" json:"total_cores,omitempty"` + TotalCores uint32 `protobuf:"varint,1,opt,name=total_cores,json=totalCores,proto3" json:"total_cores,omitempty"` // Number of threads per processor socket // See 7.5.8. If the value is unknown, the field is set // to 0. For thread counts of 256 or greater, the // Thread Count field is set to FFh and the Thread // Count 2 field is set to the number of threads. - TotalThreads int32 `protobuf:"varint,2,opt,name=total_threads,json=totalThreads,proto3" json:"total_threads,omitempty"` + TotalThreads uint32 `protobuf:"varint,2,opt,name=total_threads,json=totalThreads,proto3" json:"total_threads,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -468,14 +468,14 @@ func (*CPUInfo) Descriptor() ([]byte, []int) { return file_inventory_inventory_proto_rawDescGZIP(), []int{4} } -func (x *CPUInfo) GetTotalCores() int32 { +func (x *CPUInfo) GetTotalCores() uint32 { if x != nil { return x.TotalCores } return 0 } -func (x *CPUInfo) GetTotalThreads() int32 { +func (x *CPUInfo) GetTotalThreads() uint32 { if x != nil { return x.TotalThreads } @@ -857,9 +857,9 @@ var file_inventory_inventory_proto_rawDesc = []byte{ 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x22, 0x4f, 0x0a, 0x07, 0x43, 0x50, 0x55, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x43, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x23, 0x0a, + 0x0d, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x43, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x61, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x22, 0x6c, 0x0a, 0x0a, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x30, 0x0a, 0x14, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, diff --git a/v1/gen/python/inventory/inventory_pb2.py b/v1/gen/python/inventory/inventory_pb2.py index 5615a607..e3b7f356 100644 --- a/v1/gen/python/inventory/inventory_pb2.py +++ b/v1/gen/python/inventory/inventory_pb2.py @@ -28,7 +28,7 @@ from google.api import resource_pb2 as google_dot_api_dot_resource__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19inventory/inventory.proto\x12\x14opi_api.inventory.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\"P\n\x08\x42IOSInfo\x12\x16\n\x06vendor\x18\x01 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\x12\x12\n\x04\x64\x61te\x18\x03 \x01(\tR\x04\x64\x61te\"\xb5\x01\n\nSystemInfo\x12\x16\n\x06\x66\x61mily\x18\x01 \x01(\tR\x06\x66\x61mily\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06vendor\x18\x03 \x01(\tR\x06vendor\x12#\n\rserial_number\x18\x04 \x01(\tR\x0cserialNumber\x12\x12\n\x04uuid\x18\x05 \x01(\tR\x04uuid\x12\x10\n\x03sku\x18\x06 \x01(\tR\x03sku\x12\x18\n\x07version\x18\x07 \x01(\tR\x07version\"\xc0\x01\n\x0b\x43hassisInfo\x12\x1b\n\tasset_tag\x18\x01 \x01(\tR\x08\x61ssetTag\x12#\n\rserial_number\x18\x02 \x01(\tR\x0cserialNumber\x12\x12\n\x04type\x18\x03 \x01(\tR\x04type\x12)\n\x10type_description\x18\x04 \x01(\tR\x0ftypeDescription\x12\x16\n\x06vendor\x18\x05 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x06 \x01(\tR\x07version\"\x9d\x01\n\rBaseboardInfo\x12\x1b\n\tasset_tag\x18\x01 \x01(\tR\x08\x61ssetTag\x12#\n\rserial_number\x18\x02 \x01(\tR\x0cserialNumber\x12\x16\n\x06vendor\x18\x03 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x18\n\x07product\x18\x05 \x01(\tR\x07product\"O\n\x07\x43PUInfo\x12\x1f\n\x0btotal_cores\x18\x01 \x01(\x05R\ntotalCores\x12#\n\rtotal_threads\x18\x02 \x01(\x05R\x0ctotalThreads\"l\n\nMemoryInfo\x12\x30\n\x14total_physical_bytes\x18\x01 \x01(\x03R\x12totalPhysicalBytes\x12,\n\x12total_usable_bytes\x18\x02 \x01(\x03R\x10totalUsableBytes\"\xe0\x01\n\x0ePCIeDeviceInfo\x12\x16\n\x06\x64river\x18\x01 \x01(\tR\x06\x64river\x12\x18\n\x07\x61\x64\x64ress\x18\x02 \x01(\tR\x07\x61\x64\x64ress\x12\x16\n\x06vendor\x18\x03 \x01(\tR\x06vendor\x12\x18\n\x07product\x18\x04 \x01(\tR\x07product\x12\x1a\n\x08revision\x18\x05 \x01(\tR\x08revision\x12\x1c\n\tsubsystem\x18\x06 \x01(\tR\tsubsystem\x12\x14\n\x05\x63lass\x18\x07 \x01(\tR\x05\x63lass\x12\x1a\n\x08subclass\x18\x08 \x01(\tR\x08subclass\"Q\n\x13GetInventoryRequest\x12:\n\x04name\x18\x01 \x01(\tB&\xe0\x41\x02\xfa\x41 \n\x1eopi_api.inventory.v1/InventoryR\x04name\"\xa8\x03\n\tInventory\x12\x32\n\x04\x62ios\x18\x01 \x01(\x0b\x32\x1e.opi_api.inventory.v1.BIOSInfoR\x04\x62ios\x12\x38\n\x06system\x18\x02 \x01(\x0b\x32 .opi_api.inventory.v1.SystemInfoR\x06system\x12\x41\n\tbaseboard\x18\x03 \x01(\x0b\x32#.opi_api.inventory.v1.BaseboardInfoR\tbaseboard\x12;\n\x07\x63hassis\x18\x04 \x01(\x0b\x32!.opi_api.inventory.v1.ChassisInfoR\x07\x63hassis\x12;\n\tprocessor\x18\x05 \x01(\x0b\x32\x1d.opi_api.inventory.v1.CPUInfoR\tprocessor\x12\x38\n\x06memory\x18\x06 \x01(\x0b\x32 .opi_api.inventory.v1.MemoryInfoR\x06memory\x12\x36\n\x03pci\x18\x07 \x03(\x0b\x32$.opi_api.inventory.v1.PCIeDeviceInfoR\x03pci2\xa2\x01\n\x10InventoryService\x12\x8d\x01\n\x0cGetInventory\x12).opi_api.inventory.v1.GetInventoryRequest\x1a\x1f.opi_api.inventory.v1.Inventory\"1\xda\x41\x04name\x82\xd3\xe4\x93\x02$\x12\"/v1/{name=inventory/*/inventory/*}B[\n\x14opi_api.inventory.v1B\x0eInventoryProtoP\x01Z1github.com/opiproject/opi-api/inventory/v1/gen/gob\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19inventory/inventory.proto\x12\x14opi_api.inventory.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\"P\n\x08\x42IOSInfo\x12\x16\n\x06vendor\x18\x01 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\x12\x12\n\x04\x64\x61te\x18\x03 \x01(\tR\x04\x64\x61te\"\xb5\x01\n\nSystemInfo\x12\x16\n\x06\x66\x61mily\x18\x01 \x01(\tR\x06\x66\x61mily\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n\x06vendor\x18\x03 \x01(\tR\x06vendor\x12#\n\rserial_number\x18\x04 \x01(\tR\x0cserialNumber\x12\x12\n\x04uuid\x18\x05 \x01(\tR\x04uuid\x12\x10\n\x03sku\x18\x06 \x01(\tR\x03sku\x12\x18\n\x07version\x18\x07 \x01(\tR\x07version\"\xc0\x01\n\x0b\x43hassisInfo\x12\x1b\n\tasset_tag\x18\x01 \x01(\tR\x08\x61ssetTag\x12#\n\rserial_number\x18\x02 \x01(\tR\x0cserialNumber\x12\x12\n\x04type\x18\x03 \x01(\tR\x04type\x12)\n\x10type_description\x18\x04 \x01(\tR\x0ftypeDescription\x12\x16\n\x06vendor\x18\x05 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x06 \x01(\tR\x07version\"\x9d\x01\n\rBaseboardInfo\x12\x1b\n\tasset_tag\x18\x01 \x01(\tR\x08\x61ssetTag\x12#\n\rserial_number\x18\x02 \x01(\tR\x0cserialNumber\x12\x16\n\x06vendor\x18\x03 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x04 \x01(\tR\x07version\x12\x18\n\x07product\x18\x05 \x01(\tR\x07product\"O\n\x07\x43PUInfo\x12\x1f\n\x0btotal_cores\x18\x01 \x01(\rR\ntotalCores\x12#\n\rtotal_threads\x18\x02 \x01(\rR\x0ctotalThreads\"l\n\nMemoryInfo\x12\x30\n\x14total_physical_bytes\x18\x01 \x01(\x03R\x12totalPhysicalBytes\x12,\n\x12total_usable_bytes\x18\x02 \x01(\x03R\x10totalUsableBytes\"\xe0\x01\n\x0ePCIeDeviceInfo\x12\x16\n\x06\x64river\x18\x01 \x01(\tR\x06\x64river\x12\x18\n\x07\x61\x64\x64ress\x18\x02 \x01(\tR\x07\x61\x64\x64ress\x12\x16\n\x06vendor\x18\x03 \x01(\tR\x06vendor\x12\x18\n\x07product\x18\x04 \x01(\tR\x07product\x12\x1a\n\x08revision\x18\x05 \x01(\tR\x08revision\x12\x1c\n\tsubsystem\x18\x06 \x01(\tR\tsubsystem\x12\x14\n\x05\x63lass\x18\x07 \x01(\tR\x05\x63lass\x12\x1a\n\x08subclass\x18\x08 \x01(\tR\x08subclass\"Q\n\x13GetInventoryRequest\x12:\n\x04name\x18\x01 \x01(\tB&\xe0\x41\x02\xfa\x41 \n\x1eopi_api.inventory.v1/InventoryR\x04name\"\xa8\x03\n\tInventory\x12\x32\n\x04\x62ios\x18\x01 \x01(\x0b\x32\x1e.opi_api.inventory.v1.BIOSInfoR\x04\x62ios\x12\x38\n\x06system\x18\x02 \x01(\x0b\x32 .opi_api.inventory.v1.SystemInfoR\x06system\x12\x41\n\tbaseboard\x18\x03 \x01(\x0b\x32#.opi_api.inventory.v1.BaseboardInfoR\tbaseboard\x12;\n\x07\x63hassis\x18\x04 \x01(\x0b\x32!.opi_api.inventory.v1.ChassisInfoR\x07\x63hassis\x12;\n\tprocessor\x18\x05 \x01(\x0b\x32\x1d.opi_api.inventory.v1.CPUInfoR\tprocessor\x12\x38\n\x06memory\x18\x06 \x01(\x0b\x32 .opi_api.inventory.v1.MemoryInfoR\x06memory\x12\x36\n\x03pci\x18\x07 \x03(\x0b\x32$.opi_api.inventory.v1.PCIeDeviceInfoR\x03pci2\xa2\x01\n\x10InventoryService\x12\x8d\x01\n\x0cGetInventory\x12).opi_api.inventory.v1.GetInventoryRequest\x1a\x1f.opi_api.inventory.v1.Inventory\"1\xda\x41\x04name\x82\xd3\xe4\x93\x02$\x12\"/v1/{name=inventory/*/inventory/*}B[\n\x14opi_api.inventory.v1B\x0eInventoryProtoP\x01Z1github.com/opiproject/opi-api/inventory/v1/gen/gob\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)