[RIC-287] Added HealthCheckTimestampSent and HealthCheckTimestampReceived to nbIdenti...

Change-Id: I6225dba06870dc1195c1c2911802aad1792abc3b
Signed-off-by: Rahul Banerji <r.banerji@samsung.com>

diff --git a/ci/Dockerfile b/ci/Dockerfile
index d7cfbab..01bad27 100755 (executable)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -13,8 +13,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-     
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as ubuntu
+
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as ubuntu
 RUN apt-get update && apt-get -q -y install cmake ksh alien
 ADD . /tmp
 WORKDIR /tmp

diff --git a/entities/nb_identity.pb.go b/entities/nb_identity.pb.go
index eac6137..49d7737 100644 (file)
--- a/entities/nb_identity.pb.go
+++ b/entities/nb_identity.pb.go
@@ -166,9 +166,11 @@ type NbIdentity struct {
        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"`
-       ConnectionStatus ConnectionStatus `protobuf:"varint,3,opt,name=connection_status,json=connectionStatus,proto3,enum=entities.ConnectionStatus" json:"connection_status,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"`
+       HealthCheckTimestampSent     int64            `protobuf:"varint,4,opt,name=health_check_timestamp_sent,json=healthCheckTimestampSent,proto3" json:"health_check_timestamp_sent,omitempty"`
+       HealthCheckTimestampReceived int64            `protobuf:"varint,5,opt,name=health_check_timestamp_received,json=healthCheckTimestampReceived,proto3" json:"health_check_timestamp_received,omitempty"`
 }
 
 func (x *NbIdentity) Reset() {
@@ -224,6 +226,20 @@ func (x *NbIdentity) GetConnectionStatus() ConnectionStatus {
        return ConnectionStatus_UNKNOWN_CONNECTION_STATUS
 }
 
+func (x *NbIdentity) GetHealthCheckTimestampSent() int64 {
+       if x != nil {
+               return x.HealthCheckTimestampSent
+       }
+       return 0
+}
+
+func (x *NbIdentity) GetHealthCheckTimestampReceived() int64 {
+       if x != nil {
+               return x.HealthCheckTimestampReceived
+       }
+       return 0
+}
+
 var File_nb_identity_proto protoreflect.FileDescriptor
 
 var file_nb_identity_proto_rawDesc = []byte{
@@ -232,7 +248,7 @@ var file_nb_identity_proto_rawDesc = []byte{
        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,
+       0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x62, 0x49, 0x64, 0x22, 0xba, 0x02, 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,
@@ -244,17 +260,26 @@ var file_nb_identity_proto_rawDesc = []byte{
        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,
+       0x12, 0x3d, 0x0a, 0x1b, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b,
+       0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x73, 0x65, 0x6e, 0x74, 0x18,
+       0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65,
+       0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x53, 0x65, 0x6e, 0x74, 0x12,
+       0x45, 0x0a, 0x1f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f,
+       0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
+       0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
+       0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x65,
+       0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 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 (

diff --git a/entities/nb_identity.proto b/entities/nb_identity.proto
index a2692d9..3d70538 100644 (file)
--- a/entities/nb_identity.proto
+++ b/entities/nb_identity.proto
@@ -43,4 +43,6 @@ message NbIdentity{
   string inventory_name = 1;
   GlobalNbId global_nb_id = 2;
   ConnectionStatus connection_status = 3;
-}
\ No newline at end of file
+  int64 health_check_timestamp_sent = 4;
+  int64 health_check_timestamp_received = 5;
+}

diff --git a/reader/go.mod b/reader/go.mod
index 6fe1a87..48baa7e 100644 (file)
--- a/reader/go.mod
+++ b/reader/go.mod
@@ -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.47
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.47
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.48
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.48
        github.com/golang/protobuf v1.4.2
        github.com/google/go-cmp v0.4.1 // indirect
        github.com/pkg/errors v0.8.1