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

Merge pull request #409 from squeed/fix-integ-tests

Browse Source 
integration: fix ip address collision in integration tests
This commit is contained in:
Casey Callendrello 2019-11-11 14:07:52 +01:00 committed by GitHub
commit d5efdfe1f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/integration_linux_test.go
View File

@ -149,12 +149,12 @@ var _ = Describe("Basic PTP using cnitool", func() {
}) })
Measure("limits traffic only on the restricted bandwith veth device", func(b Benchmarker) { Measure("limits traffic only on the restricted bandwith veth device", func(b Benchmarker) {
ipRegexp := regexp.MustCompile("10\\.11\\.2\\.\\d{1,3}") ipRegexp := regexp.MustCompile("10\\.1[12]\\.2\\.\\d{1,3}")
By(fmt.Sprintf("adding %s to %s\n\n", "chained-bridge-bandwidth", contNS1.ShortName())) By(fmt.Sprintf("adding %s to %s\n\n", "chained-bridge-bandwidth", contNS1.ShortName()))
chainedBridgeBandwidthEnv.runInNS(hostNS, cnitoolBin, "add", "network-chain-test", contNS1.LongName()) chainedBridgeBandwidthEnv.runInNS(hostNS, cnitoolBin, "add", "network-chain-test", contNS1.LongName())
chainedBridgeIP := ipRegexp.FindString(chainedBridgeBandwidthEnv.runInNS(contNS1, "ip", "addr")) chainedBridgeIP := ipRegexp.FindString(chainedBridgeBandwidthEnv.runInNS(contNS1, "ip", "addr"))
Expect(chainedBridgeIP).To(ContainSubstring("10.11.2.")) Expect(chainedBridgeIP).To(ContainSubstring("10.12.2."))
By(fmt.Sprintf("adding %s to %s\n\n", "basic-bridge", contNS2.ShortName())) By(fmt.Sprintf("adding %s to %s\n\n", "basic-bridge", contNS2.ShortName()))
basicBridgeEnv.runInNS(hostNS, cnitoolBin, "add", "network-chain-test", contNS2.LongName()) basicBridgeEnv.runInNS(hostNS, cnitoolBin, "add", "network-chain-test", contNS2.LongName())

6
integration/testdata/chained-bridge-bandwidth/network-chain-test.conflist vendored
View File

@ -4,12 +4,12 @@
"plugins": [ "plugins": [
{ {
"type": "bridge", "type": "bridge",
"bridge": "test-bridge-0", "bridge": "test-bridge-1",
"isDefaultGateway": true, "isDefaultGateway": true,
"ipam": { "ipam": {
"type": "host-local", "type": "host-local",
"subnet": "10.11.2.0/24", "subnet": "10.12.2.0/24",
"dataDir": "/tmp/foo" "dataDir": "/tmp/bar"
} }
}, },
{ {