[RICPLT-2585] Update NodebInfo proto | GetE2TInstance | GetE2TInfoList

Change-Id: Ie4123d4fefacbd6075a2f0cc3b86a86a71765591
Signed-off-by: is005q <idan.shalom@intl.att.com>

diff --git a/common/utils.go b/common/utils.go
index baf5d23..e14dcb0 100644 (file)
--- a/common/utils.go
+++ b/common/utils.go
@@ -84,3 +84,12 @@ func ValidateAndBuildRanLoadInformationKey(inventoryName string) (string, error)
 
        return fmt.Sprintf("LOAD:%s", inventoryName), nil
 }
+
+func ValidateAndBuildE2TInstanceKey(address string) (string, error) {
+
+       if address == "" {
+               return "", NewValidationError("#utils.ValidateAndBuildRanLoadInformationKey - an empty inventory name received")
+       }
+
+       return fmt.Sprintf("E2TInstance:%s", address), nil
+}
\ No newline at end of file

diff --git a/entities/e2t_instance.go b/entities/e2t_instance.go
new file mode 100644 (file)
index 0000000..28e5531
--- /dev/null
+++ b/entities/e2t_instance.go
@@ -0,0 +1,18 @@
+package entities
+
+import "time"
+
+type E2TInstance struct {
+       Address string `json:"address"`
+       AssociatedRanList   []string `json:"associatedRanList"`
+       KeepAliveTimestamp int64 `json:"keepAliveTimestamp"`
+       State E2TInstanceState `json:"state"`
+}
+
+func NewE2TInstance(address string) *E2TInstance {
+       return &E2TInstance{
+               Address: address,
+               KeepAliveTimestamp:time.Now().UnixNano(),
+               State: Active,
+       }
+}
\ No newline at end of file

diff --git a/entities/e2t_instance_info.go b/entities/e2t_instance_info.go
new file mode 100644 (file)
index 0000000..c03d8b5
--- /dev/null
+++ b/entities/e2t_instance_info.go
@@ -0,0 +1,12 @@
+package entities
+
+type E2TInstanceInfo struct {
+       Address string `json:"address"`
+       AssociatedRanCount int `json:"associatedRanCount"`
+}
+
+func NewE2TInstanceInfo(address string) *E2TInstanceInfo {
+       return &E2TInstanceInfo{
+               Address: address,
+       }
+}
\ No newline at end of file

diff --git a/entities/e2t_instance_state.go b/entities/e2t_instance_state.go
new file mode 100644 (file)
index 0000000..220a737
--- /dev/null
+++ b/entities/e2t_instance_state.go
@@ -0,0 +1,8 @@
+package entities
+
+type E2TInstanceState string
+
+const (
+       Active      E2TInstanceState = "ACTIVE"
+       ToBeDeleted E2TInstanceState = "TO_BE_DELETED"
+)

diff --git a/entities/go.mod b/entities/go.mod
index b7633da..b0518a7 100644 (file)
--- a/entities/go.mod
+++ b/entities/go.mod
@@ -2,4 +2,4 @@ module gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities
 
 go 1.12
 
-require github.com/golang/protobuf v1.3.1
+require github.com/golang/protobuf v1.3.2

diff --git a/entities/go.sum b/entities/go.sum
index 04e9e7c..92819f0 100644 (file)
--- a/entities/go.sum
+++ b/entities/go.sum
@@ -1,6 +1,8 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

