ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

pkg/ns: remove namespace creation (and move to testutils)

Browse Source 
Namespace creation had an unergonomic interface and isn't used, except
for testing code. Remove it; downstream users should really be creating
their own namespaces
This commit is contained in:
Casey Callendrello
2018-03-16 15:17:00 +01:00
parent 1fb94a4222
commit a0eac8d7d9
20 changed files with 225 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ipam/dhcp/dhcp_test.go
View File

@ -120,10 +120,10 @@ var _ = Describe("DHCP Operations", func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
targetNS, err = ns.NewNS()
targetNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
serverIP := net.IPNet{

6
plugins/main/bridge/bridge_test.go
View File

@ -531,7 +531,7 @@ func cmdAddDelTest(testNS ns.NetNS, tc testCase) {
// Get a Add/Del tester based on test case version
tester := testerByVersion(tc.cniVersion)
targetNS, err := ns.NewNS()
targetNS, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNS.Close()
tester.setNS(testNS, targetNS)
@ -552,7 +552,7 @@ var _ = Describe("bridge Operations", func() {
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
})
@ -693,7 +693,7 @@ var _ = Describe("bridge Operations", func() {
}
tester := testerV03x{}
targetNS, err := ns.NewNS()
targetNS, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNS.Close()
tester.setNS(originalNS, targetNS)

4
plugins/main/host-device/host-device_test.go
View File

@ -34,7 +34,7 @@ var _ = Describe("base functionality", func() {
BeforeEach(func() {
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
ifname = fmt.Sprintf("dummy-%x", rand.Int31())
@ -65,7 +65,7 @@ var _ = Describe("base functionality", func() {
Expect(err).NotTo(HaveOccurred())
// call CmdAdd
targetNS, err := ns.NewNS()
targetNS, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
CNI_IFNAME := "eth0"

8
plugins/main/ipvlan/ipvlan_test.go
View File

@ -34,7 +34,7 @@ import (
const MASTER_NAME = "eth0"
func ipvlanAddDelTest(conf, IFNAME string, originalNS ns.NetNS) {
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -112,7 +112,7 @@ var _ = Describe("ipvlan Operations", func() {
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
err = originalNS.Do(func(ns.NetNS) error {
@ -149,7 +149,7 @@ var _ = Describe("ipvlan Operations", func() {
}
// Create ipvlan in other namespace
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -234,7 +234,7 @@ var _ = Describe("ipvlan Operations", func() {
}
}`, MASTER_NAME)
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()

3
plugins/main/loopback/loopback_test.go
View File

@ -21,6 +21,7 @@ import (
"strings"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
@ -39,7 +40,7 @@ var _ = Describe("Loopback", func() {
command = exec.Command(pathToLoPlugin)
var err error
networkNS, err = ns.NewNS()
networkNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
environ = []string{

8
plugins/main/macvlan/macvlan_test.go
View File

@ -39,7 +39,7 @@ var _ = Describe("macvlan Operations", func() {
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
err = originalNS.Do(func(ns.NetNS) error {
@ -75,7 +75,7 @@ var _ = Describe("macvlan Operations", func() {
MTU: 1500,
}
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -114,7 +114,7 @@ var _ = Describe("macvlan Operations", func() {
}
}`, MASTER_NAME)
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -200,7 +200,7 @@ var _ = Describe("macvlan Operations", func() {
}
}`, MASTER_NAME)
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()

6
plugins/main/ptp/ptp_test.go
View File

@ -35,7 +35,7 @@ var _ = Describe("ptp Operations", func() {
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
})
@ -46,7 +46,7 @@ var _ = Describe("ptp Operations", func() {
doTest := func(conf string, numIPs int) {
const IFNAME = "ptp0"
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -179,7 +179,7 @@ var _ = Describe("ptp Operations", func() {
}
}`
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()

8
plugins/main/vlan/vlan_test.go
View File

@ -39,7 +39,7 @@ var _ = Describe("vlan Operations", func() {
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
err = originalNS.Do(func(ns.NetNS) error {
@ -78,7 +78,7 @@ var _ = Describe("vlan Operations", func() {
}
// Create vlan in other namespace
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -117,7 +117,7 @@ var _ = Describe("vlan Operations", func() {
}
// Create vlan in other namespace
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()
@ -163,7 +163,7 @@ var _ = Describe("vlan Operations", func() {
}
}`, MASTER_NAME)
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()

8
plugins/meta/bandwidth/bandwidth_linux_test.go
View File

@ -52,10 +52,10 @@ var _ = Describe("bandwidth test", func() {
hostIfname = "host-veth"
containerIfname = "container-veth"
hostNs, err = ns.NewNS()
hostNs, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
containerNs, err = ns.NewNS()
containerNs, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
hostIP = net.IP{169, 254, 0, 1}
@ -455,10 +455,10 @@ var _ = Describe("bandwidth test", func() {
containerWithoutTbfIFName := "ptp1"
var err error
containerWithTbfNS, err = ns.NewNS()
containerWithTbfNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
containerWithoutTbfNS, err = ns.NewNS()
containerWithoutTbfNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
By("create two containers, and use the bandwidth plugin on one of them")

4
plugins/meta/flannel/flannel_linux_test.go
View File

@ -37,7 +37,7 @@ var _ = Describe("Flannel", func() {
BeforeEach(func() {
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
})
@ -88,7 +88,7 @@ FLANNEL_IPMASQ=true
It("uses dataDir for storing network configuration", func() {
const IFNAME = "eth0"
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()

3
plugins/meta/portmap/chain_test.go
View File

@ -20,6 +20,7 @@ import (
"runtime"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
"github.com/coreos/go-iptables/iptables"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@ -40,7 +41,7 @@ var _ = Describe("chain tests", func() {
currNs, err := ns.GetCurrentNS()
Expect(err).NotTo(HaveOccurred())
testNs, err := ns.NewNS()
testNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
tlChainName := fmt.Sprintf("cni-test-%d", rand.Intn(10000000))

3
plugins/meta/portmap/portmap_integ_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/containernetworking/cni/libcni"
"github.com/containernetworking/cni/pkg/types/current"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
"github.com/coreos/go-iptables/iptables"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@ -78,7 +79,7 @@ var _ = Describe("portmap integration tests", func() {
dirs := filepath.SplitList(os.Getenv("PATH"))
cniConf = &libcni.CNIConfig{Path: dirs}
targetNS, err = ns.NewNS()
targetNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
fmt.Fprintln(GinkgoWriter, "namespace:", targetNS.Path())

4
plugins/meta/tuning/tuning_test.go
View File

@ -33,7 +33,7 @@ var _ = Describe("tuning plugin", func() {
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
originalNS, err = ns.NewNS()
originalNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
err = originalNS.Do(func(ns.NetNS) error {
@ -79,7 +79,7 @@ var _ = Describe("tuning plugin", func() {
}
}`)
targetNs, err := ns.NewNS()
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
defer targetNs.Close()

2
plugins/sample/sample_linux_test.go
View File

@ -29,7 +29,7 @@ var _ = Describe("sample test", func() {
BeforeEach(func() {
var err error
targetNs, err = ns.NewNS()
targetNs, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
})