virtcontainers: Change all import paths

Some virtcontainers pieces of code are importing virtcontainers packages. We need to change those paths to point at kata-containers/runtime/virtcontainers Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
kata-containers · Feb 23, 2018 · 8c11930 · 8c11930
1 parent 5b0a080
commit 8c11930
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 41 deletions.
diff --git a/virtcontainers/.ci/go-test.sh b/virtcontainers/.ci/go-test.sh
@@ -18,12 +18,12 @@
 set -e
 
 test_packages=$(go list ./... | grep -v vendor)
-test_ldflags="-X github.com/containers/virtcontainers/pkg/mock.DefaultMockCCShimBinPath=$1 \
-		-X github.com/containers/virtcontainers/pkg/mock.DefaultMockKataShimBinPath=$2 \
-		-X github.com/containers/virtcontainers/pkg/mock.DefaultMockHookBinPath=$3"
+test_ldflags="-X github.com/kata-containers/runtime/virtcontainers/pkg/mock.DefaultMockCCShimBinPath=$1 \
+		-X github.com/kata-containers/runtime/virtcontainers/pkg/mock.DefaultMockKataShimBinPath=$2 \
+		-X github.com/kata-containers/runtime/virtcontainers/pkg/mock.DefaultMockHookBinPath=$3"
 echo "Run go test and generate coverage:"
 for pkg in $test_packages; do
-	if [ "$pkg" = "github.com/containers/virtcontainers" ]; then
+	if [ "$pkg" = "github.com/kata-containers/runtime/virtcontainers" ]; then
 		sudo env GOPATH=$GOPATH GOROOT=$GOROOT PATH=$PATH go test -ldflags "$test_ldflags" -cover -coverprofile=profile.cov $pkg
 	else
 		sudo env GOPATH=$GOPATH GOROOT=$GOROOT PATH=$PATH go test -ldflags "$test_ldflags" -cover $pkg

diff --git a/virtcontainers/.ci/update-vendoring.sh b/virtcontainers/.ci/update-vendoring.sh
@@ -22,7 +22,7 @@ set -e
 
 proxy_repo="github.com/clearcontainers/proxy"
 runtime_repo="github.com/clearcontainers/runtime"
-virtcontainers_repo="github.com/containers/virtcontainers"
+virtcontainers_repo="github.com/kata-containers/runtime/virtcontainers"
 
 function apply_depends_on(){
 	pushd "${GOPATH}/src/${virtcontainers_repo}"

diff --git a/virtcontainers/api_test.go b/virtcontainers/api_test.go
@@ -26,7 +26,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/containers/virtcontainers/pkg/mock"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/virtcontainers/asset.go b/virtcontainers/asset.go
@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/containers/virtcontainers/pkg/annotations"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
 )
 
 type assetType string

diff --git a/virtcontainers/asset_test.go b/virtcontainers/asset_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containers/virtcontainers/pkg/annotations"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/virtcontainers/cc_shim_test.go b/virtcontainers/cc_shim_test.go
@@ -28,7 +28,7 @@ import (
 	"time"
 	"unsafe"
 
-	. "github.com/containers/virtcontainers/pkg/mock"
+	. "github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 )
 
 // These tests don't care about the format of the container ID

diff --git a/virtcontainers/cni.go b/virtcontainers/cni.go
@@ -22,7 +22,7 @@ import (
 	cniTypes "github.com/containernetworking/cni/pkg/types"
 	cniV2Types "github.com/containernetworking/cni/pkg/types/020"
 	cniLatestTypes "github.com/containernetworking/cni/pkg/types/current"
-	cniPlugin "github.com/containers/virtcontainers/pkg/cni"
+	cniPlugin "github.com/kata-containers/runtime/virtcontainers/pkg/cni"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/virtcontainers/example_pod_run_test.go b/virtcontainers/example_pod_run_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 )
 
 const containerRootfs = "/var/lib/container/bundle/"

diff --git a/virtcontainers/hack/virtc/main.go b/virtcontainers/hack/virtc/main.go
@@ -24,11 +24,11 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/containers/virtcontainers/pkg/uuid"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/uuid"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 )
 
 var virtcLog = logrus.New()

diff --git a/virtcontainers/hook_test.go b/virtcontainers/hook_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	. "github.com/containers/virtcontainers/pkg/mock"
+	. "github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

diff --git a/virtcontainers/hyperstart_agent.go b/virtcontainers/hyperstart_agent.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	proxyClient "github.com/clearcontainers/proxy/client"
-	"github.com/containers/virtcontainers/pkg/hyperstart"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/hyperstart"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

diff --git a/virtcontainers/hyperstart_agent_test.go b/virtcontainers/hyperstart_agent_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/containers/virtcontainers/pkg/hyperstart"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/hyperstart"
 	"github.com/vishvananda/netlink"
 )
 

diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"syscall"
 
-	vcAnnotations "github.com/containers/virtcontainers/pkg/annotations"
-	"github.com/containers/virtcontainers/pkg/uuid"
+	vcAnnotations "github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/uuid"
 	kataclient "github.com/kata-containers/agent/protocols/client"
 	"github.com/kata-containers/agent/protocols/grpc"
 	"github.com/opencontainers/runtime-spec/specs-go"

diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containers/virtcontainers/pkg/mock"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 	gpb "github.com/gogo/protobuf/types"
 	pb "github.com/kata-containers/agent/protocols/grpc"
 	"golang.org/x/net/context"