diff --git a/entities/nodeb_info.pb.go b/entities/nodeb_info.pb.go
index 0bf1fa6..0933fb1 100644 (file)
--- a/entities/nodeb_info.pb.go
+++ b/entities/nodeb_info.pb.go
@@ -172,12 +172,13 @@ type NodebInfo struct {
        // Types that are valid to be assigned to Configuration:
        //      *NodebInfo_Enb
        //      *NodebInfo_Gnb
-       Configuration        isNodebInfo_Configuration `protobuf_oneof:"configuration"`
-       FailureType          Failure_Type              `protobuf:"varint,11,opt,name=failure_type,json=failureType,proto3,enum=entities.Failure_Type" json:"failure_type,omitempty"`
-       SetupFailure         *SetupFailure             `protobuf:"bytes,12,opt,name=setup_failure,json=setupFailure,proto3" json:"setup_failure,omitempty"`
-       XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
-       XXX_unrecognized     []byte                    `json:"-"`
-       XXX_sizecache        int32                     `json:"-"`
+       Configuration                isNodebInfo_Configuration `protobuf_oneof:"configuration"`
+       FailureType                  Failure_Type              `protobuf:"varint,11,opt,name=failure_type,json=failureType,proto3,enum=entities.Failure_Type" json:"failure_type,omitempty"`
+       SetupFailure                 *SetupFailure             `protobuf:"bytes,12,opt,name=setup_failure,json=setupFailure,proto3" json:"setup_failure,omitempty"`
+       AssociatedE2TInstanceAddress string                    `protobuf:"bytes,13,opt,name=associated_e2t_instance_address,json=associatedE2tInstanceAddress,proto3" json:"associated_e2t_instance_address,omitempty"`
+       XXX_NoUnkeyedLiteral         struct{}                  `json:"-"`
+       XXX_unrecognized             []byte                    `json:"-"`
+       XXX_sizecache                int32                     `json:"-"`
 }
 
 func (m *NodebInfo) Reset()         { *m = NodebInfo{} }
@@ -312,6 +313,13 @@ func (m *NodebInfo) GetSetupFailure() *SetupFailure {
        return nil
 }
 
