From 92d5740f405e351e77eed74f7cb018b730d573b1 Mon Sep 17 00:00:00 2001 From: Milan Lenco Date: Tue, 13 Aug 2024 14:48:31 +0200 Subject: [PATCH] Re-generate proto files Signed-off-by: Milan Lenco --- go/config/netinst.pb.go | 195 ++++++++++++++++++++++++++--------- python/config/netinst_pb2.py | 22 ++-- 2 files changed, 158 insertions(+), 59 deletions(-) diff --git a/go/config/netinst.pb.go b/go/config/netinst.pb.go index 69fbdd9..3688d98 100644 --- a/go/config/netinst.pb.go +++ b/go/config/netinst.pb.go @@ -878,6 +878,12 @@ type NetworkInstanceConfig struct { // Depending on the implementation, it may also introduce additional packet processing // overhead. DisableFlowlog bool `protobuf:"varint,50,opt,name=disable_flowlog,json=disableFlowlog,proto3" json:"disable_flowlog,omitempty"` + // VLAN access ports configured for a switch network instance. + // For other types of network instances, this option is ignored. + // This setting applies to physical network ports attached to the network instance. + // VLAN configuration for application interfaces is applied separately via AppInstanceConfig + // (see NetworkAdapter.access_vlan_id). + VlanAccessPorts []*VlanAccessPort `protobuf:"bytes,51,rep,name=vlan_access_ports,json=vlanAccessPorts,proto3" json:"vlan_access_ports,omitempty"` } func (x *NetworkInstanceConfig) Reset() { @@ -1010,6 +1016,73 @@ func (x *NetworkInstanceConfig) GetDisableFlowlog() bool { return false } +func (x *NetworkInstanceConfig) GetVlanAccessPorts() []*VlanAccessPort { + if x != nil { + return x.VlanAccessPorts + } + return nil +} + +// VLAN Access Port config applied to physical port(s) attached to a Switch Network Instance. +type VlanAccessPort struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // VLAN ID from the range <1,4094> + VlanId uint32 `protobuf:"varint,1,opt,name=vlan_id,json=vlanId,proto3" json:"vlan_id,omitempty"` + // Physical network adapter used as the access port for the given VLAN. + // Either a single NI port referenced by its name (SystemAdapter.Name, aka logical label) + // or an adapter shared-label matching zero or more NI ports. + AccessPort string `protobuf:"bytes,2,opt,name=access_port,json=accessPort,proto3" json:"access_port,omitempty"` +} + +func (x *VlanAccessPort) Reset() { + *x = VlanAccessPort{} + if protoimpl.UnsafeEnabled { + mi := &file_config_netinst_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VlanAccessPort) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VlanAccessPort) ProtoMessage() {} + +func (x *VlanAccessPort) ProtoReflect() protoreflect.Message { + mi := &file_config_netinst_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use VlanAccessPort.ProtoReflect.Descriptor instead. +func (*VlanAccessPort) Descriptor() ([]byte, []int) { + return file_config_netinst_proto_rawDescGZIP(), []int{7} +} + +func (x *VlanAccessPort) GetVlanId() uint32 { + if x != nil { + return x.VlanId + } + return 0 +} + +func (x *VlanAccessPort) GetAccessPort() string { + if x != nil { + return x.AccessPort + } + return "" +} + var File_config_netinst_proto protoreflect.FileDescriptor var file_config_netinst_proto_rawDesc = []byte{ @@ -1093,7 +1166,7 @@ var file_config_netinst_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6c, 0x12, 0x31, 0x0a, 0x15, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x62, 0x70, 0x64, 0x75, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x57, 0x69, 0x74, 0x68, 0x42, 0x70, 0x64, - 0x75, 0x47, 0x75, 0x61, 0x72, 0x64, 0x22, 0x88, 0x06, 0x0a, 0x15, 0x4e, 0x65, 0x74, 0x77, 0x6f, + 0x75, 0x47, 0x75, 0x61, 0x72, 0x64, 0x22, 0xdb, 0x06, 0x0a, 0x15, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a, 0x0e, 0x75, 0x75, 0x69, 0x64, 0x61, 0x6e, 0x64, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x6c, @@ -1142,37 +1215,47 @@ var file_config_netinst_proto_rawDesc = []byte{ 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6d, 0x74, 0x75, 0x12, 0x27, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x66, 0x6c, 0x6f, 0x77, 0x6c, 0x6f, 0x67, 0x18, 0x32, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x46, 0x6c, 0x6f, 0x77, 0x6c, 0x6f, - 0x67, 0x2a, 0xb3, 0x01, 0x0a, 0x10, 0x5a, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x6e, - 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x5a, 0x4e, 0x65, 0x74, 0x49, 0x6e, - 0x73, 0x74, 0x46, 0x69, 0x72, 0x73, 0x74, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x5a, 0x6e, 0x65, - 0x74, 0x49, 0x6e, 0x73, 0x74, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x10, 0x01, 0x12, 0x11, 0x0a, - 0x0d, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x10, 0x02, - 0x12, 0x11, 0x0a, 0x0d, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x43, 0x6c, 0x6f, 0x75, - 0x64, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x4d, - 0x65, 0x73, 0x68, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, - 0x74, 0x48, 0x6f, 0x6e, 0x65, 0x79, 0x50, 0x6f, 0x74, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13, 0x5a, - 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, - 0x6e, 0x74, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0c, 0x5a, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, - 0x4c, 0x61, 0x73, 0x74, 0x10, 0xff, 0x01, 0x2a, 0x57, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x69, 0x72, 0x73, 0x74, 0x10, - 0x00, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x50, 0x56, 0x34, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x49, - 0x50, 0x56, 0x36, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x49, - 0x50, 0x56, 0x34, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x49, - 0x50, 0x56, 0x36, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x04, 0x4c, 0x61, 0x73, 0x74, 0x10, 0xff, 0x01, - 0x2a, 0x43, 0x0a, 0x18, 0x5a, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4f, 0x70, 0x61, 0x71, - 0x75, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x0e, - 0x5a, 0x4e, 0x65, 0x74, 0x4f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x50, 0x4e, 0x10, 0x00, - 0x12, 0x13, 0x0a, 0x0f, 0x5a, 0x4e, 0x65, 0x74, 0x4f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4c, - 0x69, 0x73, 0x70, 0x10, 0x01, 0x2a, 0x47, 0x0a, 0x0d, 0x5a, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x7a, 0x63, 0x6c, 0x6f, 0x75, 0x64, - 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x72, 0x76, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, - 0x6d, 0x61, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x73, - 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x02, 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, + 0x67, 0x12, 0x51, 0x0a, 0x11, 0x76, 0x6c, 0x61, 0x6e, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x33, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6f, + 0x72, 0x67, 0x2e, 0x6c, 0x66, 0x65, 0x64, 0x67, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x2e, 0x63, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x56, 0x6c, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, + 0x6f, 0x72, 0x74, 0x52, 0x0f, 0x76, 0x6c, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, + 0x6f, 0x72, 0x74, 0x73, 0x22, 0x4a, 0x0a, 0x0e, 0x56, 0x6c, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x76, 0x6c, 0x61, 0x6e, 0x5f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x76, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, + 0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6f, 0x72, 0x74, + 0x2a, 0xb3, 0x01, 0x0a, 0x10, 0x5a, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x6e, 0x73, + 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x5a, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x73, + 0x74, 0x46, 0x69, 0x72, 0x73, 0x74, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x5a, 0x6e, 0x65, 0x74, + 0x49, 0x6e, 0x73, 0x74, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, + 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x10, 0x02, 0x12, + 0x11, 0x0a, 0x0d, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x43, 0x6c, 0x6f, 0x75, 0x64, + 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x4d, 0x65, + 0x73, 0x68, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x5a, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, + 0x48, 0x6f, 0x6e, 0x65, 0x79, 0x50, 0x6f, 0x74, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13, 0x5a, 0x6e, + 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0c, 0x5a, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x4c, + 0x61, 0x73, 0x74, 0x10, 0xff, 0x01, 0x2a, 0x57, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x69, 0x72, 0x73, 0x74, 0x10, 0x00, + 0x12, 0x08, 0x0a, 0x04, 0x49, 0x50, 0x56, 0x34, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x50, + 0x56, 0x36, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x49, 0x50, + 0x56, 0x34, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x49, 0x50, + 0x56, 0x36, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x04, 0x4c, 0x61, 0x73, 0x74, 0x10, 0xff, 0x01, 0x2a, + 0x43, 0x0a, 0x18, 0x5a, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4f, 0x70, 0x61, 0x71, 0x75, + 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x5a, + 0x4e, 0x65, 0x74, 0x4f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x50, 0x4e, 0x10, 0x00, 0x12, + 0x13, 0x0a, 0x0f, 0x5a, 0x4e, 0x65, 0x74, 0x4f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4c, 0x69, + 0x73, 0x70, 0x10, 0x01, 0x2a, 0x47, 0x0a, 0x0d, 0x5a, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x7a, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x49, + 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x72, 0x76, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x6d, + 0x61, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x73, 0x75, + 0x70, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x02, 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 ( @@ -1188,7 +1271,7 @@ func file_config_netinst_proto_rawDescGZIP() []byte { } var file_config_netinst_proto_enumTypes = make([]protoimpl.EnumInfo, 4) -var file_config_netinst_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_config_netinst_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_config_netinst_proto_goTypes = []interface{}{ (ZNetworkInstType)(0), // 0: org.lfedge.eve.config.ZNetworkInstType (AddressType)(0), // 1: org.lfedge.eve.config.AddressType @@ -1201,11 +1284,12 @@ var file_config_netinst_proto_goTypes = []interface{}{ (*PortProbe)(nil), // 8: org.lfedge.eve.config.PortProbe (*SpanningTreeProtocol)(nil), // 9: org.lfedge.eve.config.SpanningTreeProtocol (*NetworkInstanceConfig)(nil), // 10: org.lfedge.eve.config.NetworkInstanceConfig - (*ConnectivityProbe)(nil), // 11: org.lfedge.eve.config.ConnectivityProbe - (*UUIDandVersion)(nil), // 12: org.lfedge.eve.config.UUIDandVersion - (*Adapter)(nil), // 13: org.lfedge.eve.config.Adapter - (*Ipspec)(nil), // 14: org.lfedge.eve.config.ipspec - (*ZnetStaticDNSEntry)(nil), // 15: org.lfedge.eve.config.ZnetStaticDNSEntry + (*VlanAccessPort)(nil), // 11: org.lfedge.eve.config.VlanAccessPort + (*ConnectivityProbe)(nil), // 12: org.lfedge.eve.config.ConnectivityProbe + (*UUIDandVersion)(nil), // 13: org.lfedge.eve.config.UUIDandVersion + (*Adapter)(nil), // 14: org.lfedge.eve.config.Adapter + (*Ipspec)(nil), // 15: org.lfedge.eve.config.ipspec + (*ZnetStaticDNSEntry)(nil), // 16: org.lfedge.eve.config.ZnetStaticDNSEntry } var file_config_netinst_proto_depIdxs = []int32{ 6, // 0: org.lfedge.eve.config.NetworkInstanceOpaqueConfig.lispConfig:type_name -> org.lfedge.eve.config.NetworkInstanceLispConfig @@ -1213,21 +1297,22 @@ var file_config_netinst_proto_depIdxs = []int32{ 3, // 2: org.lfedge.eve.config.ZcServicePoint.zsType:type_name -> org.lfedge.eve.config.ZcServiceType 5, // 3: org.lfedge.eve.config.NetworkInstanceLispConfig.LispMSs:type_name -> org.lfedge.eve.config.ZcServicePoint 8, // 4: org.lfedge.eve.config.IPRoute.probe:type_name -> org.lfedge.eve.config.PortProbe - 11, // 5: org.lfedge.eve.config.PortProbe.custom_probe:type_name -> org.lfedge.eve.config.ConnectivityProbe - 12, // 6: org.lfedge.eve.config.NetworkInstanceConfig.uuidandversion:type_name -> org.lfedge.eve.config.UUIDandVersion + 12, // 5: org.lfedge.eve.config.PortProbe.custom_probe:type_name -> org.lfedge.eve.config.ConnectivityProbe + 13, // 6: org.lfedge.eve.config.NetworkInstanceConfig.uuidandversion:type_name -> org.lfedge.eve.config.UUIDandVersion 0, // 7: org.lfedge.eve.config.NetworkInstanceConfig.instType:type_name -> org.lfedge.eve.config.ZNetworkInstType - 13, // 8: org.lfedge.eve.config.NetworkInstanceConfig.port:type_name -> org.lfedge.eve.config.Adapter + 14, // 8: org.lfedge.eve.config.NetworkInstanceConfig.port:type_name -> org.lfedge.eve.config.Adapter 9, // 9: org.lfedge.eve.config.NetworkInstanceConfig.stp:type_name -> org.lfedge.eve.config.SpanningTreeProtocol 4, // 10: org.lfedge.eve.config.NetworkInstanceConfig.cfg:type_name -> org.lfedge.eve.config.NetworkInstanceOpaqueConfig 1, // 11: org.lfedge.eve.config.NetworkInstanceConfig.ipType:type_name -> org.lfedge.eve.config.AddressType - 14, // 12: org.lfedge.eve.config.NetworkInstanceConfig.ip:type_name -> org.lfedge.eve.config.ipspec - 15, // 13: org.lfedge.eve.config.NetworkInstanceConfig.dns:type_name -> org.lfedge.eve.config.ZnetStaticDNSEntry + 15, // 12: org.lfedge.eve.config.NetworkInstanceConfig.ip:type_name -> org.lfedge.eve.config.ipspec + 16, // 13: org.lfedge.eve.config.NetworkInstanceConfig.dns:type_name -> org.lfedge.eve.config.ZnetStaticDNSEntry 7, // 14: org.lfedge.eve.config.NetworkInstanceConfig.static_routes:type_name -> org.lfedge.eve.config.IPRoute - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 11, // 15: org.lfedge.eve.config.NetworkInstanceConfig.vlan_access_ports:type_name -> org.lfedge.eve.config.VlanAccessPort + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_config_netinst_proto_init() } @@ -1322,6 +1407,18 @@ func file_config_netinst_proto_init() { return nil } } + file_config_netinst_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VlanAccessPort); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1329,7 +1426,7 @@ func file_config_netinst_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_config_netinst_proto_rawDesc, NumEnums: 4, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/python/config/netinst_pb2.py b/python/config/netinst_pb2.py index ca7120b..b4c6dc9 100644 --- a/python/config/netinst_pb2.py +++ b/python/config/netinst_pb2.py @@ -15,7 +15,7 @@ from config import netcmn_pb2 as config_dot_netcmn__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63onfig/netinst.proto\x12\x15org.lfedge.eve.config\x1a\x16\x63onfig/devcommon.proto\x1a\x13\x63onfig/netcmn.proto\"\xb3\x01\n\x1bNetworkInstanceOpaqueConfig\x12\x0f\n\x07oconfig\x18\x01 \x01(\t\x12\x44\n\nlispConfig\x18\x02 \x01(\x0b\x32\x30.org.lfedge.eve.config.NetworkInstanceLispConfig\x12=\n\x04type\x18\x03 \x01(\x0e\x32/.org.lfedge.eve.config.ZNetworkOpaqueConfigType\"l\n\x0eZcServicePoint\x12\x34\n\x06zsType\x18\x03 \x01(\x0e\x32$.org.lfedge.eve.config.ZcServiceType\x12\x10\n\x08NameOrIp\x18\x01 \x01(\t\x12\x12\n\nCredential\x18\x02 \x01(\t\"\xe1\x01\n\x19NetworkInstanceLispConfig\x12\x36\n\x07LispMSs\x18\x01 \x03(\x0b\x32%.org.lfedge.eve.config.ZcServicePoint\x12\x16\n\x0eLispInstanceId\x18\x02 \x01(\r\x12\x10\n\x08\x61llocate\x18\x03 \x01(\x08\x12\x15\n\rexportprivate\x18\x04 \x01(\x08\x12\x18\n\x10\x61llocationprefix\x18\x05 \x01(\x0c\x12\x1b\n\x13\x61llocationprefixlen\x18\x06 \x01(\r\x12\x14\n\x0c\x65xperimental\x18\x14 \x01(\x08\"\xb6\x01\n\x07IPRoute\x12\x1b\n\x13\x64\x65stination_network\x18\x01 \x01(\t\x12\x0f\n\x07gateway\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\t\x12/\n\x05probe\x18\x04 \x01(\x0b\x32 .org.lfedge.eve.config.PortProbe\x12\x19\n\x11prefer_lower_cost\x18\x05 \x01(\x08\x12#\n\x1bprefer_stronger_wwan_signal\x18\x06 \x01(\x08\"}\n\tPortProbe\x12\x16\n\x0e\x65nable_gw_ping\x18\x01 \x01(\x08\x12\x18\n\x10gw_ping_max_cost\x18\x02 \x01(\r\x12>\n\x0c\x63ustom_probe\x18\x03 \x01(\x0b\x32(.org.lfedge.eve.config.ConnectivityProbe\"5\n\x14SpanningTreeProtocol\x12\x1d\n\x15ports_with_bpdu_guard\x18\x01 \x01(\t\"\xf9\x04\n\x15NetworkInstanceConfig\x12=\n\x0euuidandversion\x18\x01 \x01(\x0b\x32%.org.lfedge.eve.config.UUIDandVersion\x12\x13\n\x0b\x64isplayname\x18\x02 \x01(\t\x12\x39\n\x08instType\x18\x04 \x01(\x0e\x32\'.org.lfedge.eve.config.ZNetworkInstType\x12\x10\n\x08\x61\x63tivate\x18\x05 \x01(\x08\x12,\n\x04port\x18\x14 \x01(\x0b\x32\x1e.org.lfedge.eve.config.Adapter\x12\x38\n\x03stp\x18\x15 \x01(\x0b\x32+.org.lfedge.eve.config.SpanningTreeProtocol\x12?\n\x03\x63\x66g\x18\x1e \x01(\x0b\x32\x32.org.lfedge.eve.config.NetworkInstanceOpaqueConfig\x12\x32\n\x06ipType\x18\' \x01(\x0e\x32\".org.lfedge.eve.config.AddressType\x12)\n\x02ip\x18( \x01(\x0b\x32\x1d.org.lfedge.eve.config.ipspec\x12\x36\n\x03\x64ns\x18) \x03(\x0b\x32).org.lfedge.eve.config.ZnetStaticDNSEntry\x12\"\n\x1apropagate_connected_routes\x18* \x01(\x08\x12\x35\n\rstatic_routes\x18+ \x03(\x0b\x32\x1e.org.lfedge.eve.config.IPRoute\x12\x0b\n\x03mtu\x18, \x01(\r\x12\x17\n\x0f\x64isable_flowlog\x18\x32 \x01(\x08*\xb3\x01\n\x10ZNetworkInstType\x12\x11\n\rZNetInstFirst\x10\x00\x12\x12\n\x0eZnetInstSwitch\x10\x01\x12\x11\n\rZnetInstLocal\x10\x02\x12\x11\n\rZnetInstCloud\x10\x03\x12\x10\n\x0cZnetInstMesh\x10\x04\x12\x14\n\x10ZnetInstHoneyPot\x10\x05\x12\x17\n\x13ZnetInstTransparent\x10\x06\x12\x11\n\x0cZNetInstLast\x10\xff\x01*W\n\x0b\x41\x64\x64ressType\x12\t\n\x05\x46irst\x10\x00\x12\x08\n\x04IPV4\x10\x01\x12\x08\n\x04IPV6\x10\x02\x12\x0e\n\nCryptoIPV4\x10\x03\x12\x0e\n\nCryptoIPV6\x10\x04\x12\t\n\x04Last\x10\xff\x01*C\n\x18ZNetworkOpaqueConfigType\x12\x12\n\x0eZNetOConfigVPN\x10\x00\x12\x13\n\x0fZNetOConfigLisp\x10\x01*G\n\rZcServiceType\x12\x14\n\x10zcloudInvalidSrv\x10\x00\x12\r\n\tmapServer\x10\x01\x12\x11\n\rsupportServer\x10\x02\x42=\n\x15org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/configb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63onfig/netinst.proto\x12\x15org.lfedge.eve.config\x1a\x16\x63onfig/devcommon.proto\x1a\x13\x63onfig/netcmn.proto\"\xb3\x01\n\x1bNetworkInstanceOpaqueConfig\x12\x0f\n\x07oconfig\x18\x01 \x01(\t\x12\x44\n\nlispConfig\x18\x02 \x01(\x0b\x32\x30.org.lfedge.eve.config.NetworkInstanceLispConfig\x12=\n\x04type\x18\x03 \x01(\x0e\x32/.org.lfedge.eve.config.ZNetworkOpaqueConfigType\"l\n\x0eZcServicePoint\x12\x34\n\x06zsType\x18\x03 \x01(\x0e\x32$.org.lfedge.eve.config.ZcServiceType\x12\x10\n\x08NameOrIp\x18\x01 \x01(\t\x12\x12\n\nCredential\x18\x02 \x01(\t\"\xe1\x01\n\x19NetworkInstanceLispConfig\x12\x36\n\x07LispMSs\x18\x01 \x03(\x0b\x32%.org.lfedge.eve.config.ZcServicePoint\x12\x16\n\x0eLispInstanceId\x18\x02 \x01(\r\x12\x10\n\x08\x61llocate\x18\x03 \x01(\x08\x12\x15\n\rexportprivate\x18\x04 \x01(\x08\x12\x18\n\x10\x61llocationprefix\x18\x05 \x01(\x0c\x12\x1b\n\x13\x61llocationprefixlen\x18\x06 \x01(\r\x12\x14\n\x0c\x65xperimental\x18\x14 \x01(\x08\"\xb6\x01\n\x07IPRoute\x12\x1b\n\x13\x64\x65stination_network\x18\x01 \x01(\t\x12\x0f\n\x07gateway\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\t\x12/\n\x05probe\x18\x04 \x01(\x0b\x32 .org.lfedge.eve.config.PortProbe\x12\x19\n\x11prefer_lower_cost\x18\x05 \x01(\x08\x12#\n\x1bprefer_stronger_wwan_signal\x18\x06 \x01(\x08\"}\n\tPortProbe\x12\x16\n\x0e\x65nable_gw_ping\x18\x01 \x01(\x08\x12\x18\n\x10gw_ping_max_cost\x18\x02 \x01(\r\x12>\n\x0c\x63ustom_probe\x18\x03 \x01(\x0b\x32(.org.lfedge.eve.config.ConnectivityProbe\"5\n\x14SpanningTreeProtocol\x12\x1d\n\x15ports_with_bpdu_guard\x18\x01 \x01(\t\"\xbb\x05\n\x15NetworkInstanceConfig\x12=\n\x0euuidandversion\x18\x01 \x01(\x0b\x32%.org.lfedge.eve.config.UUIDandVersion\x12\x13\n\x0b\x64isplayname\x18\x02 \x01(\t\x12\x39\n\x08instType\x18\x04 \x01(\x0e\x32\'.org.lfedge.eve.config.ZNetworkInstType\x12\x10\n\x08\x61\x63tivate\x18\x05 \x01(\x08\x12,\n\x04port\x18\x14 \x01(\x0b\x32\x1e.org.lfedge.eve.config.Adapter\x12\x38\n\x03stp\x18\x15 \x01(\x0b\x32+.org.lfedge.eve.config.SpanningTreeProtocol\x12?\n\x03\x63\x66g\x18\x1e \x01(\x0b\x32\x32.org.lfedge.eve.config.NetworkInstanceOpaqueConfig\x12\x32\n\x06ipType\x18\' \x01(\x0e\x32\".org.lfedge.eve.config.AddressType\x12)\n\x02ip\x18( \x01(\x0b\x32\x1d.org.lfedge.eve.config.ipspec\x12\x36\n\x03\x64ns\x18) \x03(\x0b\x32).org.lfedge.eve.config.ZnetStaticDNSEntry\x12\"\n\x1apropagate_connected_routes\x18* \x01(\x08\x12\x35\n\rstatic_routes\x18+ \x03(\x0b\x32\x1e.org.lfedge.eve.config.IPRoute\x12\x0b\n\x03mtu\x18, \x01(\r\x12\x17\n\x0f\x64isable_flowlog\x18\x32 \x01(\x08\x12@\n\x11vlan_access_ports\x18\x33 \x03(\x0b\x32%.org.lfedge.eve.config.VlanAccessPort\"6\n\x0eVlanAccessPort\x12\x0f\n\x07vlan_id\x18\x01 \x01(\r\x12\x13\n\x0b\x61\x63\x63\x65ss_port\x18\x02 \x01(\t*\xb3\x01\n\x10ZNetworkInstType\x12\x11\n\rZNetInstFirst\x10\x00\x12\x12\n\x0eZnetInstSwitch\x10\x01\x12\x11\n\rZnetInstLocal\x10\x02\x12\x11\n\rZnetInstCloud\x10\x03\x12\x10\n\x0cZnetInstMesh\x10\x04\x12\x14\n\x10ZnetInstHoneyPot\x10\x05\x12\x17\n\x13ZnetInstTransparent\x10\x06\x12\x11\n\x0cZNetInstLast\x10\xff\x01*W\n\x0b\x41\x64\x64ressType\x12\t\n\x05\x46irst\x10\x00\x12\x08\n\x04IPV4\x10\x01\x12\x08\n\x04IPV6\x10\x02\x12\x0e\n\nCryptoIPV4\x10\x03\x12\x0e\n\nCryptoIPV6\x10\x04\x12\t\n\x04Last\x10\xff\x01*C\n\x18ZNetworkOpaqueConfigType\x12\x12\n\x0eZNetOConfigVPN\x10\x00\x12\x13\n\x0fZNetOConfigLisp\x10\x01*G\n\rZcServiceType\x12\x14\n\x10zcloudInvalidSrv\x10\x00\x12\r\n\tmapServer\x10\x01\x12\x11\n\rsupportServer\x10\x02\x42=\n\x15org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/configb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -24,14 +24,14 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\025org.lfedge.eve.configZ$github.com/lf-edge/eve-api/go/config' - _globals['_ZNETWORKINSTTYPE']._serialized_start=1616 - _globals['_ZNETWORKINSTTYPE']._serialized_end=1795 - _globals['_ADDRESSTYPE']._serialized_start=1797 - _globals['_ADDRESSTYPE']._serialized_end=1884 - _globals['_ZNETWORKOPAQUECONFIGTYPE']._serialized_start=1886 - _globals['_ZNETWORKOPAQUECONFIGTYPE']._serialized_end=1953 - _globals['_ZCSERVICETYPE']._serialized_start=1955 - _globals['_ZCSERVICETYPE']._serialized_end=2026 + _globals['_ZNETWORKINSTTYPE']._serialized_start=1738 + _globals['_ZNETWORKINSTTYPE']._serialized_end=1917 + _globals['_ADDRESSTYPE']._serialized_start=1919 + _globals['_ADDRESSTYPE']._serialized_end=2006 + _globals['_ZNETWORKOPAQUECONFIGTYPE']._serialized_start=2008 + _globals['_ZNETWORKOPAQUECONFIGTYPE']._serialized_end=2075 + _globals['_ZCSERVICETYPE']._serialized_start=2077 + _globals['_ZCSERVICETYPE']._serialized_end=2148 _globals['_NETWORKINSTANCEOPAQUECONFIG']._serialized_start=93 _globals['_NETWORKINSTANCEOPAQUECONFIG']._serialized_end=272 _globals['_ZCSERVICEPOINT']._serialized_start=274 @@ -45,5 +45,7 @@ _globals['_SPANNINGTREEPROTOCOL']._serialized_start=924 _globals['_SPANNINGTREEPROTOCOL']._serialized_end=977 _globals['_NETWORKINSTANCECONFIG']._serialized_start=980 - _globals['_NETWORKINSTANCECONFIG']._serialized_end=1613 + _globals['_NETWORKINSTANCECONFIG']._serialized_end=1679 + _globals['_VLANACCESSPORT']._serialized_start=1681 + _globals['_VLANACCESSPORT']._serialized_end=1735 # @@protoc_insertion_point(module_scope)