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

Merge pull request #69 from eyakubovich/err-msgs

Browse Source 
Route del would fail due to wrong scope; better errors
This commit is contained in:
Eugene Yakubovich 2015-09-30 11:56:56 -07:00
commit f885288a2d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/main/ptp/ptp.go
View File

@ -70,7 +70,7 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
contVeth, err := netlink.LinkByName(ifName) contVeth, err := netlink.LinkByName(ifName)
if err != nil { if err != nil {
return err return fmt.Errorf("failed to look up %q: %v", ifName, err)
} }
// Delete the route that was automatically added // Delete the route that was automatically added
@ -80,12 +80,11 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
IP: pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask), IP: pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
Mask: pr.IP4.IP.Mask, Mask: pr.IP4.IP.Mask,
}, },
Scope: netlink.SCOPE_LINK, Scope: netlink.SCOPE_NOWHERE,
Src: pr.IP4.IP.IP,
} }
if err := netlink.RouteDel(&route); err != nil { if err := netlink.RouteDel(&route); err != nil {
return err return fmt.Errorf("failed to delete route %v: %v", route, err)
} }
for _, r := range []netlink.Route{ for _, r := range []netlink.Route{
@ -110,7 +109,7 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
}, },
} { } {
if err := netlink.RouteAdd(&r); err != nil { if err := netlink.RouteAdd(&r); err != nil {
return err return fmt.Errorf("failed to add route %v: %v", r, err)
} }
} }