VOL-2138 Use v2 import paths for voltha-lib-go

Change-Id: I9de8accd128f23ef9d1a363a3b2038e5076826f9
diff --git a/adaptercore/device_handler.go b/adaptercore/device_handler.go
index 4908c59..a9bee44 100644
--- a/adaptercore/device_handler.go
+++ b/adaptercore/device_handler.go
@@ -33,8 +33,8 @@
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	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"
diff --git a/adaptercore/device_handler_test.go b/adaptercore/device_handler_test.go
index ecfca4b..7198bb5 100644
--- a/adaptercore/device_handler_test.go
+++ b/adaptercore/device_handler_test.go
@@ -25,8 +25,8 @@
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
-	fu "github.com/opencord/voltha-lib-go/pkg/flows"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
+	"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"
diff --git a/adaptercore/olt_platform.go b/adaptercore/olt_platform.go
index 6293cd5..5f48bc6 100644
--- a/adaptercore/olt_platform.go
+++ b/adaptercore/olt_platform.go
@@ -19,8 +19,8 @@
 
 import (
 	"errors"
-	"github.com/opencord/voltha-lib-go/pkg/flows"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"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"
 )
diff --git a/adaptercore/olt_platform_test.go b/adaptercore/olt_platform_test.go
index 9b300ab..600a3b3 100644
--- a/adaptercore/olt_platform_test.go
+++ b/adaptercore/olt_platform_test.go
@@ -22,7 +22,7 @@
 	"reflect"
 	"testing"
 
-	fu "github.com/opencord/voltha-lib-go/pkg/flows"
+	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"
 )
diff --git a/adaptercore/olt_state_transitions.go b/adaptercore/olt_state_transitions.go
index d5edb63..feb07d7 100644
--- a/adaptercore/olt_state_transitions.go
+++ b/adaptercore/olt_state_transitions.go
@@ -21,7 +21,7 @@
 	"reflect"
 	"runtime"
 
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 // DeviceState OLT Device state
diff --git a/adaptercore/openolt.go b/adaptercore/openolt.go
index eb0a038..0e6c141 100644
--- a/adaptercore/openolt.go
+++ b/adaptercore/openolt.go
@@ -23,9 +23,9 @@
 	"fmt"
 	"sync"
 
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"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"
diff --git a/adaptercore/openolt_eventmgr.go b/adaptercore/openolt_eventmgr.go
index 43c64dc..56cda0b 100644
--- a/adaptercore/openolt_eventmgr.go
+++ b/adaptercore/openolt_eventmgr.go
@@ -19,8 +19,8 @@
 
 import (
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"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"
 )
diff --git a/adaptercore/openolt_flowmgr.go b/adaptercore/openolt_flowmgr.go
index 4132162..0072770 100644
--- a/adaptercore/openolt_flowmgr.go
+++ b/adaptercore/openolt_flowmgr.go
@@ -25,9 +25,9 @@
 	"fmt"
 	"math/big"
 
-	"github.com/opencord/voltha-lib-go/pkg/flows"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
+	"github.com/opencord/voltha-lib-go/v2/pkg/flows"
+	"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"
diff --git a/adaptercore/openolt_flowmgr_test.go b/adaptercore/openolt_flowmgr_test.go
index b76fef4..cd4046c 100644
--- a/adaptercore/openolt_flowmgr_test.go
+++ b/adaptercore/openolt_flowmgr_test.go
@@ -22,10 +22,10 @@
 
 	"github.com/opencord/voltha-protos/go/voltha"
 
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	fu "github.com/opencord/voltha-lib-go/pkg/flows"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+	fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
 	"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	"github.com/opencord/voltha-openolt-adapter/mocks"
diff --git a/adaptercore/openolt_test.go b/adaptercore/openolt_test.go
index 91d8384..fb16836 100644
--- a/adaptercore/openolt_test.go
+++ b/adaptercore/openolt_test.go
@@ -29,9 +29,9 @@
 	"sync"
 	"testing"
 
