Moving BBSim to the latest protos
Change-Id: I797c3b3b6d964110b96f9636f941082ed14ad03d
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"
)