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

pkg/ip: SetupVeth returns net.Interface

Browse Source
This commit is contained in:
Gabe Rosenhouse
2017-03-10 09:49:46 -08:00
parent b07d768f12
commit 71d96ea91c
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ip/link_test.go
View File

@ -46,8 +46,8 @@ var _ = Describe("Link", func() {
hostNetNS ns.NetNS
containerNetNS ns.NetNS
ifaceCounter int = 0
hostVeth ip.Link
containerVeth ip.Link
hostVeth net.Interface
containerVeth net.Interface
hostVethName string
containerVethName string
@ -78,8 +78,8 @@ var _ = Describe("Link", func() {
}
Expect(err).NotTo(HaveOccurred())
hostVethName = hostVeth.Attrs().Name
containerVethName = containerVeth.Attrs().Name
hostVethName = hostVeth.Name
containerVethName = containerVeth.Name
return nil
})
@ -98,7 +98,7 @@ var _ = Describe("Link", func() {
containerVethFromName, err := netlink.LinkByName(containerVethName)
Expect(err).NotTo(HaveOccurred())
Expect(containerVethFromName.Attrs().Index).To(Equal(containerVeth.Attrs().Index))
Expect(containerVethFromName.Attrs().Index).To(Equal(containerVeth.Index))
return nil
})
@ -108,7 +108,7 @@ var _ = Describe("Link", func() {
hostVethFromName, err := netlink.LinkByName(hostVethName)
Expect(err).NotTo(HaveOccurred())
Expect(hostVethFromName.Attrs().Index).To(Equal(hostVeth.Attrs().Index))
Expect(hostVethFromName.Attrs().Index).To(Equal(hostVeth.Index))
return nil
})
@ -156,7 +156,7 @@ var _ = Describe("Link", func() {
hostVeth, _, err := ip.SetupVeth(containerVethName, mtu, hostNetNS)
Expect(err).NotTo(HaveOccurred())
hostVethName = hostVeth.Attrs().Name
hostVethName = hostVeth.Name
return nil
})