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

plugins/host-local: only call LoadArgs() once

Browse Source
This commit is contained in:
Stefan Junker 2016-03-17 13:57:28 +01:00
parent 122abae03a
commit 05c5aea77b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ipam/host-local/config.go
View File

@ -51,8 +51,8 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
} }
if args != "" { if args != "" {
ipamArgs := IPAMArgs{} n.IPAM.Args = &IPAMArgs{}
err := types.LoadArgs(args, &ipamArgs) err := types.LoadArgs(args, n.IPAM.Args)
if err != nil { if err != nil {
return nil, err return nil, err
} }

7
plugins/ipam/host-local/main.go
View File

@ -37,13 +37,6 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
defer store.Close() defer store.Close()
ipamArgs := IPAMArgs{}
err = types.LoadArgs(args.Args, &ipamArgs)
if err != nil {
return err
}
ipamConf.Args = &ipamArgs
allocator, err := NewIPAllocator(ipamConf, store) allocator, err := NewIPAllocator(ipamConf, store)
if err != nil { if err != nil {
return err return err