From 5894ee8418269690bda9d23bc1d50d61d3669e11 Mon Sep 17 00:00:00 2001
From: rangajal <ranjit.angajala@nokia.com>
Date: Tue, 10 Nov 2020 07:10:05 +0000
Subject: [PATCH] fixed code violations

Change-Id: I29a6a6394e3968e721fb28aab18649d91c016545
Signed-off-by: rangajal <ranjit.angajala@nokia.com>
---
 RELNOTES               |  3 +++
 container-tag.yaml     |  2 +-
 pkg/nbi/control.go     | 25 ++++++++++++++++++-------
 pkg/nbi/httprestful.go | 12 +++++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index 96deaaa..d248e38 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.6.9
+* Code violations fixed in pkg/nbi/httprestful.go and pkg/nbi/control.go
+
 ### v0.6.8
 * Appending Receiver endpoint in routes if RX message type is same
 
diff --git a/container-tag.yaml b/container-tag.yaml
index 5bb3ab8..a6070e9 100644
--- 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.6.8
+tag: 0.6.9
diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index db6c405..5eff852 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -139,10 +139,15 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	m.Lock()
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
 	m.Unlock()
-	if err != nil || data == nil {
-		xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
-		return
-	}
+        if data == nil {
+                if err != nil {
+                        xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
+                        return
+                } else {
+                        xapp.Logger.Debug("Cannot get data from sdl interface")
+                        return
+                }
+        }
 
 	ep := sbiEngine.CheckEndpoint(string(params.Payload))
 	if ep == nil {
@@ -172,9 +177,15 @@ func sendRoutesToAll() (err error) {
         data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
 	fmt.Printf("data = %v,%v,%v",data,sdlEngine,sbiEngine)
         m.Unlock()
-        if err != nil || data == nil {
-                return errors.New("Cannot get data from sdl interface due to: " + err.Error())
-        }
+	if data == nil {
+	        if err != nil {
+			return errors.New("Cannot get data from sdl interface due to: " + err.Error())
+	        } else {
+	                xapp.Logger.Debug("Cannot get data from sdl interface, data is null")
+	                return errors.New("Cannot get data from sdl interface")
+	        }
+	}
+
 	if sbiEngine == nil {
 		fmt.Printf("SBI is nil")
 	}
diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go
index e10f42b..d57fb18 100644
--- a/pkg/nbi/httprestful.go
+++ b/pkg/nbi/httprestful.go
@@ -127,6 +127,7 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error {
 func provideXappHandleHandlerImpl(data *models.XappCallbackData) error {
 	if data != nil {
 		xapp.Logger.Debug("Received callback data")
+		return nil
 	}
 	err := validateXappCallbackData(data)
 	if err != nil {
@@ -370,9 +371,14 @@ func dumpDebugData() (models.Debuginfo, error) {
 	sdlEngine, _ := sdl.GetSdl("file")
 	rpeEngine, _ := rpe.GetRpe("rmrpush")
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
-	if err != nil || data == nil {
-		xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
-		return response, err
+	if data == nil {
+		if err != nil {
+			xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
+			return response, err
+		} else {
+			xapp.Logger.Debug("Cannot get data from sdl interface")
+			return response, errors.New("Cannot get data from sdl interface")
+		}
 	}
 	response.RouteTable = *rpeEngine.GeneratePolicies(rtmgr.Eps, data)
 
-- 
2.16.6