Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions plugins/main/ipvlan/ipvlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type NetConf struct {
types.NetConf
Master string `json:"master"`
Mode string `json:"mode"`
Flag string `json:"flag,omitempty"`
MTU int `json:"mtu"`
LinkContNs bool `json:"linkInContainer,omitempty"`
}
Expand Down Expand Up @@ -104,6 +105,32 @@ func modeFromString(s string) (netlink.IPVlanMode, error) {
}
}

func flagFromString(s string) (netlink.IPVlanFlag, error) {
switch s {
case "", "bridge":
return netlink.IPVLAN_FLAG_BRIDGE, nil
case "private":
return netlink.IPVLAN_FLAG_PRIVATE, nil
case "vepa":
return netlink.IPVLAN_FLAG_VEPA, nil
default:
return 0, fmt.Errorf("unknown ipvlan flag: %q", s)
}
}

func flagToString(flag netlink.IPVlanFlag) (string, error) {
switch flag {
case netlink.IPVLAN_FLAG_BRIDGE:
return "bridge", nil
case netlink.IPVLAN_FLAG_PRIVATE:
return "private", nil
case netlink.IPVLAN_FLAG_VEPA:
return "vepa", nil
default:
return "", fmt.Errorf("unknown ipvlan flag: %d", flag)
}
}

func modeToString(mode netlink.IPVlanMode) (string, error) {
switch mode {
case netlink.IPVLAN_MODE_L2:
Expand All @@ -125,6 +152,11 @@ func createIpvlan(conf *NetConf, ifName string, netns ns.NetNS) (*current.Interf
return nil, err
}

flag, err := flagFromString(conf.Flag)
if err != nil {
return nil, err
}

var m netlink.Link
if conf.LinkContNs {
err = netns.Do(func(_ ns.NetNS) error {
Expand Down Expand Up @@ -154,6 +186,7 @@ func createIpvlan(conf *NetConf, ifName string, netns ns.NetNS) (*current.Interf
mv := &netlink.IPVlan{
LinkAttrs: linkAttrs,
Mode: mode,
Flag: flag,
}

if conf.LinkContNs {
Expand Down Expand Up @@ -426,7 +459,7 @@ func cmdCheck(args *skel.CmdArgs) error {
// Check prevResults for ips, routes and dns against values found in the container
if err := netns.Do(func(_ ns.NetNS) error {
// Check interface against values found in the container
err := validateCniContainerInterface(contMap, n.Mode)
err := validateCniContainerInterface(contMap, n.Mode, n.Flag)
if err != nil {
return err
}
Expand All @@ -448,7 +481,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return nil
}

func validateCniContainerInterface(intf current.Interface, modeExpected string) error {
func validateCniContainerInterface(intf current.Interface, modeExpected, flagExpected string) error {
var link netlink.Link
var err error

Expand Down Expand Up @@ -484,6 +517,22 @@ func validateCniContainerInterface(intf current.Interface, modeExpected string)
return fmt.Errorf("Container IPVlan mode %s does not match expected value: %s", currString, confString)
}

flag, err := flagFromString(flagExpected)
if err != nil {
return err
}
if ipv.Flag != flag {
currString, err := flagToString(ipv.Flag)
if err != nil {
return err
}
confString, err := flagToString(flag)
if err != nil {
return err
}
return fmt.Errorf("Container IPVlan flag %s does not match expected value: %s", currString, confString)
}

if intf.Mac != "" {
if intf.Mac != link.Attrs().HardwareAddr.String() {
return fmt.Errorf("Interface %s Mac %s doesn't match container Mac: %s", intf.Name, intf.Mac, link.Attrs().HardwareAddr)
Expand Down
85 changes: 85 additions & 0 deletions plugins/main/ipvlan/ipvlan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type Net struct {
Type string `json:"type,omitempty"`
Master string `json:"master"`
Mode string `json:"mode"`
Flag string `json:"flag,omitempty"`
IPAM *allocator.IPAMConfig `json:"ipam"`
DNS types.DNS `json:"dns"`
RawPrevResult map[string]interface{} `json:"prevResult,omitempty"`
Expand Down Expand Up @@ -376,6 +377,90 @@ var _ = Describe("ipvlan Operations", func() {
Expect(err).NotTo(HaveOccurred())
})

for _, flagName := range []string{"bridge", "private", "vepa"} {
flagName := flagName
expectedFlag, err := flagFromString(flagName)
Expect(err).NotTo(HaveOccurred())

It(fmt.Sprintf("[%s] creates an ipvlan link with flag %q", ver, flagName), func() {
conf := &NetConf{
NetConf: types.NetConf{
CNIVersion: ver,
Name: "testConfig",
Type: "ipvlan",
},
Master: masterInterface,
Mode: "l2",
Flag: flagName,
MTU: 1500,
LinkContNs: isInContainer,
}

err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()

_, err := createIpvlan(conf, "foobar0", targetNS)
Expect(err).NotTo(HaveOccurred())
return nil
})
Expect(err).NotTo(HaveOccurred())

err = targetNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()

link, err := netlinksafe.LinkByName("foobar0")
Expect(err).NotTo(HaveOccurred())
ipv, ok := link.(*netlink.IPVlan)
Expect(ok).To(BeTrue())
Expect(ipv.Flag).To(Equal(expectedFlag))
return nil
})
Expect(err).NotTo(HaveOccurred())
})

It(fmt.Sprintf("[%s] configures and deconfigures an ipvlan link with flag %q with ADD/CHECK/DEL", ver, flagName), func() {
conf := fmt.Sprintf(`{
"cniVersion": "%s",
"name": "mynet",
"type": "ipvlan",
"master": "%s",
"flag": "%s",
"linkInContainer": %t,
"ipam": {
"type": "host-local",
"subnet": "10.1.2.0/24",
"dataDir": "%s"
}
}`, ver, masterInterface, flagName, isInContainer, dataDir)

ipvlanAddCheckDelTest(conf, "", originalNS, targetNS)
})
}

It(fmt.Sprintf("[%s] rejects an unknown ipvlan flag", ver), func() {
conf := &NetConf{
NetConf: types.NetConf{
CNIVersion: ver,
Name: "testConfig",
Type: "ipvlan",
},
Master: masterInterface,
Mode: "l2",
Flag: "bogus",
MTU: 1500,
LinkContNs: isInContainer,
}

err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()

_, err := createIpvlan(conf, "foobar0", targetNS)
Expect(err).To(MatchError(ContainSubstring(`unknown ipvlan flag: "bogus"`)))
return nil
})
Expect(err).NotTo(HaveOccurred())
})

It(fmt.Sprintf("[%s] configures and deconfigures an iplvan link with ADD/DEL", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "%s",
Expand Down
Loading