RICPLT-2707 - Create RNIB reader in C

Change-Id: Ib7ec614a1e019a7d2a1ab09c22173490d4708823
Signed-off-by: Irina <ib565x@intl.att.com>

diff --git a/creader/go.mod b/creader/go.mod
index 3dc4425..542bbda 100644 (file)
--- a/creader/go.mod
+++ b/creader/go.mod
@@ -3,9 +3,9 @@ module gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/creader
 go 1.12
 
 require (
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.28
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.28
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.28
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.29
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.29
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.29
        gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.5.0
        github.com/golang/protobuf v1.3.2
        github.com/pkg/errors v0.8.1

diff --git a/creader/go.sum b/creader/go.sum
index f99bda5..6652c5f 100644 (file)
--- a/creader/go.sum
+++ b/creader/go.sum
@@ -2,10 +2,14 @@ gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.27 h1:frasTDcg8Q8FgYutz
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.27/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.28 h1:Rewapfbc30ZkBaYB/3gW3W1BEivoiPdQm5UnmUswcMA=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.28/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.29 h1:T0ydbEy2pmP2n8A/eyx5iF5PNm0XYa3A5G5HmXsN0Wo=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.29/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.27 h1:nvZDzuB/SYKDuF1It7M4/Y/iVlVrCZ0Ob8AITAyppKo=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.27/go.mod h1:Fh23KkroYw5CRBh39WzZzxpKSkpQWL3scdzGnMngLo8=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.28 h1:+8Nn+Jn/AvhwBI1LtLsNS1PtOGAOYUHdicOrMn/8mmU=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.28/go.mod h1:Fh23KkroYw5CRBh39WzZzxpKSkpQWL3scdzGnMngLo8=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.29 h1:H/6CeGFUwS4S1DJ2OVwjt/qKmm/VTdgcgHcxBJfrQt4=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.29/go.mod h1:Fh23KkroYw5CRBh39WzZzxpKSkpQWL3scdzGnMngLo8=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.23 h1:TYV3HE2UNwGOWiA4C226/WhB94crwjuHKIFTgDDvo8I=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.23/go.mod h1:uZVjwZjfWV4JJzyQVO/O48Ykph57zfpfMB7nK+WGKX8=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.24 h1:Wwp36IoHwp091lXVCYLtFK6AMhoGAR4NYEgW1C42h6k=
@@ -14,6 +18,8 @@ gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.27 h1:sWjlU/wBiWIBeSixn
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.27/go.mod h1:vZ/335+rRSQW82wcbc80fNNICSK3TiCqIxmkqeC2Pfo=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.28 h1:AaYvK59fxDXQUV9NCo6WuxDOvBQbnRU3WTPyJaYhkkg=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.28/go.mod h1:vZ/335+rRSQW82wcbc80fNNICSK3TiCqIxmkqeC2Pfo=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.29 h1:eke+zU8y2gQmEBxAQryBXwBWwvXSHeu+pC11t8luQBQ=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.29/go.mod h1:EPOJ7YGXDS5F+IK1pa9cv2JYlj73PYOXVvgolhhCSfM=
 gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.0 h1:+P3XuWKSaMbzh5PNtrW9gkZlCN0hKrZq+Cn8JetwBys=
 gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.0/go.mod h1:y2WhrCvdLkAKdH+ySdHSOSehACJkTMyZghCGVcqoZzc=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=

diff --git a/creader/rNibReader_c.go b/creader/rNibReader_c.go
index 9ac32ff..3ab4d49 100644 (file)
--- a/creader/rNibReader_c.go
+++ b/creader/rNibReader_c.go
@@ -15,7 +15,8 @@ var sdl common.ISdlInstance
 var instance reader.RNibReader
 
 type response struct {
-       GnbList []string        `json:"gnb_list"`
+       GnbList  []string `json:"gnb_list"`
+       ErrorMsg string   `json:"error_msg,omitempty"`
 }
 
 //export open
@@ -32,18 +33,24 @@ func close() {
 //export getListGnbIds
 func getListGnbIds() unsafe.Pointer {
        listGnbIds, err := instance.GetListGnbIds()
-       if err != nil || listGnbIds == nil{
-               return nil
+       res := &response{
+               GnbList: []string{},
        }
 
-       var gnbList []string
-       for _, value := range listGnbIds {
-               gnbList = append(gnbList, value.InventoryName)
+       if err != nil {
+               res.ErrorMsg = err.Error()
+
+               return createCBytesResponse(res)
        }
-       res := &response{
-               GnbList:gnbList,
+
+       for _, value := range listGnbIds {
+               res.GnbList = append(res.GnbList, value.InventoryName)
        }
 
+       return createCBytesResponse(res)
+}
+
+func createCBytesResponse(res *response) unsafe.Pointer {
        byteResponse, err := json.Marshal(res)
        if err != nil {
                return nil
@@ -52,7 +59,6 @@ func getListGnbIds() unsafe.Pointer {
        return C.CBytes(byteResponse)
 }
 
-
-
 func main() {
-}
\ No newline at end of file
+
+}