X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2if_state.go;h=5f7eb353360fdab9b050f2b047ed3c6054644948;hb=refs%2Fchanges%2F62%2F10962%2F5;hp=876dfc4f67b90bdad30a18de8726b0ac6295c6eb;hpb=92c3855b5c2d86a54f1342498a2772a605073e06;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/e2if_state.go b/pkg/control/e2if_state.go
index 876dfc4..5f7eb35 100644
--- a/pkg/control/e2if_state.go
+++ b/pkg/control/e2if_state.go
@@ -22,9 +22,10 @@ package control
 import (
 	"encoding/json"
 	"fmt"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"strings"
 	"sync"
+
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 )
 
 type XappRnibIf struct {
@@ -57,7 +58,10 @@ func (e *E2IfState) Init(c *Control) {
 	e.control = c
 	e.NbIdMap = make(map[string]string, 0)
 	e.ReadE2ConfigurationFromRnib()
-	e.SubscribeChannels()
+	err := e.SubscribeChannels()
+	if err != nil {
+		xapp.Logger.Error("Init(): SubscribeChannels() failed: %v", err)
+	}
 }
 
 func (e *E2IfState) GetE2NodesJson() []byte {
@@ -114,6 +118,18 @@ func (e *E2IfState) NotificationCb(ch string, events ...string) {
 			delete(e.NbIdMap, nbId)
 			e.control.registry.DeleteAllE2Subscriptions(nbId, e.control)
 		}
+	} else if strings.Contains(events[0], "_UNDER_RESET") {
+		xapp.Logger.Debug("NotificationCb UNDER_RESET len(nbId) == 0 ")
+		e.control.UpdateCounter(cE2StateUnderReset)
+		nbId, err := ExtractNbiIdFromString(events[0])
+		if err != nil {
+			xapp.Logger.Error("NotificationCb _UNDER_RESET %v ", err)
+			return
+		}
+		xapp.Logger.Debug("E2 Under Reset. NbId=%s", nbId)
+		if _, ok := e.NbIdMap[nbId]; ok {
+			e.control.registry.DeleteAllE2Subscriptions(nbId, e.control)
+		}
 	}
 }
 
@@ -194,6 +210,9 @@ func ExtractNbiIdFromString(s string) (string, error) {
 	} else if strings.Contains(s, "_DISCONNECTED") {
 		splitStringTbl := strings.Split(s, "_DISCONNECTED")
 		nbId = splitStringTbl[0]
+	} else if strings.Contains(s, "_UNDER_RESET") {
+		splitStringTbl := strings.Split(s, "_UNDER_RESET")
+		nbId = splitStringTbl[0]
 	}
 	if len(nbId) == 0 {
 		return "", fmt.Errorf("ExtractNbiIdFromString(): len(nbId) == 0 ")