diff --git a/go/evecommon/devmodelcommon.pb.go b/go/evecommon/devmodelcommon.pb.go index 8ccaf97a..a189bd41 100644 --- a/go/evecommon/devmodelcommon.pb.go +++ b/go/evecommon/devmodelcommon.pb.go @@ -35,14 +35,16 @@ const ( PhyIoType_PhyIoNetWWAN PhyIoType = 6 PhyIoType_PhyIoHDMI PhyIoType = 7 // enum 8 is reserved for backward compatibility with controller API - PhyIoType_PhyIoNVMEStorage PhyIoType = 9 - PhyIoType_PhyIoSATAStorage PhyIoType = 10 - PhyIoType_PhyIoNetEthPF PhyIoType = 11 - PhyIoType_PhyIoNetEthVF PhyIoType = 12 - PhyIoType_PhyIoCAN PhyIoType = 13 - PhyIoType_PhyIoVCAN PhyIoType = 14 - PhyIoType_PhyIoLCAN PhyIoType = 15 - PhyIoType_PhyIoOther PhyIoType = 255 + PhyIoType_PhyIoNVMEStorage PhyIoType = 9 + PhyIoType_PhyIoSATAStorage PhyIoType = 10 + PhyIoType_PhyIoNetEthPF PhyIoType = 11 + PhyIoType_PhyIoNetEthVF PhyIoType = 12 + PhyIoType_PhyIoUSBController PhyIoType = 13 + PhyIoType_PhyIoUSBDevice PhyIoType = 14 + PhyIoType_PhyIoCAN PhyIoType = 15 + PhyIoType_PhyIoVCAN PhyIoType = 16 + PhyIoType_PhyIoLCAN PhyIoType = 17 + PhyIoType_PhyIoOther PhyIoType = 255 ) // Enum value maps for PhyIoType. @@ -60,28 +62,32 @@ var ( 10: "PhyIoSATAStorage", 11: "PhyIoNetEthPF", 12: "PhyIoNetEthVF", - 13: "PhyIoCAN", - 14: "PhyIoVCAN", - 15: "PhyIoLCAN", + 13: "PhyIoUSBController", + 14: "PhyIoUSBDevice", + 15: "PhyIoCAN", + 16: "PhyIoVCAN", + 17: "PhyIoLCAN", 255: "PhyIoOther", } PhyIoType_value = map[string]int32{ - "PhyIoNoop": 0, - "PhyIoNetEth": 1, - "PhyIoUSB": 2, - "PhyIoCOM": 3, - "PhyIoAudio": 4, - "PhyIoNetWLAN": 5, - "PhyIoNetWWAN": 6, - "PhyIoHDMI": 7, - "PhyIoNVMEStorage": 9, - "PhyIoSATAStorage": 10, - "PhyIoNetEthPF": 11, - "PhyIoNetEthVF": 12, - "PhyIoCAN": 13, - "PhyIoVCAN": 14, - "PhyIoLCAN": 15, - "PhyIoOther": 255, + "PhyIoNoop": 0, + "PhyIoNetEth": 1, + "PhyIoUSB": 2, + "PhyIoCOM": 3, + "PhyIoAudio": 4, + "PhyIoNetWLAN": 5, + "PhyIoNetWWAN": 6, + "PhyIoHDMI": 7, + "PhyIoNVMEStorage": 9, + "PhyIoSATAStorage": 10, + "PhyIoNetEthPF": 11, + "PhyIoNetEthVF": 12, + "PhyIoUSBController": 13, + "PhyIoUSBDevice": 14, + "PhyIoCAN": 15, + "PhyIoVCAN": 16, + "PhyIoLCAN": 17, + "PhyIoOther": 255, } ) @@ -182,7 +188,7 @@ var file_evecommon_devmodelcommon_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x65, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x64, 0x65, 0x76, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, 0x65, - 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2a, 0x99, 0x02, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, + 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2a, 0xc5, 0x02, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4e, 0x6f, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4e, 0x65, 0x74, 0x45, 0x74, 0x68, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x53, @@ -196,27 +202,29 @@ var file_evecommon_devmodelcommon_proto_rawDesc = []byte{ 0x79, 0x49, 0x6f, 0x53, 0x41, 0x54, 0x41, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x10, 0x0a, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4e, 0x65, 0x74, 0x45, 0x74, 0x68, 0x50, 0x46, 0x10, 0x0b, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4e, 0x65, 0x74, 0x45, - 0x74, 0x68, 0x56, 0x46, 0x10, 0x0c, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x43, - 0x41, 0x4e, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x56, 0x43, 0x41, - 0x4e, 0x10, 0x0e, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4c, 0x43, 0x41, 0x4e, - 0x10, 0x0f, 0x12, 0x0f, 0x0a, 0x0a, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4f, 0x74, 0x68, 0x65, 0x72, - 0x10, 0xff, 0x01, 0x2a, 0xa0, 0x01, 0x0a, 0x10, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x50, 0x68, 0x79, 0x49, - 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, - 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x6e, - 0x64, 0x41, 0x70, 0x70, 0x73, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x68, 0x79, 0x49, 0x6f, - 0x55, 0x73, 0x61, 0x67, 0x65, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x10, 0x02, 0x12, 0x17, 0x0a, - 0x13, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x44, 0x65, 0x64, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, - 0x73, 0x61, 0x67, 0x65, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x10, 0x04, 0x12, 0x16, - 0x0a, 0x12, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x4d, 0x67, 0x6d, 0x74, - 0x4f, 0x6e, 0x6c, 0x79, 0x10, 0x05, 0x42, 0x52, 0x0a, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, - 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x42, - 0x0e, 0x44, 0x65, 0x76, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, - 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x66, - 0x2d, 0x65, 0x64, 0x67, 0x65, 0x2f, 0x65, 0x76, 0x65, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, - 0x2f, 0x65, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x74, 0x68, 0x56, 0x46, 0x10, 0x0c, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, + 0x53, 0x42, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x10, 0x0d, 0x12, 0x12, + 0x0a, 0x0e, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x53, 0x42, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x10, 0x0e, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x43, 0x41, 0x4e, 0x10, 0x0f, + 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x56, 0x43, 0x41, 0x4e, 0x10, 0x10, 0x12, + 0x0d, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4c, 0x43, 0x41, 0x4e, 0x10, 0x11, 0x12, 0x0f, + 0x0a, 0x0a, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x10, 0xff, 0x01, 0x2a, + 0xa0, 0x01, 0x0a, 0x10, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x55, + 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, + 0x67, 0x65, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x50, 0x68, 0x79, 0x49, + 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x4d, 0x67, 0x6d, 0x74, 0x41, 0x6e, 0x64, 0x41, 0x70, 0x70, + 0x73, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, + 0x65, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x50, 0x68, 0x79, + 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x44, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, + 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, + 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x68, + 0x79, 0x49, 0x6f, 0x55, 0x73, 0x61, 0x67, 0x65, 0x4d, 0x67, 0x6d, 0x74, 0x4f, 0x6e, 0x6c, 0x79, + 0x10, 0x05, 0x42, 0x52, 0x0a, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, + 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x42, 0x0e, 0x44, 0x65, 0x76, + 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x27, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x66, 0x2d, 0x65, 0x64, 0x67, + 0x65, 0x2f, 0x65, 0x76, 0x65, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x65, 0x76, 0x65, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/evecommon/devmodelcommon.proto b/proto/evecommon/devmodelcommon.proto index 6ec3d9a0..98dea024 100644 --- a/proto/evecommon/devmodelcommon.proto +++ b/proto/evecommon/devmodelcommon.proto @@ -24,9 +24,11 @@ enum PhyIoType { PhyIoSATAStorage = 10; PhyIoNetEthPF = 11; PhyIoNetEthVF = 12; - PhyIoCAN = 13; - PhyIoVCAN = 14; - PhyIoLCAN = 15; + PhyIoUSBController = 13; + PhyIoUSBDevice = 14; + PhyIoCAN = 15; + PhyIoVCAN = 16; + PhyIoLCAN = 17; PhyIoOther = 255; } diff --git a/python/evecommon/devmodelcommon_pb2.py b/python/evecommon/devmodelcommon_pb2.py index c07f3e97..05dab4d7 100644 --- a/python/evecommon/devmodelcommon_pb2.py +++ b/python/evecommon/devmodelcommon_pb2.py @@ -13,7 +13,7 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x65vecommon/devmodelcommon.proto\x12\x15org.lfedge.eve.common*\x99\x02\n\tPhyIoType\x12\r\n\tPhyIoNoop\x10\x00\x12\x0f\n\x0bPhyIoNetEth\x10\x01\x12\x0c\n\x08PhyIoUSB\x10\x02\x12\x0c\n\x08PhyIoCOM\x10\x03\x12\x0e\n\nPhyIoAudio\x10\x04\x12\x10\n\x0cPhyIoNetWLAN\x10\x05\x12\x10\n\x0cPhyIoNetWWAN\x10\x06\x12\r\n\tPhyIoHDMI\x10\x07\x12\x14\n\x10PhyIoNVMEStorage\x10\t\x12\x14\n\x10PhyIoSATAStorage\x10\n\x12\x11\n\rPhyIoNetEthPF\x10\x0b\x12\x11\n\rPhyIoNetEthVF\x10\x0c\x12\x0c\n\x08PhyIoCAN\x10\r\x12\r\n\tPhyIoVCAN\x10\x0e\x12\r\n\tPhyIoLCAN\x10\x0f\x12\x0f\n\nPhyIoOther\x10\xff\x01*\xa0\x01\n\x10PhyIoMemberUsage\x12\x12\n\x0ePhyIoUsageNone\x10\x00\x12\x19\n\x15PhyIoUsageMgmtAndApps\x10\x01\x12\x14\n\x10PhyIoUsageShared\x10\x02\x12\x17\n\x13PhyIoUsageDedicated\x10\x03\x12\x16\n\x12PhyIoUsageDisabled\x10\x04\x12\x16\n\x12PhyIoUsageMgmtOnly\x10\x05\x42R\n\x15org.lfedge.eve.commonB\x0e\x44\x65vModelCommonP\x01Z\'github.com/lf-edge/eve-api/go/evecommonb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x65vecommon/devmodelcommon.proto\x12\x15org.lfedge.eve.common*\xc5\x02\n\tPhyIoType\x12\r\n\tPhyIoNoop\x10\x00\x12\x0f\n\x0bPhyIoNetEth\x10\x01\x12\x0c\n\x08PhyIoUSB\x10\x02\x12\x0c\n\x08PhyIoCOM\x10\x03\x12\x0e\n\nPhyIoAudio\x10\x04\x12\x10\n\x0cPhyIoNetWLAN\x10\x05\x12\x10\n\x0cPhyIoNetWWAN\x10\x06\x12\r\n\tPhyIoHDMI\x10\x07\x12\x14\n\x10PhyIoNVMEStorage\x10\t\x12\x14\n\x10PhyIoSATAStorage\x10\n\x12\x11\n\rPhyIoNetEthPF\x10\x0b\x12\x11\n\rPhyIoNetEthVF\x10\x0c\x12\x16\n\x12PhyIoUSBController\x10\r\x12\x12\n\x0ePhyIoUSBDevice\x10\x0e\x12\x0c\n\x08PhyIoCAN\x10\x0f\x12\r\n\tPhyIoVCAN\x10\x10\x12\r\n\tPhyIoLCAN\x10\x11\x12\x0f\n\nPhyIoOther\x10\xff\x01*\xa0\x01\n\x10PhyIoMemberUsage\x12\x12\n\x0ePhyIoUsageNone\x10\x00\x12\x19\n\x15PhyIoUsageMgmtAndApps\x10\x01\x12\x14\n\x10PhyIoUsageShared\x10\x02\x12\x17\n\x13PhyIoUsageDedicated\x10\x03\x12\x16\n\x12PhyIoUsageDisabled\x10\x04\x12\x16\n\x12PhyIoUsageMgmtOnly\x10\x05\x42R\n\x15org.lfedge.eve.commonB\x0e\x44\x65vModelCommonP\x01Z\'github.com/lf-edge/eve-api/go/evecommonb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -23,7 +23,7 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\025org.lfedge.eve.commonB\016DevModelCommonP\001Z\'github.com/lf-edge/eve-api/go/evecommon' _globals['_PHYIOTYPE']._serialized_start=58 - _globals['_PHYIOTYPE']._serialized_end=339 - _globals['_PHYIOMEMBERUSAGE']._serialized_start=342 - _globals['_PHYIOMEMBERUSAGE']._serialized_end=502 + _globals['_PHYIOTYPE']._serialized_end=383 + _globals['_PHYIOMEMBERUSAGE']._serialized_start=386 + _globals['_PHYIOMEMBERUSAGE']._serialized_end=546 # @@protoc_insertion_point(module_scope)