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

pkg/ip: Ensure that SetupVeth returns correct hostVeth

Browse Source 
The veth is moved from the container NS to the host NS.
This is handled by the code that sets the link to UP but the wrong
hostVeth is returned to the calling code.
This commit is contained in:
Tom Denham
2016-08-29 14:10:36 -07:00
parent 415d707faf
commit 31ef82276a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ip/link.go
View File

@ -117,7 +117,7 @@ func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (hostVeth, contVet
} }
err = hostNS.Do(func(_ ns.NetNS) error { err = hostNS.Do(func(_ ns.NetNS) error {
hostVeth, err := netlink.LinkByName(hostVethName) hostVeth, err = netlink.LinkByName(hostVethName)
if err != nil { if err != nil {
return fmt.Errorf("failed to lookup %q in %q: %v", hostVethName, hostNS.Path(), err) return fmt.Errorf("failed to lookup %q in %q: %v", hostVethName, hostNS.Path(), err)
} }

10
ip/link_test.go
View File

@ -46,6 +46,8 @@ var _ = Describe("Link", func() {
hostNetNS ns.NetNS hostNetNS ns.NetNS
containerNetNS ns.NetNS containerNetNS ns.NetNS
ifaceCounter int = 0 ifaceCounter int = 0
hostVeth netlink.Link
containerVeth netlink.Link
hostVethName string hostVethName string
containerVethName string containerVethName string
@ -70,7 +72,7 @@ var _ = Describe("Link", func() {
_ = containerNetNS.Do(func(ns.NetNS) error { _ = containerNetNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
hostVeth, containerVeth, err := ip.SetupVeth(fmt.Sprintf(ifaceFormatString, ifaceCounter), mtu, hostNetNS) hostVeth, containerVeth, err = ip.SetupVeth(fmt.Sprintf(ifaceFormatString, ifaceCounter), mtu, hostNetNS)
if err != nil { if err != nil {
return err return err
} }
@ -94,8 +96,9 @@ var _ = Describe("Link", func() {
_ = containerNetNS.Do(func(ns.NetNS) error { _ = containerNetNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := netlink.LinkByName(containerVethName) containerVethFromName, err := netlink.LinkByName(containerVethName)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(containerVethFromName.Attrs().Index).To(Equal(containerVeth.Attrs().Index))
return nil return nil
}) })
@ -103,8 +106,9 @@ var _ = Describe("Link", func() {
_ = hostNetNS.Do(func(ns.NetNS) error { _ = hostNetNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := netlink.LinkByName(hostVethName) hostVethFromName, err := netlink.LinkByName(hostVethName)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(hostVethFromName.Attrs().Index).To(Equal(hostVeth.Attrs().Index))
return nil return nil
}) })