*.go: update contivmodel import path to reference local netplugin directory

dseevr · dseevr · commit db703e8ff1de · 2017-11-27T17:09:17.000-08:00
Signed-off-by: Bill Robinson &lt;dseevr@users.noreply.github.com&gt;
diff --git a/contivmodel/systemtests/client_test.go b/contivmodel/systemtests/client_test.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/mgmtfn/dockplugin/netDriver.go b/mgmtfn/dockplugin/netDriver.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/netmaster/docknet"
 	"github.com/contiv/netplugin/netmaster/intent"
 	"github.com/contiv/netplugin/netmaster/master"
diff --git a/netctl/config.go b/netctl/config.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/codegangsta/cli"
-	contivClient "github.com/contiv/contivmodel/client"
+	contivClient "github.com/contiv/netplugin/contivmodel/client"
 )
 
 // Config represents the contents of ~/.netctl/config.json
diff --git a/netctl/netctl.go b/netctl/netctl.go
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/codegangsta/cli"
-	contivClient "github.com/contiv/contivmodel/client"
+	contivClient "github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/version"
 )
 
diff --git a/netmaster/k8snetwork/networkpolicy.go b/netmaster/k8snetwork/networkpolicy.go
@@ -8,7 +8,7 @@ import (
 	"github.com/contiv/client-go/pkg/api/v1"
 	"github.com/contiv/client-go/pkg/apis/extensions/v1beta1"
 	"github.com/contiv/client-go/pkg/watch"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/utils/k8sutils"
 	"reflect"
 	"strings"
diff --git a/netmaster/k8snetwork/networkpolicy_test.go b/netmaster/k8snetwork/networkpolicy_test.go
@@ -3,7 +3,7 @@ package networkpolicy
 import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/netmaster/objApi"
diff --git a/netmaster/master/policy.go b/netmaster/master/policy.go
@@ -16,7 +16,7 @@ limitations under the License.
 package master
 
 import (
-	"github.com/contiv/contivmodel"
+	"github.com/contiv/netplugin/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/utils"
diff --git a/netmaster/mastercfg/policyState.go b/netmaster/mastercfg/policyState.go
@@ -23,7 +23,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 
-	"github.com/contiv/contivmodel"
+	"github.com/contiv/netplugin/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/ofnet"
 )
diff --git a/netmaster/objApi/apiController.go b/netmaster/objApi/apiController.go
@@ -25,7 +25,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	contivModel "github.com/contiv/contivmodel"
+	contivModel "github.com/contiv/netplugin/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/drivers"
 	"github.com/contiv/netplugin/netmaster/docknet"
diff --git a/netmaster/objApi/extContracts.go b/netmaster/objApi/extContracts.go
@@ -18,7 +18,7 @@ package objApi
 import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel"
+	"github.com/contiv/netplugin/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/objdb/modeldb"
 )
diff --git a/netmaster/objApi/infraproxy.go b/netmaster/objApi/infraproxy.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel"
+	"github.com/contiv/netplugin/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/master"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
diff --git a/netmaster/objApi/objapi_test.go b/netmaster/objApi/objapi_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 	"time"
 
-	contivModel "github.com/contiv/contivmodel"
-	"github.com/contiv/contivmodel/client"
+	contivModel "github.com/contiv/netplugin/contivmodel"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/gstate"
 	"github.com/contiv/netplugin/netmaster/intent"
diff --git a/test/integration/app_prof_test.go b/test/integration/app_prof_test.go
@@ -17,7 +17,7 @@ package integration
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 
 	. "github.com/contiv/check"
 )
diff --git a/test/integration/endpoint_test.go b/test/integration/endpoint_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 
 	. "github.com/contiv/check"
diff --git a/test/integration/integ_test.go b/test/integration/integ_test.go
@@ -22,7 +22,7 @@ import (
 	. "testing"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 
 	. "github.com/contiv/check"
 )
diff --git a/test/integration/mesos_test.go b/test/integration/mesos_test.go
@@ -31,7 +31,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/netplugin/mgmtfn/mesosplugin/cniapi"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
diff --git a/test/integration/netprofile_test.go b/test/integration/netprofile_test.go
@@ -18,7 +18,7 @@ package integration
 import (
 	"time"
 
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 
 	. "github.com/contiv/check"
 )
diff --git a/test/integration/npcluster_test.go b/test/integration/npcluster_test.go
@@ -22,7 +22,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 
-	"github.com/contiv/contivmodel"
+	"github.com/contiv/netplugin/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/daemon"
 	"github.com/contiv/netplugin/netplugin/agent"
