Nodeb-rnib unit tests were failing due to illegal integer to string
conversion, when unit tests were tried to run with Golang 1.6 version.
There has been made some updates to string conversion function in
newer Golang version, because string conversion passes with Golang
1.12. With this commit change problematic string() conversion function
to strconv.FormatInt(), which works both with the Golang 1.12 and also
newer versions.
Update also ca-certificates, because they are out-dated in the Ubuntu
18 Docker builder base image.
Fix ci/build export directory creation in Docker image, it should be
created under root directory, not under /tmp directory.
Bump sdlgo version to v0.8.0.
Issue-Id: RIC-836
Signed-off-by: Timo Tietavainen <timo.tietavainen@nokia.com>
Change-Id: I6e0bad9defd953b286d1e645d543ebf68b4475bf
FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as ubuntu
RUN apt-get update && apt-get -q -y install cmake ksh alien
FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as ubuntu
RUN apt-get update && apt-get -q -y install cmake ksh alien
+
+# Update CA certificates
+RUN apt update && apt install --reinstall -y \
+ ca-certificates \
+ && \
+ update-ca-certificates
+
new_name=${project_name}_$ver
echo $new_names
dpkg-deb --build $target_dir
new_name=${project_name}_$ver
echo $new_names
dpkg-deb --build $target_dir
echo "mv *.deb $new_name.deb"
mv *.deb $new_name.deb
echo "deb package is: $project_name_$ver.deb"
ls -al *.deb
echo "mv *.deb $new_name.deb"
mv *.deb $new_name.deb
echo "deb package is: $project_name_$ver.deb"
ls -al *.deb
-
\ No newline at end of file
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35
- gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.7.0
+ gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.8.0
-replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0
+replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35/go.mod h1:G+4sUBMbLfQ+RrGS65U15tKmbnP+/1b5oLTPmMfyfT4=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35 h1:LcxnUUDwsCzYEISKmkjkyYfg/lnLt8ofkPiGK69vNIA=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35/go.mod h1:2bSaXTpECbZieB8bMnubTqMwF3n+mMBxlTaAXvcduNg=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35/go.mod h1:G+4sUBMbLfQ+RrGS65U15tKmbnP+/1b5oLTPmMfyfT4=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35 h1:LcxnUUDwsCzYEISKmkjkyYfg/lnLt8ofkPiGK69vNIA=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35/go.mod h1:2bSaXTpECbZieB8bMnubTqMwF3n+mMBxlTaAXvcduNg=
-gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0 h1:mxlBo54jxwHHFmGYzFI+fBIkOGwarQP4dx2KBxQ8ln8=
-gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0/go.mod h1:KCHu4JkWnw2Ro6P747wU9S2t7zxFLmBNCiYvGZo3CHo=
+gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0 h1:H7GtCRC+pGn6oOxYalUZr7LinQX5jQCVa+ConX7PB5Q=
+gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0/go.mod h1:KCHu4JkWnw2Ro6P747wU9S2t7zxFLmBNCiYvGZo3CHo=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
require (
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.1
require (
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.1
- gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.7.0
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.4.1 // indirect
github.com/pkg/errors v0.8.1
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.4.1 // indirect
github.com/pkg/errors v0.8.1
replace gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities => ../entities
replace gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities => ../entities
-replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0
+replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
- nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: string(plmnId + i), NbId: string(nbId + i)}}
+ nbIdentity := &entities.NbIdentity{
+ InventoryName: name,
+ GlobalNbId: &entities.GlobalNbId{
+ PlmnId: strconv.FormatInt(int64(plmnId+i), 16),
+ NbId: strconv.FormatInt(int64(nbId+i), 16),
+ },
+ }
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
- nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: string(plmnId + i), NbId: string(nbId + i)}}
+ nbIdentity := &entities.NbIdentity{
+ InventoryName: name,
+ GlobalNbId: &entities.GlobalNbId{
+ PlmnId: strconv.FormatInt(int64(plmnId+i), 16),
+ NbId: strconv.FormatInt(int64(nbId+i), 16),
+ },
+ }
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
- nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: string(plmnId + i), NbId: string(nbId + i)}}
+ nbIdentity := &entities.NbIdentity{
+ InventoryName: name,
+ GlobalNbId: &entities.GlobalNbId{
+ PlmnId: strconv.FormatInt(int64(plmnId+i), 16),
+ NbId: strconv.FormatInt(int64(nbId+i), 16),
+ },
+ }
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
- nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: string(plmnId + i), NbId: string(nbId + i)}}
+ nbIdentity := &entities.NbIdentity{
+ InventoryName: name,
+ GlobalNbId: &entities.GlobalNbId{
+ PlmnId: strconv.FormatInt(int64(plmnId+i), 16),
+ NbId: strconv.FormatInt(int64(nbId+i), 16),
+ },
+ }
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
data, err := proto.Marshal(nbIdentity)
if err != nil {
t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err)