-	com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
-	fu "github.com/opencord/voltha-lib-go/pkg/flows"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
+	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"
diff --git a/adaptercore/resourcemanager/resourcemanager.go b/adaptercore/resourcemanager/resourcemanager.go
index 57aea46..a6a7921 100755
--- a/adaptercore/resourcemanager/resourcemanager.go
+++ b/adaptercore/resourcemanager/resourcemanager.go
@@ -24,10 +24,10 @@
 	"strconv"
 	"strings"
 
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	ponrmgr "github.com/opencord/voltha-lib-go/pkg/ponresourcemanager"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"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"
 )
diff --git a/adaptercore/resourcemanager/resourcemanager_test.go b/adaptercore/resourcemanager/resourcemanager_test.go
index 7210b3b..07448c6 100644
--- a/adaptercore/resourcemanager/resourcemanager_test.go
+++ b/adaptercore/resourcemanager/resourcemanager_test.go
@@ -26,10 +26,10 @@
 import (
 	"encoding/json"
 	"errors"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	ponrmgr "github.com/opencord/voltha-lib-go/pkg/ponresourcemanager"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"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"
 	"reflect"
diff --git a/adaptercore/statsmanager.go b/adaptercore/statsmanager.go
index 9235b85..778accc 100755
--- a/adaptercore/statsmanager.go
+++ b/adaptercore/statsmanager.go
@@ -21,7 +21,7 @@
 	"errors"
 	"fmt"
 
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/openolt"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
diff --git a/adaptercore/statsmanager_test.go b/adaptercore/statsmanager_test.go
index a923226..88f3703 100644
--- a/adaptercore/statsmanager_test.go
+++ b/adaptercore/statsmanager_test.go
@@ -20,7 +20,7 @@
 import (
 	"testing"
 
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/openolt"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
diff --git a/config/config.go b/config/config.go
index ae5c0c6..ba93d87 100644
--- a/config/config.go
+++ b/config/config.go
@@ -20,7 +20,7 @@
 import (
 	"flag"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"os"
 )
 
diff --git a/go.mod b/go.mod
index c302e8b..e8e0e4a 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@
 	github.com/golang/protobuf v1.3.2
 	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/opencord/voltha-lib-go v0.0.0-20191024175357-456b893dc42c
+	github.com/opencord/voltha-lib-go/v2 v2.2.7
 	github.com/opencord/voltha-protos v1.0.3
 	go.etcd.io/etcd v0.0.0-20190930204107-236ac2a90522
 	google.golang.org/grpc v1.24.0
diff --git a/go.sum b/go.sum
index c36f59d..c92e136 100644
--- a/go.sum
+++ b/go.sum
@@ -190,8 +190,8 @@
 github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opencord/voltha-lib-go v0.0.0-20191024175357-456b893dc42c h1:+8iex9a0qDyuNqCXfy2SBHOK0Cfiev38RhQqkIitpew=
-github.com/opencord/voltha-lib-go v0.0.0-20191024175357-456b893dc42c/go.mod h1:VDb+kLjSvAm4iaArzXB143fug199CG0/wv+Bseh1mcM=
+github.com/opencord/voltha-lib-go/v2 v2.2.7 h1:DMB1o9GubDeA9RhdYqcp5JbhQj7LpRohp+fBa9OY/x4=
+github.com/opencord/voltha-lib-go/v2 v2.2.7/go.mod h1:q/dYViCK5moxRVbHhrg31wyWz/rIfh9ze1fHO8rndX8=
 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/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
diff --git a/main.go b/main.go
index 5adb596..eaebd9a 100644
--- a/main.go
+++ b/main.go
@@ -27,14 +27,14 @@
 	"syscall"
 	"time"
 
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
 
-	"github.com/opencord/voltha-lib-go/pkg/adapters"
-	com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	"github.com/opencord/voltha-lib-go/pkg/probe"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters"
+	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/probe"
 	ac "github.com/opencord/voltha-openolt-adapter/adaptercore"
 	"github.com/opencord/voltha-openolt-adapter/config"
 	"github.com/opencord/voltha-openolt-adapter/config/version"
@@ -356,7 +356,7 @@
 		log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
 	}
 
-	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/adapters/common", log.DebugLevel)
+	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/adapters/common", log.DebugLevel)
 
 	defer log.CleanUp()
 
diff --git a/main_test.go b/main_test.go
index 05ee582..a85d642 100644
--- a/main_test.go
+++ b/main_test.go
@@ -20,8 +20,8 @@
 	"errors"
 	"testing"
 
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-openolt-adapter/config"
 	"github.com/opencord/voltha-openolt-adapter/mocks"
 	ca "github.com/opencord/voltha-protos/go/inter_container"
diff --git a/mocks/mockCoreProxy.go b/mocks/mockCoreProxy.go
index db3171a..874c13a 100644
--- a/mocks/mockCoreProxy.go
+++ b/mocks/mockCoreProxy.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/mocks/mockKVClient.go b/mocks/mockKVClient.go
index 4ec2802..70617df 100644
--- a/mocks/mockKVClient.go
+++ b/mocks/mockKVClient.go
@@ -23,10 +23,10 @@
 	"strconv"
 	"strings"
 
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	openolt "github.com/opencord/voltha-protos/go/openolt"
 )
