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

Merge pull request #566 from crandles/fix-vlan-errors

Browse Source 
vlan: fix error message text by removing ptp references
This commit is contained in:
Dan Williams 2021-01-20 10:44:39 -06:00 committed by GitHub
commit 49ee6f3768
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/main/vlan/vlan.go
View File

@ -238,7 +238,7 @@ func cmdCheck(args *skel.CmdArgs) error {
return err return err
} }
if conf.NetConf.RawPrevResult == nil { if conf.NetConf.RawPrevResult == nil {
return fmt.Errorf("ptp: Required prevResult missing") return fmt.Errorf("vlan: Required prevResult missing")
} }
if err := version.ParsePrevResult(&conf.NetConf); err != nil { if err := version.ParsePrevResult(&conf.NetConf); err != nil {
return err return err
@ -308,10 +308,10 @@ func validateCniContainerInterface(intf current.Interface, masterIndex int, vlan
} }
link, err = netlink.LinkByName(intf.Name) link, err = netlink.LinkByName(intf.Name)
if err != nil { if err != nil {
return fmt.Errorf("ptp: Container Interface name in prevResult: %s not found", intf.Name) return fmt.Errorf("vlan: Container Interface name in prevResult: %s not found", intf.Name)
} }
if intf.Sandbox == "" { if intf.Sandbox == "" {
return fmt.Errorf("ptp: Error: Container interface %s should not be in host namespace", link.Attrs().Name) return fmt.Errorf("vlan: Error: Container interface %s should not be in host namespace", link.Attrs().Name)
} }
vlan, isVlan := link.(*netlink.Vlan) vlan, isVlan := link.(*netlink.Vlan)