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

dhcp: increase test coverage to 1.0.0 and older spec versions

Browse Source 
Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams
2021-01-28 14:53:35 -06:00
parent dd3f6064f6
commit 932653fd3f
1 changed files with 209 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,9 @@
package main
import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net"
"os"
@ -25,7 +27,7 @@ import (
"time"
"github.com/containernetworking/cni/pkg/skel"
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
@ -208,6 +210,11 @@ var _ = Describe("DHCP Operations", func() {
dhcpPluginPath, err := exec.LookPath("dhcp")
Expect(err).NotTo(HaveOccurred())
clientCmd = exec.Command(dhcpPluginPath, "daemon", "-socketpath", socketPath)
// copy dhcp client's stdout/stderr to test stdout
clientCmd.Stdout = os.Stdout
clientCmd.Stderr = os.Stderr
err = clientCmd.Start()
Expect(err).NotTo(HaveOccurred())
Expect(clientCmd.Process).NotTo(BeNil())
@ -226,20 +233,28 @@ var _ = Describe("DHCP Operations", func() {
clientCmd.Wait()
Expect(originalNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(originalNS)).To(Succeed())
Expect(targetNS.Close()).To(Succeed())
defer os.RemoveAll(tmpDir)
Expect(testutils.UnmountNS(targetNS)).To(Succeed())
Expect(os.RemoveAll(tmpDir)).To(Succeed())
})
It("configures and deconfigures a link with ADD/DEL", func() {
for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver
It(fmt.Sprintf("[%s] configures and deconfigures a link with ADD/DEL", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "%s",
"name": "mynet",
"type": "ipvlan",
"ipam": {
"type": "dhcp",
"daemonSocketPath": "%s"
}
}`, socketPath)
}`, ver, socketPath)
args := &skel.CmdArgs{
ContainerID: "dummy",
@ -248,7 +263,7 @@ var _ = Describe("DHCP Operations", func() {
StdinData: []byte(conf),
}
var addResult *current.Result
var addResult *types100.Result
err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
@ -257,7 +272,7 @@ var _ = Describe("DHCP Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
addResult, err = current.GetResult(r)
addResult, err = types100.GetResult(r)
Expect(err).NotTo(HaveOccurred())
Expect(len(addResult.IPs)).To(Equal(1))
Expect(addResult.IPs[0].Address.String()).To(Equal("192.168.1.5/24"))
@ -273,16 +288,16 @@ var _ = Describe("DHCP Operations", func() {
Expect(err).NotTo(HaveOccurred())
})
It("correctly handles multiple DELs for the same container", func() {
It(fmt.Sprintf("[%s] correctly handles multiple DELs for the same container", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "%s",
"name": "mynet",
"type": "ipvlan",
"ipam": {
"type": "dhcp",
"daemonSocketPath": "%s"
}
}`, socketPath)
}`, ver, socketPath)
args := &skel.CmdArgs{
ContainerID: "dummy",
@ -291,7 +306,7 @@ var _ = Describe("DHCP Operations", func() {
StdinData: []byte(conf),
}
var addResult *current.Result
var addResult *types100.Result
err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
@ -300,7 +315,7 @@ var _ = Describe("DHCP Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
addResult, err = current.GetResult(r)
addResult, err = types100.GetResult(r)
Expect(err).NotTo(HaveOccurred())
Expect(len(addResult.IPs)).To(Equal(1))
Expect(addResult.IPs[0].Address.String()).To(Equal("192.168.1.5/24"))
@ -338,6 +353,7 @@ var _ = Describe("DHCP Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
})
}
})
const (
@ -508,7 +524,19 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
// Start the DHCP client daemon
dhcpPluginPath, err := exec.LookPath("dhcp")
Expect(err).NotTo(HaveOccurred())
clientCmd = exec.Command(dhcpPluginPath, "daemon", "-socketpath", socketPath)
// Use very short timeouts for lease-unavailable operations because
// the same test is run many times, and the delays will exceed the
// `go test` timeout with default delays. Since our DHCP server
// and client daemon are local processes anyway, we can depend on
// them to respond very quickly.
clientCmd = exec.Command(dhcpPluginPath, "daemon", "-socketpath", socketPath, "-timeout", "2s", "-resendmax", "8s")
// copy dhcp client's stdout/stderr to test stdout
var b bytes.Buffer
mw := io.MultiWriter(os.Stdout, &b)
clientCmd.Stdout = mw
clientCmd.Stderr = mw
err = clientCmd.Start()
Expect(err).NotTo(HaveOccurred())
Expect(clientCmd.Process).NotTo(BeNil())
@ -527,13 +555,21 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
clientCmd.Wait()
Expect(originalNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(originalNS)).To(Succeed())
Expect(targetNS.Close()).To(Succeed())
defer os.RemoveAll(tmpDir)
Expect(testutils.UnmountNS(targetNS)).To(Succeed())
Expect(os.RemoveAll(tmpDir)).To(Succeed())
})
It("Configures multiple links with multiple ADD with second lease unavailable", func() {
for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver
It(fmt.Sprintf("[%s] configures multiple links with multiple ADD with second lease unavailable", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "%s",
"name": "mynet",
"type": "bridge",
"bridge": "%s",
@ -541,7 +577,7 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
"type": "dhcp",
"daemonSocketPath": "%s"
}
}`, hostBridgeName, socketPath)
}`, ver, hostBridgeName, socketPath)
args := &skel.CmdArgs{
ContainerID: "dummy",
@ -550,7 +586,7 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
StdinData: []byte(conf),
}
var addResult *current.Result
var addResult *types100.Result
err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
@ -559,7 +595,7 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
addResult, err = current.GetResult(r)
addResult, err = types100.GetResult(r)
Expect(err).NotTo(HaveOccurred())
Expect(len(addResult.IPs)).To(Equal(1))
Expect(addResult.IPs[0].Address.String()).To(Equal("192.168.1.5/24"))
@ -615,4 +651,5 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
})
}
})