Merge "Automation of nodeb health check"

[ric-plt/e2mgr.git] / E2Manager / managers / ran_list_manager.go

diff --git a/E2Manager/managers/ran_list_manager.go b/E2Manager/managers/ran_list_manager.go
index 030180f..b6dcbcb 100755 (executable)
--- a/E2Manager/managers/ran_list_manager.go
+++ b/E2Manager/managers/ran_list_manager.go
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,10 +21,12 @@
 package managers
 
 import (
+       "e2mgr/e2managererrors"
        "e2mgr/logger"
        "e2mgr/services"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "sync"
+       "time"
 )
 
 type ranListManagerInstance struct {
@@ -39,7 +42,10 @@ type RanListManager interface {
        UpdateNbIdentityConnectionStatus(nodeType entities.Node_Type, ranName string, connectionStatus entities.ConnectionStatus) error
        RemoveNbIdentity(nodeType entities.Node_Type, ranName string) error
        GetNbIdentityList() []*entities.NbIdentity
-       UpdateRanState(nodebInfo *entities.NodebInfo) error // TODO: replace with UpdateNbIdentityConnectionStatus
+       GetNbIdentity(ranName string) (*entities.NbIdentity, error)
+       UpdateHealthcheckTimeStampReceived(oldRRanName string) (*entities.NbIdentity, *entities.NbIdentity)
+       UpdateHealthcheckTimeStampSent(oldRRanName string) (*entities.NbIdentity, *entities.NbIdentity)
+       UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error
 }
 
 func NewRanListManager(logger *logger.Logger, rnibDataService services.RNibDataService) RanListManager {
@@ -50,12 +56,6 @@ func NewRanListManager(logger *logger.Logger, rnibDataService services.RNibDataS
        }
 }
 
-// TODO: replace with UpdateNbIdentityConnectionStatus
-func (m *ranListManagerInstance) UpdateRanState(nodebInfo *entities.NodebInfo) error {
-       m.logger.Infof("#ranListManagerInstance.UpdateRanState - RAN name: %s - Updating state...", nodebInfo.RanName)
-       return nil
-}
-
 func (m *ranListManagerInstance) InitNbIdentityMap() error {
        nbIds, err := m.rnibDataService.GetListNodebIds()
 
@@ -92,7 +92,32 @@ func (m *ranListManagerInstance) AddNbIdentity(nodeType entities.Node_Type, nbId
 }
 
 func (m *ranListManagerInstance) UpdateNbIdentityConnectionStatus(nodeType entities.Node_Type, ranName string, connectionStatus entities.ConnectionStatus) error {
-       //TODO: implement
+       m.mux.Lock()
+       defer m.mux.Unlock()
+
+       m.logger.Infof("#ranListManagerInstance.UpdateNbIdentityConnectionStatus - RAN name: %s - updating nodeb identity connection status", ranName)
+
+       oldNbIdentity, ok := m.nbIdentityMap[ranName]
+       if !ok {
+               m.logger.Errorf("#ranListManagerInstance.UpdateNbIdentityConnectionStatus - RAN name: %s - nodeb identity not found in nbIdentityMap", ranName)
+               return e2managererrors.NewInternalError()
+       }
+
+       newNbIdentity := &entities.NbIdentity{
+               GlobalNbId:       oldNbIdentity.GlobalNbId,
+               InventoryName:    ranName,
+               ConnectionStatus: connectionStatus,
+               HealthCheckTimestampSent: oldNbIdentity.HealthCheckTimestampSent,
+               HealthCheckTimestampReceived: oldNbIdentity.HealthCheckTimestampReceived,
+       }
+       m.nbIdentityMap[ranName] = newNbIdentity
+
+       err := m.rnibDataService.UpdateNbIdentity(nodeType, oldNbIdentity, newNbIdentity)
+       if err != nil {
+               m.logger.Errorf("#ranListManagerInstance.UpdateNbIdentityConnectionStatus - RAN name: %s - Failed updating nodeb identity in DB. error: %s", ranName, err)
+               return err
+       }
+       m.logger.Infof("#ranListManagerInstance.UpdateNbIdentityConnectionStatus - RAN name: %s - Successfully updated nodeb identity", ranName)
        return nil
 }
 
@@ -130,3 +155,62 @@ func (m *ranListManagerInstance) GetNbIdentityList() []*entities.NbIdentity {
 
        return nbIds
 }
+
+func (m *ranListManagerInstance) GetNbIdentity(ranName string) (*entities.NbIdentity, error) {
+       nbIdentity, ok := m.nbIdentityMap[ranName]
+       if !ok {
+               m.logger.Infof("#ranListManagerInstance.GetNbIdentity - RAN name: %s - nodeb identity not found", ranName)
+               return nil , e2managererrors.NewResourceNotFoundError()
+       }
+
+       m.logger.Infof("#ranListManagerInstance.GetNbIdentity - RAN name: %s - nodeb identity returned", ranName)
+
+       return nbIdentity, nil
+}
+
+func (m *ranListManagerInstance) UpdateHealthcheckTimeStampSent(oldRRanName string) (*entities.NbIdentity, *entities.NbIdentity){
+       currentTimeStamp := time.Now().UnixNano()
+       oldNbIdentity := m.nbIdentityMap[oldRRanName]
+
+       newNbIdentity := &entities.NbIdentity{
+               GlobalNbId:       oldNbIdentity.GlobalNbId,
+               InventoryName:    oldNbIdentity.InventoryName,
+               ConnectionStatus: oldNbIdentity.ConnectionStatus,
+               HealthCheckTimestampSent: currentTimeStamp,
+               HealthCheckTimestampReceived: oldNbIdentity.HealthCheckTimestampReceived,
+       }
+
+       m.nbIdentityMap[oldNbIdentity.InventoryName] = newNbIdentity
+       return oldNbIdentity, newNbIdentity
+}
+
+func (m *ranListManagerInstance) UpdateHealthcheckTimeStampReceived(oldRRanName string) (*entities.NbIdentity, *entities.NbIdentity){
+       currentTimeStamp := time.Now().UnixNano()
+       oldNbIdentity := m.nbIdentityMap[oldRRanName]
+
+       newNbIdentity := &entities.NbIdentity{
+               GlobalNbId:       oldNbIdentity.GlobalNbId,
+               InventoryName:    oldNbIdentity.InventoryName,
+               ConnectionStatus: oldNbIdentity.ConnectionStatus,
+               HealthCheckTimestampSent: oldNbIdentity.HealthCheckTimestampSent,
+               HealthCheckTimestampReceived: currentTimeStamp,
+       }
+
+       m.nbIdentityMap[oldNbIdentity.InventoryName] = newNbIdentity
+       return oldNbIdentity, newNbIdentity
+}
+
+func (m *ranListManagerInstance) UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error {
+       m.mux.Lock()
+       defer m.mux.Unlock()
+
+       err := m.rnibDataService.UpdateNbIdentities(nodeType, oldNbIdentities, newNbIdentities)
+
+       if err != nil {
+               m.logger.Errorf("#ranListManagerInstance.UpdateNbIdentities not completed for %d nbIdentities of nodetype - %s", len(newNbIdentities), nodeType.String())
+       } else{
+               m.logger.Infof("#ranListManagerInstance.UpdateNbIdentities completed successfully for %d nbIdentities of nodetype - %s", len(newNbIdentities), nodeType.String())
+       }
+
+       return err
+}