diff --git a/mocks/mockTechprofile.go b/mocks/mockTechprofile.go
index a06b51b..63f81e6 100644
--- a/mocks/mockTechprofile.go
+++ b/mocks/mockTechprofile.go
@@ -18,9 +18,9 @@
 package mocks
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/README.md b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/README.md
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/README.md
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/README.md
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/adapter_proxy_if.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif/adapter_proxy_if.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/adapter_proxy_if.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif/adapter_proxy_if.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/core_proxy_if.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif/core_proxy_if.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/core_proxy_if.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif/core_proxy_if.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/events_proxy_if.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif/events_proxy_if.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/events_proxy_if.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif/events_proxy_if.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/adapter_proxy.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/adapter_proxy.go
similarity index 96%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/adapter_proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/adapter_proxy.go
index fee70c8..ebef281 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/adapter_proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/adapter_proxy.go
@@ -21,8 +21,8 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"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"
 	"time"
 )
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/core_proxy.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/core_proxy.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/core_proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/core_proxy.go
index 1daeacb..18e454f 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/core_proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/core_proxy.go
@@ -19,8 +19,8 @@
 	"context"
 	"github.com/golang/protobuf/ptypes"
 	a "github.com/golang/protobuf/ptypes/any"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"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/voltha"
 	"google.golang.org/grpc/codes"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/events_proxy.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/events_proxy.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/events_proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/events_proxy.go
