commit 761f7519cdc75a50f162ce379068b2bf9a200157
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Nov 23 15:52:40 2020 -0800
committer Matteo Scandolo <teo@opennetworking.org> Tue Nov 24 17:15:46 2020 +0000
tree ac736dca1c521892dedb343d74347ad3807582c8
parent 80129dbf3f425354791d92b847b20596cfa4e065

using latest voltha-ci-tool container to correctly generate coverage reports

Change-Id: I0d16a3ea6be63d3487a6998f16ec4016553615c7

Makefile

diff --git a/Makefile b/Makefile
index a4ad5ca..71ed349 100644
--- a/Makefile
+++ b/Makefile
@@ -48,11 +48,11 @@
 	--build-arg org_opencord_vcs_dirty="${DOCKER_LABEL_VCS_DIRTY}"
 
 # tool containers
-VOLTHA_TOOLS_VERSION ?= 2.0.0
+VOLTHA_TOOLS_VERSION ?= 2.3.1
 
 GO                = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app -v gocache:/.cache -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golang go
 GO_JUNIT_REPORT   = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app -i voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-go-junit-report go-junit-report
-GOCOVER_COBERTURA = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app -i voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-gocover-cobertura gocover-cobertura
+GOCOVER_COBERTURA = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app/src/github.com/opencord/voltha-openonu-adapter-go -i voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-gocover-cobertura gocover-cobertura
 GOFMT             = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golang gofmt
 GOLANGCI_LINT     = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app -v gocache:/.cache -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golangci-lint golangci-lint
 HADOLINT          = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-hadolint hadolint

cmd/openonu-adapter/main.go

diff --git a/cmd/openonu-adapter/main.go b/cmd/openonu-adapter/main.go
index 878e619..486188d 100644
--- a/cmd/openonu-adapter/main.go
+++ b/cmd/openonu-adapter/main.go
@@ -40,8 +40,8 @@
 	ic "github.com/opencord/voltha-protos/v3/go/inter_container"
 	"github.com/opencord/voltha-protos/v3/go/voltha"
 
-	"test.internal/openadapter/internal/pkg/config"
-	ac "test.internal/openadapter/internal/pkg/onuadaptercore"
+	"github.com/opencord/voltha-openonu-adapter-go/internal/pkg/config"
+	ac "github.com/opencord/voltha-openonu-adapter-go/internal/pkg/onuadaptercore"
 )
 
 type adapter struct {

go.mod

diff --git a/go.mod b/go.mod
index 9eee99b..f2d3ff5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module test.internal/openadapter
+module github.com/opencord/voltha-openonu-adapter-go
 
 go 1.13
 

internal/pkg/onuadaptercore/openonu.go

diff --git a/internal/pkg/onuadaptercore/openonu.go b/internal/pkg/onuadaptercore/openonu.go
index 946cdc9..d71f80f 100644
--- a/internal/pkg/onuadaptercore/openonu.go
+++ b/internal/pkg/onuadaptercore/openonu.go
@@ -32,7 +32,7 @@
 	"github.com/opencord/voltha-protos/v3/go/openflow_13"
 	"github.com/opencord/voltha-protos/v3/go/voltha"
 
-	"test.internal/openadapter/internal/pkg/config"
+	"github.com/opencord/voltha-openonu-adapter-go/internal/pkg/config"
 )
 
 //OpenONUAC structure holds the ONU core information