+func (m *NodebInfo) GetAssociatedE2TInstanceAddress() string {
+       if m != nil {
+               return m.AssociatedE2TInstanceAddress
+       }
+       return ""
+}
+
 // XXX_OneofWrappers is for the internal use of the proto package.
 func (*NodebInfo) XXX_OneofWrappers() []interface{} {
        return []interface{}{
@@ -395,44 +403,47 @@ func init() {
 func init() { proto.RegisterFile("nodeb_info.proto", fileDescriptor_04b920976079e56c) }
 
 var fileDescriptor_04b920976079e56c = []byte{
-       // 623 bytes of a gzipped FileDescriptorProto
-       0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xef, 0x6e, 0xda, 0x3e,
-       0x14, 0x25, 0x81, 0x16, 0x72, 0x81, 0xfe, 0x5c, 0xf7, 0xcf, 0x2f, 0x45, 0x9a, 0xca, 0x98, 0x26,
-       0xa1, 0x4a, 0x63, 0x53, 0x26, 0x4d, 0x9a, 0xf6, 0x89, 0x42, 0x4a, 0xa3, 0x55, 0x86, 0x25, 0x41,
-       0xdd, 0x3e, 0x59, 0x09, 0x35, 0x28, 0x12, 0x38, 0x51, 0x62, 0xa4, 0xf5, 0x6d, 0xf6, 0x54, 0x7b,
-       0x9e, 0xc9, 0x26, 0x10, 0xc6, 0xfa, 0xed, 0xfa, 0x9c, 0x73, 0xcf, 0xc9, 0xbd, 0x76, 0x00, 0xf1,
-       0xf8, 0x89, 0x85, 0x34, 0xe2, 0xf3, 0xb8, 0x97, 0xa4, 0xb1, 0x88, 0x71, 0x8d, 0x71, 0x11, 0x89,
-       0x88, 0x65, 0x2d, 0x63, 0xc1, 0xc3, 0x0d, 0xd8, 0x32, 0xd8, 0xae, 0xbc, 0xfe, 0x69, 0xd1, 0x8c,
-       0x89, 0x75, 0x42, 0xe7, 0x41, 0xb4, 0x5c, 0xa7, 0x8c, 0xa6, 0x2c, 0x4b, 0x62, 0x9e, 0xb1, 0x5c,
-       0x70, 0xca, 0x43, 0x1a, 0x3d, 0x29, 0x97, 0xe7, 0x0d, 0xd4, 0xf9, 0x5d, 0x01, 0x83, 0xc8, 0x20,
-       0x87, 0xcf, 0x63, 0x7c, 0x05, 0xb5, 0x34, 0xe0, 0x94, 0x07, 0x2b, 0x66, 0x6a, 0x6d, 0xad, 0x6b,
-       0xb8, 0xd5, 0x34, 0xe0, 0x24, 0x58, 0x31, 0x7c, 0x02, 0x7a, 0x94, 0x98, 0xba, 0x02, 0xf5, 0x28,
-       0xc1, 0x18, 0x2a, 0x49, 0x9c, 0x0a, 0xb3, 0xdc, 0xd6, 0xba, 0x4d, 0x57, 0xd5, 0xf8, 0x11, 0xfe,
-       0x67, 0x16, 0x0d, 0x92, 0x64, 0x19, 0xcd, 0x02, 0x11, 0xc5, 0x9c, 0xaa, 0x90, 0x59, 0xbc, 0x34,
-       0x2b, 0x6d, 0xad, 0x7b, 0x62, 0x5d, 0xf7, 0xb6, 0x23, 0xf4, 0x6c, 0xab, 0x5f, 0xe8, 0x26, 0xb9,
-       0xcc, 0xbd, 0x60, 0x2f, 0xc1, 0x78, 0x04, 0xa7, 0xb3, 0x98, 0x73, 0x36, 0x53, 0xa6, 0x99, 0x08,
-       0xc4, 0x3a, 0x33, 0x8f, 0x94, 0x65, 0xab, 0xb0, 0x1c, 0xec, 0x24, 0x9e, 0x52, 0xb8, 0x68, 0x76,
-       0x80, 0xe0, 0xf7, 0x70, 0xb6, 0x67, 0x14, 0x08, 0xc1, 0x56, 0x89, 0xc8, 0xcc, 0x63, 0x35, 0x04,
-       0x2e, 0xa8, 0x7e, 0xce, 0xe0, 0x4f, 0xd0, 0x58, 0x2c, 0xe3, 0x30, 0x58, 0x52, 0xb5, 0x3b, 0xb3,
-       0xda, 0xd6, 0xba, 0x75, 0xeb, 0xbc, 0x08, 0x1d, 0x29, 0x96, 0x84, 0xce, 0x93, 0x0b, 0x8b, 0x5d,
-       0x8d, 0x3f, 0x80, 0x21, 0xef, 0x8f, 0x8a, 0xe7, 0x84, 0x99, 0x35, 0xf5, 0xa5, 0x67, 0x45, 0x93,
-       0xdc, 0x78, 0xcf, 0x7f, 0x4e, 0x98, 0x5b, 0x93, 0x2a, 0x59, 0xe1, 0xd7, 0x50, 0x66, 0x3c, 0x34,
-       0x0d, 0x15, 0xd0, 0xdc, 0x5b, 0x14, 0x0f, 0xef, 0x4b, 0xae, 0xe4, 0xa4, 0x64, 0xc1, 0x43, 0x13,
-       0x0e, 0x25, 0xa3, 0x8d, 0x64, 0xc1, 0x43, 0xfc, 0x19, 0x1a, 0xdb, 0xcb, 0x57, 0xd1, 0x75, 0x15,
-       0x7d, 0x59, 0x68, 0xef, 0x36, 0xec, 0x26, 0xbd, 0x9e, 0x6b, 0xd5, 0x07, 0x7c, 0x81, 0xe6, 0x5f,
-       0xaf, 0xc7, 0x6c, 0xa8, 0x9c, 0xbd, 0x5e, 0x4f, 0xd2, 0xb9, 0x81, 0xdb, 0xc8, 0xf6, 0x4e, 0xb7,
-       0xff, 0x41, 0x73, 0x16, 0xf3, 0x79, 0xb4, 0x58, 0xa7, 0xea, 0xea, 0x3a, 0xef, 0xa0, 0x22, 0xa7,
-       0xec, 0xbc, 0x85, 0x8a, 0x72, 0xaf, 0x43, 0x75, 0x4a, 0xbe, 0x92, 0xf1, 0x23, 0x41, 0x25, 0x5c,
-       0x85, 0xb2, 0x4d, 0x6e, 0x91, 0x26, 0x8b, 0x11, 0xb9, 0x45, 0x7a, 0xc7, 0x87, 0x6a, 0x6e, 0xd5,
-       0x71, 0xf2, 0x0e, 0x04, 0x8d, 0xbc, 0x83, 0xfa, 0x3f, 0x26, 0x36, 0x2a, 0xe1, 0x73, 0x40, 0xdf,
-       0x2d, 0xea, 0xd9, 0xfe, 0x74, 0x42, 0xef, 0xfa, 0xce, 0xc3, 0xd4, 0xb5, 0x91, 0x86, 0xaf, 0xe0,
-       0xc2, 0x26, 0xc3, 0x01, 0xfd, 0x87, 0xd2, 0x6f, 0x56, 0x70, 0xf1, 0xe2, 0x3b, 0xc3, 0x6f, 0xe0,
-       0x7a, 0xeb, 0x6d, 0x5b, 0xb4, 0x3f, 0x99, 0x3c, 0x38, 0x83, 0xbe, 0xef, 0x8c, 0x09, 0x9d, 0xb8,
-       0x63, 0x7f, 0x3c, 0x18, 0x3f, 0x1c, 0xc4, 0xb9, 0xf6, 0xb7, 0xa9, 0xed, 0xf9, 0x2f, 0xc5, 0x6d,
-       0x29, 0xfd, 0xe6, 0x97, 0x06, 0xe8, 0xf0, 0x11, 0xe2, 0x57, 0x70, 0xb5, 0x8d, 0x1a, 0x8c, 0x09,
-       0xb1, 0x07, 0x2a, 0xc6, 0xf3, 0xfb, 0xfe, 0xd4, 0x43, 0x25, 0xdc, 0x04, 0x23, 0x87, 0xed, 0x21,
-       0xd2, 0xe4, 0xd0, 0x43, 0xc7, 0x2b, 0x10, 0x1d, 0xb7, 0xe0, 0x72, 0x77, 0xdc, 0x1b, 0xd0, 0x1e,
-       0xa2, 0x32, 0x3e, 0x01, 0xd8, 0x7a, 0x92, 0x11, 0xaa, 0xe0, 0x53, 0x68, 0x7a, 0xf7, 0x53, 0x5f,
-       0x9e, 0xe8, 0x50, 0xae, 0xfa, 0x48, 0xfa, 0x4b, 0x68, 0x73, 0x3c, 0x0e, 0x8f, 0xd5, 0x1f, 0xf9,
-       0xf1, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x92, 0xa2, 0xb1, 0x67, 0x5e, 0x04, 0x00, 0x00,
+       // 662 bytes of a gzipped FileDescriptorProto
+       0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xef, 0x8b, 0xda, 0x4a,
+       0x14, 0x35, 0xea, 0xae, 0x7a, 0xd5, 0x7d, 0xd9, 0xd9, 0x1f, 0x2f, 0x2b, 0xef, 0xa1, 0xb5, 0x14,
+       0x64, 0xa1, 0xb6, 0xa4, 0x50, 0x28, 0xfd, 0xe4, 0xea, 0xac, 0x1b, 0xba, 0x44, 0x9b, 0x44, 0xb6,
+       0xfd, 0x34, 0x4c, 0xe2, 0x28, 0x01, 0x9d, 0x84, 0x64, 0x84, 0xee, 0x1f, 0x53, 0xe8, 0x9f, 0x5a,
+       0x66, 0x8c, 0xc6, 0xda, 0xfd, 0x76, 0xe7, 0x9c, 0x33, 0xe7, 0xcc, 0xbd, 0xb9, 0x01, 0x9d, 0x47,
+       0x73, 0xe6, 0x93, 0x90, 0x2f, 0xa2, 0x7e, 0x9c, 0x44, 0x22, 0x42, 0x55, 0xc6, 0x45, 0x28, 0x42,
+       0x96, 0xb6, 0x6a, 0x4b, 0xee, 0x6f, 0xc1, 0x56, 0x8d, 0xed, 0xcb, 0xf6, 0x0f, 0x93, 0xa4, 0x4c,
+       0x6c, 0x62, 0xb2, 0xa0, 0xe1, 0x6a, 0x93, 0x30, 0x92, 0xb0, 0x34, 0x8e, 0x78, 0xca, 0x32, 0xc1,
+       0x39, 0xf7, 0x49, 0x38, 0x57, 0x2e, 0xcf, 0x5b, 0xa8, 0xfb, 0xf3, 0x04, 0x6a, 0xb6, 0x0c, 0xb2,
+       0xf8, 0x22, 0x42, 0x37, 0x50, 0x4d, 0x28, 0x27, 0x9c, 0xae, 0x99, 0xa1, 0x75, 0xb4, 0x5e, 0xcd,
+       0xa9, 0x24, 0x94, 0xdb, 0x74, 0xcd, 0xd0, 0x19, 0x14, 0xc3, 0xd8, 0x28, 0x2a, 0xb0, 0x18, 0xc6,
+       0x08, 0x41, 0x39, 0x8e, 0x12, 0x61, 0x94, 0x3a, 0x5a, 0xaf, 0xe9, 0xa8, 0x1a, 0x3d, 0xc1, 0xbf,
+       0xcc, 0x24, 0x34, 0x8e, 0x57, 0x61, 0x40, 0x45, 0x18, 0x71, 0xa2, 0x42, 0x82, 0x68, 0x65, 0x94,
+       0x3b, 0x5a, 0xef, 0xcc, 0x6c, 0xf7, 0x77, 0x2d, 0xf4, 0xb1, 0x39, 0xc8, 0x75, 0xd3, 0x4c, 0xe6,
+       0x5c, 0xb1, 0x97, 0x60, 0x34, 0x86, 0xf3, 0x20, 0xe2, 0x9c, 0x05, 0xca, 0x34, 0x15, 0x54, 0x6c,
+       0x52, 0xe3, 0x44, 0x59, 0xb6, 0x72, 0xcb, 0xe1, 0x5e, 0xe2, 0x2a, 0x85, 0xa3, 0x07, 0x47, 0x08,
+       0x7a, 0x07, 0x17, 0x07, 0x46, 0x54, 0x08, 0xb6, 0x8e, 0x45, 0x6a, 0x9c, 0xaa, 0x26, 0x50, 0x4e,
+       0x0d, 0x32, 0x06, 0x7d, 0x84, 0xc6, 0x72, 0x15, 0xf9, 0x74, 0x45, 0xd4, 0xec, 0x8c, 0x4a, 0x47,
+       0xeb, 0xd5, 0xcd, 0xcb, 0x3c, 0x74, 0xac, 0x58, 0xdb, 0xb7, 0xe6, 0x0e, 0x2c, 0xf7, 0x35, 0x7a,
+       0x0f, 0x35, 0xf9, 0xfd, 0x88, 0x78, 0x8e, 0x99, 0x51, 0x55, 0x2f, 0xbd, 0xc8, 0x2f, 0xc9, 0x89,
+       0xf7, 0xbd, 0xe7, 0x98, 0x39, 0x55, 0xa9, 0x92, 0x15, 0x7a, 0x05, 0x25, 0xc6, 0x7d, 0xa3, 0xa6,
+       0x02, 0x9a, 0x07, 0x83, 0xe2, 0xfe, 0x43, 0xc1, 0x91, 0x9c, 0x94, 0x2c, 0xb9, 0x6f, 0xc0, 0xb1,
+       0x64, 0xbc, 0x95, 0x2c, 0xb9, 0x8f, 0x3e, 0x41, 0x63, 0xf7, 0xf1, 0x55, 0x74, 0x5d, 0x45, 0x5f,
+       0xe7, 0xda, 0xfb, 0x2d, 0xbb, 0x4d, 0xaf, 0x67, 0x5a, 0xf5, 0x80, 0xcf, 0xd0, 0xfc, 0x63, 0x7b,
+       0x8c, 0x86, 0xca, 0x39, 0xb8, 0xeb, 0x4a, 0x3a, 0x33, 0x70, 0x1a, 0xe9, 0xc1, 0x09, 0x61, 0x68,
+       0xd3, 0x34, 0x8d, 0x82, 0x90, 0x0a, 0x36, 0x27, 0xcc, 0x14, 0x24, 0xe4, 0xa9, 0xa0, 0x3c, 0x60,
+       0x84, 0xce, 0xe7, 0x09, 0x4b, 0x53, 0xa3, 0xa9, 0x76, 0xe7, 0xbf, 0x5c, 0x86, 0x4d, 0x61, 0x65,
+       0xa2, 0xc1, 0x56, 0x73, 0xf7, 0x0f, 0x34, 0x83, 0x88, 0x2f, 0xc2, 0xe5, 0x26, 0x51, 0x1b, 0xd0,
+       0x7d, 0x0b, 0x65, 0x39, 0xac, 0xee, 0x1b, 0x28, 0xab, 0x47, 0xd6, 0xa1, 0x32, 0xb3, 0xbf, 0xd8,
+       0x93, 0x27, 0x5b, 0x2f, 0xa0, 0x0a, 0x94, 0xb0, 0x7d, 0xa7, 0x6b, 0xb2, 0x18, 0xdb, 0x77, 0x7a,
+       0xb1, 0xeb, 0x41, 0x25, 0x7b, 0x51, 0xd7, 0xca, 0x6e, 0xe8, 0xd0, 0xc8, 0x6e, 0x10, 0xef, 0xfb,
+       0x14, 0xeb, 0x05, 0x74, 0x09, 0xfa, 0x37, 0x93, 0xb8, 0xd8, 0x9b, 0x4d, 0xc9, 0xfd, 0xc0, 0x7a,
+       0x9c, 0x39, 0x58, 0xd7, 0xd0, 0x0d, 0x5c, 0x61, 0x7b, 0x34, 0x24, 0x7f, 0x51, 0xc5, 0xdb, 0x35,
+       0x5c, 0xbd, 0xb8, 0xae, 0xe8, 0x35, 0xb4, 0x77, 0xde, 0xd8, 0x24, 0x83, 0xe9, 0xf4, 0xd1, 0x1a,
+       0x0e, 0x3c, 0x6b, 0x62, 0x93, 0xa9, 0x33, 0xf1, 0x26, 0xc3, 0xc9, 0xe3, 0x51, 0x9c, 0x83, 0xbf,
+       0xce, 0xb0, 0xeb, 0xbd, 0x14, 0xb7, 0xa3, 0x8a, 0xb7, 0xbf, 0x34, 0xd0, 0x8f, 0x77, 0x19, 0xfd,
+       0x0f, 0x37, 0xbb, 0xa8, 0xe1, 0xc4, 0xb6, 0xf1, 0x50, 0xc5, 0xb8, 0xde, 0xc0, 0x9b, 0xb9, 0x7a,
+       0x01, 0x35, 0xa1, 0x96, 0xc1, 0x78, 0xa4, 0x6b, 0xb2, 0xe9, 0x91, 0xe5, 0xe6, 0x48, 0x11, 0xb5,
+       0xe0, 0x7a, 0x7f, 0x3c, 0x68, 0x10, 0x8f, 0xf4, 0x12, 0x3a, 0x03, 0xd8, 0x79, 0xda, 0x63, 0xbd,
+       0x8c, 0xce, 0xa1, 0xe9, 0x3e, 0xcc, 0x3c, 0x79, 0x22, 0x23, 0x39, 0xea, 0x13, 0xe9, 0x2f, 0xa1,
+       0xed, 0xf1, 0xd4, 0x3f, 0x55, 0x3f, 0xf6, 0x87, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x8a,
+       0x3b, 0x82, 0xa5, 0x04, 0x00, 0x00,
 }

diff --git a/entities/nodeb_info.proto b/entities/nodeb_info.proto
index c8676aa..a6f2ab1 100644 (file)
--- a/entities/nodeb_info.proto
+++ b/entities/nodeb_info.proto
@@ -37,6 +37,7 @@ message NodebInfo {
     }
     Failure.Type failure_type = 11;
     SetupFailure setup_failure = 12;
+    string associated_e2t_instance_address = 13;
 }
 
 enum E2ApplicationProtocol {

diff --git a/reader/go.mod b/reader/go.mod
index 50004a6..7f92eac 100644 (file)
--- a/reader/go.mod
+++ b/reader/go.mod
@@ -3,10 +3,10 @@ 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.23
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.23
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.25
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.25
        gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.5.0
-       github.com/golang/protobuf v1.3.1
+       github.com/golang/protobuf v1.3.2
        github.com/pkg/errors v0.8.1
        github.com/stretchr/testify v1.3.0
 )

diff --git a/reader/go.sum b/reader/go.sum
index ed70528..3df6c8d 100644 (file)
--- a/reader/go.sum
+++ b/reader/go.sum
@@ -15,6 +15,8 @@ github.com/go-redis/redis v6.15.3+incompatible/go.mod h1:W2YCLaZryXHirdd9QqwkiVU
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

diff --git a/reader/rNibReader.go b/reader/rNibReader.go
index 0d1d80f..8abaf81 100644 (file)
--- a/reader/rNibReader.go
+++ b/reader/rNibReader.go
@@ -17,12 +17,15 @@
 package reader
 
 import (
+       "encoding/json"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "github.com/golang/protobuf/proto"
        "reflect"
 )
 
+const E2TInfoListKey = "E2TInfoList"
+
 type rNibReaderInstance struct {
        sdl common.ISdlInstance
 }
@@ -51,6 +54,11 @@ type RNibReader interface {
        GetListNodebIds() ([]*entities.NbIdentity, error)
        // GetRanLoadInformation retrieves nodeb load information entity from redis DB by nodeb inventory name
        GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, error)
+
+       GetE2TInstance(address string) (*entities.E2TInstance, error)
+
+       GetE2TInfoList() ([]*entities.E2TInstanceInfo, error)
+
 }
 
 /*
@@ -187,6 +195,45 @@ func (w *rNibReaderInstance) GetRanLoadInformation(inventoryName string) (*entit
        return loadInfo, err
 }
 
+func (w *rNibReaderInstance) GetE2TInstance(address string) (*entities.E2TInstance, error) {
+       key, rNibErr := common.ValidateAndBuildE2TInstanceKey(address)
+       if rNibErr != nil {
+               return nil, rNibErr
+       }
+       e2tInstance := &entities.E2TInstance{}
+       err := w.getByKeyAndUnmarshalJson(key, e2tInstance)
+       if err != nil {
+               return nil, err
+       }
+       return e2tInstance, err
+}
+
+func (w *rNibReaderInstance) GetE2TInfoList() ([]*entities.E2TInstanceInfo, error) {
+       e2tInfoList := []*entities.E2TInstanceInfo{}
+       err := w.getByKeyAndUnmarshalJson(E2TInfoListKey, &e2tInfoList)
+       if err != nil {
+               return nil, err
+       }
+       return e2tInfoList, err
+}
+
+func (w *rNibReaderInstance) getByKeyAndUnmarshalJson(key string, entity interface{}) error {
+       data, err := w.sdl.Get([]string{key})
+
+       if err != nil {
+               return common.NewInternalError(err)
+       }
+
+       if data != nil && data[key] != nil {
+               err = json.Unmarshal([]byte(data[key].(string)), entity)
+               if err != nil {
+                       return common.NewInternalError(err)
+               }
+               return nil
+       }
+       return common.NewResourceNotFoundErrorf("#rNibReader.getByKeyAndUnmarshalJson - entity of type %s not found. Key: %s", reflect.TypeOf(entity).String(), key)
+}
+
 func (w *rNibReaderInstance) getByKeyAndUnmarshal(key string, entity proto.Message) error {
        data, err := w.sdl.Get([]string{key})
        if err != nil {