"fmt"
"github.com/spf13/viper"
"github.com/valyala/fastjson"
+ "os"
"strings"
"time"
"unsafe"
var sbiClient sbi.SBIClientInterface
var nbiClient *Nbi
var log = xapp.Logger
+var rnib iRnib = xapp.Rnib
func NewNbi(s sbi.SBIClientInterface) *Nbi {
sbiClient = s
if ok := n.SubscribeStatus("o-ran-sc-ric-xapp-desc-v1", "/o-ran-sc-ric-xapp-desc-v1:ric/health"); !ok {
return ok
}
+
+ if ok := n.SubscribeStatus("o-ran-sc-ric-alarm-v1", "/o-ran-sc-ric-alarm-v1:ric/alarms"); !ok {
+ return ok
+ }
+ if ok := n.SubscribeStatus("o-ran-sc-ric-xapp-desc-v1", "/o-ran-sc-ric-xapp-desc-v1:ric/configuration"); !ok {
+ return ok
+ }
+
return true
}
changedModule := C.GoString(module)
changedXpath := C.GoString(xpath)
- log.Info("NBI: Module change callback - event='%d' module=%s xpath=%s reqId=%d", event, changedModule, changedXpath, reqId)
+ log.Info("NBI: change event='%d' module=%s xpath=%s reqId=%d", event, changedModule, changedXpath, reqId)
+ if C.SR_EV_CHANGE != event {
+ log.Info("NBI: Changes finalized!")
+ return C.SR_ERR_OK
+ }
- if C.SR_EV_CHANGE == event {
+ if changedModule == "o-ran-sc-ric-xapp-desc-v1" {
configJson := C.yang_data_sr2json(session, module, event, &nbiClient.oper)
err := nbiClient.ManageXapps(changedModule, C.GoString(configJson), int(nbiClient.oper))
if err != nil {
}
}
- if C.SR_EV_DONE == event {
+ if changedModule == "o-ran-sc-ric-ueec-config-v1" {
configJson := C.get_data_json(session, module)
- err := nbiClient.ManageConfigmaps(changedModule, C.GoString(configJson), int(nbiClient.oper))
+ err := nbiClient.ManageConfigmaps(changedModule, C.GoString(configJson), int(C.SR_OP_MODIFIED))
if err != nil {
return C.SR_ERR_OPERATION_FAILED
}
func (n *Nbi) ManageXapps(module, configJson string, oper int) error {
log.Info("ManageXapps: module=%s configJson=%s", module, configJson)
- if configJson == "" || module != "o-ran-sc-ric-xapp-desc-v1" {
+ if configJson == "" {
return nil
}
func (n *Nbi) ManageConfigmaps(module, configJson string, oper int) error {
log.Info("ManageConfig: module=%s configJson=%s", module, configJson)
- if configJson == "" || module != "o-ran-sc-ric-ueec-config-v1" {
+ if configJson == "" {
return nil
}
value, err := n.ParseJson(configJson)
if err != nil {
+ log.Info("ParseJson failed with error: %v", oper)
return err
}
root := fmt.Sprintf("%s:ric", module)
appName := string(value.GetStringBytes(root, "config", "name"))
namespace := string(value.GetStringBytes(root, "config", "namespace"))
- control := value.Get(root, "config", "control").String()
+ controlVal := value.Get(root, "config", "control")
+ if controlVal == nil {
+ return nil
+ }
+ control := controlVal.String()
var f interface{}
err = json.Unmarshal([]byte(strings.ReplaceAll(control, "\\", "")), &f)
}
//export nbiGnbStateCB
-func nbiGnbStateCB(session *C.sr_session_ctx_t, module *C.char, xpath *C.char, req_xpath *C.char, reqid C.uint32_t, parent **C.char) C.int {
- log.Info("NBI: Module state data for module='%s' path='%s' rpath='%s' requested [id=%d]", C.GoString(module), C.GoString(xpath), C.GoString(req_xpath), reqid)
+func nbiGnbStateCB(session *C.sr_session_ctx_t, module *C.char, xpath *C.char, rpath *C.char, reqid C.uint32_t, parent **C.char) C.int {
+ mod := C.GoString(module)
+ log.Info("nbiGnbStateCB: module='%s' xpath='%s' rpath='%s' [id=%d]", mod, C.GoString(xpath), C.GoString(rpath), reqid)
+
+ if mod == "o-ran-sc-ric-xapp-desc-v1" {
+
+ if C.GoString(xpath) == "/o-ran-sc-ric-xapp-desc-v1:ric/configuration" {
+ nbGetAllXappsDefCfg(session, parent)
+ return C.SR_ERR_OK
+ }
- if C.GoString(module) == "o-ran-sc-ric-xapp-desc-v1" {
- log.Info("xApp health query not implemtented yet!")
+ xappnamespace := os.Getenv("XAPP_NAMESPACE")
+ if xappnamespace == "" {
+ xappnamespace = "ricxapp"
+ }
+ podList, _ := sbiClient.GetAllPodStatus(xappnamespace)
+
+ for _, pod := range podList {
+ path := fmt.Sprintf("/o-ran-sc-ric-xapp-desc-v1:ric/health/status[name='%s']", pod.Name)
+ nbiClient.CreateNewElement(session, parent, path, "name", path)
+ nbiClient.CreateNewElement(session, parent, path, "health", pod.Health)
+ nbiClient.CreateNewElement(session, parent, path, "status", pod.Status)
+ }
return C.SR_ERR_OK
}
- gnbs, err := xapp.Rnib.GetListGnbIds()
- if err != nil || len(gnbs) == 0 {
- log.Info("Rnib.GetListGnbIds() returned elementCount=%d err:%v", len(gnbs), err)
+ if mod == "o-ran-sc-ric-alarm-v1" {
+ if alerts, _ := sbiClient.GetAlerts(); alerts != nil {
+ for _, alert := range alerts.Payload {
+ id := alert.Annotations["alarm_id"]
+ path := fmt.Sprintf("/o-ran-sc-ric-alarm-v1:ric/alarms/alarm[alarm-id='%s']", id)
+ nbiClient.CreateNewElement(session, parent, path, "alarm-id", id)
+ nbiClient.CreateNewElement(session, parent, path, "fault-text", alert.Alert.Labels["alertname"])
+ nbiClient.CreateNewElement(session, parent, path, "severity", alert.Alert.Labels["severity"])
+ nbiClient.CreateNewElement(session, parent, path, "status", alert.Alert.Labels["status"])
+ nbiClient.CreateNewElement(session, parent, path, "additional-info", alert.Annotations["additional_info"])
+ }
+ }
return C.SR_ERR_OK
}
- for _, gnb := range gnbs {
- ranName := gnb.GetInventoryName()
- info, err := xapp.Rnib.GetNodeb(ranName)
- if err != nil {
- log.Error("GetNodeb() failed for ranName=%s: %v", ranName, err)
- continue
+ gnbs, err := rnib.GetListGnbIds()
+ log.Info("Rnib.GetListGnbIds() returned elementCount=%d err:%v", len(gnbs), err)
+ if err == nil && len(gnbs) > 0 {
+ for _, gnb := range gnbs {
+ ranName := gnb.GetInventoryName()
+ info, err := rnib.GetNodeb(ranName)
+ if err != nil {
+ log.Error("GetNodeb() failed for ranName=%s: %v", ranName, err)
+ continue
+ }
+
+ prot := nbiClient.E2APProt2Str(int(info.E2ApplicationProtocol))
+ connStat := nbiClient.ConnStatus2Str(int(info.ConnectionStatus))
+ ntype := nbiClient.NodeType2Str(int(info.NodeType))
+
+ log.Info("gNB info: %s -> %s %s %s -> %s %s", ranName, prot, connStat, ntype, gnb.GetGlobalNbId().GetPlmnId(), gnb.GetGlobalNbId().GetNbId())
+
+ path := fmt.Sprintf("/o-ran-sc-ric-gnb-status-v1:ric/nodes/node[ran-name='%s']", ranName)
+ nbiClient.CreateNewElement(session, parent, path, "ran-name", ranName)
+ nbiClient.CreateNewElement(session, parent, path, "ip", info.Ip)
+ nbiClient.CreateNewElement(session, parent, path, "port", fmt.Sprintf("%d", info.Port))
+ nbiClient.CreateNewElement(session, parent, path, "plmn-id", gnb.GetGlobalNbId().GetPlmnId())
+ nbiClient.CreateNewElement(session, parent, path, "nb-id", gnb.GetGlobalNbId().GetNbId())
+ nbiClient.CreateNewElement(session, parent, path, "e2ap-protocol", prot)
+ nbiClient.CreateNewElement(session, parent, path, "connection-status", connStat)
+ nbiClient.CreateNewElement(session, parent, path, "node", ntype)
}
+ }
- prot := nbiClient.E2APProt2Str(int(info.E2ApplicationProtocol))
- connStat := nbiClient.ConnStatus2Str(int(info.ConnectionStatus))
- ntype := nbiClient.NodeType2Str(int(info.NodeType))
-
- log.Info("gNB info: %s -> %s %s %s -> %s %s", ranName, prot, connStat, ntype, gnb.GetGlobalNbId().GetPlmnId(), gnb.GetGlobalNbId().GetNbId())
-
- nbiClient.CreateNewElement(session, parent, ranName, "ran-name", ranName)
- nbiClient.CreateNewElement(session, parent, ranName, "ip", info.Ip)
- nbiClient.CreateNewElement(session, parent, ranName, "port", fmt.Sprintf("%d", info.Port))
- nbiClient.CreateNewElement(session, parent, ranName, "plmn-id", gnb.GetGlobalNbId().GetPlmnId())
- nbiClient.CreateNewElement(session, parent, ranName, "nb-id", gnb.GetGlobalNbId().GetNbId())
- nbiClient.CreateNewElement(session, parent, ranName, "e2ap-protocol", prot)
- nbiClient.CreateNewElement(session, parent, ranName, "connection-status", connStat)
- nbiClient.CreateNewElement(session, parent, ranName, "node", ntype)
+ //Check if any Enbs are connected to RIC
+ enbs, err2 := rnib.GetListEnbIds()
+ log.Info("Rnib.GetListEnbIds() returned elementCount=%d err:%v", len(gnbs), err)
+ if err2 == nil || len(enbs) > 0 {
+ log.Info("Getting Enb details from list of Enbs")
+ for _, enb := range enbs {
+ ranName := enb.GetInventoryName()
+ info, err := rnib.GetNodeb(ranName)
+ if err != nil {
+ log.Error("GetNodeb() failed for ranName=%s: %v", ranName, err)
+ continue
+ }
+
+ prot := nbiClient.E2APProt2Str(int(info.E2ApplicationProtocol))
+ connStat := nbiClient.ConnStatus2Str(int(info.ConnectionStatus))
+ ntype := nbiClient.NodeType2Str(int(info.NodeType))
+
+ log.Info("eNB info: %s -> %s %s %s -> %s %s", ranName, prot, connStat, ntype, enb.GetGlobalNbId().GetPlmnId(), enb.GetGlobalNbId().GetNbId())
+
+ path := fmt.Sprintf("/o-ran-sc-ric-gnb-status-v1:ric/nodes/node[ran-name='%s']", ranName)
+ nbiClient.CreateNewElement(session, parent, path, "ran-name", ranName)
+ nbiClient.CreateNewElement(session, parent, path, "ip", info.Ip)
+ nbiClient.CreateNewElement(session, parent, path, "port", fmt.Sprintf("%d", info.Port))
+ nbiClient.CreateNewElement(session, parent, path, "plmn-id", enb.GetGlobalNbId().GetPlmnId())
+ nbiClient.CreateNewElement(session, parent, path, "nb-id", enb.GetGlobalNbId().GetNbId())
+ nbiClient.CreateNewElement(session, parent, path, "e2ap-protocol", prot)
+ nbiClient.CreateNewElement(session, parent, path, "connection-status", connStat)
+ nbiClient.CreateNewElement(session, parent, path, "node", ntype)
+ }
}
+
return C.SR_ERR_OK
}
func (n *Nbi) CreateNewElement(session *C.sr_session_ctx_t, parent **C.char, key, name, value string) {
- basePath := fmt.Sprintf("/o-ran-sc-ric-gnb-status-v1:ric/nodes/node[ran-name='%s']/%s", key, name)
+ basePath := fmt.Sprintf("%s/%s", key, name)
log.Info("%s -> %s", basePath, value)
cPath := C.CString(basePath)
}
return "not-specified"
}
+
+func (n *Nbi) testModuleChangeCB(module string) bool {
+ var event C.sr_event_t = C.SR_EV_CHANGE
+ reqID := C.int(100)
+ modName := C.CString(module)
+ defer C.free(unsafe.Pointer(modName))
+
+ if ret := nbiModuleChangeCB(n.session, modName, nil, event, reqID); ret != C.SR_ERR_OK {
+ return false
+ }
+ return true
+}
+
+func (n *Nbi) testModuleChangeCBDone(module string) bool {
+ var event C.sr_event_t = C.SR_EV_DONE
+ reqID := C.int(100)
+ modName := C.CString(module)
+ defer C.free(unsafe.Pointer(modName))
+
+ if ret := nbiModuleChangeCB(n.session, modName, nil, event, reqID); ret != C.SR_ERR_OK {
+ return false
+ }
+ return true
+}
+
+func (n *Nbi) testGnbStateCB(module string) bool {
+ modName := C.CString(module)
+ defer C.free(unsafe.Pointer(modName))
+ reqID := C.uint32_t(100)
+ parent := make([]*C.char, 1)
+
+ if ret := nbiGnbStateCB(n.session, modName, nil, nil, reqID, &parent[0]); ret != C.SR_ERR_OK {
+ return false
+ }
+ return true
+}
+
+func nbGetAllXappsDefCfg(session *C.sr_session_ctx_t, parent **C.char) {
+ var xappNameList []string
+ var xappCfgList []string
+
+ //Get the default config of all deployed xapps from appgmr using rest api
+ xappNameList, xappCfgList = sbiClient.GetAllDeployedXappsConfig()
+ if xappCfgList == nil || len(xappCfgList) == 0 {
+ log.Error("GetAllDeployedXappsConfig() Failure")
+ return
+ }
+ log.Info("GetAllDeployedXappsConfig Success, recvd xapp config")
+
+ //Loop thru the list of recvd xapps for config
+ for i, xappCfg := range xappCfgList {
+ path := fmt.Sprintf("/o-ran-sc-ric-xapp-desc-v1:ric/configuration/xapps/xapp[name='%s']", xappNameList[i])
+ nbiClient.CreateNewElement(session, parent, path, "name", xappNameList[i])
+ nbiClient.CreateNewElement(session, parent, path, "config", xappCfg)
+ }
+}
+
+type iRnib interface {
+ GetListGnbIds() ([]*xapp.RNIBNbIdentity, xapp.RNIBIRNibError)
+ GetListEnbIds() ([]*xapp.RNIBNbIdentity, xapp.RNIBIRNibError)
+ GetNodeb(invName string) (*xapp.RNIBNodebInfo, xapp.RNIBIRNibError)
+}
Code Review / ric-plt / o1.git / blobdiff