Godeps,vendor: update contivmodel to the latest version + use new objdb import paths

dseevr · dseevr · commit 3a42d57bf4ce · 2017-10-25T20:58:18.000-07:00
This also pulled in the changes from contiv-experimental/contivmodel#68 which had not previously been included. Signed-off-by: Bill Robinson <dseevr@users.noreply.github.com>
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/netmaster/daemon/daemon.go b/netmaster/daemon/daemon.go
@@ -32,8 +32,8 @@ import (
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/netmaster/objApi"
 	"github.com/contiv/netplugin/netmaster/resources"
+	"github.com/contiv/netplugin/objdb"
 	"github.com/contiv/netplugin/utils"
-	"github.com/contiv/objdb"
 	"github.com/contiv/ofnet"
 	"github.com/gorilla/mux"
 
diff --git a/netmaster/k8snetwork/networkpolicy_test.go b/netmaster/k8snetwork/networkpolicy_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/netmaster/objApi"
 	"github.com/contiv/netplugin/netmaster/resources"
+	"github.com/contiv/netplugin/objdb"
 	"github.com/contiv/netplugin/state"
 	"github.com/contiv/netplugin/utils"
-	"github.com/contiv/objdb"
 	"github.com/contiv/ofnet"
 	etcdclient "github.com/coreos/etcd/client"
 	"github.com/gorilla/mux"
diff --git a/netmaster/objApi/apiController.go b/netmaster/objApi/apiController.go
@@ -30,10 +30,10 @@ import (
 	"github.com/contiv/netplugin/netmaster/intent"
 	"github.com/contiv/netplugin/netmaster/master"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
+	"github.com/contiv/netplugin/objdb"
+	"github.com/contiv/netplugin/objdb/modeldb"
 	"github.com/contiv/netplugin/utils"
 	"github.com/contiv/netplugin/utils/netutils"
-	"github.com/contiv/objdb"
-	"github.com/contiv/objdb/modeldb"
 	"io/ioutil"
 	"net/http"
 
diff --git a/netmaster/objApi/extContracts.go b/netmaster/objApi/extContracts.go
@@ -20,7 +20,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
-	"github.com/contiv/objdb/modeldb"
+	"github.com/contiv/netplugin/objdb/modeldb"
 )
 
 // Some utility functions to work with the external contracts
diff --git a/netmaster/objApi/objapi_test.go b/netmaster/objApi/objapi_test.go
@@ -32,10 +32,10 @@ import (
 	"github.com/contiv/netplugin/netmaster/master"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/netmaster/resources"
+	"github.com/contiv/netplugin/objdb"
 	"github.com/contiv/netplugin/state"
 	"github.com/contiv/netplugin/utils"
 	"github.com/contiv/netplugin/utils/netutils"
-	"github.com/contiv/objdb"
 	"github.com/contiv/ofnet"
 	etcdclient "github.com/coreos/etcd/client"
 	"github.com/gorilla/mux"
diff --git a/netplugin/cluster/cluster.go b/netplugin/cluster/cluster.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netplugin/plugin"
+	"github.com/contiv/netplugin/objdb"
 	"github.com/contiv/netplugin/utils"
 	"github.com/contiv/netplugin/utils/netutils"
-	"github.com/contiv/objdb"
 
 	log "github.com/Sirupsen/logrus"
 )
diff --git a/vendor/github.com/contiv/contivmodel/contivModel.go b/vendor/github.com/contiv/contivmodel/contivModel.go

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`log "github.com/Sirupsen/logrus"`
`21`	`21`	`"github.com/contiv/contivmodel"`
`22`	`22`	`"github.com/contiv/netplugin/core"`
`23`		`- "github.com/contiv/objdb/modeldb"`
	`23`	`+ "github.com/contiv/netplugin/objdb/modeldb"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// Some utility functions to work with the external contracts`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ import (`
`24`	`24`
`25`	`25`	`"github.com/contiv/netplugin/core"`
`26`	`26`	`"github.com/contiv/netplugin/netplugin/plugin"`
	`27`	`+ "github.com/contiv/netplugin/objdb"`
`27`	`28`	`"github.com/contiv/netplugin/utils"`
`28`	`29`	`"github.com/contiv/netplugin/utils/netutils"`
`29`		`- "github.com/contiv/objdb"`
`30`	`30`
`31`	`31`	`log "github.com/Sirupsen/logrus"`
`32`	`32`	`)`