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

Merge pull request #1029 from samuelkarp/log-peer-veth-failure

Browse Source 
ip: include peer name in error message
This commit is contained in:
Tomofumi Hayashi 2024-05-13 17:23:30 +09:00 committed by GitHub
commit c0533466c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/ip/link_linux.go
View File

@ -90,7 +90,7 @@ func makeVeth(name, vethPeerName string, mtu int, mac string, hostNS ns.NetNS) (
if peerExists(peerName) && vethPeerName == "" { if peerExists(peerName) && vethPeerName == "" {
continue continue
} }
return peerName, veth, fmt.Errorf("container veth name provided (%v) already exists", name) return peerName, veth, fmt.Errorf("container veth name (%q) peer provided (%q) already exists", name, peerName)
default: default:
return peerName, veth, fmt.Errorf("failed to make veth pair: %v", err) return peerName, veth, fmt.Errorf("failed to make veth pair: %v", err)
} }

11
pkg/ip/link_linux_test.go
View File

@ -149,9 +149,9 @@ var _ = Describe("Link", func() {
It("returns useful error", func() { It("returns useful error", func() {
_ = containerNetNS.Do(func(ns.NetNS) error { _ = containerNetNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
testHostVethName := "test" + hostVethName
_, _, err := ip.SetupVeth(containerVethName, mtu, "", hostNetNS) _, _, err := ip.SetupVethWithName(containerVethName, testHostVethName, mtu, "", hostNetNS)
Expect(err.Error()).To(Equal(fmt.Sprintf("container veth name provided (%s) already exists", containerVethName))) Expect(err.Error()).To(Equal(fmt.Sprintf("container veth name (%q) peer provided (%q) already exists", containerVethName, testHostVethName)))
return nil return nil
}) })
@ -180,9 +180,8 @@ var _ = Describe("Link", func() {
It("returns useful error", func() { It("returns useful error", func() {
_ = containerNetNS.Do(func(ns.NetNS) error { _ = containerNetNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, _, err := ip.SetupVeth(containerVethName, mtu, "", hostNetNS) _, _, err := ip.SetupVethWithName(containerVethName, hostVethName, mtu, "", hostNetNS)
Expect(err.Error()).To(HavePrefix("container veth name provided")) Expect(err.Error()).To(Equal(fmt.Sprintf("container veth name (%q) peer provided (%q) already exists", containerVethName, hostVethName)))
Expect(err.Error()).To(HaveSuffix("already exists"))
return nil return nil
}) })
}) })