index 25b1be4..0f966d3 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/events_proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/events_proxy.go
@@ -23,9 +23,9 @@
 	"strings"
 	"time"
 
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"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"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/performance_metrics.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/performance_metrics.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/performance_metrics.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/performance_metrics.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/request_handler.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/request_handler.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/request_handler.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/request_handler.go
index 27f9846..3a51996 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/request_handler.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/request_handler.go
@@ -19,10 +19,10 @@
 	"errors"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/opencord/voltha-lib-go/pkg/adapters"
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters"
+	"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"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/utils.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/utils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/utils.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/common/utils.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/iAdapter.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/iAdapter.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/adapters/iAdapter.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/iAdapter.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/client.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/client.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/client.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/client.go
index f40d10e..c0ebe5f 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/client.go
@@ -16,7 +16,7 @@
 package kvstore
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 const (
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/consulclient.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/consulclient.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/consulclient.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/consulclient.go
index c3e3999..e0e8550 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/consulclient.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/consulclient.go
@@ -19,7 +19,7 @@
 	"bytes"
 	"context"
 	"errors"
-	log "github.com/opencord/voltha-lib-go/pkg/log"
+	log "github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"sync"
 	"time"
 	//log "ciena.com/coordinator/common"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/etcdclient.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/etcdclient.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/etcdclient.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/etcdclient.go
index beac4e0..8db047c 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/etcdclient.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/etcdclient.go
@@ -19,7 +19,7 @@
 	"context"
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	v3Client "go.etcd.io/etcd/clientv3"
 	v3Concurrency "go.etcd.io/etcd/clientv3/concurrency"
 	v3rpcTypes "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/kvutils.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/kvutils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/kvutils.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore/kvutils.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/backend.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/backend.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/backend.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/backend.go
index fb2c813..f5ead88 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/backend.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/backend.go
@@ -19,8 +19,8 @@
 import (
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"strconv"
 	"sync"
 	"time"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/branch.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/branch.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/branch.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/branch.go
index 2075b7e..957e0ca 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/branch.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/branch.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"sync"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/callback_type.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/callback_type.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/callback_type.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/callback_type.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/child_type.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/child_type.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/child_type.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/child_type.go
index fae9844..016d7a2 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/child_type.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/child_type.go
@@ -20,7 +20,7 @@
 	desc "github.com/golang/protobuf/descriptor"
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"reflect"
 	"strconv"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/data_revision.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/data_revision.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/data_revision.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/data_revision.go
index b930ae1..35f5958 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/data_revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/data_revision.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/event_bus.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/event_bus.go
index 3af2556..a7bd040 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/event_bus.go
@@ -19,7 +19,7 @@
 import (
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus_client.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/event_bus_client.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus_client.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/event_bus_client.go
index fdc02f9..b9c6431 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus_client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/event_bus_client.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/merge.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/merge.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/merge.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/merge.go
index 752d025..07ae9b9 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/merge.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/merge.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 func revisionsAreEqual(a, b []Revision) bool {
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/model.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/model.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/model.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/model.go
index 8087919..ba4a9b1 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/model.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/model.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 func init() {
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/node.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/node.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/node.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/node.go
index 7fd0250..264a9dd 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/node.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/node.go
@@ -23,7 +23,7 @@
 	"context"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/non_persisted_revision.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/non_persisted_revision.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/non_persisted_revision.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/non_persisted_revision.go
index 514b3b3..384caed 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/non_persisted_revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/non_persisted_revision.go
@@ -21,8 +21,8 @@
 	"crypto/md5"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"sort"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/persisted_revision.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/persisted_revision.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/persisted_revision.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/persisted_revision.go
index 8ab182b..53d93b7 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/persisted_revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/persisted_revision.go
@@ -22,8 +22,8 @@
 	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/profiling.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/profiling.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/profiling.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/profiling.go
index c50c9f6..f8e9f7a 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/profiling.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/profiling.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"sync"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/proxy.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/proxy.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/proxy.go
index 2d2c24e..b5378fe 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/proxy.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"runtime"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/revision.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/revision.go
similarity index 96%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/revision.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/revision.go
index 71c5d0c..29fc5e9 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/revision.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
 	"time"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/root.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/root.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/root.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/root.go
index 20c3721..771f938 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/root.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/root.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"sync"
 )
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/transaction.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/transaction.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/transaction.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/transaction.go
index 5bef77e..d7a34e7 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/transaction.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/transaction.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 type Transaction struct {
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/utils.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/utils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/db/model/utils.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/db/model/utils.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/flows/flow_utils.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/flows/flow_utils.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/flows/flow_utils.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/flows/flow_utils.go
index 2dbf52d..aeecc03 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/flows/flow_utils.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/flows/flow_utils.go
@@ -21,7 +21,7 @@
 	"fmt"
 	"github.com/cevaris/ordered_map"
 	"github.com/gogo/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"math/big"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/client.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/client.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/kafka/client.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/client.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/kafka_inter_container_library.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/kafka_inter_container_library.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/kafka/kafka_inter_container_library.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/kafka_inter_container_library.go
index d2e0702..e265928 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/kafka_inter_container_library.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/kafka_inter_container_library.go
@@ -23,7 +23,7 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"reflect"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/sarama_client.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/kafka/sarama_client.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go
index cec18ec..854b3e2 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/sarama_client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go
@@ -22,7 +22,7 @@
 	scc "github.com/bsm/sarama-cluster"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"strings"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/utils.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/utils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/kafka/utils.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/utils.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/log/log.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/log/log.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/log/log.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/log/log.go
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/ponresourcemanager/ponresourcemanager.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager/ponresourcemanager.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/ponresourcemanager/ponresourcemanager.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager/ponresourcemanager.go
index 12e6a3c..4422a10 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/ponresourcemanager/ponresourcemanager.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager/ponresourcemanager.go
@@ -24,10 +24,10 @@
 	"strconv"
 
 	bitmap "github.com/boljen/go-bitmap"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
 )
 
 const (
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/probe/probe.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/probe/probe.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/probe/probe.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/probe/probe.go
index 192c7ca..9823566 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/probe/probe.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/probe/probe.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"net/http"
 	"sync"
 )
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/4QueueHybridProfileMap1.json b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/4QueueHybridProfileMap1.json
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/4QueueHybridProfileMap1.json
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/4QueueHybridProfileMap1.json
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/README.md b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/README.md
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/README.md
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/README.md
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/config.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/config.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/config.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/config.go
index f9655a8..3a45af1 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/config.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/config.go
@@ -16,7 +16,7 @@
 package techprofile
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
 )
 
 // tech profile default constants
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/tech_profile.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/tech_profile.go
index c8f2aa3..6ffbea8 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/tech_profile.go
@@ -22,9 +22,9 @@
 	"fmt"
 	"strconv"
 
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )
 
diff --git a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile_if.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/tech_profile_if.go
similarity index 96%
rename from vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile_if.go
rename to vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/tech_profile_if.go
index de2fca4..0d7cc6a 100644
--- a/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile_if.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/techprofile/tech_profile_if.go
@@ -17,7 +17,7 @@
 package techprofile
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6aa9bf6..36866b2 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -60,18 +60,18 @@
 github.com/mitchellh/go-homedir
 # github.com/mitchellh/mapstructure v1.1.2
 github.com/mitchellh/mapstructure
-# github.com/opencord/voltha-lib-go v0.0.0-20191024175357-456b893dc42c
-github.com/opencord/voltha-lib-go/pkg/adapters
-github.com/opencord/voltha-lib-go/pkg/adapters/adapterif
-github.com/opencord/voltha-lib-go/pkg/adapters/common
-github.com/opencord/voltha-lib-go/pkg/db/kvstore
-github.com/opencord/voltha-lib-go/pkg/kafka
-github.com/opencord/voltha-lib-go/pkg/log
-github.com/opencord/voltha-lib-go/pkg/probe
-github.com/opencord/voltha-lib-go/pkg/flows
-github.com/opencord/voltha-lib-go/pkg/techprofile
-github.com/opencord/voltha-lib-go/pkg/db/model
-github.com/opencord/voltha-lib-go/pkg/ponresourcemanager
+# github.com/opencord/voltha-lib-go/v2 v2.2.7
+github.com/opencord/voltha-lib-go/v2/pkg/adapters
+github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif
+github.com/opencord/voltha-lib-go/v2/pkg/adapters/common
+github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore
+github.com/opencord/voltha-lib-go/v2/pkg/kafka
+github.com/opencord/voltha-lib-go/v2/pkg/log
+github.com/opencord/voltha-lib-go/v2/pkg/probe
+github.com/opencord/voltha-lib-go/v2/pkg/flows
+github.com/opencord/voltha-lib-go/v2/pkg/techprofile
+github.com/opencord/voltha-lib-go/v2/pkg/db/model
+github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager
 # github.com/opencord/voltha-protos v1.0.3
 github.com/opencord/voltha-protos/go/inter_container
 github.com/opencord/voltha-protos/go/voltha