[VOL-5581] optional onuid for getchilddevice filter
Change-Id: Ib3c9414264a728d6636905fa4270ae81310f0bb6
Signed-off-by: Akash Reddy Kankanala <akash.kankanala@radisys.com>
diff --git a/VERSION b/VERSION
index 64ff7de..b64ab70 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.7.1
+5.7.2
diff --git a/go/core_adapter/core_adapter.pb.go b/go/core_adapter/core_adapter.pb.go
index c79baf3..a184eb0 100644
--- a/go/core_adapter/core_adapter.pb.go
+++ b/go/core_adapter/core_adapter.pb.go
@@ -82,7 +82,7 @@
state protoimpl.MessageState `protogen:"open.v1"`
ParentId string `protobuf:"bytes,1,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"`
SerialNumber string `protobuf:"bytes,2,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
- OnuId uint32 `protobuf:"varint,3,opt,name=onu_id,json=onuId,proto3" json:"onu_id,omitempty"`
+ OnuId *uint32 `protobuf:"varint,3,opt,name=onu_id,json=onuId,proto3,oneof" json:"onu_id,omitempty"`
ParentPortNo uint32 `protobuf:"varint,4,opt,name=parent_port_no,json=parentPortNo,proto3" json:"parent_port_no,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
@@ -133,8 +133,8 @@
}
func (x *ChildDeviceFilter) GetOnuId() uint32 {
- if x != nil {
- return x.OnuId
+ if x != nil && x.OnuId != nil {
+ return *x.OnuId
}
return 0
}
@@ -1181,12 +1181,13 @@
" voltha_protos/core_adapter.proto\x12\fcore_adapter\x1a\x1avoltha_protos/common.proto\x1a\x1avoltha_protos/voltha.proto\x1a\x1fvoltha_protos/openflow_13.proto\x1a\x1bvoltha_protos/adapter.proto\x1a\x1avoltha_protos/device.proto\x1a\x1evoltha_protos/extensions.proto\x1a\x1dvoltha_protos/omci_test.proto\"n\n" +
"\x13AdapterRegistration\x12*\n" +
"\aadapter\x18\x01 \x01(\v2\x10.adapter.AdapterR\aadapter\x12+\n" +
- "\x06dTypes\x18\x02 \x01(\v2\x13.device.DeviceTypesR\x06dTypes\"\x92\x01\n" +
+ "\x06dTypes\x18\x02 \x01(\v2\x13.device.DeviceTypesR\x06dTypes\"\xa2\x01\n" +
"\x11ChildDeviceFilter\x12\x1b\n" +
"\tparent_id\x18\x01 \x01(\tR\bparentId\x12#\n" +
- "\rserial_number\x18\x02 \x01(\tR\fserialNumber\x12\x15\n" +
- "\x06onu_id\x18\x03 \x01(\rR\x05onuId\x12$\n" +
- "\x0eparent_port_no\x18\x04 \x01(\rR\fparentPortNo\"q\n" +
+ "\rserial_number\x18\x02 \x01(\tR\fserialNumber\x12\x1a\n" +
+ "\x06onu_id\x18\x03 \x01(\rH\x00R\x05onuId\x88\x01\x01\x12$\n" +
+ "\x0eparent_port_no\x18\x04 \x01(\rR\fparentPortNoB\t\n" +
+ "\a_onu_id\"q\n" +
"\n" +
"PortFilter\x12\x1b\n" +
"\tdevice_id\x18\x01 \x01(\tR\bdeviceId\x12\x12\n" +
@@ -1364,6 +1365,7 @@
if File_voltha_protos_core_adapter_proto != nil {
return
}
+ file_voltha_protos_core_adapter_proto_msgTypes[1].OneofWrappers = []any{}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
diff --git a/protos/voltha_protos/core_adapter.proto b/protos/voltha_protos/core_adapter.proto
index e58aaaa..677abca 100755
--- a/protos/voltha_protos/core_adapter.proto
+++ b/protos/voltha_protos/core_adapter.proto
@@ -23,7 +23,7 @@
message ChildDeviceFilter {
string parent_id = 1;
string serial_number = 2;
- uint32 onu_id = 3;
+ optional uint32 onu_id = 3;
uint32 parent_port_no = 4;
}
diff --git a/voltha.pb b/voltha.pb
index d84612b..d72967b 100644
--- a/voltha.pb
+++ b/voltha.pb
Binary files differ