Moving BBSim to the latest protos
Change-Id: I797c3b3b6d964110b96f9636f941082ed14ad03d
diff --git a/.gitignore b/.gitignore
index 6c768c6..050d517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
release
.DS_Store
*.logs
-*.trace
\ No newline at end of file
+*.trace
+.idea
diff --git a/Makefile b/Makefile
index ee2b460..f6529d5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
DOCKER_PORTS ?= -p 50070:50070 -p 50060:50060 -p 50071:50071 -p 50072:50072 -p 50073:50073
## protobuf related
-VOLTHA_PROTOS ?= $(shell GO111MODULE=on go list -f '{{ .Dir }}' -m github.com/opencord/voltha-protos)
+VOLTHA_PROTOS ?= $(shell GO111MODULE=on go list -f '{{ .Dir }}' -m github.com/opencord/voltha-protos/v2)
GOOGLEAPI ?= $(shell GO111MODULE=on go list -f '{{ .Dir }}' -m github.com/grpc-ecosystem/grpc-gateway)
TOOLS_DIR := tools
TOOLS_BIN := $(TOOLS_DIR)/bin/
@@ -51,7 +51,7 @@
$(GO_TOOLS_BIN): $(GO_TOOLS_VENDOR)
GO111MODULE=on GOBIN="$(PWD)/$(TOOLS_BIN)" go install -mod=vendor $(GO_TOOLS)
-protos: dep setup_tools api/bbsim/bbsim.pb.go api/bbsim/bbsim.pb.gw.go api/legacy/bbsim.pb.go api/legacy/bbsim.pb.gw.go # @HELP Build proto files
+protos: setup_tools api/bbsim/bbsim.pb.go api/bbsim/bbsim.pb.gw.go api/legacy/bbsim.pb.go api/legacy/bbsim.pb.gw.go # @HELP Build proto files
dep: # @HELP Download the dependencies to the vendor folder
GO111MODULE=on go mod vendor
@@ -63,7 +63,7 @@
docker build -t ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim-builder:${DOCKER_TAG} -f build/ci/Dockerfile.builder .
docker run --rm -v $(shell pwd):/bbsim ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim-builder:${DOCKER_TAG} /bin/sh -c "cd /bbsim; make _build"
-test: dep protos fmt # @HELP Execute unit tests
+test: clean dep protos fmt # @HELP Execute unit tests
GO111MODULE=on go test -v -mod vendor $(TEST_PACKAGES) -covermode count -coverprofile ./tests/results/go-test-coverage.out 2>&1 | tee ./tests/results/go-test-results.out
go-junit-report < ./tests/results/go-test-results.out > ./tests/results/go-test-results.xml
gocover-cobertura < ./tests/results/go-test-coverage.out > ./tests/results/go-test-coverage.xml
@@ -138,6 +138,15 @@
# Internals
+clean:
+ rm -f api/bbsim/*.go
+ rm -f api/legacy/*.go
+ rm -f bbsim
+ rm -f bbsimctl
+ rm -f bbr
+ rm -rf tools/bin
+ rm -rf vendor
+
build-bbr:
GO111MODULE=on go build -i -v -mod vendor \
-ldflags "-w -X main.buildTime=$(shell date +”%Y/%m/%d-%H:%M:%S”) \
diff --git a/go.mod b/go.mod
index 0e175f9..73e3a78 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@
github.com/looplab/fsm v0.1.0
github.com/opencord/cordctl v0.0.0-20190909161711-01e9c1f04bf4
github.com/opencord/omci-sim v0.0.0-20191011202236-3687c57a7252
- github.com/opencord/voltha-protos v0.0.0-20190813191205-792553b747df
+ github.com/opencord/voltha-protos/v2 v2.0.1
github.com/pkg/errors v0.8.1 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0 // indirect
diff --git a/go.sum b/go.sum
index 84816cc..90e19ab 100644
--- a/go.sum
+++ b/go.sum
@@ -30,6 +30,7 @@
github.com/jhump/protoreflect v1.5.0 h1:NgpVT+dX71c8hZnxHof2M7QDK7QtohIJ7DYycjnkyfc=
github.com/jhump/protoreflect v1.5.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -45,6 +46,10 @@
github.com/opencord/omci-sim v0.0.0-20191011202236-3687c57a7252/go.mod h1:ToOkj7hkHgoet9XQDadKMhYqgA7qItZsi2j1Pk/mX6Y=
github.com/opencord/voltha-protos v0.0.0-20190813191205-792553b747df h1:j/gaZts38ij2uVVikbXGqlm6n3hts1s0zWzUnBI96C4=
github.com/opencord/voltha-protos v0.0.0-20190813191205-792553b747df/go.mod h1:MDGL9ai3XOPbiZ0tA8U7k4twK/T/P0Hh4gtjNxNk/qY=
+github.com/opencord/voltha-protos v1.0.3 h1:9v+R/QGF1xK+HKTqFM0IqCABoGCAxC8iKH4VzNBJDto=
+github.com/opencord/voltha-protos v1.0.3/go.mod h1:myfFIkJdA+rCXmKdLImhh79MfabN4ZOKQ4grk32DnPQ=
+github.com/opencord/voltha-protos/v2 v2.0.1 h1:vcE0XxNVeu0SED0bW2lf2w24k/QMFrFqMexuedIyTEg=
+github.com/opencord/voltha-protos/v2 v2.0.1/go.mod h1:6kOcfYi1CadWowFxI2SH5wLfHrsRECZLZlD2MFK6WDI=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -85,6 +90,7 @@
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -97,6 +103,7 @@
google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610 h1:Ygq9/SRJX9+dU0WCIICM8RkWvDw03lvB77hrhJnpxfU=
google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.22.1 h1:/7cs52RnTJmD43s3uxzlq2U7nqVTd/37viQwMrMNlOM=
google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -109,5 +116,6 @@
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/internal/bbr/devices/olt.go b/internal/bbr/devices/olt.go
index 2a894b0..5e68fa3 100644
--- a/internal/bbr/devices/olt.go
+++ b/internal/bbr/devices/olt.go
@@ -25,7 +25,7 @@
"github.com/opencord/bbsim/internal/bbsim/devices"
"github.com/opencord/bbsim/internal/bbsim/packetHandlers"
"github.com/opencord/bbsim/internal/common"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"io"
diff --git a/internal/bbsim/api/legacy_api_handler.go b/internal/bbsim/api/legacy_api_handler.go
index c56e963..8ae4854 100644
--- a/internal/bbsim/api/legacy_api_handler.go
+++ b/internal/bbsim/api/legacy_api_handler.go
@@ -25,7 +25,7 @@
"github.com/opencord/bbsim/api/legacy"
api "github.com/opencord/bbsim/api/legacy"
"github.com/opencord/bbsim/internal/bbsim/devices"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
diff --git a/internal/bbsim/devices/helpers.go b/internal/bbsim/devices/helpers.go
index a00931d..07cfe3a 100644
--- a/internal/bbsim/devices/helpers.go
+++ b/internal/bbsim/devices/helpers.go
@@ -18,7 +18,7 @@
import (
"github.com/looplab/fsm"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"strconv"
)
diff --git a/internal/bbsim/devices/messageTypes.go b/internal/bbsim/devices/messageTypes.go
index b61ac18..acfd832 100644
--- a/internal/bbsim/devices/messageTypes.go
+++ b/internal/bbsim/devices/messageTypes.go
@@ -19,7 +19,7 @@
import (
"github.com/google/gopacket"
"github.com/opencord/bbsim/internal/bbsim/packetHandlers"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
)
type MessageType int
diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index ce64b4e..e810ce1 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -29,8 +29,8 @@
"github.com/opencord/bbsim/internal/bbsim/packetHandlers"
bbsim "github.com/opencord/bbsim/internal/bbsim/types"
omcisim "github.com/opencord/omci-sim"
- "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/tech_profile"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/tech_profile"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)
diff --git a/internal/bbsim/devices/onu.go b/internal/bbsim/devices/onu.go
index dbbeb2b..bf5140b 100644
--- a/internal/bbsim/devices/onu.go
+++ b/internal/bbsim/devices/onu.go
@@ -29,7 +29,7 @@
"github.com/opencord/bbsim/internal/common"
omcilib "github.com/opencord/bbsim/internal/common/omci"
omcisim "github.com/opencord/omci-sim"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
log "github.com/sirupsen/logrus"
"net"
"time"
diff --git a/internal/bbsim/devices/onu_flow_test.go b/internal/bbsim/devices/onu_flow_test.go
index fad206c..6a4a153 100644
--- a/internal/bbsim/devices/onu_flow_test.go
+++ b/internal/bbsim/devices/onu_flow_test.go
@@ -19,7 +19,7 @@
import (
"github.com/google/gopacket/layers"
"github.com/looplab/fsm"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"gotest.tools/assert"
"testing"
)
diff --git a/internal/bbsim/devices/onu_test_helpers.go b/internal/bbsim/devices/onu_test_helpers.go
index a2e7ddd..2f9926f 100644
--- a/internal/bbsim/devices/onu_test_helpers.go
+++ b/internal/bbsim/devices/onu_test_helpers.go
@@ -19,8 +19,8 @@
import (
"context"
"errors"
- "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/tech_profile"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/tech_profile"
"google.golang.org/grpc"
"net"
)
diff --git a/internal/bbsim/devices/pon.go b/internal/bbsim/devices/pon.go
index ac1bdb7..024716d 100644
--- a/internal/bbsim/devices/pon.go
+++ b/internal/bbsim/devices/pon.go
@@ -22,7 +22,7 @@
"fmt"
"github.com/looplab/fsm"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
)
type PonPort struct {
diff --git a/internal/bbsim/responders/dhcp/dhcp.go b/internal/bbsim/responders/dhcp/dhcp.go
index ce71069..8bcace6 100644
--- a/internal/bbsim/responders/dhcp/dhcp.go
+++ b/internal/bbsim/responders/dhcp/dhcp.go
@@ -26,7 +26,7 @@
"github.com/opencord/bbsim/internal/bbsim/packetHandlers"
bbsim "github.com/opencord/bbsim/internal/bbsim/types"
omci "github.com/opencord/omci-sim"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
log "github.com/sirupsen/logrus"
"net"
"reflect"
diff --git a/internal/bbsim/responders/dhcp/dhcp_test.go b/internal/bbsim/responders/dhcp/dhcp_test.go
index 6aa8060..b507a2b 100644
--- a/internal/bbsim/responders/dhcp/dhcp_test.go
+++ b/internal/bbsim/responders/dhcp/dhcp_test.go
@@ -19,7 +19,7 @@
import (
"errors"
"github.com/looplab/fsm"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"google.golang.org/grpc"
"gotest.tools/assert"
"net"
diff --git a/internal/bbsim/responders/eapol/eapol.go b/internal/bbsim/responders/eapol/eapol.go
index c13aa69..e40e3cd 100644
--- a/internal/bbsim/responders/eapol/eapol.go
+++ b/internal/bbsim/responders/eapol/eapol.go
@@ -25,7 +25,7 @@
"github.com/looplab/fsm"
bbsim "github.com/opencord/bbsim/internal/bbsim/types"
omci "github.com/opencord/omci-sim"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
log "github.com/sirupsen/logrus"
"net"
)
diff --git a/internal/bbsim/responders/eapol/eapol_test.go b/internal/bbsim/responders/eapol/eapol_test.go
index f32c6f8..0a2051e 100644
--- a/internal/bbsim/responders/eapol/eapol_test.go
+++ b/internal/bbsim/responders/eapol/eapol_test.go
@@ -19,7 +19,7 @@
import (
"errors"
"github.com/looplab/fsm"
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"google.golang.org/grpc"
"gotest.tools/assert"
"net"
diff --git a/internal/bbsim/types/interfaces.go b/internal/bbsim/types/interfaces.go
index 2921a42..53a05b4 100644
--- a/internal/bbsim/types/interfaces.go
+++ b/internal/bbsim/types/interfaces.go
@@ -17,7 +17,7 @@
package types
import (
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
)
// represent a gRPC stream
diff --git a/internal/common/helpers.go b/internal/common/helpers.go
index 6ba022f..4e1997b 100644
--- a/internal/common/helpers.go
+++ b/internal/common/helpers.go
@@ -17,7 +17,7 @@
package common
import (
- "github.com/opencord/voltha-protos/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"strconv"
)
diff --git a/tools/.gitignore b/tools/.gitignore
index 08c9828..377afa0 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,3 +1,3 @@
*
!.gitignore
-!main.go
+!main.go
\ No newline at end of file