Merge pull request #8514 from Luap99/revert-8410-fix-multiple-networks

Revert "Allow multiple --network flags for podman run/create"

2 files changed, 0 insertions, 49 deletions

diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index ccfbcefae..be0a2f6f0 100644
--- a/test/e2e/pod_create_test.go
+++ b/test/e2e/pod_create_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/containers/podman/v2/pkg/rootless"
 	. "github.com/containers/podman/v2/test/utils"
-	"github.com/containers/storage/pkg/stringid"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
@@ -477,23 +476,4 @@ entrypoint ["/fromimage"]
 		Expect(status3.ExitCode()).To(Equal(0))
 		Expect(strings.Contains(status3.OutputToString(), "Degraded")).To(BeTrue())
 	})
-
-	It("podman create pod invalid network config", func() {
-		net1 := "n1" + stringid.GenerateNonCryptoID()
-		session := podmanTest.Podman([]string{"network", "create", net1})
-		session.WaitWithDefaultTimeout()
-		defer podmanTest.removeCNINetwork(net1)
-		Expect(session.ExitCode()).To(BeZero())
-
-		session = podmanTest.Podman([]string{"pod", "create", "--network", "host", "--network", net1})
-		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(125))
-		Expect(session.ErrorToString()).To(ContainSubstring("host"))
-		Expect(session.ErrorToString()).To(ContainSubstring("bridge"))
-
-		session = podmanTest.Podman([]string{"pod", "create", "--network", "container:abc"})
-		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(125))
-		Expect(session.ErrorToString()).To(ContainSubstring("pods presently do not support network mode container"))
-	})
 })
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 1d416498c..3e80e953e 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -665,33 +665,4 @@ var _ = Describe("Podman run networking", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(BeZero())
 	})
-
-	It("podman run with multiple networks", func() {
-		net1 := "n1" + stringid.GenerateNonCryptoID()
-		session := podmanTest.Podman([]string{"network", "create", net1})
-		session.WaitWithDefaultTimeout()
-		defer podmanTest.removeCNINetwork(net1)
-		Expect(session.ExitCode()).To(BeZero())
-
-		net2 := "n2" + stringid.GenerateNonCryptoID()
-		session = podmanTest.Podman([]string{"network", "create", net2})
-		session.WaitWithDefaultTimeout()
-		defer podmanTest.removeCNINetwork(net2)
-		Expect(session.ExitCode()).To(BeZero())
-
-		run := podmanTest.Podman([]string{"run", "--network", net1, "--network", net2, ALPINE, "ip", "-o", "-4", "addr"})
-		run.WaitWithDefaultTimeout()
-		Expect(run.ExitCode()).To(BeZero())
-		Expect(len(run.OutputToStringArray())).To(Equal(3))
-		Expect(run.OutputToString()).To(ContainSubstring("lo"))
-		Expect(run.OutputToString()).To(ContainSubstring("eth0"))
-		Expect(run.OutputToString()).To(ContainSubstring("eth1"))
-
-		//invalid config network host and cni should fail
-		run = podmanTest.Podman([]string{"run", "--network", "host", "--network", net2, ALPINE, "ip", "-o", "-4", "addr"})
-		run.WaitWithDefaultTimeout()
-		Expect(run.ExitCode()).To(Equal(125))
-		Expect(run.ErrorToString()).To(ContainSubstring("host"))
-		Expect(run.ErrorToString()).To(ContainSubstring("bridge"))
-	})
 })