containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9235 from Luap99/fix-9234 

Fix podman network disconnect wrong NetworkStatus number
This commit is contained in:
OpenShift Merge Robot 2021-02-04 16:34:45 -05:00 committed by GitHub
parent e6e3520498 5c6ab3075e
commit b1bd126cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/networking_linux.go
View File

@ -1180,7 +1180,7 @@ func (c *Container) NetworkDisconnect(nameOrID, netName string, force bool) erro
// update network status if container is not running // update network status if container is not running
networkStatus := c.state.NetworkStatus networkStatus := c.state.NetworkStatus
// clip out the index of the network // clip out the index of the network
tmpNetworkStatus := make([]*cnitypes.Result, len(networkStatus)-1) tmpNetworkStatus := make([]*cnitypes.Result, 0, len(networkStatus)-1)
for k, v := range networkStatus { for k, v := range networkStatus {
if index != k { if index != k {
tmpNetworkStatus = append(tmpNetworkStatus, v) tmpNetworkStatus = append(tmpNetworkStatus, v)

20
test/e2e/network_connect_disconnect_test.go
View File

@ -74,6 +74,11 @@ var _ = Describe("Podman network connect and disconnect", func() {
dis.WaitWithDefaultTimeout() dis.WaitWithDefaultTimeout()
Expect(dis.ExitCode()).To(BeZero()) Expect(dis.ExitCode()).To(BeZero())
inspect := podmanTest.Podman([]string{"container", "inspect", "test", "--format", "{{len .NetworkSettings.Networks}}"})
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(BeZero())
Expect(inspect.OutputToString()).To(Equal("0"))
exec = podmanTest.Podman([]string{"exec", "-it", "test", "ip", "addr", "show", "eth0"}) exec = podmanTest.Podman([]string{"exec", "-it", "test", "ip", "addr", "show", "eth0"})
exec.WaitWithDefaultTimeout() exec.WaitWithDefaultTimeout()
Expect(exec.ExitCode()).ToNot(BeZero()) Expect(exec.ExitCode()).ToNot(BeZero())
@ -146,6 +151,11 @@ var _ = Describe("Podman network connect and disconnect", func() {
connect.WaitWithDefaultTimeout() connect.WaitWithDefaultTimeout()
Expect(connect.ExitCode()).To(BeZero()) Expect(connect.ExitCode()).To(BeZero())
inspect := podmanTest.Podman([]string{"container", "inspect", "test", "--format", "{{len .NetworkSettings.Networks}}"})
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(BeZero())
Expect(inspect.OutputToString()).To(Equal("2"))
exec = podmanTest.Podman([]string{"exec", "-it", "test", "ip", "addr", "show", "eth1"}) exec = podmanTest.Podman([]string{"exec", "-it", "test", "ip", "addr", "show", "eth1"})
exec.WaitWithDefaultTimeout() exec.WaitWithDefaultTimeout()
Expect(exec.ExitCode()).To(BeZero()) Expect(exec.ExitCode()).To(BeZero())
@ -167,6 +177,11 @@ var _ = Describe("Podman network connect and disconnect", func() {
dis.WaitWithDefaultTimeout() dis.WaitWithDefaultTimeout()
Expect(dis.ExitCode()).To(BeZero()) Expect(dis.ExitCode()).To(BeZero())
inspect := podmanTest.Podman([]string{"container", "inspect", "test", "--format", "{{len .NetworkSettings.Networks}}"})
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(BeZero())
Expect(inspect.OutputToString()).To(Equal("2"))
start := podmanTest.Podman([]string{"start", "test"}) start := podmanTest.Podman([]string{"start", "test"})
start.WaitWithDefaultTimeout() start.WaitWithDefaultTimeout()
Expect(start.ExitCode()).To(BeZero()) Expect(start.ExitCode()).To(BeZero())
@ -202,6 +217,11 @@ var _ = Describe("Podman network connect and disconnect", func() {
dis.WaitWithDefaultTimeout() dis.WaitWithDefaultTimeout()
Expect(dis.ExitCode()).To(BeZero()) Expect(dis.ExitCode()).To(BeZero())
inspect := podmanTest.Podman([]string{"container", "inspect", "test", "--format", "{{len .NetworkSettings.Networks}}"})
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(BeZero())
Expect(inspect.OutputToString()).To(Equal("1"))
start := podmanTest.Podman([]string{"start", "test"}) start := podmanTest.Podman([]string{"start", "test"})
start.WaitWithDefaultTimeout() start.WaitWithDefaultTimeout()
Expect(start.ExitCode()).To(BeZero()) Expect(start.ExitCode()).To(BeZero())