VOL-2017 eliminate common dir and move its contents up a level
Change-Id: Ia52dac284a7edcdcfe7eaa8c568b84d19d604b58
diff --git a/pkg/db/model/backend.go b/pkg/db/model/backend.go
index de731ad..fb2c813 100644
--- a/pkg/db/model/backend.go
+++ b/pkg/db/model/backend.go
@@ -19,8 +19,8 @@
import (
"errors"
"fmt"
- "github.com/opencord/voltha-lib-go/pkg/common/log"
"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"strconv"
"sync"
"time"
diff --git a/pkg/db/model/base_test.go b/pkg/db/model/base_test.go
index 06110b1..d4c7d3a 100644
--- a/pkg/db/model/base_test.go
+++ b/pkg/db/model/base_test.go
@@ -16,7 +16,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
"runtime/debug"
"sync"
diff --git a/pkg/db/model/branch.go b/pkg/db/model/branch.go
index a242ab8..2075b7e 100644
--- a/pkg/db/model/branch.go
+++ b/pkg/db/model/branch.go
@@ -17,7 +17,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"sync"
)
diff --git a/pkg/db/model/child_type.go b/pkg/db/model/child_type.go
index baf01a2..fae9844 100644
--- a/pkg/db/model/child_type.go
+++ b/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/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"github.com/opencord/voltha-protos/go/common"
"reflect"
"strconv"
diff --git a/pkg/db/model/data_revision.go b/pkg/db/model/data_revision.go
index d349ec2..b930ae1 100644
--- a/pkg/db/model/data_revision.go
+++ b/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/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"reflect"
)
diff --git a/pkg/db/model/event_bus.go b/pkg/db/model/event_bus.go
index 079e3b2..3af2556 100644
--- a/pkg/db/model/event_bus.go
+++ b/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/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
)
diff --git a/pkg/db/model/event_bus_client.go b/pkg/db/model/event_bus_client.go
index e3729e8..fdc02f9 100644
--- a/pkg/db/model/event_bus_client.go
+++ b/pkg/db/model/event_bus_client.go
@@ -17,7 +17,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
)
diff --git a/pkg/db/model/merge.go b/pkg/db/model/merge.go
index b2a0e33..752d025 100644
--- a/pkg/db/model/merge.go
+++ b/pkg/db/model/merge.go
@@ -17,7 +17,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
)
func revisionsAreEqual(a, b []Revision) bool {
diff --git a/pkg/db/model/model.go b/pkg/db/model/model.go
index 5236ec2..8087919 100644
--- a/pkg/db/model/model.go
+++ b/pkg/db/model/model.go
@@ -16,7 +16,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
)
func init() {
diff --git a/pkg/db/model/node.go b/pkg/db/model/node.go
index 4d8c467..7fd0250 100644
--- a/pkg/db/model/node.go
+++ b/pkg/db/model/node.go
@@ -23,7 +23,7 @@
"context"
"fmt"
"github.com/golang/protobuf/proto"
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"reflect"
"strings"
"sync"
diff --git a/pkg/db/model/non_persisted_revision.go b/pkg/db/model/non_persisted_revision.go
index db78b4c..88320cb 100644
--- a/pkg/db/model/non_persisted_revision.go
+++ b/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/common/log"
"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"reflect"
"sort"
"sync"
diff --git a/pkg/db/model/persisted_revision.go b/pkg/db/model/persisted_revision.go
index fa1a97e..c644e14 100644
--- a/pkg/db/model/persisted_revision.go
+++ b/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/common/log"
"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"reflect"
"strings"
"sync"
diff --git a/pkg/db/model/profiling.go b/pkg/db/model/profiling.go
index cb5814b..c50c9f6 100644
--- a/pkg/db/model/profiling.go
+++ b/pkg/db/model/profiling.go
@@ -17,7 +17,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"sync"
)
diff --git a/pkg/db/model/proxy.go b/pkg/db/model/proxy.go
index a68b585..2d2c24e 100644
--- a/pkg/db/model/proxy.go
+++ b/pkg/db/model/proxy.go
@@ -22,7 +22,7 @@
"errors"
"fmt"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"reflect"
"runtime"
"strings"
diff --git a/pkg/db/model/proxy_load_test.go b/pkg/db/model/proxy_load_test.go
index 6c4839d..056d3c1 100644
--- a/pkg/db/model/proxy_load_test.go
+++ b/pkg/db/model/proxy_load_test.go
@@ -19,7 +19,7 @@
"context"
"encoding/hex"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"github.com/opencord/voltha-protos/go/common"
"github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/pkg/db/model/root.go b/pkg/db/model/root.go
index 7485937..20c3721 100644
--- a/pkg/db/model/root.go
+++ b/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/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
"reflect"
"sync"
)
diff --git a/pkg/db/model/transaction.go b/pkg/db/model/transaction.go
index e71a5a0..5bef77e 100644
--- a/pkg/db/model/transaction.go
+++ b/pkg/db/model/transaction.go
@@ -17,7 +17,7 @@
import (
"context"
- "github.com/opencord/voltha-lib-go/pkg/common/log"
+ "github.com/opencord/voltha-lib-go/pkg/log"
)
type Transaction struct {