diff --git a/virtcontainers/kata_shim_test.go b/virtcontainers/kata_shim_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containers/virtcontainers/pkg/mock"
+	. "github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 )
 
 // These tests don't care about the format of the container ID

diff --git a/virtcontainers/network.go b/virtcontainers/network.go
@@ -30,8 +30,8 @@ import (
 	"time"
 
 	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/containers/virtcontainers/pkg/ethtool"
-	"github.com/containers/virtcontainers/pkg/uuid"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/ethtool"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/uuid"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"

diff --git a/virtcontainers/pkg/hyperstart/hyperstart_test.go b/virtcontainers/pkg/hyperstart/hyperstart_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containers/virtcontainers/pkg/hyperstart"
-	"github.com/containers/virtcontainers/pkg/hyperstart/mock"
+	. "github.com/kata-containers/runtime/virtcontainers/pkg/hyperstart"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/hyperstart/mock"
 )
 
 const (

diff --git a/virtcontainers/pkg/hyperstart/mock/hyperstart.go b/virtcontainers/pkg/hyperstart/mock/hyperstart.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"testing"
 
-	hyper "github.com/containers/virtcontainers/pkg/hyperstart"
+	hyper "github.com/kata-containers/runtime/virtcontainers/pkg/hyperstart"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/virtcontainers/pkg/oci/utils.go b/virtcontainers/pkg/oci/utils.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 
 	criContainerdAnnotations "github.com/containerd/cri-containerd/pkg/annotations"
-	vc "github.com/containers/virtcontainers"
-	vcAnnotations "github.com/containers/virtcontainers/pkg/annotations"
-	dockershimAnnotations "github.com/containers/virtcontainers/pkg/annotations/dockershim"
+	vc "github.com/kata-containers/runtime/virtcontainers"
+	vcAnnotations "github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
+	dockershimAnnotations "github.com/kata-containers/runtime/virtcontainers/pkg/annotations/dockershim"
 	crioAnnotations "github.com/kubernetes-incubator/cri-o/pkg/annotations"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"

diff --git a/virtcontainers/pkg/oci/utils_test.go b/virtcontainers/pkg/oci/utils_test.go
@@ -26,8 +26,8 @@ import (
 	"reflect"
 	"testing"
 
-	vc "github.com/containers/virtcontainers"
-	vcAnnotations "github.com/containers/virtcontainers/pkg/annotations"
+	vc "github.com/kata-containers/runtime/virtcontainers"
+	vcAnnotations "github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
 	"github.com/kubernetes-incubator/cri-o/pkg/annotations"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"

diff --git a/virtcontainers/pkg/vcMock/container.go b/virtcontainers/pkg/vcMock/container.go
@@ -15,7 +15,7 @@
 package vcMock
 
 import (
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 )
 
 // ID implements the VCContainer function of the same name.

diff --git a/virtcontainers/pkg/vcMock/mock.go b/virtcontainers/pkg/vcMock/mock.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"syscall"
 
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/virtcontainers/pkg/vcMock/mock_test.go b/virtcontainers/pkg/vcMock/mock_test.go
@@ -19,7 +19,7 @@ import (
 	"syscall"
 	"testing"
 
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/virtcontainers/pkg/vcMock/pod.go b/virtcontainers/pkg/vcMock/pod.go
@@ -15,7 +15,7 @@
 package vcMock
 
 import (
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 )
 
 // ID implements the VCPod function of the same name.

diff --git a/virtcontainers/pkg/vcMock/types.go b/virtcontainers/pkg/vcMock/types.go
@@ -17,7 +17,7 @@ package vcMock
 import (
 	"syscall"
 
-	vc "github.com/containers/virtcontainers"
+	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/virtcontainers/pod_test.go b/virtcontainers/pod_test.go
@@ -26,7 +26,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/containers/virtcontainers/pkg/annotations"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/virtcontainers/pkg/uuid"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/uuid"
 	govmmQemu "github.com/intel/govmm/qemu"
 	"github.com/sirupsen/logrus"
 )

diff --git a/virtcontainers/shim/mock/cc-shim/shim.go b/virtcontainers/shim/mock/cc-shim/shim.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/containers/virtcontainers/pkg/mock"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 )
 
 func main() {

diff --git a/virtcontainers/shim/mock/kata-shim/shim.go b/virtcontainers/shim/mock/kata-shim/shim.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/containers/virtcontainers/pkg/mock"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/mock"
 )
 
 func main() {

diff --git a/virtcontainers/utils/virtcontainers-setup.sh b/virtcontainers/utils/virtcontainers-setup.sh
@@ -59,8 +59,8 @@ echo "Clone cni"
 git clone https://github.com/containernetworking/plugins.git
 
 echo "Copy CNI config files"
-cp $GOPATH/src/github.com/containers/virtcontainers/test/cni/10-mynet.conf ${ETCDIR}/cni/net.d/
-cp $GOPATH/src/github.com/containers/virtcontainers/test/cni/99-loopback.conf ${ETCDIR}/cni/net.d/
+cp $GOPATH/src/github.com/kata-containers/runtime/virtcontainers/test/cni/10-mynet.conf ${ETCDIR}/cni/net.d/
+cp $GOPATH/src/github.com/kata-containers/runtime/virtcontainers/test/cni/99-loopback.conf ${ETCDIR}/cni/net.d/
 
 pushd plugins
 ./build.sh