Fix UT coverity report issue

Change-Id: I891f8810c687224df42e2a477350cf0f838146cb
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>

diff --git a/build/build_ubuntu.sh b/build/build_ubuntu.sh
index 28f0a6f..44619c4 100755 (executable)
--- a/build/build_ubuntu.sh
+++ b/build/build_ubuntu.sh
@@ -17,7 +17,7 @@
 #   limitations under the License.
 #==================================================================================
 
-set -eux
+#set -eux
 
 echo "--> build_ubuntu.sh starts"
 
@@ -43,7 +43,7 @@ export CFG_FILE=../config/config-file.json
 export RMR_SEED_RT=../config/uta_rtg.rt
 
 # xApp stuff
-export DEF_FILE=../definitions/alarm-definition.json
+export DEF_FILE=../../definitions/alarm-definition.json
 export PERF_DEF_FILE=../testresources/perf-alarm-definition.json
 export PERF_OBJ_FILE=../testresources/perf-alarm-object.json
 
@@ -61,7 +61,6 @@ hash=$(git rev-parse --short HEAD || true)
 
 ROOT_DIR=$PWD
 
-
 # compile the CLI
 cd ${ROOT_DIR}/cli && go build -a -installsuffix cgo alarm-cli.go
 
@@ -71,7 +70,16 @@ cd ${ROOT_DIR}/manager && go build -a -installsuffix cgo -ldflags "-X main.Versi
 # Execute UT and measure coverage for the Alarm Library
 cd ${ROOT_DIR}/alarm && go test . -v -coverprofile cover.out
 
+# Copy alarm/cover.out to alarm-go/cover.out
+cd ${ROOT_DIR} && cat alarm/cover.out > coverage.out
+
 # And for the Alarm Manager
-cd ${ROOT_DIR}/manager && go test -v -p 1 -coverprofile cover.out ./cmd/ -c -o ./manager_test && ./manager_test
+#cd ${ROOT_DIR}/manager && go test -v -p 1 -coverprofile cover.out ./cmd/ -c -o ./manager_test && ./manager_test
+cd ${ROOT_DIR}/manager && GO111MODULE=on RMR_SEED_RT=../../config/uta_rtg.rt CFG_FILE=../../config/config-file.json go test -v -p 1 -cover -coverprofile=cover.out ./...
+
+# Remove first line of the manager/cover.out and append to alarm-go/coverity.out
+cd ${ROOT_DIR} && sed '1d' manager/cover.out >> coverage.out
+
+cd ${ROOT_DIR} && GO111MODULE=on go tool cover -html=coverage.out -o coverage.html
 
 echo "--> build_ubuntu.sh ends"

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index bc08e13..0acb623 100755 (executable)
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -273,9 +273,9 @@ Get alerts from Prometheus Alert Manager:
 
  .. code-block:: none
 
-  Syntax: cli/alarm-cli gapam --active --inhibited --silenced --unprocessed --host [--port]
+  Syntax: cli/alarm-cli alerts --active --inhibited --silenced --unprocessed --host [--port]
 
-  Example: cli/alarm-cli gapam --active true --inhibited true --silenced true --unprocessed true --host 10.102.36.121 --port 9093
+  Example: cli/alarm-cli alerts --active true --inhibited true --silenced true --unprocessed true --host 10.102.36.121 --port 9093
 
 
 REST interface usage guide

diff --git a/go.mod b/go.mod
index 0fb43fa..b6ae937 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -20,8 +20,6 @@ require (
        github.com/gorilla/mux v1.7.1
        github.com/jedib0t/go-pretty v4.3.0+incompatible
        github.com/mattn/go-runewidth v0.0.9 // indirect
-       github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-       github.com/modern-go/reflect2 v1.0.1 // indirect
        github.com/prometheus/alertmanager v0.20.0
        github.com/spf13/viper v1.6.2
        github.com/stretchr/testify v1.5.1

diff --git a/manager/cmd/manager_test.go b/manager/cmd/manager_test.go
index 00df224..0457c58 100755 (executable)
--- a/manager/cmd/manager_test.go
+++ b/manager/cmd/manager_test.go
@@ -353,7 +353,7 @@ func TestGetPrometheusAlerts(t *testing.T) {
 
        commandReady := make(chan bool, 1)
        command := "cli/alarm-cli"
-       args := []string{"gapam", "--active", "true", "--inhibited", "true", "--silenced", "--unprocessed", "true", "true", "--host", "localhost", "--port", "9093", "flushall"}
+       args := []string{"alerts", "--active", "true", "--inhibited", "true", "--silenced", "--unprocessed", "true", "true", "--host", "localhost", "--port", "9093", "flushall"}
        ExecCLICommand(commandReady, command, args...)
        <-commandReady