X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=creader%2FrNibReader_c.go;h=74521d7271fd1b2d6a31b538b3437bd8c432150c;hb=6f0febff2d177ef6da0de23f785f81aec0603d96;hp=3ab4d4947d00d112807b32a07e9f7ff23faaeb42;hpb=c2678e2ca97b17dc7ade57f9fa6f7ceb1ce25ed8;p=ric-plt%2Fnodeb-rnib.git diff --git a/creader/rNibReader_c.go b/creader/rNibReader_c.go index 3ab4d49..74521d7 100644 --- a/creader/rNibReader_c.go +++ b/creader/rNibReader_c.go @@ -1,8 +1,28 @@ +// +// Copyright 2019 AT&T Intellectual Property +// Copyright 2019 Nokia +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// 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. + +// This source code is part of the near-RT RIC (RAN Intelligent Controller) +// platform project (RICP). + package main import ( "encoding/json" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common" + "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader" "gerrit.o-ran-sc.org/r/ric-plt/sdlgo" "unsafe" @@ -15,27 +35,25 @@ var sdl common.ISdlInstance var instance reader.RNibReader type response struct { - GnbList []string `json:"gnb_list"` - ErrorMsg string `json:"error_msg,omitempty"` + GnbList []*entities.NbIdentity `json:"gnb_list"` + ErrorMsg string `json:"error_msg,omitempty"` } -//export open -func open() { +//export openSdl +func openSdl() { sdl = sdlgo.NewSdlInstance("e2Manager", sdlgo.NewDatabase()) instance = reader.GetRNibReader(sdl) } -//export close -func close() { +//export closeSdl +func closeSdl() { _ = sdl.Close() } //export getListGnbIds func getListGnbIds() unsafe.Pointer { listGnbIds, err := instance.GetListGnbIds() - res := &response{ - GnbList: []string{}, - } + res := &response{} if err != nil { res.ErrorMsg = err.Error() @@ -43,8 +61,8 @@ func getListGnbIds() unsafe.Pointer { return createCBytesResponse(res) } - for _, value := range listGnbIds { - res.GnbList = append(res.GnbList, value.InventoryName) + if listGnbIds != nil { + res.GnbList = listGnbIds } return createCBytesResponse(res) @@ -59,6 +77,4 @@ func createCBytesResponse(res *response) unsafe.Pointer { return C.CBytes(byteResponse) } -func main() { - -} +func main() {}