diff --git a/test/systemtests/aci_test.go b/test/systemtests/aci_test.go
@@ -6,7 +6,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 /* TestACIMode does the following:
diff --git a/test/systemtests/basic_test.go b/test/systemtests/basic_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 func (s *systemtestSuite) TestBasicStartRemoveContainerVXLAN(c *C) {
diff --git a/test/systemtests/bgp_test.go b/test/systemtests/bgp_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/remotessh"
 )
 
diff --git a/test/systemtests/hostaccess_test.go b/test/systemtests/hostaccess_test.go
@@ -2,7 +2,7 @@ package systemtests
 
 import (
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"time"
 )
 
diff --git a/test/systemtests/init_test.go b/test/systemtests/init_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/remotessh"
 )
 
diff --git a/test/systemtests/netprofile_test.go b/test/systemtests/netprofile_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 func (s *systemtestSuite) TestNetprofileBasicUpdateVXLAN(c *C) {
diff --git a/test/systemtests/network_test.go b/test/systemtests/network_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 func (s *systemtestSuite) TestInfraNetworkAddDeleteVXLAN(c *C) {
diff --git a/test/systemtests/policy_test.go b/test/systemtests/policy_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 func (s *systemtestSuite) TestPolicyBasicVXLAN(c *C) {
diff --git a/test/systemtests/service_test.go b/test/systemtests/service_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 var providerIndex int
diff --git a/test/systemtests/trigger_test.go b/test/systemtests/trigger_test.go
@@ -9,7 +9,7 @@ import (
 	. "github.com/contiv/check"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 )
 
 func (s *systemtestSuite) TestTriggerNetpluginUplinkUpgrade(c *C) {
diff --git a/test/systemtests/util_test.go b/test/systemtests/util_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	. "github.com/contiv/check"
-	"github.com/contiv/contivmodel/client"
+	"github.com/contiv/netplugin/contivmodel/client"
 	"github.com/contiv/remotessh"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"time"`
`23`	`23`
`24`	`24`	`. "github.com/contiv/check"`
`25`		`- "github.com/contiv/contivmodel/client"`
	`25`	`+ "github.com/contiv/netplugin/contivmodel/client"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func Test(t *testing.T) { TestingT(t) }`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"path/filepath"`
`10`	`10`
`11`	`11`	`"github.com/codegangsta/cli"`
`12`		`- contivClient "github.com/contiv/contivmodel/client"`
	`12`	`+ contivClient "github.com/contiv/netplugin/contivmodel/client"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// Config represents the contents of ~/.netctl/config.json`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"golang.org/x/crypto/ssh/terminal"`
`18`	`18`
`19`	`19`	`"github.com/codegangsta/cli"`
`20`		`- contivClient "github.com/contiv/contivmodel/client"`
	`20`	`+ contivClient "github.com/contiv/netplugin/contivmodel/client"`
`21`	`21`	`"github.com/contiv/netplugin/version"`
`22`	`22`	`)`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`log "github.com/Sirupsen/logrus"`
`25`	`25`
`26`		`- "github.com/contiv/contivmodel"`
	`26`	`+ "github.com/contiv/netplugin/contivmodel"`
`27`	`27`	`"github.com/contiv/netplugin/core"`
`28`	`28`	`"github.com/contiv/ofnet"`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package objApi`
`18`	`18`	`import (`
`19`	`19`	`"fmt"`
`20`	`20`	`log "github.com/Sirupsen/logrus"`
`21`		`- "github.com/contiv/contivmodel"`
	`21`	`+ "github.com/contiv/netplugin/contivmodel"`
`22`	`22`	`"github.com/contiv/netplugin/core"`
`23`	`23`	`"github.com/contiv/netplugin/objdb/modeldb"`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package integration`
`17`	`17`
`18`	`18`	`import (`
`19`	`19`	`log "github.com/Sirupsen/logrus"`
`20`		`- "github.com/contiv/contivmodel/client"`
	`20`	`+ "github.com/contiv/netplugin/contivmodel/client"`
`21`	`21`
`22`	`22`	`. "github.com/contiv/check"`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package integration`
`18`	`18`	`import (`
`19`	`19`	`"time"`
`20`	`20`
`21`		`- "github.com/contiv/contivmodel/client"`
	`21`	`+ "github.com/contiv/netplugin/contivmodel/client"`
`22`	`22`
`23`	`23`	`. "github.com/contiv/check"`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`log "github.com/Sirupsen/logrus"`
`8`	`8`	`. "github.com/contiv/check"`
`9`		`- "github.com/contiv/contivmodel/client"`
	`9`	`+ "github.com/contiv/netplugin/contivmodel/client"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`/* TestACIMode does the following:`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/Sirupsen/logrus"`
`10`	`10`	`. "github.com/contiv/check"`
`11`		`- "github.com/contiv/contivmodel/client"`
	`11`	`+ "github.com/contiv/netplugin/contivmodel/client"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func (s systemtestSuite) TestBasicStartRemoveContainerVXLAN(c C) {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package systemtests`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`. "github.com/contiv/check"`
`5`		`- "github.com/contiv/contivmodel/client"`
	`5`	`+ "github.com/contiv/netplugin/contivmodel/client"`
`6`	`6`	`"time"`
`7`	`7`	`)`
`8`	`8`