Increased http client timeout

Change-Id: I4011b7b12f31ca08d1d781de2878eb59e458571a
Signed-off-by: wahidw <abdulwahid.w@nokia.com>

diff --git a/Dockerfile b/Dockerfile
index f8fd194..d8f55e8 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,10 +23,10 @@
 # a Docker tag from the string in file container-tag.yaml
 
 #FROM golang:1.12.1 as rtmgrbuild
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:5-u18.04-nng as rtmgrbuild
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:6-u18.04-nng as rtmgrbuild
 
 # Install RMr shared library
-ARG RMRVERSION=3.6.5
+ARG RMRVERSION=3.8.0
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb

diff --git a/RELNOTES b/RELNOTES
index b1e1090..f05542b 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.5.7-1
+* Increased http client timeout to 15sec 
+
 ### v0.5.7
 * Commented subscription list retrieval during rtmgr startUp 
 

diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index c81f9f6..6b886d5 100755 (executable)
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -20,7 +20,7 @@ set -eux
 
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
-RMRVERSION=3.6.5
+RMRVERSION=3.8.0
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 

diff --git a/container-tag.yaml b/container-tag.yaml
index 599041f..b8bbac7 100644 (file)
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -2,4 +2,4 @@
 # By default this file is in the docker build directory,
 # but the location can configured in the JJB template.
 ---
-tag: 0.5.7
+tag: 0.5.7-1

diff --git a/pkg/nbi/httpgetter.go b/pkg/nbi/httpgetter.go
index be2577c..fca8367 100644 (file)
--- a/pkg/nbi/httpgetter.go
+++ b/pkg/nbi/httpgetter.go
@@ -37,8 +37,8 @@ import (
        "routing-manager/pkg/rpe"
        "routing-manager/pkg/rtmgr"
        "routing-manager/pkg/sdl"
-       "time"
        "sync"
+       "time"
 )
 
 type HttpGetter struct {
@@ -52,7 +52,7 @@ func NewHttpGetter() *HttpGetter {
        return instance
 }
 
-var myClient = &http.Client{Timeout: 5 * time.Second}
+var myClient = &http.Client{Timeout: 15 * time.Second}
 
 func fetchAllXApps(xmurl string) (*[]rtmgr.XApp, error) {
        xapp.Logger.Info("Invoked httpGetter.fetchXappList: " + xmurl)