X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fran_list_manager.go;h=b6dcbcbbf4ec7fa4dbc3fbfdc6a893ac66f9357d;hb=HEAD;hp=8ffa4113f1968fa246a24cdfc9ad7de79c3c3339;hpb=f52319be7df4b8cce5f9aef8c51e35add3003987;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/ran_list_manager.go b/E2Manager/managers/ran_list_manager.go old mode 100755 new mode 100644 index 8ffa411..b6dcbcb --- 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. @@ -41,6 +42,7 @@ 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 + 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 @@ -154,6 +156,18 @@ 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] @@ -190,7 +204,13 @@ func (m *ranListManagerInstance) UpdateNbIdentities(nodeType entities.Node_Type, m.mux.Lock() defer m.mux.Unlock() - err:= m.rnibDataService.UpdateNbIdentities(nodeType, oldNbIdentities, newNbIdentities) + 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 }