Zero timeout is not allowed. Make sure that there is some default values

Change-Id: I6234908e2b68685c0720152794a0803de0f066e3
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>

diff --git a/container-tag.yaml b/container-tag.yaml
index 8ef37f6..0b276f1 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.8"

diff --git a/pkg/control/control.go b/pkg/control/control.go
index a5d81fb..9f90252 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -86,14 +86,29 @@ func NewControl() *Control {
 
        // viper.GetDuration returns nanoseconds
        e2tSubReqTimeout = viper.GetDuration("controls.e2tSubReqTimeout_ms") * 1000000
+       if e2tSubReqTimeout == 0 {
+               e2tSubReqTimeout = 2000 * 1000000
+       }
        xapp.Logger.Info("e2tSubReqTimeout %v", e2tSubReqTimeout)
        e2tSubDelReqTime = viper.GetDuration("controls.e2tSubDelReqTime_ms") * 1000000
+       if e2tSubDelReqTime == 0 {
+               e2tSubDelReqTime = 2000 * 1000000
+       }
        xapp.Logger.Info("e2tSubDelReqTime %v", e2tSubDelReqTime)
        e2tRecvMsgTimeout = viper.GetDuration("controls.e2tRecvMsgTimeout_ms") * 1000000
+       if e2tRecvMsgTimeout == 0 {
+               e2tRecvMsgTimeout = 2000 * 1000000
+       }
        xapp.Logger.Info("e2tRecvMsgTimeout %v", e2tRecvMsgTimeout)
        e2tMaxSubReqTryCount = viper.GetUint64("controls.e2tMaxSubReqTryCount")
+       if e2tMaxSubReqTryCount == 0 {
+               e2tMaxSubReqTryCount = 1
+       }
        xapp.Logger.Info("e2tMaxSubReqTryCount %v", e2tMaxSubReqTryCount)
        e2tMaxSubDelReqTryCount = viper.GetUint64("controls.e2tMaxSubDelReqTryCount")
+       if e2tMaxSubDelReqTryCount == 0 {
+               e2tMaxSubDelReqTryCount = 1
+       }
        xapp.Logger.Info("e2tMaxSubDelReqTryCount %v", e2tMaxSubDelReqTryCount)
 
        transport := httptransport.New(viper.GetString("rtmgr.HostAddr")+":"+viper.GetString("rtmgr.port"), viper.GetString("rtmgr.baseUrl"), []string{"http"})