network: Change NewNS() call

NewNS() api has been moved to testutils package in the cni plugin repo. Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
WeiZhang555 · Oct 8, 2019 · 929c4e7 · 929c4e7
1 parent c0995c6
commit 929c4e7
Show file tree

Hide file tree

Showing 20 changed files with 1,957 additions and 6 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/katautils/network.go b/pkg/katautils/network.go
@@ -15,6 +15,7 @@ import (
 	"strings"
 
 	"github.com/containernetworking/plugins/pkg/ns"
+	"github.com/containernetworking/plugins/pkg/testutils"
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	"golang.org/x/sys/unix"
 )
@@ -59,7 +60,7 @@ func SetupNetworkNamespace(config *vc.NetworkConfig) error {
 	}
 
 	if config.NetNSPath == "" {
-		n, err := ns.NewNS()
+		n, err := testutils.NewNS()
 		if err != nil {
 			return err
 		}

diff --git a/pkg/katautils/network_test.go b/pkg/katautils/network_test.go
@@ -14,6 +14,7 @@ import (
 	"testing"
 
 	"github.com/containernetworking/plugins/pkg/ns"
+	"github.com/containernetworking/plugins/pkg/testutils"
 	ktu "github.com/kata-containers/runtime/pkg/katatestutils"
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/stretchr/testify/assert"
@@ -127,7 +128,7 @@ func TestSetupNetworkNamespace(t *testing.T) {
 	assert.Error(err)
 
 	// Existent netns path
-	n, err := ns.NewNS()
+	n, err := testutils.NewNS()
 	assert.NoError(err)
 	config = &vc.NetworkConfig{
 		NetNSPath: n.Path(),

diff --git a/vendor/github.com/containernetworking/cni/LICENSE b/vendor/github.com/containernetworking/cni/LICENSE