static: increase test coverage to 1.0.0 and older spec versions
Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
parent
932653fd3f
commit
f534133ec7
@ -15,12 +15,13 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/containernetworking/cni/pkg/skel"
|
"github.com/containernetworking/cni/pkg/skel"
|
||||||
"github.com/containernetworking/cni/pkg/types"
|
"github.com/containernetworking/cni/pkg/types"
|
||||||
current "github.com/containernetworking/cni/pkg/types/100"
|
"github.com/containernetworking/cni/pkg/types/100"
|
||||||
"github.com/containernetworking/plugins/pkg/testutils"
|
"github.com/containernetworking/plugins/pkg/testutils"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
@ -28,18 +29,101 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var _ = Describe("static Operations", func() {
|
var _ = Describe("static Operations", func() {
|
||||||
It("allocates and releases addresses with ADD/DEL", func() {
|
for _, ver := range testutils.AllSpecVersions {
|
||||||
const ifname string = "eth0"
|
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
|
||||||
const nspath string = "/some/where"
|
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
|
||||||
|
ver := ver
|
||||||
|
|
||||||
conf := `{
|
It(fmt.Sprintf("[%s] allocates and releases addresses with ADD/DEL", ver), func() {
|
||||||
"cniVersion": "0.3.1",
|
const ifname string = "eth0"
|
||||||
"name": "mynet",
|
const nspath string = "/some/where"
|
||||||
"type": "ipvlan",
|
|
||||||
"master": "foo0",
|
conf := fmt.Sprintf(`{
|
||||||
"ipam": {
|
"cniVersion": "%s",
|
||||||
"type": "static",
|
"name": "mynet",
|
||||||
"addresses": [ {
|
"type": "ipvlan",
|
||||||
|
"master": "foo0",
|
||||||
|
"ipam": {
|
||||||
|
"type": "static",
|
||||||
|
"addresses": [ {
|
||||||
|
"address": "10.10.0.1/24",
|
||||||
|
"gateway": "10.10.0.254"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"address": "3ffe:ffff:0:01ff::1/64",
|
||||||
|
"gateway": "3ffe:ffff:0::1"
|
||||||
|
}],
|
||||||
|
"routes": [
|
||||||
|
{ "dst": "0.0.0.0/0" },
|
||||||
|
{ "dst": "192.168.0.0/16", "gw": "10.10.5.1" },
|
||||||
|
{ "dst": "3ffe:ffff:0:01ff::1/64" }],
|
||||||
|
"dns": {
|
||||||
|
"nameservers" : ["8.8.8.8"],
|
||||||
|
"domain": "example.com",
|
||||||
|
"search": [ "example.com" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}`, ver)
|
||||||
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocate the IP
|
||||||
|
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
||||||
|
return cmdAdd(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
if testutils.SpecVersionHasIPVersion(ver) {
|
||||||
|
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := types100.GetResult(r)
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
// Gomega is cranky about slices with different caps
|
||||||
|
Expect(*result.IPs[0]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("10.10.0.1/24"),
|
||||||
|
Gateway: net.ParseIP("10.10.0.254"),
|
||||||
|
}))
|
||||||
|
|
||||||
|
Expect(*result.IPs[1]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
||||||
|
Gateway: net.ParseIP("3ffe:ffff:0::1"),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
Expect(len(result.IPs)).To(Equal(2))
|
||||||
|
|
||||||
|
Expect(result.Routes).To(Equal([]*types.Route{
|
||||||
|
{Dst: mustCIDR("0.0.0.0/0")},
|
||||||
|
{Dst: mustCIDR("192.168.0.0/16"), GW: net.ParseIP("10.10.5.1")},
|
||||||
|
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64")},
|
||||||
|
}))
|
||||||
|
|
||||||
|
// Release the IP
|
||||||
|
err = testutils.CmdDelWithArgs(args, func() error {
|
||||||
|
return cmdDel(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It(fmt.Sprintf("[%s] doesn't error when passed an unknown ID on DEL", ver), func() {
|
||||||
|
const ifname string = "eth0"
|
||||||
|
const nspath string = "/some/where"
|
||||||
|
|
||||||
|
conf := fmt.Sprintf(`{
|
||||||
|
"cniVersion": "%s",
|
||||||
|
"name": "mynet",
|
||||||
|
"type": "ipvlan",
|
||||||
|
"master": "foo0",
|
||||||
|
"ipam": {
|
||||||
|
"type": "static",
|
||||||
|
"addresses": [ {
|
||||||
"address": "10.10.0.1/24",
|
"address": "10.10.0.1/24",
|
||||||
"gateway": "10.10.0.254"
|
"gateway": "10.10.0.254"
|
||||||
},
|
},
|
||||||
@ -47,428 +131,370 @@ var _ = Describe("static Operations", func() {
|
|||||||
"address": "3ffe:ffff:0:01ff::1/64",
|
"address": "3ffe:ffff:0:01ff::1/64",
|
||||||
"gateway": "3ffe:ffff:0::1"
|
"gateway": "3ffe:ffff:0::1"
|
||||||
}],
|
}],
|
||||||
"routes": [
|
"routes": [
|
||||||
{ "dst": "0.0.0.0/0" },
|
{ "dst": "0.0.0.0/0" },
|
||||||
{ "dst": "192.168.0.0/16", "gw": "10.10.5.1" },
|
{ "dst": "192.168.0.0/16", "gw": "10.10.5.1" },
|
||||||
{ "dst": "3ffe:ffff:0:01ff::1/64" }],
|
{ "dst": "3ffe:ffff:0:01ff::1/64" }],
|
||||||
"dns": {
|
"dns": {
|
||||||
"nameservers" : ["8.8.8.8"],
|
"nameservers" : ["8.8.8.8"],
|
||||||
"domain": "example.com",
|
"domain": "example.com",
|
||||||
"search": [ "example.com" ]
|
"search": [ "example.com" ]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}`, ver)
|
||||||
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
}
|
}
|
||||||
}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
// Release the IP
|
||||||
ContainerID: "dummy",
|
err := testutils.CmdDelWithArgs(args, func() error {
|
||||||
Netns: nspath,
|
return cmdDel(args)
|
||||||
IfName: ifname,
|
})
|
||||||
StdinData: []byte(conf),
|
Expect(err).NotTo(HaveOccurred())
|
||||||
}
|
|
||||||
|
|
||||||
// Allocate the IP
|
|
||||||
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
|
||||||
return cmdAdd(args)
|
|
||||||
})
|
})
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
|
||||||
|
|
||||||
result, err := current.GetResult(r)
|
It(fmt.Sprintf("[%s] allocates and releases addresses with ADD/DEL, with ENV variables", ver), func() {
|
||||||
Expect(err).NotTo(HaveOccurred())
|
const ifname string = "eth0"
|
||||||
|
const nspath string = "/some/where"
|
||||||
|
|
||||||
// Gomega is cranky about slices with different caps
|
conf := fmt.Sprintf(`{
|
||||||
Expect(*result.IPs[0]).To(Equal(
|
"cniVersion": "%s",
|
||||||
current.IPConfig{
|
"name": "mynet",
|
||||||
Address: mustCIDR("10.10.0.1/24"),
|
"type": "ipvlan",
|
||||||
Gateway: net.ParseIP("10.10.0.254"),
|
"master": "foo0",
|
||||||
|
"ipam": {
|
||||||
|
"type": "static",
|
||||||
|
"routes": [
|
||||||
|
{ "dst": "0.0.0.0/0" },
|
||||||
|
{ "dst": "192.168.0.0/16", "gw": "10.10.5.1" }],
|
||||||
|
"dns": {
|
||||||
|
"nameservers" : ["8.8.8.8"],
|
||||||
|
"domain": "example.com",
|
||||||
|
"search": [ "example.com" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}`, ver)
|
||||||
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
|
Args: "IP=10.10.0.1/24;GATEWAY=10.10.0.254",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocate the IP
|
||||||
|
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
||||||
|
return cmdAdd(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
if testutils.SpecVersionHasIPVersion(ver) {
|
||||||
|
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := types100.GetResult(r)
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
// Gomega is cranky about slices with different caps
|
||||||
|
Expect(*result.IPs[0]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("10.10.0.1/24"),
|
||||||
|
Gateway: net.ParseIP("10.10.0.254"),
|
||||||
|
}))
|
||||||
|
|
||||||
|
Expect(len(result.IPs)).To(Equal(1))
|
||||||
|
|
||||||
|
Expect(result.Routes).To(Equal([]*types.Route{
|
||||||
|
{Dst: mustCIDR("0.0.0.0/0")},
|
||||||
|
{Dst: mustCIDR("192.168.0.0/16"), GW: net.ParseIP("10.10.5.1")},
|
||||||
}))
|
}))
|
||||||
|
|
||||||
Expect(*result.IPs[1]).To(Equal(
|
// Release the IP
|
||||||
current.IPConfig{
|
err = testutils.CmdDelWithArgs(args, func() error {
|
||||||
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
return cmdDel(args)
|
||||||
Gateway: net.ParseIP("3ffe:ffff:0::1"),
|
})
|
||||||
},
|
Expect(err).NotTo(HaveOccurred())
|
||||||
))
|
|
||||||
Expect(len(result.IPs)).To(Equal(2))
|
|
||||||
|
|
||||||
Expect(result.Routes).To(Equal([]*types.Route{
|
|
||||||
{Dst: mustCIDR("0.0.0.0/0")},
|
|
||||||
{Dst: mustCIDR("192.168.0.0/16"), GW: net.ParseIP("10.10.5.1")},
|
|
||||||
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64")},
|
|
||||||
}))
|
|
||||||
|
|
||||||
// Release the IP
|
|
||||||
err = testutils.CmdDelWithArgs(args, func() error {
|
|
||||||
return cmdDel(args)
|
|
||||||
})
|
})
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
It("doesn't error when passed an unknown ID on DEL", func() {
|
It(fmt.Sprintf("[%s] allocates and releases multiple addresses with ADD/DEL, with ENV variables", ver), func() {
|
||||||
const ifname string = "eth0"
|
const ifname string = "eth0"
|
||||||
const nspath string = "/some/where"
|
const nspath string = "/some/where"
|
||||||
|
|
||||||
conf := `{
|
conf := fmt.Sprintf(`{
|
||||||
"cniVersion": "0.3.0",
|
"cniVersion": "%s",
|
||||||
"name": "mynet",
|
"name": "mynet",
|
||||||
"type": "ipvlan",
|
"type": "ipvlan",
|
||||||
"master": "foo0",
|
"master": "foo0",
|
||||||
"ipam": {
|
"ipam": {
|
||||||
"type": "static",
|
"type": "static"
|
||||||
"addresses": [ {
|
}
|
||||||
"address": "10.10.0.1/24",
|
}`, ver)
|
||||||
"gateway": "10.10.0.254"
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
|
Args: "IP=10.10.0.1/24,11.11.0.1/24;GATEWAY=10.10.0.254",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocate the IP
|
||||||
|
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
||||||
|
return cmdAdd(args)
|
||||||
|
})
|
||||||
|
if !testutils.SpecVersionHasMultipleIPs(ver) {
|
||||||
|
errStr := fmt.Sprintf("CNI version %s does not support more than 1 address per family", ver)
|
||||||
|
Expect(err).To(MatchError(errStr))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
if testutils.SpecVersionHasIPVersion(ver) {
|
||||||
|
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := types100.GetResult(r)
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
// Gomega is cranky about slices with different caps
|
||||||
|
Expect(*result.IPs[0]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("10.10.0.1/24"),
|
||||||
|
Gateway: net.ParseIP("10.10.0.254"),
|
||||||
|
}))
|
||||||
|
Expect(*result.IPs[1]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("11.11.0.1/24"),
|
||||||
|
Gateway: nil,
|
||||||
|
}))
|
||||||
|
|
||||||
|
Expect(len(result.IPs)).To(Equal(2))
|
||||||
|
|
||||||
|
// Release the IP
|
||||||
|
err = testutils.CmdDelWithArgs(args, func() error {
|
||||||
|
return cmdDel(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It(fmt.Sprintf("[%s] allocates and releases multiple addresses with ADD/DEL, from RuntimeConfig", ver), func() {
|
||||||
|
const ifname string = "eth0"
|
||||||
|
const nspath string = "/some/where"
|
||||||
|
|
||||||
|
conf := fmt.Sprintf(`{
|
||||||
|
"cniVersion": "%s",
|
||||||
|
"name": "mynet",
|
||||||
|
"type": "ipvlan",
|
||||||
|
"master": "foo0",
|
||||||
|
"capabilities": {"ips": true},
|
||||||
|
"ipam": {
|
||||||
|
"type": "static",
|
||||||
|
"routes": [
|
||||||
|
{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
|
||||||
|
{ "dst": "3ffe:ffff:0:01ff::1/64",
|
||||||
|
"gw": "3ffe:ffff:0::1" } ],
|
||||||
|
"dns": {
|
||||||
|
"nameservers" : ["8.8.8.8"],
|
||||||
|
"domain": "example.com",
|
||||||
|
"search": [ "example.com" ]
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
"RuntimeConfig": {
|
||||||
"address": "3ffe:ffff:0:01ff::1/64",
|
|
||||||
"gateway": "3ffe:ffff:0::1"
|
|
||||||
}],
|
|
||||||
"routes": [
|
|
||||||
{ "dst": "0.0.0.0/0" },
|
|
||||||
{ "dst": "192.168.0.0/16", "gw": "10.10.5.1" },
|
|
||||||
{ "dst": "3ffe:ffff:0:01ff::1/64" }],
|
|
||||||
"dns": {
|
|
||||||
"nameservers" : ["8.8.8.8"],
|
|
||||||
"domain": "example.com",
|
|
||||||
"search": [ "example.com" ]
|
|
||||||
}}}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
|
||||||
ContainerID: "dummy",
|
|
||||||
Netns: nspath,
|
|
||||||
IfName: ifname,
|
|
||||||
StdinData: []byte(conf),
|
|
||||||
}
|
|
||||||
|
|
||||||
// Release the IP
|
|
||||||
err := testutils.CmdDelWithArgs(args, func() error {
|
|
||||||
return cmdDel(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
It("allocates and releases addresses with ADD/DEL, with ENV variables", func() {
|
|
||||||
const ifname string = "eth0"
|
|
||||||
const nspath string = "/some/where"
|
|
||||||
|
|
||||||
conf := `{
|
|
||||||
"cniVersion": "0.3.1",
|
|
||||||
"name": "mynet",
|
|
||||||
"type": "ipvlan",
|
|
||||||
"master": "foo0",
|
|
||||||
"ipam": {
|
|
||||||
"type": "static",
|
|
||||||
"routes": [
|
|
||||||
{ "dst": "0.0.0.0/0" },
|
|
||||||
{ "dst": "192.168.0.0/16", "gw": "10.10.5.1" }],
|
|
||||||
"dns": {
|
|
||||||
"nameservers" : ["8.8.8.8"],
|
|
||||||
"domain": "example.com",
|
|
||||||
"search": [ "example.com" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
|
||||||
ContainerID: "dummy",
|
|
||||||
Netns: nspath,
|
|
||||||
IfName: ifname,
|
|
||||||
StdinData: []byte(conf),
|
|
||||||
Args: "IP=10.10.0.1/24;GATEWAY=10.10.0.254",
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocate the IP
|
|
||||||
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
|
||||||
return cmdAdd(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
|
||||||
|
|
||||||
result, err := current.GetResult(r)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
// Gomega is cranky about slices with different caps
|
|
||||||
Expect(*result.IPs[0]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("10.10.0.1/24"),
|
|
||||||
Gateway: net.ParseIP("10.10.0.254"),
|
|
||||||
}))
|
|
||||||
|
|
||||||
Expect(len(result.IPs)).To(Equal(1))
|
|
||||||
|
|
||||||
Expect(result.Routes).To(Equal([]*types.Route{
|
|
||||||
{Dst: mustCIDR("0.0.0.0/0")},
|
|
||||||
{Dst: mustCIDR("192.168.0.0/16"), GW: net.ParseIP("10.10.5.1")},
|
|
||||||
}))
|
|
||||||
|
|
||||||
// Release the IP
|
|
||||||
err = testutils.CmdDelWithArgs(args, func() error {
|
|
||||||
return cmdDel(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
It("allocates and releases multiple addresses with ADD/DEL, with ENV variables", func() {
|
|
||||||
const ifname string = "eth0"
|
|
||||||
const nspath string = "/some/where"
|
|
||||||
|
|
||||||
conf := `{
|
|
||||||
"cniVersion": "0.3.1",
|
|
||||||
"name": "mynet",
|
|
||||||
"type": "ipvlan",
|
|
||||||
"master": "foo0",
|
|
||||||
"ipam": {
|
|
||||||
"type": "static"
|
|
||||||
}
|
|
||||||
}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
|
||||||
ContainerID: "dummy",
|
|
||||||
Netns: nspath,
|
|
||||||
IfName: ifname,
|
|
||||||
StdinData: []byte(conf),
|
|
||||||
Args: "IP=10.10.0.1/24,11.11.0.1/24;GATEWAY=10.10.0.254",
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocate the IP
|
|
||||||
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
|
||||||
return cmdAdd(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
|
||||||
|
|
||||||
result, err := current.GetResult(r)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
// Gomega is cranky about slices with different caps
|
|
||||||
Expect(*result.IPs[0]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("10.10.0.1/24"),
|
|
||||||
Gateway: net.ParseIP("10.10.0.254"),
|
|
||||||
}))
|
|
||||||
Expect(*result.IPs[1]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("11.11.0.1/24"),
|
|
||||||
Gateway: nil,
|
|
||||||
}))
|
|
||||||
|
|
||||||
Expect(len(result.IPs)).To(Equal(2))
|
|
||||||
|
|
||||||
// Release the IP
|
|
||||||
err = testutils.CmdDelWithArgs(args, func() error {
|
|
||||||
return cmdDel(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
It("allocates and releases multiple addresses with ADD/DEL, from RuntimeConfig", func() {
|
|
||||||
const ifname string = "eth0"
|
|
||||||
const nspath string = "/some/where"
|
|
||||||
|
|
||||||
conf := `{
|
|
||||||
"cniVersion": "0.3.1",
|
|
||||||
"name": "mynet",
|
|
||||||
"type": "ipvlan",
|
|
||||||
"master": "foo0",
|
|
||||||
"capabilities": {"ips": true},
|
|
||||||
"ipam": {
|
|
||||||
"type": "static",
|
|
||||||
"routes": [
|
|
||||||
{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
|
|
||||||
{ "dst": "3ffe:ffff:0:01ff::1/64",
|
|
||||||
"gw": "3ffe:ffff:0::1" } ],
|
|
||||||
"dns": {
|
|
||||||
"nameservers" : ["8.8.8.8"],
|
|
||||||
"domain": "example.com",
|
|
||||||
"search": [ "example.com" ]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"RuntimeConfig": {
|
|
||||||
"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
|
|
||||||
}
|
|
||||||
}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
|
||||||
ContainerID: "dummy",
|
|
||||||
Netns: nspath,
|
|
||||||
IfName: ifname,
|
|
||||||
StdinData: []byte(conf),
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocate the IP
|
|
||||||
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
|
||||||
return cmdAdd(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
|
||||||
|
|
||||||
result, err := current.GetResult(r)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
// Gomega is cranky about slices with different caps
|
|
||||||
Expect(*result.IPs[0]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("10.10.0.1/24"),
|
|
||||||
}))
|
|
||||||
Expect(*result.IPs[1]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
|
||||||
},
|
|
||||||
))
|
|
||||||
Expect(len(result.IPs)).To(Equal(2))
|
|
||||||
Expect(result.Routes).To(Equal([]*types.Route{
|
|
||||||
{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
|
|
||||||
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
|
|
||||||
}))
|
|
||||||
|
|
||||||
// Release the IP
|
|
||||||
err = testutils.CmdDelWithArgs(args, func() error {
|
|
||||||
return cmdDel(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
It("allocates and releases multiple addresses with ADD/DEL, from args", func() {
|
|
||||||
const ifname string = "eth0"
|
|
||||||
const nspath string = "/some/where"
|
|
||||||
|
|
||||||
conf := `{
|
|
||||||
"cniVersion": "0.3.1",
|
|
||||||
"name": "mynet",
|
|
||||||
"type": "ipvlan",
|
|
||||||
"master": "foo0",
|
|
||||||
"ipam": {
|
|
||||||
"type": "static",
|
|
||||||
"routes": [
|
|
||||||
{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
|
|
||||||
{ "dst": "3ffe:ffff:0:01ff::1/64",
|
|
||||||
"gw": "3ffe:ffff:0::1" } ],
|
|
||||||
"dns": {
|
|
||||||
"nameservers" : ["8.8.8.8"],
|
|
||||||
"domain": "example.com",
|
|
||||||
"search": [ "example.com" ]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"args": {
|
|
||||||
"cni": {
|
|
||||||
"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
|
"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
|
||||||
}
|
}
|
||||||
|
}`, ver)
|
||||||
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
}
|
}
|
||||||
}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
// Allocate the IP
|
||||||
ContainerID: "dummy",
|
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
||||||
Netns: nspath,
|
return cmdAdd(args)
|
||||||
IfName: ifname,
|
})
|
||||||
StdinData: []byte(conf),
|
Expect(err).NotTo(HaveOccurred())
|
||||||
}
|
if testutils.SpecVersionHasIPVersion(ver) {
|
||||||
|
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
||||||
// Allocate the IP
|
|
||||||
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
|
||||||
return cmdAdd(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
|
||||||
|
|
||||||
result, err := current.GetResult(r)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
// Gomega is cranky about slices with different caps
|
|
||||||
Expect(*result.IPs[0]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("10.10.0.1/24"),
|
|
||||||
}))
|
|
||||||
Expect(*result.IPs[1]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
|
||||||
},
|
|
||||||
))
|
|
||||||
Expect(len(result.IPs)).To(Equal(2))
|
|
||||||
Expect(result.Routes).To(Equal([]*types.Route{
|
|
||||||
{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
|
|
||||||
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
|
|
||||||
}))
|
|
||||||
|
|
||||||
// Release the IP
|
|
||||||
err = testutils.CmdDelWithArgs(args, func() error {
|
|
||||||
return cmdDel(args)
|
|
||||||
})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
It("allocates and releases multiple addresses with ADD/DEL, from RuntimeConfig/ARGS/CNI_ARGS", func() {
|
|
||||||
const ifname string = "eth0"
|
|
||||||
const nspath string = "/some/where"
|
|
||||||
|
|
||||||
conf := `{
|
|
||||||
"cniVersion": "0.3.1",
|
|
||||||
"name": "mynet",
|
|
||||||
"type": "ipvlan",
|
|
||||||
"master": "foo0",
|
|
||||||
"capabilities": {"ips": true},
|
|
||||||
"ipam": {
|
|
||||||
"type": "static",
|
|
||||||
"routes": [
|
|
||||||
{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
|
|
||||||
{ "dst": "3ffe:ffff:0:01ff::1/64",
|
|
||||||
"gw": "3ffe:ffff:0::1" } ],
|
|
||||||
"dns": {
|
|
||||||
"nameservers" : ["8.8.8.8"],
|
|
||||||
"domain": "example.com",
|
|
||||||
"search": [ "example.com" ]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"RuntimeConfig": {
|
|
||||||
"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
|
|
||||||
},
|
|
||||||
"args": {
|
|
||||||
"cni": {
|
|
||||||
"ips" : ["10.10.0.2/24", "3ffe:ffff:0:01ff::2/64"]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}`
|
|
||||||
|
|
||||||
args := &skel.CmdArgs{
|
result, err := types100.GetResult(r)
|
||||||
ContainerID: "dummy",
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Netns: nspath,
|
|
||||||
IfName: ifname,
|
|
||||||
StdinData: []byte(conf),
|
|
||||||
Args: "IP=10.10.0.3/24,11.11.0.3/24;GATEWAY=10.10.0.254",
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocate the IP
|
// Gomega is cranky about slices with different caps
|
||||||
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
Expect(*result.IPs[0]).To(Equal(
|
||||||
return cmdAdd(args)
|
types100.IPConfig{
|
||||||
})
|
Address: mustCIDR("10.10.0.1/24"),
|
||||||
Expect(err).NotTo(HaveOccurred())
|
}))
|
||||||
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
Expect(*result.IPs[1]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
result, err := current.GetResult(r)
|
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
||||||
Expect(err).NotTo(HaveOccurred())
|
},
|
||||||
|
))
|
||||||
// only addresses in runtimeConfig configured because of its priorities
|
Expect(len(result.IPs)).To(Equal(2))
|
||||||
Expect(*result.IPs[0]).To(Equal(
|
Expect(result.Routes).To(Equal([]*types.Route{
|
||||||
current.IPConfig{
|
{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
|
||||||
Address: mustCIDR("10.10.0.1/24"),
|
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
|
||||||
}))
|
}))
|
||||||
Expect(*result.IPs[1]).To(Equal(
|
|
||||||
current.IPConfig{
|
|
||||||
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
|
||||||
},
|
|
||||||
))
|
|
||||||
Expect(len(result.IPs)).To(Equal(2))
|
|
||||||
Expect(result.Routes).To(Equal([]*types.Route{
|
|
||||||
{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
|
|
||||||
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
|
|
||||||
}))
|
|
||||||
|
|
||||||
// Release the IP
|
// Release the IP
|
||||||
err = testutils.CmdDelWithArgs(args, func() error {
|
err = testutils.CmdDelWithArgs(args, func() error {
|
||||||
return cmdDel(args)
|
return cmdDel(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
})
|
})
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
})
|
|
||||||
|
|
||||||
|
It(fmt.Sprintf("[%s] allocates and releases multiple addresses with ADD/DEL, from args", ver), func() {
|
||||||
|
const ifname string = "eth0"
|
||||||
|
const nspath string = "/some/where"
|
||||||
|
|
||||||
|
conf := fmt.Sprintf(`{
|
||||||
|
"cniVersion": "%s",
|
||||||
|
"name": "mynet",
|
||||||
|
"type": "ipvlan",
|
||||||
|
"master": "foo0",
|
||||||
|
"ipam": {
|
||||||
|
"type": "static",
|
||||||
|
"routes": [
|
||||||
|
{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
|
||||||
|
{ "dst": "3ffe:ffff:0:01ff::1/64",
|
||||||
|
"gw": "3ffe:ffff:0::1" } ],
|
||||||
|
"dns": {
|
||||||
|
"nameservers" : ["8.8.8.8"],
|
||||||
|
"domain": "example.com",
|
||||||
|
"search": [ "example.com" ]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"args": {
|
||||||
|
"cni": {
|
||||||
|
"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}`, ver)
|
||||||
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocate the IP
|
||||||
|
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
||||||
|
return cmdAdd(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
if testutils.SpecVersionHasIPVersion(ver) {
|
||||||
|
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := types100.GetResult(r)
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
// Gomega is cranky about slices with different caps
|
||||||
|
Expect(*result.IPs[0]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("10.10.0.1/24"),
|
||||||
|
}))
|
||||||
|
Expect(*result.IPs[1]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
Expect(len(result.IPs)).To(Equal(2))
|
||||||
|
Expect(result.Routes).To(Equal([]*types.Route{
|
||||||
|
{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
|
||||||
|
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
|
||||||
|
}))
|
||||||
|
|
||||||
|
// Release the IP
|
||||||
|
err = testutils.CmdDelWithArgs(args, func() error {
|
||||||
|
return cmdDel(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It(fmt.Sprintf("[%s] allocates and releases multiple addresses with ADD/DEL, from RuntimeConfig/ARGS/CNI_ARGS", ver), func() {
|
||||||
|
const ifname string = "eth0"
|
||||||
|
const nspath string = "/some/where"
|
||||||
|
|
||||||
|
conf := fmt.Sprintf(`{
|
||||||
|
"cniVersion": "%s",
|
||||||
|
"name": "mynet",
|
||||||
|
"type": "ipvlan",
|
||||||
|
"master": "foo0",
|
||||||
|
"capabilities": {"ips": true},
|
||||||
|
"ipam": {
|
||||||
|
"type": "static",
|
||||||
|
"routes": [
|
||||||
|
{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
|
||||||
|
{ "dst": "3ffe:ffff:0:01ff::1/64",
|
||||||
|
"gw": "3ffe:ffff:0::1" } ],
|
||||||
|
"dns": {
|
||||||
|
"nameservers" : ["8.8.8.8"],
|
||||||
|
"domain": "example.com",
|
||||||
|
"search": [ "example.com" ]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"RuntimeConfig": {
|
||||||
|
"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
|
||||||
|
},
|
||||||
|
"args": {
|
||||||
|
"cni": {
|
||||||
|
"ips" : ["10.10.0.2/24", "3ffe:ffff:0:01ff::2/64"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}`, ver)
|
||||||
|
|
||||||
|
args := &skel.CmdArgs{
|
||||||
|
ContainerID: "dummy",
|
||||||
|
Netns: nspath,
|
||||||
|
IfName: ifname,
|
||||||
|
StdinData: []byte(conf),
|
||||||
|
Args: "IP=10.10.0.3/24,11.11.0.3/24;GATEWAY=10.10.0.254",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocate the IP
|
||||||
|
r, raw, err := testutils.CmdAddWithArgs(args, func() error {
|
||||||
|
return cmdAdd(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
if testutils.SpecVersionHasIPVersion(ver) {
|
||||||
|
Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := types100.GetResult(r)
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
// only addresses in runtimeConfig configured because of its priorities
|
||||||
|
Expect(*result.IPs[0]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("10.10.0.1/24"),
|
||||||
|
}))
|
||||||
|
Expect(*result.IPs[1]).To(Equal(
|
||||||
|
types100.IPConfig{
|
||||||
|
Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
Expect(len(result.IPs)).To(Equal(2))
|
||||||
|
Expect(result.Routes).To(Equal([]*types.Route{
|
||||||
|
{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
|
||||||
|
{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
|
||||||
|
}))
|
||||||
|
|
||||||
|
// Release the IP
|
||||||
|
err = testutils.CmdDelWithArgs(args, func() error {
|
||||||
|
return cmdDel(args)
|
||||||
|
})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
func mustCIDR(s string) net.IPNet {
|
func mustCIDR(s string) net.IPNet {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user