From 22988e393b1c22119ac33841bcef19b2d7d91ebd Mon Sep 17 00:00:00 2001 From: Jordan Halterman Date: Wed, 9 Dec 2020 18:04:29 -0800 Subject: [PATCH] Make subscription details not-nullable for Go codes --- go/onos/e2sub/subscription/subscription.pb.go | 222 ++++++++---------- .../e2sub/subscription/subscription.proto | 4 +- 2 files changed, 106 insertions(+), 120 deletions(-) diff --git a/go/onos/e2sub/subscription/subscription.pb.go b/go/onos/e2sub/subscription/subscription.pb.go index 4566b674..df788c00 100644 --- a/go/onos/e2sub/subscription/subscription.pb.go +++ b/go/onos/e2sub/subscription/subscription.pb.go @@ -358,13 +358,13 @@ func (m *ServiceModel) GetID() ServiceModelID { // Subscription is a subscription state type Subscription struct { - ID ID `protobuf:"bytes,1,opt,name=id,proto3,casttype=ID" json:"id,omitempty"` - Revision Revision `protobuf:"varint,2,opt,name=revision,proto3,casttype=Revision" json:"revision,omitempty"` - AppID AppID `protobuf:"bytes,3,opt,name=app_id,json=appId,proto3,casttype=AppID" json:"app_id,omitempty"` - E2NodeID E2NodeID `protobuf:"bytes,4,opt,name=e2_node_id,json=e2NodeId,proto3,casttype=E2NodeID" json:"e2_node_id,omitempty"` - ServiceModel *ServiceModel `protobuf:"bytes,5,opt,name=service_model,json=serviceModel,proto3" json:"service_model,omitempty"` - Details *SubscriptionDetails `protobuf:"bytes,6,opt,name=details,proto3" json:"details,omitempty"` - Lifecycle Lifecycle `protobuf:"bytes,7,opt,name=lifecycle,proto3" json:"lifecycle"` + ID ID `protobuf:"bytes,1,opt,name=id,proto3,casttype=ID" json:"id,omitempty"` + Revision Revision `protobuf:"varint,2,opt,name=revision,proto3,casttype=Revision" json:"revision,omitempty"` + AppID AppID `protobuf:"bytes,3,opt,name=app_id,json=appId,proto3,casttype=AppID" json:"app_id,omitempty"` + E2NodeID E2NodeID `protobuf:"bytes,4,opt,name=e2_node_id,json=e2NodeId,proto3,casttype=E2NodeID" json:"e2_node_id,omitempty"` + ServiceModel ServiceModel `protobuf:"bytes,5,opt,name=service_model,json=serviceModel,proto3" json:"service_model"` + Details SubscriptionDetails `protobuf:"bytes,6,opt,name=details,proto3" json:"details"` + Lifecycle Lifecycle `protobuf:"bytes,7,opt,name=lifecycle,proto3" json:"lifecycle"` } func (m *Subscription) Reset() { *m = Subscription{} } @@ -428,18 +428,18 @@ func (m *Subscription) GetE2NodeID() E2NodeID { return "" } -func (m *Subscription) GetServiceModel() *ServiceModel { +func (m *Subscription) GetServiceModel() ServiceModel { if m != nil { return m.ServiceModel } - return nil + return ServiceModel{} } -func (m *Subscription) GetDetails() *SubscriptionDetails { +func (m *Subscription) GetDetails() SubscriptionDetails { if m != nil { return m.Details } - return nil + return SubscriptionDetails{} } func (m *Subscription) GetLifecycle() Lifecycle { @@ -1080,79 +1080,79 @@ func init() { } var fileDescriptor_9092711340dfb78a = []byte{ - // 1137 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x5f, 0x4f, 0xdb, 0x56, - 0x14, 0x8f, 0xf3, 0x8f, 0xe4, 0x90, 0xc2, 0xe5, 0x96, 0x82, 0xc9, 0xaa, 0x04, 0xb9, 0x9a, 0x94, - 0x46, 0x1b, 0xa4, 0x66, 0x40, 0xdb, 0xb7, 0x04, 0xbb, 0x95, 0x27, 0x92, 0x50, 0xdb, 0xc0, 0x3a, - 0x4d, 0xb2, 0x42, 0x7c, 0xcb, 0x2c, 0x41, 0xec, 0xc5, 0x86, 0x89, 0x49, 0xd3, 0xde, 0xf7, 0xd4, - 0x97, 0xbd, 0xed, 0x53, 0xec, 0x53, 0xf4, 0xb1, 0x7b, 0xdb, 0x13, 0x9a, 0xc2, 0xb7, 0xe8, 0xcb, - 0x26, 0x5f, 0x9b, 0xe0, 0xf8, 0x4f, 0x00, 0xa9, 0x6f, 0xd7, 0xbf, 0x73, 0xce, 0xef, 0x9c, 0x73, - 0xef, 0xb9, 0xbf, 0x9b, 0x40, 0xdd, 0x1c, 0x98, 0xf6, 0x3a, 0xe1, 0xed, 0xb3, 0xa3, 0x75, 0xfb, - 0xec, 0xc8, 0xee, 0x0f, 0x0d, 0xcb, 0x31, 0xcc, 0xc1, 0xc4, 0xc7, 0x9a, 0x35, 0x34, 0x1d, 0x13, - 0x2f, 0xbb, 0xbe, 0x6b, 0xd4, 0x77, 0x2d, 0x68, 0x2e, 0x2f, 0x1e, 0x9b, 0xc7, 0x26, 0xf5, 0x59, - 0x77, 0x57, 0x9e, 0x3b, 0x27, 0x40, 0x71, 0xd7, 0x78, 0x47, 0xfa, 0x17, 0xfd, 0x13, 0x82, 0xb7, - 0x21, 0x6f, 0x3b, 0x3d, 0xe7, 0xcc, 0x66, 0x99, 0x55, 0xa6, 0x36, 0xc7, 0x57, 0xd7, 0x12, 0xc8, - 0xd6, 0x14, 0xea, 0x26, 0xfb, 0xee, 0xdc, 0x7b, 0x06, 0x72, 0xe2, 0x39, 0x19, 0x38, 0x78, 0x0b, - 0xb2, 0xce, 0x85, 0x45, 0x7c, 0x02, 0x2e, 0x91, 0x80, 0x7a, 0xab, 0x17, 0x16, 0x91, 0xa9, 0x3f, - 0xee, 0x42, 0x29, 0x68, 0x67, 0xd3, 0xab, 0x4c, 0x6d, 0x96, 0xff, 0x32, 0xb9, 0x80, 0xc0, 0x47, - 0x2b, 0xfb, 0xe1, 0xb2, 0x9a, 0x92, 0x27, 0x08, 0xb8, 0xe7, 0x50, 0x52, 0xc8, 0xf0, 0xdc, 0xe8, - 0x93, 0xb6, 0xa9, 0x93, 0x13, 0x5c, 0x83, 0xb4, 0xa1, 0xb3, 0xd9, 0x55, 0xa6, 0x56, 0x6c, 0xb1, - 0xa3, 0xcb, 0x6a, 0x5a, 0x12, 0x3e, 0x5d, 0x56, 0xe7, 0x82, 0x3e, 0x92, 0x20, 0xa7, 0x0d, 0x9d, - 0xfb, 0x23, 0x03, 0xa5, 0x20, 0x3d, 0x7e, 0x4c, 0x43, 0x19, 0x1a, 0x5a, 0x1a, 0x87, 0xa6, 0x3d, - 0x77, 0x5c, 0x83, 0xc2, 0x90, 0x9c, 0x1b, 0xf6, 0x75, 0xd5, 0xd9, 0x56, 0xe9, 0xd3, 0x65, 0xb5, - 0x20, 0xfb, 0x98, 0x3c, 0xb6, 0xe2, 0xa7, 0x90, 0xef, 0x59, 0x96, 0x66, 0xe8, 0x6c, 0x86, 0x72, - 0xe1, 0xd1, 0x65, 0x35, 0xd7, 0xb4, 0x2c, 0x4a, 0xe7, 0x2d, 0xe4, 0x5c, 0xcf, 0xb2, 0x24, 0x1d, - 0x6f, 0x01, 0x10, 0x5e, 0x1b, 0x98, 0x3a, 0xd1, 0x26, 0xaa, 0x2e, 0x88, 0x7c, 0xc7, 0xd4, 0x09, - 0x8d, 0x18, 0xaf, 0xe5, 0x02, 0xf1, 0x56, 0x3a, 0xfe, 0x16, 0x1e, 0xd8, 0x5e, 0x47, 0xda, 0xa9, - 0xdb, 0x12, 0x9b, 0xbb, 0x6d, 0x1f, 0x03, 0xfd, 0xcb, 0x25, 0x3b, 0xb8, 0x63, 0xaf, 0x60, 0x46, - 0x27, 0x4e, 0xcf, 0x38, 0xb1, 0xd9, 0x3c, 0x65, 0xf9, 0xea, 0x4e, 0xa7, 0x21, 0x78, 0x31, 0xf2, - 0x75, 0x30, 0x7e, 0x05, 0xc5, 0x93, 0xeb, 0x11, 0x63, 0x67, 0x28, 0x53, 0xf2, 0x5c, 0x8c, 0x87, - 0xd1, 0x3f, 0xd4, 0x9b, 0x50, 0xee, 0x77, 0x06, 0x1e, 0xc6, 0x24, 0xc2, 0xcf, 0x81, 0x25, 0xee, - 0x34, 0x69, 0xce, 0xd0, 0x38, 0x3e, 0x26, 0x43, 0x4d, 0x27, 0xef, 0x8c, 0x81, 0x41, 0xc7, 0xc8, - 0x3d, 0xb4, 0x92, 0xbc, 0x44, 0xed, 0xaa, 0x67, 0x16, 0xc6, 0x56, 0xfc, 0x02, 0x66, 0x7a, 0x7d, - 0x77, 0x65, 0xb3, 0xe9, 0xd5, 0x4c, 0x6d, 0x76, 0xca, 0xc0, 0x37, 0xa9, 0x9f, 0x7c, 0xed, 0xcf, - 0xfd, 0xcd, 0x40, 0xde, 0xc3, 0xf0, 0xd2, 0x78, 0x3c, 0x72, 0xad, 0xfc, 0xe8, 0x66, 0x30, 0xb6, - 0xfd, 0xab, 0x90, 0xa6, 0x57, 0xe1, 0xc9, 0x2d, 0xd4, 0x81, 0xbb, 0x50, 0x01, 0x08, 0xb4, 0x90, - 0xa1, 0x2d, 0x04, 0x10, 0x7c, 0x00, 0x0b, 0x2e, 0x01, 0xf9, 0xe9, 0xcc, 0xed, 0xda, 0xab, 0x88, - 0xce, 0xc8, 0x2c, 0xff, 0x74, 0xea, 0x11, 0x79, 0x11, 0x7e, 0x2b, 0xc8, 0x0e, 0x21, 0xdc, 0x9f, - 0x0c, 0xa0, 0xb0, 0x1b, 0x6e, 0x4e, 0x5c, 0xe8, 0xaf, 0xef, 0xcc, 0x1f, 0xe8, 0x47, 0x84, 0x92, - 0x63, 0x9c, 0x12, 0xcd, 0x31, 0xb5, 0x9f, 0x7b, 0x86, 0x73, 0xeb, 0x86, 0xa8, 0xc6, 0x29, 0x51, - 0xcd, 0xc3, 0x9e, 0xe1, 0xc8, 0xe0, 0x8c, 0xd7, 0x5c, 0x1f, 0x96, 0x9a, 0xba, 0x1e, 0x9c, 0x00, - 0xd9, 0x4d, 0x68, 0x3b, 0x58, 0x0a, 0x89, 0x07, 0x73, 0x0f, 0xf1, 0x08, 0xc9, 0x86, 0x0e, 0xcb, - 0x91, 0x24, 0xb6, 0x65, 0x0e, 0x6c, 0xf2, 0x39, 0xb3, 0xbc, 0x80, 0x15, 0x99, 0x9c, 0x9a, 0xe7, - 0x24, 0xae, 0x9b, 0xa9, 0x72, 0xc3, 0x3d, 0x86, 0x72, 0x5c, 0xa8, 0x57, 0x23, 0xb7, 0x05, 0x4b, - 0xaf, 0x89, 0x73, 0x7f, 0x56, 0x1d, 0x96, 0x23, 0x71, 0x9f, 0xbf, 0xed, 0x32, 0xb0, 0xbb, 0x86, - 0x3d, 0x91, 0xc6, 0xf6, 0xeb, 0xe3, 0x06, 0xb0, 0x12, 0x63, 0xf3, 0x6b, 0x78, 0x03, 0x0f, 0x82, - 0x44, 0xee, 0xfb, 0x94, 0xb9, 0xef, 0xf3, 0x30, 0xc9, 0xc0, 0x6d, 0xc3, 0xca, 0x61, 0xcf, 0xe9, - 0xff, 0x18, 0x57, 0x0c, 0x2e, 0x43, 0x61, 0x60, 0x0e, 0x89, 0x75, 0xd2, 0xbb, 0xa0, 0xfd, 0x16, - 0xe4, 0xf1, 0x37, 0xf7, 0x1d, 0x94, 0xe3, 0x02, 0xfd, 0x4a, 0x5f, 0x42, 0x8e, 0x8a, 0x8d, 0xbf, - 0x4d, 0x95, 0xe9, 0x0f, 0xa0, 0x5f, 0x9a, 0x17, 0x52, 0xaf, 0x41, 0xde, 0x7b, 0x57, 0x31, 0x40, - 0xbe, 0xb9, 0xa3, 0x4a, 0x07, 0x22, 0x4a, 0x61, 0x0c, 0x73, 0x7b, 0x62, 0x47, 0x90, 0x3a, 0xaf, - 0x35, 0x41, 0xdc, 0x15, 0x55, 0x11, 0x31, 0xf5, 0x97, 0x50, 0x1c, 0x3f, 0xa0, 0xb8, 0x00, 0xd9, - 0x4e, 0xb7, 0xe3, 0xba, 0x16, 0x21, 0xd7, 0x14, 0x04, 0x51, 0x40, 0x0c, 0x9e, 0x85, 0x99, 0xfd, - 0x3d, 0xa1, 0xa9, 0x8a, 0x02, 0x4a, 0xbb, 0x1f, 0xb2, 0xd8, 0xee, 0x1e, 0x88, 0x02, 0xca, 0xd4, - 0x55, 0x80, 0x9b, 0x1b, 0x8a, 0x97, 0x00, 0xbb, 0x99, 0xba, 0x1d, 0x4d, 0x7d, 0xbb, 0x27, 0x6a, - 0xb2, 0xb8, 0xd7, 0x95, 0x55, 0x94, 0x0a, 0xe3, 0x52, 0x47, 0x11, 0x65, 0x15, 0x31, 0x61, 0x7c, - 0xaf, 0xbb, 0x2b, 0xed, 0xbc, 0x45, 0xe9, 0xfa, 0x0f, 0xb0, 0x18, 0xa7, 0x00, 0xf8, 0x09, 0x54, - 0x95, 0xfd, 0x96, 0x22, 0xbe, 0xd9, 0x17, 0x3b, 0xaa, 0x16, 0x0c, 0xdd, 0xe9, 0x76, 0x54, 0xa9, - 0xb3, 0xef, 0xd6, 0x5d, 0x85, 0x2f, 0x12, 0x9c, 0x0e, 0x9b, 0x92, 0x8a, 0x98, 0xfa, 0x5f, 0x19, - 0x80, 0x1b, 0x55, 0xc0, 0x8f, 0x60, 0x41, 0x95, 0xda, 0xa2, 0xa6, 0x76, 0xa9, 0x83, 0xf6, 0xbd, - 0x28, 0x77, 0x51, 0x2a, 0x02, 0x1f, 0x3e, 0x6b, 0x2b, 0x88, 0x89, 0xc2, 0x7c, 0x5b, 0x41, 0xe9, - 0x28, 0xbc, 0xd9, 0x56, 0x50, 0xc6, 0x6d, 0x30, 0x44, 0xd2, 0x68, 0x2b, 0x28, 0x1b, 0xc5, 0x79, - 0x17, 0xcf, 0x45, 0xf1, 0x0d, 0x17, 0xcf, 0x47, 0xf1, 0x6f, 0x5c, 0x7c, 0x26, 0x8a, 0x6f, 0xba, - 0x78, 0x01, 0x2f, 0xc3, 0xc3, 0x70, 0x5e, 0xd7, 0x50, 0x8c, 0x1a, 0x78, 0x6a, 0x80, 0xa8, 0x61, - 0x93, 0x1a, 0x66, 0xf1, 0x22, 0xa0, 0x10, 0x95, 0x82, 0x4a, 0x51, 0x94, 0x57, 0xd0, 0x83, 0x28, - 0xba, 0xa9, 0xa0, 0xb9, 0x98, 0x9d, 0x6c, 0x28, 0x68, 0x3e, 0x66, 0x27, 0x1b, 0x0a, 0x42, 0x51, - 0x78, 0xab, 0xa1, 0xa0, 0x05, 0xfe, 0xbf, 0x2c, 0x3c, 0x12, 0xf9, 0xe0, 0x35, 0xf1, 0x7f, 0x6c, - 0x60, 0x07, 0xe6, 0x43, 0x22, 0x8b, 0xd7, 0x93, 0x9f, 0xc7, 0x58, 0xcd, 0x2f, 0x37, 0xee, 0x1e, - 0xe0, 0x5f, 0xcd, 0x5f, 0x01, 0x47, 0x95, 0x13, 0xf3, 0x89, 0x3c, 0x89, 0x0a, 0x5d, 0xde, 0xb8, - 0x57, 0x8c, 0x9f, 0xde, 0x81, 0xf9, 0x90, 0xc4, 0x4e, 0x69, 0x3a, 0x5e, 0xc4, 0xa7, 0x34, 0x9d, - 0xa4, 0xde, 0xbf, 0xc0, 0x42, 0x44, 0x56, 0xf1, 0xb3, 0x29, 0x3f, 0xbf, 0xe2, 0xe5, 0xb9, 0xcc, - 0xdf, 0x27, 0xc4, 0xcf, 0xfd, 0x1b, 0xe0, 0xa8, 0x52, 0x4e, 0xd9, 0xf0, 0x44, 0x3d, 0x9e, 0xb2, - 0xe1, 0xc9, 0x52, 0xdc, 0x60, 0x5a, 0xec, 0x87, 0x51, 0x85, 0xf9, 0x38, 0xaa, 0x30, 0xff, 0x8e, - 0x2a, 0xcc, 0xfb, 0xab, 0x4a, 0xea, 0xe3, 0x55, 0x25, 0xf5, 0xcf, 0x55, 0x25, 0x75, 0x94, 0xa7, - 0xff, 0x7e, 0x36, 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x4a, 0xc4, 0xa3, 0x5a, 0x0d, 0x00, - 0x00, + // 1138 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x16, 0xf5, 0x67, 0x69, 0xac, 0x38, 0xeb, 0x8d, 0x63, 0xd3, 0x6a, 0x20, 0x19, 0x0c, 0x0a, + 0x28, 0x42, 0x6b, 0x2b, 0x74, 0x6d, 0x27, 0xb9, 0x49, 0x26, 0x1b, 0x10, 0xb0, 0x7e, 0x42, 0xd2, + 0x76, 0x53, 0x14, 0x20, 0x64, 0x71, 0xe3, 0x12, 0xb0, 0x45, 0x56, 0xa4, 0x5d, 0xb8, 0x40, 0xd1, + 0x7b, 0x4f, 0x79, 0x80, 0x5e, 0xfa, 0x0a, 0x7d, 0x8a, 0x1c, 0xd3, 0x5b, 0x4f, 0x46, 0x21, 0xbf, + 0x45, 0x2e, 0x2d, 0xb8, 0xa4, 0x65, 0x8a, 0x3f, 0xb2, 0x0d, 0xe4, 0xb6, 0xfb, 0xcd, 0xcc, 0xb7, + 0x33, 0xc3, 0xd9, 0x6f, 0x25, 0xa8, 0x9b, 0x43, 0xd3, 0xde, 0x20, 0xbc, 0x7d, 0x76, 0xb4, 0x61, + 0x9f, 0x1d, 0xd9, 0x83, 0x91, 0x61, 0x39, 0x86, 0x39, 0x9c, 0xda, 0xac, 0x5b, 0x23, 0xd3, 0x31, + 0xf1, 0x8a, 0xeb, 0xbb, 0x4e, 0x7d, 0xd7, 0x83, 0xe6, 0xf2, 0xd2, 0xb1, 0x79, 0x6c, 0x52, 0x9f, + 0x0d, 0x77, 0xe5, 0xb9, 0x73, 0x02, 0x14, 0xf7, 0x8c, 0x77, 0x64, 0x70, 0x31, 0x38, 0x21, 0x78, + 0x07, 0xf2, 0xb6, 0xd3, 0x77, 0xce, 0x6c, 0x96, 0x59, 0x63, 0x6a, 0x0b, 0x7c, 0x75, 0x3d, 0x81, + 0x6c, 0x5d, 0xa1, 0x6e, 0xb2, 0xef, 0xce, 0xbd, 0x67, 0x20, 0x27, 0x9e, 0x93, 0xa1, 0x83, 0xb7, + 0x21, 0xeb, 0x5c, 0x58, 0xc4, 0x27, 0xe0, 0x12, 0x09, 0xa8, 0xb7, 0x7a, 0x61, 0x11, 0x99, 0xfa, + 0xe3, 0x2e, 0x94, 0x82, 0x76, 0x36, 0xbd, 0xc6, 0xd4, 0xe6, 0xf9, 0x2f, 0x93, 0x13, 0x08, 0x6c, + 0x5a, 0xd9, 0x0f, 0x97, 0xd5, 0x94, 0x3c, 0x45, 0xc0, 0xbd, 0x80, 0x92, 0x42, 0x46, 0xe7, 0xc6, + 0x80, 0xb4, 0x4d, 0x9d, 0x9c, 0xe0, 0x1a, 0xa4, 0x0d, 0x9d, 0xcd, 0xae, 0x31, 0xb5, 0x62, 0x8b, + 0x1d, 0x5f, 0x56, 0xd3, 0x92, 0xf0, 0xe9, 0xb2, 0xba, 0x10, 0xf4, 0x91, 0x04, 0x39, 0x6d, 0xe8, + 0xdc, 0x9f, 0x19, 0x28, 0x05, 0xe9, 0xf1, 0x13, 0x1a, 0xca, 0xd0, 0xd0, 0xd2, 0x24, 0x34, 0xed, + 0xb9, 0xe3, 0x1a, 0x14, 0x46, 0xe4, 0xdc, 0xb0, 0xaf, 0xb3, 0xce, 0xb6, 0x4a, 0x9f, 0x2e, 0xab, + 0x05, 0xd9, 0xc7, 0xe4, 0x89, 0x15, 0x3f, 0x83, 0x7c, 0xdf, 0xb2, 0x34, 0x43, 0x67, 0x33, 0x94, + 0x0b, 0x8f, 0x2f, 0xab, 0xb9, 0xa6, 0x65, 0x51, 0x3a, 0x6f, 0x21, 0xe7, 0xfa, 0x96, 0x25, 0xe9, + 0x78, 0x1b, 0x80, 0xf0, 0xda, 0xd0, 0xd4, 0x89, 0x36, 0x95, 0x75, 0x41, 0xe4, 0x3b, 0xa6, 0x4e, + 0x68, 0xc4, 0x64, 0x2d, 0x17, 0x88, 0xb7, 0xd2, 0x71, 0x0f, 0x1e, 0xd8, 0x5e, 0x45, 0xda, 0xa9, + 0x5b, 0x12, 0x9b, 0xbb, 0xad, 0x8f, 0x81, 0xfa, 0x27, 0x7d, 0x0c, 0xf6, 0x6d, 0x0f, 0xe6, 0x74, + 0xe2, 0xf4, 0x8d, 0x13, 0x9b, 0xcd, 0x53, 0xae, 0xaf, 0xee, 0xf4, 0x4d, 0x04, 0x2f, 0xc6, 0xa7, + 0xbc, 0xa6, 0xc0, 0xdf, 0x42, 0xf1, 0xe4, 0x7a, 0xdc, 0xd8, 0x39, 0xca, 0x97, 0x3c, 0x23, 0x93, + 0xc1, 0xf4, 0x59, 0x6e, 0x42, 0xb9, 0xdf, 0x19, 0x78, 0x14, 0x73, 0x1c, 0x7e, 0x01, 0x2c, 0x71, + 0x27, 0x4b, 0x73, 0x46, 0xc6, 0xf1, 0x31, 0x19, 0x69, 0x3a, 0x79, 0x67, 0x0c, 0x0d, 0x3a, 0x52, + 0xee, 0x07, 0x2c, 0xc9, 0xcb, 0xd4, 0xae, 0x7a, 0x66, 0x61, 0x62, 0xc5, 0x2f, 0x61, 0xae, 0x3f, + 0x70, 0x57, 0x36, 0x9b, 0x5e, 0xcb, 0xd4, 0xe6, 0x67, 0x0c, 0x7f, 0x93, 0xfa, 0xc9, 0xd7, 0xfe, + 0xdc, 0xdf, 0x0c, 0xe4, 0x3d, 0x0c, 0x2f, 0x4f, 0x46, 0x25, 0xd7, 0xca, 0x8f, 0x6f, 0x86, 0x64, + 0xc7, 0xbf, 0x16, 0x69, 0x7a, 0x2d, 0x9e, 0xde, 0x42, 0x1d, 0xb8, 0x17, 0x15, 0x80, 0x40, 0x09, + 0x19, 0x5a, 0x42, 0x00, 0xc1, 0x07, 0xb0, 0xe8, 0x12, 0x90, 0x9f, 0xce, 0xdc, 0xaa, 0xbd, 0x8c, + 0xe8, 0xbc, 0xcc, 0xf3, 0xcf, 0x66, 0x7e, 0x28, 0x2f, 0xc2, 0x2f, 0x05, 0xd9, 0x21, 0x84, 0xfb, + 0x83, 0x01, 0x14, 0x76, 0xc3, 0xcd, 0xa9, 0xcb, 0xfd, 0xf5, 0x9d, 0xf9, 0x03, 0xf5, 0x88, 0x50, + 0x72, 0x8c, 0x53, 0xa2, 0x39, 0xa6, 0xf6, 0x73, 0xdf, 0x70, 0x6e, 0x6d, 0x88, 0x6a, 0x9c, 0x12, + 0xd5, 0x3c, 0xec, 0x1b, 0x8e, 0x0c, 0xce, 0x64, 0xcd, 0x0d, 0x60, 0xb9, 0xa9, 0xeb, 0xc1, 0x09, + 0x90, 0xdd, 0x03, 0x6d, 0x07, 0x4b, 0x21, 0x21, 0x61, 0xee, 0x21, 0x24, 0x21, 0x09, 0xd1, 0x61, + 0x25, 0x72, 0x88, 0x6d, 0x99, 0x43, 0x9b, 0x7c, 0xce, 0x53, 0x5e, 0xc2, 0xaa, 0x4c, 0x4e, 0xcd, + 0x73, 0x12, 0x57, 0xcd, 0x4c, 0xe9, 0xe1, 0x9e, 0x40, 0x39, 0x2e, 0xd4, 0xcb, 0x91, 0xdb, 0x86, + 0xe5, 0xd7, 0xc4, 0xb9, 0x3f, 0xab, 0x0e, 0x2b, 0x91, 0xb8, 0xcf, 0x5f, 0x76, 0x19, 0xd8, 0x3d, + 0xc3, 0x9e, 0x3a, 0xc6, 0xf6, 0xf3, 0xe3, 0x86, 0xb0, 0x1a, 0x63, 0xf3, 0x73, 0x78, 0x03, 0x0f, + 0x82, 0x44, 0xee, 0x5b, 0x95, 0xb9, 0xef, 0x53, 0x31, 0xcd, 0xc0, 0xed, 0xc0, 0xea, 0x61, 0xdf, + 0x19, 0xfc, 0x18, 0x97, 0x0c, 0x2e, 0x43, 0x61, 0x68, 0x8e, 0x88, 0x75, 0xd2, 0xbf, 0xa0, 0xf5, + 0x16, 0xe4, 0xc9, 0x9e, 0xfb, 0x0e, 0xca, 0x71, 0x81, 0x7e, 0xa6, 0xaf, 0x20, 0x47, 0xc5, 0xc6, + 0x6f, 0x53, 0x65, 0xf6, 0x63, 0xe8, 0xa7, 0xe6, 0x85, 0xd4, 0x6b, 0x90, 0xf7, 0xde, 0x58, 0x0c, + 0x90, 0x6f, 0xee, 0xaa, 0xd2, 0x81, 0x88, 0x52, 0x18, 0xc3, 0x42, 0x4f, 0xec, 0x08, 0x52, 0xe7, + 0xb5, 0x26, 0x88, 0x7b, 0xa2, 0x2a, 0x22, 0xa6, 0xfe, 0x0a, 0x8a, 0x93, 0xc7, 0x14, 0x17, 0x20, + 0xdb, 0xe9, 0x76, 0x5c, 0xd7, 0x22, 0xe4, 0x9a, 0x82, 0x20, 0x0a, 0x88, 0xc1, 0xf3, 0x30, 0xb7, + 0xdf, 0x13, 0x9a, 0xaa, 0x28, 0xa0, 0xb4, 0xbb, 0x91, 0xc5, 0x76, 0xf7, 0x40, 0x14, 0x50, 0xa6, + 0xae, 0x02, 0xdc, 0xdc, 0x50, 0xbc, 0x0c, 0xd8, 0x3d, 0xa9, 0xdb, 0xd1, 0xd4, 0xb7, 0x3d, 0x51, + 0x93, 0xc5, 0x5e, 0x57, 0x56, 0x51, 0x2a, 0x8c, 0x4b, 0x1d, 0x45, 0x94, 0x55, 0xc4, 0x84, 0xf1, + 0x5e, 0x77, 0x4f, 0xda, 0x7d, 0x8b, 0xd2, 0xf5, 0x1f, 0x60, 0x29, 0x4e, 0x01, 0xf0, 0x53, 0xa8, + 0x2a, 0xfb, 0x2d, 0x45, 0x7c, 0xb3, 0x2f, 0x76, 0x54, 0x2d, 0x18, 0xba, 0xdb, 0xed, 0xa8, 0x52, + 0x67, 0xdf, 0xcd, 0xbb, 0x0a, 0x5f, 0x24, 0x38, 0x1d, 0x36, 0x25, 0x15, 0x31, 0xf5, 0xbf, 0x32, + 0x00, 0x37, 0xaa, 0x80, 0x1f, 0xc3, 0xa2, 0x2a, 0xb5, 0x45, 0x4d, 0xed, 0x52, 0x07, 0xed, 0x7b, + 0x51, 0xee, 0xa2, 0x54, 0x04, 0x3e, 0x7c, 0xde, 0x56, 0x10, 0x13, 0x85, 0xf9, 0xb6, 0x82, 0xd2, + 0x51, 0x78, 0xab, 0xad, 0xa0, 0x8c, 0x5b, 0x60, 0x88, 0xa4, 0xd1, 0x56, 0x50, 0x36, 0x8a, 0xf3, + 0x2e, 0x9e, 0x8b, 0xe2, 0x9b, 0x2e, 0x9e, 0x8f, 0xe2, 0xdf, 0xb8, 0xf8, 0x5c, 0x14, 0xdf, 0x72, + 0xf1, 0x02, 0x5e, 0x81, 0x47, 0xe1, 0x73, 0x5d, 0x43, 0x31, 0x6a, 0xe0, 0xa9, 0x01, 0xa2, 0x86, + 0x2d, 0x6a, 0x98, 0xc7, 0x4b, 0x80, 0x42, 0x54, 0x0a, 0x2a, 0x45, 0x51, 0x5e, 0x41, 0x0f, 0xa2, + 0xe8, 0x96, 0x82, 0x16, 0x62, 0x3a, 0xd9, 0x50, 0xd0, 0xc3, 0x98, 0x4e, 0x36, 0x14, 0x84, 0xa2, + 0xf0, 0x76, 0x43, 0x41, 0x8b, 0xfc, 0x7f, 0x59, 0x78, 0x2c, 0xf2, 0xc1, 0x6b, 0xe2, 0xff, 0xf0, + 0xc0, 0x0e, 0x3c, 0x0c, 0x89, 0x2c, 0xde, 0x48, 0x7e, 0x1e, 0x63, 0x35, 0xbf, 0xdc, 0xb8, 0x7b, + 0x80, 0x7f, 0x35, 0x7f, 0x05, 0x1c, 0x55, 0x4e, 0xcc, 0x27, 0xf2, 0x24, 0x2a, 0x74, 0x79, 0xf3, + 0x5e, 0x31, 0xfe, 0xf1, 0x0e, 0x3c, 0x0c, 0x49, 0xec, 0x8c, 0xa2, 0xe3, 0x45, 0x7c, 0x46, 0xd1, + 0x49, 0xea, 0xfd, 0x0b, 0x2c, 0x46, 0x64, 0x15, 0x3f, 0x9f, 0xf1, 0xf3, 0x2b, 0x5e, 0x9e, 0xcb, + 0xfc, 0x7d, 0x42, 0xfc, 0xb3, 0x7f, 0x03, 0x1c, 0x55, 0xca, 0x19, 0x0d, 0x4f, 0xd4, 0xe3, 0x19, + 0x0d, 0x4f, 0x96, 0xe2, 0x06, 0xd3, 0x62, 0x3f, 0x8c, 0x2b, 0xcc, 0xc7, 0x71, 0x85, 0xf9, 0x77, + 0x5c, 0x61, 0xde, 0x5f, 0x55, 0x52, 0x1f, 0xaf, 0x2a, 0xa9, 0x7f, 0xae, 0x2a, 0xa9, 0xa3, 0x3c, + 0xfd, 0x27, 0xb4, 0xf9, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x37, 0x7c, 0x6b, 0x66, 0x0d, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1543,30 +1543,26 @@ func (m *Subscription) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x3a - if m.Details != nil { - { - size, err := m.Details.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintSubscription(dAtA, i, uint64(size)) + { + size, err := m.Details.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x32 + i -= size + i = encodeVarintSubscription(dAtA, i, uint64(size)) } - if m.ServiceModel != nil { - { - size, err := m.ServiceModel.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintSubscription(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x32 + { + size, err := m.ServiceModel.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x2a + i -= size + i = encodeVarintSubscription(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a if len(m.E2NodeID) > 0 { i -= len(m.E2NodeID) copy(dAtA[i:], m.E2NodeID) @@ -2110,14 +2106,10 @@ func (m *Subscription) Size() (n int) { if l > 0 { n += 1 + l + sovSubscription(uint64(l)) } - if m.ServiceModel != nil { - l = m.ServiceModel.Size() - n += 1 + l + sovSubscription(uint64(l)) - } - if m.Details != nil { - l = m.Details.Size() - n += 1 + l + sovSubscription(uint64(l)) - } + l = m.ServiceModel.Size() + n += 1 + l + sovSubscription(uint64(l)) + l = m.Details.Size() + n += 1 + l + sovSubscription(uint64(l)) l = m.Lifecycle.Size() n += 1 + l + sovSubscription(uint64(l)) return n @@ -2742,9 +2734,6 @@ func (m *Subscription) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.ServiceModel == nil { - m.ServiceModel = &ServiceModel{} - } if err := m.ServiceModel.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2778,9 +2767,6 @@ func (m *Subscription) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Details == nil { - m.Details = &SubscriptionDetails{} - } if err := m.Details.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/proto/onos/e2sub/subscription/subscription.proto b/proto/onos/e2sub/subscription/subscription.proto index 5d530a4b..59e4b1c0 100644 --- a/proto/onos/e2sub/subscription/subscription.proto +++ b/proto/onos/e2sub/subscription/subscription.proto @@ -75,8 +75,8 @@ message Subscription { uint64 revision = 2 [(gogoproto.casttype) = "Revision"]; string app_id = 3 [(gogoproto.casttype) = "AppID", (gogoproto.customname) = "AppID"]; string e2_node_id = 4 [(gogoproto.casttype) = "E2NodeID", (gogoproto.customname) = "E2NodeID"]; - ServiceModel service_model = 5; - SubscriptionDetails details = 6; + ServiceModel service_model = 5 [(gogoproto.nullable) = false]; + SubscriptionDetails details = 6 [(gogoproto.nullable) = false]; Lifecycle lifecycle = 7 [(gogoproto.nullable) = false]; }