[RIC-430] Update NbIdentity proto 56/4356/1 common/v1.0.45 entities/v1.0.45 reader/v1.0.45 v1.0.45
authoridanshal <idan.shalom@intl.att.com>
Thu, 9 Jul 2020 08:51:23 +0000 (08:51 +0000)
committeridanshal <idan.shalom@intl.att.com>
Thu, 9 Jul 2020 08:51:30 +0000 (08:51 +0000)
Change-Id: I7cad80c356266473f1e8a4a2d0c9b5773866bde7
Signed-off-by: idanshal <idan.shalom@intl.att.com>
entities/nb_identity.pb.go
entities/nb_identity.proto
entities/nodeb_info.pb.go
entities/nodeb_info.proto
reader/go.mod

index c4f761a..eac6137 100644 (file)
@@ -45,17 +45,78 @@ const (
 // of the legacy proto package is being used.
 const _ = proto.ProtoPackageIsVersion4
 
-type NbIdentity struct {
+type ConnectionStatus int32
+
+const (
+       ConnectionStatus_UNKNOWN_CONNECTION_STATUS ConnectionStatus = 0
+       ConnectionStatus_CONNECTED                 ConnectionStatus = 1
+       ConnectionStatus_DISCONNECTED              ConnectionStatus = 2
+       ConnectionStatus_CONNECTED_SETUP_FAILED    ConnectionStatus = 3
+       ConnectionStatus_CONNECTING                ConnectionStatus = 4
+       ConnectionStatus_SHUTTING_DOWN             ConnectionStatus = 5
+       ConnectionStatus_SHUT_DOWN                 ConnectionStatus = 6
+)
+
+// Enum value maps for ConnectionStatus.
+var (
+       ConnectionStatus_name = map[int32]string{
+               0: "UNKNOWN_CONNECTION_STATUS",
+               1: "CONNECTED",
+               2: "DISCONNECTED",
+               3: "CONNECTED_SETUP_FAILED",
+               4: "CONNECTING",
+               5: "SHUTTING_DOWN",
+               6: "SHUT_DOWN",
+       }
+       ConnectionStatus_value = map[string]int32{
+               "UNKNOWN_CONNECTION_STATUS": 0,
+               "CONNECTED":                 1,
+               "DISCONNECTED":              2,
+               "CONNECTED_SETUP_FAILED":    3,
+               "CONNECTING":                4,
+               "SHUTTING_DOWN":             5,
+               "SHUT_DOWN":                 6,
+       }
+)
+
+func (x ConnectionStatus) Enum() *ConnectionStatus {
+       p := new(ConnectionStatus)
+       *p = x
+       return p
+}
+
+func (x ConnectionStatus) String() string {
+       return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ConnectionStatus) Descriptor() protoreflect.EnumDescriptor {
+       return file_nb_identity_proto_enumTypes[0].Descriptor()
+}
+
+func (ConnectionStatus) Type() protoreflect.EnumType {
+       return &file_nb_identity_proto_enumTypes[0]
+}
+
+func (x ConnectionStatus) Number() protoreflect.EnumNumber {
+       return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use ConnectionStatus.Descriptor instead.
+func (ConnectionStatus) EnumDescriptor() ([]byte, []int) {
+       return file_nb_identity_proto_rawDescGZIP(), []int{0}
+}
+
+type GlobalNbId struct {
        state         protoimpl.MessageState
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       InventoryName string      `protobuf:"bytes,1,opt,name=inventory_name,json=inventoryName,proto3" json:"inventory_name,omitempty"`
-       GlobalNbId    *GlobalNbId `protobuf:"bytes,2,opt,name=global_nb_id,json=globalNbId,proto3" json:"global_nb_id,omitempty"`
+       PlmnId string `protobuf:"bytes,1,opt,name=plmn_id,json=plmnId,proto3" json:"plmn_id,omitempty"`
+       NbId   string `protobuf:"bytes,2,opt,name=nb_id,json=nbId,proto3" json:"nb_id,omitempty"`
 }
 
-func (x *NbIdentity) Reset() {
-       *x = NbIdentity{}
+func (x *GlobalNbId) Reset() {
+       *x = GlobalNbId{}
        if protoimpl.UnsafeEnabled {
                mi := &file_nb_identity_proto_msgTypes[0]
                ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -63,13 +124,13 @@ func (x *NbIdentity) Reset() {
        }
 }
 
-func (x *NbIdentity) String() string {
+func (x *GlobalNbId) String() string {
        return protoimpl.X.MessageStringOf(x)
 }
 
-func (*NbIdentity) ProtoMessage() {}
+func (*GlobalNbId) ProtoMessage() {}
 
-func (x *NbIdentity) ProtoReflect() protoreflect.Message {
+func (x *GlobalNbId) ProtoReflect() protoreflect.Message {
        mi := &file_nb_identity_proto_msgTypes[0]
        if protoimpl.UnsafeEnabled && x != nil {
                ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -81,36 +142,37 @@ func (x *NbIdentity) ProtoReflect() protoreflect.Message {
        return mi.MessageOf(x)
 }
 
-// Deprecated: Use NbIdentity.ProtoReflect.Descriptor instead.
-func (*NbIdentity) Descriptor() ([]byte, []int) {
+// Deprecated: Use GlobalNbId.ProtoReflect.Descriptor instead.
+func (*GlobalNbId) Descriptor() ([]byte, []int) {
        return file_nb_identity_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *NbIdentity) GetInventoryName() string {
+func (x *GlobalNbId) GetPlmnId() string {
        if x != nil {
-               return x.InventoryName
+               return x.PlmnId
        }
        return ""
 }
 
-func (x *NbIdentity) GetGlobalNbId() *GlobalNbId {
+func (x *GlobalNbId) GetNbId() string {
        if x != nil {
-               return x.GlobalNbId
+               return x.NbId
        }
-       return nil
+       return ""
 }
 
-type GlobalNbId struct {
+type NbIdentity struct {
        state         protoimpl.MessageState
        sizeCache     protoimpl.SizeCache
        unknownFields protoimpl.UnknownFields
 
-       PlmnId string `protobuf:"bytes,1,opt,name=plmn_id,json=plmnId,proto3" json:"plmn_id,omitempty"`
-       NbId   string `protobuf:"bytes,2,opt,name=nb_id,json=nbId,proto3" json:"nb_id,omitempty"`
+       InventoryName    string           `protobuf:"bytes,1,opt,name=inventory_name,json=inventoryName,proto3" json:"inventory_name,omitempty"`
+       GlobalNbId       *GlobalNbId      `protobuf:"bytes,2,opt,name=global_nb_id,json=globalNbId,proto3" json:"global_nb_id,omitempty"`
+       ConnectionStatus ConnectionStatus `protobuf:"varint,3,opt,name=connection_status,json=connectionStatus,proto3,enum=entities.ConnectionStatus" json:"connection_status,omitempty"`
 }
 
-func (x *GlobalNbId) Reset() {
-       *x = GlobalNbId{}
+func (x *NbIdentity) Reset() {
+       *x = NbIdentity{}
        if protoimpl.UnsafeEnabled {
                mi := &file_nb_identity_proto_msgTypes[1]
                ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -118,13 +180,13 @@ func (x *GlobalNbId) Reset() {
        }
 }
 
-func (x *GlobalNbId) String() string {
+func (x *NbIdentity) String() string {
        return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GlobalNbId) ProtoMessage() {}
+func (*NbIdentity) ProtoMessage() {}
 
-func (x *GlobalNbId) ProtoReflect() protoreflect.Message {
+func (x *NbIdentity) ProtoReflect() protoreflect.Message {
        mi := &file_nb_identity_proto_msgTypes[1]
        if protoimpl.UnsafeEnabled && x != nil {
                ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -136,41 +198,63 @@ func (x *GlobalNbId) ProtoReflect() protoreflect.Message {
        return mi.MessageOf(x)
 }
 
-// Deprecated: Use GlobalNbId.ProtoReflect.Descriptor instead.
-func (*GlobalNbId) Descriptor() ([]byte, []int) {
+// Deprecated: Use NbIdentity.ProtoReflect.Descriptor instead.
+func (*NbIdentity) Descriptor() ([]byte, []int) {
        return file_nb_identity_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *GlobalNbId) GetPlmnId() string {
+func (x *NbIdentity) GetInventoryName() string {
        if x != nil {
-               return x.PlmnId
+               return x.InventoryName
        }
        return ""
 }
 
-func (x *GlobalNbId) GetNbId() string {
+func (x *NbIdentity) GetGlobalNbId() *GlobalNbId {
        if x != nil {
-               return x.NbId
+               return x.GlobalNbId
        }
-       return ""
+       return nil
+}
+
+func (x *NbIdentity) GetConnectionStatus() ConnectionStatus {
+       if x != nil {
+               return x.ConnectionStatus
+       }
+       return ConnectionStatus_UNKNOWN_CONNECTION_STATUS
 }
 
 var File_nb_identity_proto protoreflect.FileDescriptor
 
 var file_nb_identity_proto_rawDesc = []byte{
        0x0a, 0x11, 0x6e, 0x62, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72,
-       0x6f, 0x74, 0x6f, 0x12, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x6b, 0x0a,
-       0x0a, 0x4e, 0x62, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x69,
-       0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-       0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x61,
-       0x6d, 0x65, 0x12, 0x36, 0x0a, 0x0c, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x6e, 0x62, 0x5f,
-       0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74,
-       0x69, 0x65, 0x73, 0x2e, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x4e, 0x62, 0x49, 0x64, 0x52, 0x0a,
-       0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x4e, 0x62, 0x49, 0x64, 0x22, 0x3a, 0x0a, 0x0a, 0x47, 0x6c,
-       0x6f, 0x62, 0x61, 0x6c, 0x4e, 0x62, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x6c, 0x6d, 0x6e,
-       0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x6d, 0x6e, 0x49,
-       0x64, 0x12, 0x13, 0x0a, 0x05, 0x6e, 0x62, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-       0x52, 0x04, 0x6e, 0x62, 0x49, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+       0x6f, 0x74, 0x6f, 0x12, 0x08, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x0a,
+       0x0a, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x4e, 0x62, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x70,
+       0x6c, 0x6d, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c,
+       0x6d, 0x6e, 0x49, 0x64, 0x12, 0x13, 0x0a, 0x05, 0x6e, 0x62, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+       0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x62, 0x49, 0x64, 0x22, 0xb4, 0x01, 0x0a, 0x0a, 0x4e, 0x62,
+       0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x76, 0x65,
+       0x6e, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+       0x52, 0x0d, 0x69, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+       0x36, 0x0a, 0x0c, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x6e, 0x62, 0x5f, 0x69, 0x64, 0x18,
+       0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73,
+       0x2e, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x4e, 0x62, 0x49, 0x64, 0x52, 0x0a, 0x67, 0x6c, 0x6f,
+       0x62, 0x61, 0x6c, 0x4e, 0x62, 0x49, 0x64, 0x12, 0x47, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+       0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01,
+       0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x43, 0x6f,
+       0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x10,
+       0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+       0x2a, 0xa0, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53,
+       0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x19, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
+       0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54,
+       0x55, 0x53, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x45,
+       0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x44, 0x49, 0x53, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43,
+       0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54,
+       0x45, 0x44, 0x5f, 0x53, 0x45, 0x54, 0x55, 0x50, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10,
+       0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4e, 0x47, 0x10,
+       0x04, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x48, 0x55, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x44, 0x4f,
+       0x57, 0x4e, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x48, 0x55, 0x54, 0x5f, 0x44, 0x4f, 0x57,
+       0x4e, 0x10, 0x06, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -185,18 +269,21 @@ func file_nb_identity_proto_rawDescGZIP() []byte {
        return file_nb_identity_proto_rawDescData
 }
 
+var file_nb_identity_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_nb_identity_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_nb_identity_proto_goTypes = []interface{}{
-       (*NbIdentity)(nil), // 0: entities.NbIdentity
-       (*GlobalNbId)(nil), // 1: entities.GlobalNbId
+       (ConnectionStatus)(0), // 0: entities.ConnectionStatus
+       (*GlobalNbId)(nil),    // 1: entities.GlobalNbId
+       (*NbIdentity)(nil),    // 2: entities.NbIdentity
 }
 var file_nb_identity_proto_depIdxs = []int32{
        1, // 0: entities.NbIdentity.global_nb_id:type_name -> entities.GlobalNbId
-       1, // [1:1] is the sub-list for method output_type
-       1, // [1:1] is the sub-list for method input_type
-       1, // [1:1] is the sub-list for extension type_name
-       1, // [1:1] is the sub-list for extension extendee
-       0, // [0:1] is the sub-list for field type_name
+       0, // 1: entities.NbIdentity.connection_status:type_name -> entities.ConnectionStatus
+       2, // [2:2] is the sub-list for method output_type
+       2, // [2:2] is the sub-list for method input_type
+       2, // [2:2] is the sub-list for extension type_name
+       2, // [2:2] is the sub-list for extension extendee
+       0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_nb_identity_proto_init() }
@@ -206,7 +293,7 @@ func file_nb_identity_proto_init() {
        }
        if !protoimpl.UnsafeEnabled {
                file_nb_identity_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-                       switch v := v.(*NbIdentity); i {
+                       switch v := v.(*GlobalNbId); i {
                        case 0:
                                return &v.state
                        case 1:
@@ -218,7 +305,7 @@ func file_nb_identity_proto_init() {
                        }
                }
                file_nb_identity_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-                       switch v := v.(*GlobalNbId); i {
+                       switch v := v.(*NbIdentity); i {
                        case 0:
                                return &v.state
                        case 1:
@@ -235,13 +322,14 @@ func file_nb_identity_proto_init() {
                File: protoimpl.DescBuilder{
                        GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
                        RawDescriptor: file_nb_identity_proto_rawDesc,
-                       NumEnums:      0,
+                       NumEnums:      1,
                        NumMessages:   2,
                        NumExtensions: 0,
                        NumServices:   0,
                },
                GoTypes:           file_nb_identity_proto_goTypes,
                DependencyIndexes: file_nb_identity_proto_depIdxs,
+               EnumInfos:         file_nb_identity_proto_enumTypes,
                MessageInfos:      file_nb_identity_proto_msgTypes,
        }.Build()
        File_nb_identity_proto = out.File
index d67cf89..a2692d9 100644 (file)
 syntax = "proto3";
 package entities;
 
-message NbIdentity{
-    string inventory_name = 1;
-    GlobalNbId global_nb_id = 2;
+enum ConnectionStatus {
+  UNKNOWN_CONNECTION_STATUS = 0;
+  CONNECTED = 1;
+  DISCONNECTED = 2;
+  CONNECTED_SETUP_FAILED = 3;
+  CONNECTING = 4;
+  SHUTTING_DOWN = 5;
+  SHUT_DOWN = 6;
 }
 
 message GlobalNbId{
-    string plmn_id = 1;
-    string nb_id = 2;
+  string plmn_id = 1;
+  string nb_id = 2;
 }
+
+message NbIdentity{
+  string inventory_name = 1;
+  GlobalNbId global_nb_id = 2;
+  ConnectionStatus connection_status = 3;
+}
\ No newline at end of file
index 2df5e93..d55b5c2 100644 (file)
@@ -94,67 +94,6 @@ func (E2ApplicationProtocol) EnumDescriptor() ([]byte, []int) {
        return file_nodeb_info_proto_rawDescGZIP(), []int{0}
 }
 
-type ConnectionStatus int32
-
-const (
-       ConnectionStatus_UNKNOWN_CONNECTION_STATUS ConnectionStatus = 0
-       ConnectionStatus_CONNECTED                 ConnectionStatus = 1
-       ConnectionStatus_DISCONNECTED              ConnectionStatus = 2
-       ConnectionStatus_CONNECTED_SETUP_FAILED    ConnectionStatus = 3
-       ConnectionStatus_CONNECTING                ConnectionStatus = 4
-       ConnectionStatus_SHUTTING_DOWN             ConnectionStatus = 5
-       ConnectionStatus_SHUT_DOWN                 ConnectionStatus = 6
-)
-
-// Enum value maps for ConnectionStatus.
-var (
-       ConnectionStatus_name = map[int32]string{
-               0: "UNKNOWN_CONNECTION_STATUS",
-               1: "CONNECTED",
-               2: "DISCONNECTED",
-               3: "CONNECTED_SETUP_FAILED",
-               4: "CONNECTING",
-               5: "SHUTTING_DOWN",
-               6: "SHUT_DOWN",
-       }
-       ConnectionStatus_value = map[string]int32{
-               "UNKNOWN_CONNECTION_STATUS": 0,
-               "CONNECTED":                 1,
-               "DISCONNECTED":              2,
-               "CONNECTED_SETUP_FAILED":    3,
-               "CONNECTING":                4,
-               "SHUTTING_DOWN":             5,
-               "SHUT_DOWN":                 6,
-       }
-)
-
-func (x ConnectionStatus) Enum() *ConnectionStatus {
-       p := new(ConnectionStatus)
-       *p = x
-       return p
-}
-
-func (x ConnectionStatus) String() string {
-       return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ConnectionStatus) Descriptor() protoreflect.EnumDescriptor {
-       return file_nodeb_info_proto_enumTypes[1].Descriptor()
-}
-
-func (ConnectionStatus) Type() protoreflect.EnumType {
-       return &file_nodeb_info_proto_enumTypes[1]
-}
-
-func (x ConnectionStatus) Number() protoreflect.EnumNumber {
-       return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ConnectionStatus.Descriptor instead.
-func (ConnectionStatus) EnumDescriptor() ([]byte, []int) {
-       return file_nodeb_info_proto_rawDescGZIP(), []int{1}
-}
-
 type Node_Type int32
 
 const (
@@ -188,11 +127,11 @@ func (x Node_Type) String() string {
 }
 
 func (Node_Type) Descriptor() protoreflect.EnumDescriptor {
-       return file_nodeb_info_proto_enumTypes[2].Descriptor()
+       return file_nodeb_info_proto_enumTypes[1].Descriptor()
 }
 
 func (Node_Type) Type() protoreflect.EnumType {
-       return &file_nodeb_info_proto_enumTypes[2]
+       return &file_nodeb_info_proto_enumTypes[1]
 }
 
 func (x Node_Type) Number() protoreflect.EnumNumber {
@@ -237,11 +176,11 @@ func (x Failure_Type) String() string {
 }
 
 func (Failure_Type) Descriptor() protoreflect.EnumDescriptor {
-       return file_nodeb_info_proto_enumTypes[3].Descriptor()
+       return file_nodeb_info_proto_enumTypes[2].Descriptor()
 }
 
 func (Failure_Type) Type() protoreflect.EnumType {
-       return &file_nodeb_info_proto_enumTypes[3]
+       return &file_nodeb_info_proto_enumTypes[2]
 }
 
 func (x Failure_Type) Number() protoreflect.EnumNumber {
@@ -552,18 +491,8 @@ var file_nodeb_info_proto_rawDesc = []byte{
        0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x58, 0x32, 0x5f, 0x53,
        0x45, 0x54, 0x55, 0x50, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x19,
        0x0a, 0x15, 0x45, 0x4e, 0x44, 0x43, 0x5f, 0x58, 0x32, 0x5f, 0x53, 0x45, 0x54, 0x55, 0x50, 0x5f,
-       0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x02, 0x2a, 0xa0, 0x01, 0x0a, 0x10, 0x43, 0x6f,
-       0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d,
-       0x0a, 0x19, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43,
-       0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x10, 0x00, 0x12, 0x0d, 0x0a,
-       0x09, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c,
-       0x44, 0x49, 0x53, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1a,
-       0x0a, 0x16, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x45, 0x44, 0x5f, 0x53, 0x45, 0x54, 0x55,
-       0x50, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x43, 0x4f,
-       0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x48,
-       0x55, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x05, 0x12, 0x0d, 0x0a,
-       0x09, 0x53, 0x48, 0x55, 0x54, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x06, 0x62, 0x06, 0x70, 0x72,
-       0x6f, 0x74, 0x6f, 0x33,
+       0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+       0x33,
 }
 
 var (
@@ -578,16 +507,16 @@ func file_nodeb_info_proto_rawDescGZIP() []byte {
        return file_nodeb_info_proto_rawDescData
 }
 
-var file_nodeb_info_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_nodeb_info_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
 var file_nodeb_info_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_nodeb_info_proto_goTypes = []interface{}{
        (E2ApplicationProtocol)(0), // 0: entities.E2ApplicationProtocol
-       (ConnectionStatus)(0),      // 1: entities.ConnectionStatus
-       (Node_Type)(0),             // 2: entities.Node.Type
-       (Failure_Type)(0),          // 3: entities.Failure.Type
-       (*NodebInfo)(nil),          // 4: entities.NodebInfo
-       (*Node)(nil),               // 5: entities.Node
-       (*Failure)(nil),            // 6: entities.Failure
+       (Node_Type)(0),             // 1: entities.Node.Type
+       (Failure_Type)(0),          // 2: entities.Failure.Type
+       (*NodebInfo)(nil),          // 3: entities.NodebInfo
+       (*Node)(nil),               // 4: entities.Node
+       (*Failure)(nil),            // 5: entities.Failure
+       (ConnectionStatus)(0),      // 6: entities.ConnectionStatus
        (*GlobalNbId)(nil),         // 7: entities.GlobalNbId
        (*Enb)(nil),                // 8: entities.Enb
        (*Gnb)(nil),                // 9: entities.Gnb
@@ -595,12 +524,12 @@ var file_nodeb_info_proto_goTypes = []interface{}{
 }
 var file_nodeb_info_proto_depIdxs = []int32{
        0,  // 0: entities.NodebInfo.e2_application_protocol:type_name -> entities.E2ApplicationProtocol
-       1,  // 1: entities.NodebInfo.connection_status:type_name -> entities.ConnectionStatus
+       6,  // 1: entities.NodebInfo.connection_status:type_name -> entities.ConnectionStatus
        7,  // 2: entities.NodebInfo.global_nb_id:type_name -> entities.GlobalNbId
-       2,  // 3: entities.NodebInfo.node_type:type_name -> entities.Node.Type
+       1,  // 3: entities.NodebInfo.node_type:type_name -> entities.Node.Type
        8,  // 4: entities.NodebInfo.enb:type_name -> entities.Enb
        9,  // 5: entities.NodebInfo.gnb:type_name -> entities.Gnb
-       3,  // 6: entities.NodebInfo.failure_type:type_name -> entities.Failure.Type
+       2,  // 6: entities.NodebInfo.failure_type:type_name -> entities.Failure.Type
        10, // 7: entities.NodebInfo.setup_failure:type_name -> entities.SetupFailure
        8,  // [8:8] is the sub-list for method output_type
        8,  // [8:8] is the sub-list for method input_type
@@ -665,7 +594,7 @@ func file_nodeb_info_proto_init() {
                File: protoimpl.DescBuilder{
                        GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
                        RawDescriptor: file_nodeb_info_proto_rawDesc,
-                       NumEnums:      4,
+                       NumEnums:      3,
                        NumMessages:   3,
                        NumExtensions: 0,
                        NumServices:   0,
index 6f5e3e0..46d93ed 100644 (file)
@@ -29,50 +29,41 @@ import "x2_setup_failure_response.proto";
 import "nb_identity.proto";
 
 message NodebInfo {
-    string ran_name = 1;
-    string ip = 2;
-    uint32 port = 3;
-    E2ApplicationProtocol e2_application_protocol = 4;
-    ConnectionStatus connection_status = 5;
-    GlobalNbId global_nb_id = 6;
-    Node.Type node_type = 7;
-    oneof configuration {
-        Enb enb = 8;
-        Gnb gnb = 9;
-    }
-    Failure.Type failure_type = 10;
-    SetupFailure setup_failure = 11;
-    string associated_e2t_instance_address = 12;
+  string ran_name = 1;
+  string ip = 2;
+  uint32 port = 3;
+  E2ApplicationProtocol e2_application_protocol = 4;
+  ConnectionStatus connection_status = 5;
+  GlobalNbId global_nb_id = 6;
+  Node.Type node_type = 7;
+  oneof configuration {
+    Enb enb = 8;
+    Gnb gnb = 9;
+  }
+  Failure.Type failure_type = 10;
+  SetupFailure setup_failure = 11;
+  string associated_e2t_instance_address = 12;
 }
 
 enum E2ApplicationProtocol {
-    UNKNOWN_E2_APPLICATION_PROTOCOL = 0;
-    X2_SETUP_REQUEST = 1;
-    ENDC_X2_SETUP_REQUEST = 2;
+  UNKNOWN_E2_APPLICATION_PROTOCOL = 0;
+  X2_SETUP_REQUEST = 1;
+  ENDC_X2_SETUP_REQUEST = 2;
 }
 
-enum ConnectionStatus {
-    UNKNOWN_CONNECTION_STATUS = 0;
-    CONNECTED = 1;
-    DISCONNECTED = 2;
-    CONNECTED_SETUP_FAILED = 3;
-    CONNECTING = 4;
-    SHUTTING_DOWN = 5;
-    SHUT_DOWN = 6;
-}
 
 message Node {
-    enum Type {
-        UNKNOWN = 0;
-        ENB = 1;
-        GNB = 2;
-    }
+  enum Type {
+    UNKNOWN = 0;
+    ENB = 1;
+    GNB = 2;
+  }
 }
 
 message Failure {
-    enum Type {
-        UNKNOWN_TYPE = 0;
-        X2_SETUP_FAILURE = 1;
-        ENDC_X2_SETUP_FAILURE = 2;
-    }
-}
+  enum Type {
+    UNKNOWN_TYPE = 0;
+    X2_SETUP_FAILURE = 1;
+    ENDC_X2_SETUP_FAILURE = 2;
+  }
+}
\ No newline at end of file
index 08d50ac..9160ac4 100644 (file)
@@ -3,8 +3,8 @@ module gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader
 go 1.12
 
 require (
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.44
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.44
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.45
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.45
        github.com/golang/protobuf v1.4.2
        github.com/google/go-cmp v0.4.1 // indirect
        github.com/pkg/errors v0.8.1