From a2b011fedf87918e924bf11b5be3216b3d5d13a8 Mon Sep 17 00:00:00 2001 From: Paul Gaiduk Date: Fri, 22 Mar 2024 14:46:27 +0100 Subject: [PATCH] proto: autogenerated protocol files All changes after the 'make'. Signed-off-by: Paul Gaiduk --- go/config/vm.pb.go | 63 ++++++++++++++++---------- go/evecommon/devmodelcommon.pb.go | 54 +++++++++++----------- python/config/vm_pb2.py | 8 ++-- python/evecommon/devmodelcommon_pb2.py | 8 ++-- 4 files changed, 73 insertions(+), 60 deletions(-) diff --git a/go/config/vm.pb.go b/go/config/vm.pb.go index 0b85ad20..ab4322f7 100644 --- a/go/config/vm.pb.go +++ b/go/config/vm.pb.go @@ -117,9 +117,10 @@ type VmConfig struct { Irqs []uint32 `protobuf:"varint,13,rep,packed,name=irqs,proto3" json:"irqs,omitempty"` Iomem []string `protobuf:"bytes,14,rep,name=iomem,proto3" json:"iomem,omitempty"` VirtualizationMode VmMode `protobuf:"varint,15,opt,name=virtualizationMode,proto3,enum=org.lfedge.eve.config.VmMode" json:"virtualizationMode,omitempty"` - EnableVnc bool `protobuf:"varint,16,opt,name=enableVnc,proto3" json:"enableVnc,omitempty"` - VncDisplay uint32 `protobuf:"varint,17,opt,name=vncDisplay,proto3" json:"vncDisplay,omitempty"` - VncPasswd string `protobuf:"bytes,18,opt,name=vncPasswd,proto3" json:"vncPasswd,omitempty"` + // Enable VNC access to the edge application + EnableVnc bool `protobuf:"varint,16,opt,name=enable_vnc,json=enableVnc,proto3" json:"enable_vnc,omitempty"` + VncDisplay uint32 `protobuf:"varint,17,opt,name=vncDisplay,proto3" json:"vncDisplay,omitempty"` + VncPasswd string `protobuf:"bytes,18,opt,name=vncPasswd,proto3" json:"vncPasswd,omitempty"` // Change of the 'disable logs' field can be handled without VM reboot DisableLogs bool `protobuf:"varint,19,opt,name=disableLogs,proto3" json:"disableLogs,omitempty"` // Set if the VM should run in a mode with pinned CPUs. @@ -136,6 +137,8 @@ type VmConfig struct { // for one VM instance (guest RAM + VM monitor) is set according to the // following equation: `memory` + `vmm_maxmem` VmmMaxmem uint32 `protobuf:"varint,21,opt,name=vmm_maxmem,json=vmmMaxmem,proto3" json:"vmm_maxmem,omitempty"` + // Enable VNC access to the shim VM harboring the edge application (for containers only) + EnableVncShimVm bool `protobuf:"varint,22,opt,name=enable_vnc_shim_vm,json=enableVncShimVm,proto3" json:"enable_vnc_shim_vm,omitempty"` } func (x *VmConfig) Reset() { @@ -317,12 +320,19 @@ func (x *VmConfig) GetVmmMaxmem() uint32 { return 0 } +func (x *VmConfig) GetEnableVncShimVm() bool { + if x != nil { + return x.EnableVncShimVm + } + return false +} + var File_config_vm_proto protoreflect.FileDescriptor var file_config_vm_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x6d, 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, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xed, 0x04, 0x0a, 0x08, 0x56, 0x6d, 0x43, + 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x9b, 0x05, 0x0a, 0x08, 0x56, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, 0x6d, 0x64, 0x69, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, @@ -350,27 +360,30 @@ var file_config_vm_proto_rawDesc = []byte{ 0x1d, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x56, 0x6d, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x12, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, - 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x56, 0x6e, 0x63, 0x18, - 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x56, 0x6e, 0x63, - 0x12, 0x1e, 0x0a, 0x0a, 0x76, 0x6e, 0x63, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x18, 0x11, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x76, 0x6e, 0x63, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, - 0x12, 0x1c, 0x0a, 0x09, 0x76, 0x6e, 0x63, 0x50, 0x61, 0x73, 0x73, 0x77, 0x64, 0x18, 0x12, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x76, 0x6e, 0x63, 0x50, 0x61, 0x73, 0x73, 0x77, 0x64, 0x12, 0x20, - 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x13, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x6f, 0x67, 0x73, - 0x12, 0x17, 0x0a, 0x07, 0x70, 0x69, 0x6e, 0x5f, 0x63, 0x70, 0x75, 0x18, 0x14, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x70, 0x69, 0x6e, 0x43, 0x70, 0x75, 0x12, 0x1d, 0x0a, 0x0a, 0x76, 0x6d, 0x6d, - 0x5f, 0x6d, 0x61, 0x78, 0x6d, 0x65, 0x6d, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x76, - 0x6d, 0x6d, 0x4d, 0x61, 0x78, 0x6d, 0x65, 0x6d, 0x2a, 0x47, 0x0a, 0x06, 0x56, 0x6d, 0x4d, 0x6f, - 0x64, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x50, 0x56, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x48, 0x56, - 0x4d, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x6c, 0x65, 0x72, 0x10, 0x02, 0x12, - 0x07, 0x0a, 0x03, 0x46, 0x4d, 0x4c, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x48, 0x59, - 0x50, 0x45, 0x52, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x10, - 0x05, 0x42, 0x3d, 0x0a, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, - 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5a, 0x24, 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, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x6e, 0x63, + 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x56, 0x6e, + 0x63, 0x12, 0x1e, 0x0a, 0x0a, 0x76, 0x6e, 0x63, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x18, + 0x11, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x76, 0x6e, 0x63, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, + 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x76, 0x6e, 0x63, 0x50, 0x61, 0x73, 0x73, 0x77, 0x64, 0x18, 0x12, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x76, 0x6e, 0x63, 0x50, 0x61, 0x73, 0x73, 0x77, 0x64, 0x12, + 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x13, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x6f, 0x67, + 0x73, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x69, 0x6e, 0x5f, 0x63, 0x70, 0x75, 0x18, 0x14, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x06, 0x70, 0x69, 0x6e, 0x43, 0x70, 0x75, 0x12, 0x1d, 0x0a, 0x0a, 0x76, 0x6d, + 0x6d, 0x5f, 0x6d, 0x61, 0x78, 0x6d, 0x65, 0x6d, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, + 0x76, 0x6d, 0x6d, 0x4d, 0x61, 0x78, 0x6d, 0x65, 0x6d, 0x12, 0x2b, 0x0a, 0x12, 0x65, 0x6e, 0x61, + 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x6e, 0x63, 0x5f, 0x73, 0x68, 0x69, 0x6d, 0x5f, 0x76, 0x6d, 0x18, + 0x16, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x56, 0x6e, 0x63, + 0x53, 0x68, 0x69, 0x6d, 0x56, 0x6d, 0x2a, 0x47, 0x0a, 0x06, 0x56, 0x6d, 0x4d, 0x6f, 0x64, 0x65, + 0x12, 0x06, 0x0a, 0x02, 0x50, 0x56, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x48, 0x56, 0x4d, 0x10, + 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x6c, 0x65, 0x72, 0x10, 0x02, 0x12, 0x07, 0x0a, + 0x03, 0x46, 0x4d, 0x4c, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x48, 0x59, 0x50, 0x45, + 0x52, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x10, 0x05, 0x42, + 0x3d, 0x0a, 0x15, 0x6f, 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, + 0x65, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5a, 0x24, 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, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/go/evecommon/devmodelcommon.pb.go b/go/evecommon/devmodelcommon.pb.go index a189bd41..b7a185f4 100644 --- a/go/evecommon/devmodelcommon.pb.go +++ b/go/evecommon/devmodelcommon.pb.go @@ -26,15 +26,14 @@ const ( type PhyIoType int32 const ( - PhyIoType_PhyIoNoop PhyIoType = 0 - PhyIoType_PhyIoNetEth PhyIoType = 1 - PhyIoType_PhyIoUSB PhyIoType = 2 - PhyIoType_PhyIoCOM PhyIoType = 3 - PhyIoType_PhyIoAudio PhyIoType = 4 - PhyIoType_PhyIoNetWLAN PhyIoType = 5 - PhyIoType_PhyIoNetWWAN PhyIoType = 6 - PhyIoType_PhyIoHDMI PhyIoType = 7 - // enum 8 is reserved for backward compatibility with controller API + PhyIoType_PhyIoNoop PhyIoType = 0 + PhyIoType_PhyIoNetEth PhyIoType = 1 + PhyIoType_PhyIoUSB PhyIoType = 2 + PhyIoType_PhyIoCOM PhyIoType = 3 + PhyIoType_PhyIoAudio PhyIoType = 4 + PhyIoType_PhyIoNetWLAN PhyIoType = 5 + PhyIoType_PhyIoNetWWAN PhyIoType = 6 + PhyIoType_PhyIoHDMI PhyIoType = 7 PhyIoType_PhyIoNVMEStorage PhyIoType = 9 PhyIoType_PhyIoSATAStorage PhyIoType = 10 PhyIoType_PhyIoNetEthPF PhyIoType = 11 @@ -188,7 +187,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, 0xc5, 0x02, 0x0a, 0x09, 0x50, 0x68, 0x79, 0x49, + 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2a, 0xcb, 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, @@ -208,23 +207,24 @@ var file_evecommon_devmodelcommon_proto_rawDesc = []byte{ 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, + 0x0a, 0x0a, 0x50, 0x68, 0x79, 0x49, 0x6f, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x10, 0xff, 0x01, 0x22, + 0x04, 0x08, 0x08, 0x10, 0x08, 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/python/config/vm_pb2.py b/python/config/vm_pb2.py index 7381d8fa..005fa9fc 100644 --- a/python/config/vm_pb2.py +++ b/python/config/vm_pb2.py @@ -13,7 +13,7 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63onfig/vm.proto\x12\x15org.lfedge.eve.config\"\xa0\x03\n\x08VmConfig\x12\x0e\n\x06kernel\x18\x01 \x01(\t\x12\x0f\n\x07ramdisk\x18\x02 \x01(\t\x12\x0e\n\x06memory\x18\x03 \x01(\r\x12\x0e\n\x06maxmem\x18\x04 \x01(\r\x12\r\n\x05vcpus\x18\x05 \x01(\r\x12\x0f\n\x07maxcpus\x18\x06 \x01(\r\x12\x0f\n\x07rootdev\x18\x07 \x01(\t\x12\x11\n\textraargs\x18\x08 \x01(\t\x12\x12\n\nbootloader\x18\t \x01(\t\x12\x0c\n\x04\x63pus\x18\n \x01(\t\x12\x12\n\ndevicetree\x18\x0b \x01(\t\x12\r\n\x05\x64tdev\x18\x0c \x03(\t\x12\x0c\n\x04irqs\x18\r \x03(\r\x12\r\n\x05iomem\x18\x0e \x03(\t\x12\x39\n\x12virtualizationMode\x18\x0f \x01(\x0e\x32\x1d.org.lfedge.eve.config.VmMode\x12\x11\n\tenableVnc\x18\x10 \x01(\x08\x12\x12\n\nvncDisplay\x18\x11 \x01(\r\x12\x11\n\tvncPasswd\x18\x12 \x01(\t\x12\x13\n\x0b\x64isableLogs\x18\x13 \x01(\x08\x12\x0f\n\x07pin_cpu\x18\x14 \x01(\x08\x12\x12\n\nvmm_maxmem\x18\x15 \x01(\r*G\n\x06VmMode\x12\x06\n\x02PV\x10\x00\x12\x07\n\x03HVM\x10\x01\x12\n\n\x06\x46iller\x10\x02\x12\x07\n\x03\x46ML\x10\x03\x12\x0b\n\x07NOHYPER\x10\x04\x12\n\n\x06LEGACY\x10\x05\x42=\n\x15org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/configb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63onfig/vm.proto\x12\x15org.lfedge.eve.config\"\xbd\x03\n\x08VmConfig\x12\x0e\n\x06kernel\x18\x01 \x01(\t\x12\x0f\n\x07ramdisk\x18\x02 \x01(\t\x12\x0e\n\x06memory\x18\x03 \x01(\r\x12\x0e\n\x06maxmem\x18\x04 \x01(\r\x12\r\n\x05vcpus\x18\x05 \x01(\r\x12\x0f\n\x07maxcpus\x18\x06 \x01(\r\x12\x0f\n\x07rootdev\x18\x07 \x01(\t\x12\x11\n\textraargs\x18\x08 \x01(\t\x12\x12\n\nbootloader\x18\t \x01(\t\x12\x0c\n\x04\x63pus\x18\n \x01(\t\x12\x12\n\ndevicetree\x18\x0b \x01(\t\x12\r\n\x05\x64tdev\x18\x0c \x03(\t\x12\x0c\n\x04irqs\x18\r \x03(\r\x12\r\n\x05iomem\x18\x0e \x03(\t\x12\x39\n\x12virtualizationMode\x18\x0f \x01(\x0e\x32\x1d.org.lfedge.eve.config.VmMode\x12\x12\n\nenable_vnc\x18\x10 \x01(\x08\x12\x12\n\nvncDisplay\x18\x11 \x01(\r\x12\x11\n\tvncPasswd\x18\x12 \x01(\t\x12\x13\n\x0b\x64isableLogs\x18\x13 \x01(\x08\x12\x0f\n\x07pin_cpu\x18\x14 \x01(\x08\x12\x12\n\nvmm_maxmem\x18\x15 \x01(\r\x12\x1a\n\x12\x65nable_vnc_shim_vm\x18\x16 \x01(\x08*G\n\x06VmMode\x12\x06\n\x02PV\x10\x00\x12\x07\n\x03HVM\x10\x01\x12\n\n\x06\x46iller\x10\x02\x12\x07\n\x03\x46ML\x10\x03\x12\x0b\n\x07NOHYPER\x10\x04\x12\n\n\x06LEGACY\x10\x05\x42=\n\x15org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/configb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -22,8 +22,8 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\025org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/config' - _globals['_VMMODE']._serialized_start=461 - _globals['_VMMODE']._serialized_end=532 + _globals['_VMMODE']._serialized_start=490 + _globals['_VMMODE']._serialized_end=561 _globals['_VMCONFIG']._serialized_start=43 - _globals['_VMCONFIG']._serialized_end=459 + _globals['_VMCONFIG']._serialized_end=488 # @@protoc_insertion_point(module_scope) diff --git a/python/evecommon/devmodelcommon_pb2.py b/python/evecommon/devmodelcommon_pb2.py index 05dab4d7..20cf21ae 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*\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') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x65vecommon/devmodelcommon.proto\x12\x15org.lfedge.eve.common*\xcb\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\"\x04\x08\x08\x10\x08*\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=383 - _globals['_PHYIOMEMBERUSAGE']._serialized_start=386 - _globals['_PHYIOMEMBERUSAGE']._serialized_end=546 + _globals['_PHYIOTYPE']._serialized_end=389 + _globals['_PHYIOMEMBERUSAGE']._serialized_start=392 + _globals['_PHYIOMEMBERUSAGE']._serialized_end=552 # @@protoc_insertion_point(module_scope)