Merge pull request #29 from crosbymichael/prefix

abhi · web-flow · commit ef9a3f8e884d · 2018-08-17T19:33:06.000-07:00
Use network count in ifname index
diff --git a/opts.go b/opts.go
@@ -136,10 +136,11 @@ func WithConfListFile(fileName string) CNIOpt {
 		if err != nil {
 			return err
 		}
+		i := len(c.networks)
 		c.networks = append(c.networks, &Network{
 			cni:    c.cniConfig,
 			config: confList,
-			ifName: getIfName(c.prefix, 0),
+			ifName: getIfName(c.prefix, i),
 		})
 		return nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,11 @@ func WithConfListFile(fileName string) CNIOpt {`
`136`	`136`	`if err != nil {`
`137`	`137`	`return err`
`138`	`138`	`}`
	`139`	`+ i := len(c.networks)`
`139`	`140`	`c.networks = append(c.networks, &Network{`
`140`	`141`	`cni: c.cniConfig,`
`141`	`142`	`config: confList,`
`142`		`- ifName: getIfName(c.prefix, 0),`
	`143`	`+ ifName: getIfName(c.prefix, i),`
`143`	`144`	`})`
`144`	`145`	`return nil`
`145`	`146`	`}`