VOL-2189 update voltha-openolt-adapter to use voltha-protos=v2.0.1 and voltha-lib-go=v2.2.9;
Release v2.2.1
Change-Id: I527d6541f9d8b7df8504d886a01163c7e57bdd77
diff --git a/adaptercore/device_handler.go b/adaptercore/device_handler.go
index dbf301f..2e19d7c 100644
--- a/adaptercore/device_handler.go
+++ b/adaptercore/device_handler.go
@@ -37,11 +37,11 @@
"github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-lib-go/v2/pkg/pmmetrics"
rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
- "github.com/opencord/voltha-protos/go/common"
- ic "github.com/opencord/voltha-protos/go/inter_container"
- of "github.com/opencord/voltha-protos/go/openflow_13"
- oop "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/voltha"
+ "github.com/opencord/voltha-protos/v2/go/common"
+ ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ of "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ oop "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
"google.golang.org/grpc"
"google.golang.org/grpc/status"
)
diff --git a/adaptercore/device_handler_test.go b/adaptercore/device_handler_test.go
index 924430d..6f52609 100644
--- a/adaptercore/device_handler_test.go
+++ b/adaptercore/device_handler_test.go
@@ -32,11 +32,11 @@
"github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
"github.com/opencord/voltha-openolt-adapter/mocks"
- ic "github.com/opencord/voltha-protos/go/inter_container"
- of "github.com/opencord/voltha-protos/go/openflow_13"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- oop "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/voltha"
+ ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ of "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ oop "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
func init() {
diff --git a/adaptercore/olt_platform.go b/adaptercore/olt_platform.go
index ed6d489..6f0d58c 100644
--- a/adaptercore/olt_platform.go
+++ b/adaptercore/olt_platform.go
@@ -21,8 +21,8 @@
"errors"
"github.com/opencord/voltha-lib-go/v2/pkg/flows"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/voltha"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
/*=====================================================================
diff --git a/adaptercore/olt_platform_test.go b/adaptercore/olt_platform_test.go
index 600a3b3..c842d02 100644
--- a/adaptercore/olt_platform_test.go
+++ b/adaptercore/olt_platform_test.go
@@ -23,8 +23,8 @@
"testing"
fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/voltha"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
func TestMkUniPortNum(t *testing.T) {
diff --git a/adaptercore/openolt.go b/adaptercore/openolt.go
index 0e6c141..603f75e 100644
--- a/adaptercore/openolt.go
+++ b/adaptercore/openolt.go
@@ -26,9 +26,9 @@
"github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/go/inter_container"
- "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/voltha"
+ ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
//OpenOLT structure holds the OLT information
diff --git a/adaptercore/openolt_eventmgr.go b/adaptercore/openolt_eventmgr.go
index 56cda0b..8173ad1 100644
--- a/adaptercore/openolt_eventmgr.go
+++ b/adaptercore/openolt_eventmgr.go
@@ -21,8 +21,8 @@
"fmt"
"github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
- oop "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/voltha"
+ oop "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
const (
diff --git a/adaptercore/openolt_eventmgr_test.go b/adaptercore/openolt_eventmgr_test.go
index dcfcef3..8012318 100644
--- a/adaptercore/openolt_eventmgr_test.go
+++ b/adaptercore/openolt_eventmgr_test.go
@@ -22,7 +22,7 @@
"time"
"github.com/opencord/voltha-openolt-adapter/mocks"
- oop "github.com/opencord/voltha-protos/go/openolt"
+ oop "github.com/opencord/voltha-protos/v2/go/openolt"
)
func mockEventMgr() *OpenOltEventMgr {
diff --git a/adaptercore/openolt_flowmgr.go b/adaptercore/openolt_flowmgr.go
index f0e81f6..6bee5a2 100644
--- a/adaptercore/openolt_flowmgr.go
+++ b/adaptercore/openolt_flowmgr.go
@@ -30,12 +30,12 @@
"github.com/opencord/voltha-lib-go/v2/pkg/log"
tp "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
- "github.com/opencord/voltha-protos/go/common"
- ic "github.com/opencord/voltha-protos/go/inter_container"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- openoltpb2 "github.com/opencord/voltha-protos/go/openolt"
- tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
- "github.com/opencord/voltha-protos/go/voltha"
+ "github.com/opencord/voltha-protos/v2/go/common"
+ ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ openoltpb2 "github.com/opencord/voltha-protos/v2/go/openolt"
+ tp_pb "github.com/opencord/voltha-protos/v2/go/tech_profile"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
//deepcopy "github.com/getlantern/deepcopy"
"google.golang.org/grpc/codes"
diff --git a/adaptercore/openolt_flowmgr_test.go b/adaptercore/openolt_flowmgr_test.go
index 9d1c73e..12ff83e 100644
--- a/adaptercore/openolt_flowmgr_test.go
+++ b/adaptercore/openolt_flowmgr_test.go
@@ -21,7 +21,7 @@
"fmt"
"testing"
- "github.com/opencord/voltha-protos/go/voltha"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
@@ -30,10 +30,10 @@
"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
"github.com/opencord/voltha-openolt-adapter/mocks"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/openolt"
- openoltpb2 "github.com/opencord/voltha-protos/go/openolt"
- tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
+ openoltpb2 "github.com/opencord/voltha-protos/v2/go/openolt"
+ tp_pb "github.com/opencord/voltha-protos/v2/go/tech_profile"
)
var flowMgr *OpenOltFlowMgr
diff --git a/adaptercore/openolt_test.go b/adaptercore/openolt_test.go
index fb16836..27af430 100644
--- a/adaptercore/openolt_test.go
+++ b/adaptercore/openolt_test.go
@@ -32,10 +32,10 @@
com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- ic "github.com/opencord/voltha-protos/go/inter_container"
- "github.com/opencord/voltha-protos/go/openflow_13"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/voltha"
+ ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
// mocks the OpenOLT struct.
diff --git a/adaptercore/resourcemanager/resourcemanager.go b/adaptercore/resourcemanager/resourcemanager.go
index b43aa2b..3757e37 100755
--- a/adaptercore/resourcemanager/resourcemanager.go
+++ b/adaptercore/resourcemanager/resourcemanager.go
@@ -28,8 +28,8 @@
"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
ponrmgr "github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/openolt"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
)
const (
diff --git a/adaptercore/resourcemanager/resourcemanager_test.go b/adaptercore/resourcemanager/resourcemanager_test.go
index cdce9ab..0212cf6 100644
--- a/adaptercore/resourcemanager/resourcemanager_test.go
+++ b/adaptercore/resourcemanager/resourcemanager_test.go
@@ -30,8 +30,8 @@
"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
ponrmgr "github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager"
- ofp "github.com/opencord/voltha-protos/go/openflow_13"
- "github.com/opencord/voltha-protos/go/openolt"
+ ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
"reflect"
"strconv"
"strings"
diff --git a/adaptercore/statsmanager.go b/adaptercore/statsmanager.go
index 6a67f15..b2bddd7 100755
--- a/adaptercore/statsmanager.go
+++ b/adaptercore/statsmanager.go
@@ -24,8 +24,8 @@
"time"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/voltha"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
var mutex = &sync.Mutex{}
diff --git a/adaptercore/statsmanager_test.go b/adaptercore/statsmanager_test.go
index 91f6c87..211f82a 100644
--- a/adaptercore/statsmanager_test.go
+++ b/adaptercore/statsmanager_test.go
@@ -22,8 +22,8 @@
"testing"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/go/openolt"
- "github.com/opencord/voltha-protos/go/voltha"
+ "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-protos/v2/go/voltha"
)
func init() {