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

Vendor github.com/containernetworking/cni libcni and pkg file needed for CHECK

Browse Source 
Update plugins/tests to deal with changes made to this vendor'ed code
This commit is contained in:
Michael Cambria
2018-11-05 15:33:56 -05:00
parent b93d284d18
commit ddbf22f7f9
14 changed files with 329 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/meta/portmap/portmap_integ_test.go
View File

@ -16,6 +16,7 @@ package main
import (
"bytes"
"context"
"fmt"
"math/rand"
"net"
@ -121,7 +122,7 @@ var _ = Describe("portmap integration tests", func() {
return nil
}
netDeleted = true
return cniConf.DelNetworkList(configList, &runtimeConfig)
return cniConf.DelNetworkList(context.TODO(), configList, &runtimeConfig)
}
// we'll also manually check the iptables chains
@ -130,7 +131,7 @@ var _ = Describe("portmap integration tests", func() {
dnatChainName := genDnatChain("cni-portmap-unit-test", runtimeConfig.ContainerID).name
// Create the network
resI, err := cniConf.AddNetworkList(configList, &runtimeConfig)
resI, err := cniConf.AddNetworkList(context.TODO(), configList, &runtimeConfig)
Expect(err).NotTo(HaveOccurred())
defer deleteNetwork()