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

Replace nc with the local echo client.

Browse Source 
This makes the behaviour more consistent across platforms.

Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
This commit is contained in:
Federico Paolinelli 2020-10-02 15:56:39 +02:00
parent 322790226b
commit 8a6e96b3f0
7 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration/integration_linux_test.go
View File

@ -225,23 +225,22 @@ func (n Namespace) Del() {
} }
func makeTcpClientInNS(netns string, address string, port int, numBytes int) { func makeTcpClientInNS(netns string, address string, port int, numBytes int) {
message := bytes.Repeat([]byte{'a'}, numBytes) payload := bytes.Repeat([]byte{'a'}, numBytes)
message := string(payload)
bin, err := exec.LookPath("nc")
Expect(err).NotTo(HaveOccurred())
var cmd *exec.Cmd var cmd *exec.Cmd
if netns != "" { if netns != "" {
netns = filepath.Base(netns) netns = filepath.Base(netns)
cmd = exec.Command("ip", "netns", "exec", netns, bin, "-v", address, strconv.Itoa(port)) cmd = exec.Command("ip", "netns", "exec", netns, echoClientBinaryPath, "--target", fmt.Sprintf("%s:%d", address, port), "--message", message)
} else { } else {
cmd = exec.Command("nc", address, strconv.Itoa(port)) cmd = exec.Command(echoClientBinaryPath, "--target", fmt.Sprintf("%s:%d", address, port), "--message", message)
} }
cmd.Stdin = bytes.NewBuffer([]byte(message)) cmd.Stdin = bytes.NewBuffer([]byte(message))
cmd.Stderr = GinkgoWriter cmd.Stderr = GinkgoWriter
out, err := cmd.Output() out, err := cmd.Output()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(string(out)).To(Equal(string(message))) Expect(string(out)).To(Equal(message))
} }
func startEchoServerInNamespace(netNS Namespace) (int, *gexec.Session, error) { func startEchoServerInNamespace(netNS Namespace) (int, *gexec.Session, error) {

16
integration/integration_suite_test.go
View File

@ -14,11 +14,10 @@
package integration_test package integration_test
import ( import (
"math/rand" "strings"
"testing" "testing"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec" "github.com/onsi/gomega/gexec"
) )
@ -28,15 +27,18 @@ func TestIntegration(t *testing.T) {
RunSpecs(t, "integration") RunSpecs(t, "integration")
} }
var echoServerBinaryPath string var echoServerBinaryPath, echoClientBinaryPath string
var _ = SynchronizedBeforeSuite(func() []byte { var _ = SynchronizedBeforeSuite(func() []byte {
binaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echosvr") serverBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/server")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
return []byte(binaryPath) clientBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/client")
Expect(err).NotTo(HaveOccurred())
return []byte(strings.Join([]string{serverBinaryPath, clientBinaryPath}, ","))
}, func(data []byte) { }, func(data []byte) {
echoServerBinaryPath = string(data) binaries := strings.Split(string(data), ",")
rand.Seed(config.GinkgoConfig.RandomSeed + int64(GinkgoParallelNode())) echoServerBinaryPath = binaries[0]
echoClientBinaryPath = binaries[1]
}) })
var _ = SynchronizedAfterSuite(func() {}, func() { var _ = SynchronizedAfterSuite(func() {}, func() {

BIN
pkg/testutils/echo/client/client
View File

Binary file not shown.

2
pkg/testutils/echo/echo_test.go
View File

@ -20,7 +20,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
clientBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/client") clientBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/client")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
return []byte(fmt.Sprintf("%s,%s", serverBinaryPath, clientBinaryPath)) return []byte(strings.Join([]string{serverBinaryPath, clientBinaryPath}, ","))
}, func(data []byte) { }, func(data []byte) {
binaries := strings.Split(string(data), ",") binaries := strings.Split(string(data), ",")
serverBinaryPath = binaries[0] serverBinaryPath = binaries[0]

23
plugins/meta/bandwidth/bandwidth_suite_test.go
View File

@ -39,14 +39,18 @@ func TestTBF(t *testing.T) {
RunSpecs(t, "plugins/meta/bandwidth") RunSpecs(t, "plugins/meta/bandwidth")
} }
var echoServerBinaryPath string var echoServerBinaryPath, echoClientBinaryPath string
var _ = SynchronizedBeforeSuite(func() []byte { var _ = SynchronizedBeforeSuite(func() []byte {
binaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echosvr") serverBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/server")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
return []byte(binaryPath) clientBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/client")
Expect(err).NotTo(HaveOccurred())
return []byte(strings.Join([]string{serverBinaryPath, clientBinaryPath}, ","))
}, func(data []byte) { }, func(data []byte) {
echoServerBinaryPath = string(data) binaries := strings.Split(string(data), ",")
echoServerBinaryPath = binaries[0]
echoClientBinaryPath = binaries[1]
}) })
var _ = SynchronizedAfterSuite(func() {}, func() { var _ = SynchronizedAfterSuite(func() {}, func() {
@ -84,23 +88,22 @@ func startEchoServerInNamespace(netNS ns.NetNS) (int, *gexec.Session, error) {
} }
func makeTcpClientInNS(netns string, address string, port int, numBytes int) { func makeTcpClientInNS(netns string, address string, port int, numBytes int) {
message := bytes.Repeat([]byte{'a'}, numBytes) payload := bytes.Repeat([]byte{'a'}, numBytes)
message := string(payload)
bin, err := exec.LookPath("nc")
Expect(err).NotTo(HaveOccurred())
var cmd *exec.Cmd var cmd *exec.Cmd
if netns != "" { if netns != "" {
netns = filepath.Base(netns) netns = filepath.Base(netns)
cmd = exec.Command("ip", "netns", "exec", netns, bin, "-v", address, strconv.Itoa(port)) cmd = exec.Command("ip", "netns", "exec", netns, echoClientBinaryPath, "--target", fmt.Sprintf("%s:%d", address, port), "--message", message)
} else { } else {
cmd = exec.Command("nc", address, strconv.Itoa(port)) cmd = exec.Command(echoClientBinaryPath, "--target", fmt.Sprintf("%s:%d", address, port), "--message", message)
} }
cmd.Stdin = bytes.NewBuffer([]byte(message)) cmd.Stdin = bytes.NewBuffer([]byte(message))
cmd.Stderr = GinkgoWriter cmd.Stderr = GinkgoWriter
out, err := cmd.Output() out, err := cmd.Output()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(string(out)).To(Equal(string(message))) Expect(string(out)).To(Equal(message))
} }
func createVeth(hostNamespace string, hostVethIfName string, containerNamespace string, containerVethIfName string, hostIP []byte, containerIP []byte, hostIfaceMTU int) { func createVeth(hostNamespace string, hostVethIfName string, containerNamespace string, containerVethIfName string, hostIP []byte, containerIP []byte, hostIfaceMTU int) {

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

@ -23,7 +23,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strconv"
"github.com/containernetworking/cni/libcni" "github.com/containernetworking/cni/libcni"
"github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/cni/pkg/types/current"
@ -227,16 +226,14 @@ var _ = Describe("portmap integration tests", func() {
// testEchoServer returns true if we found an echo server on the port // testEchoServer returns true if we found an echo server on the port
func testEchoServer(address string, port int, netns string) bool { func testEchoServer(address string, port int, netns string) bool {
message := "Aliquid melius quam pessimum optimum non est." message := "'Aliquid melius quam pessimum optimum non est.'"
bin, err := exec.LookPath("nc")
Expect(err).NotTo(HaveOccurred())
var cmd *exec.Cmd var cmd *exec.Cmd
if netns != "" { if netns != "" {
netns = filepath.Base(netns) netns = filepath.Base(netns)
cmd = exec.Command("ip", "netns", "exec", netns, bin, "-v", address, strconv.Itoa(port)) cmd = exec.Command("ip", "netns", "exec", netns, echoClientBinaryPath, "--target", fmt.Sprintf("%s:%d", address, port), "--message", message)
} else { } else {
cmd = exec.Command("nc", address, strconv.Itoa(port)) cmd = exec.Command(echoClientBinaryPath, "--target", fmt.Sprintf("%s:%d", address, port), "--message", message)
} }
cmd.Stdin = bytes.NewBufferString(message) cmd.Stdin = bytes.NewBufferString(message)
cmd.Stderr = GinkgoWriter cmd.Stderr = GinkgoWriter

12
plugins/meta/portmap/portmap_suite_test.go
View File

@ -40,14 +40,18 @@ func TestPortmap(t *testing.T) {
RunSpecs(t, "plugins/meta/portmap") RunSpecs(t, "plugins/meta/portmap")
} }
var echoServerBinaryPath string var echoServerBinaryPath, echoClientBinaryPath string
var _ = SynchronizedBeforeSuite(func() []byte { var _ = SynchronizedBeforeSuite(func() []byte {
binaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echosvr") serverBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/server")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
return []byte(binaryPath) clientBinaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echo/client")
Expect(err).NotTo(HaveOccurred())
return []byte(strings.Join([]string{serverBinaryPath, clientBinaryPath}, ","))
}, func(data []byte) { }, func(data []byte) {
echoServerBinaryPath = string(data) binaries := strings.Split(string(data), ",")
echoServerBinaryPath = binaries[0]
echoClientBinaryPath = binaries[1]
}) })
var _ = SynchronizedAfterSuite(func() {}, func() { var _ = SynchronizedAfterSuite(func() {}, func() {