From 38baf3d5e2bc5c1e8b216dc072ea1d3eaf5053b8 Mon Sep 17 00:00:00 2001
From: Paul Holzinger <paul.holzinger@web.de>
Date: Sat, 9 Jan 2021 16:54:41 +0100
Subject: Add Networks format placeholder to podman ps and pod ps

`podman ps --format {{.Networks}}` will show all connected networks for
this container. For `pod ps` it will show the infra container networks.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
---
 test/e2e/pod_ps_test.go | 39 +++++++++++++++++++++++++++++++++++++++
 test/e2e/ps_test.go     | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

(limited to 'test/e2e')

diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go
index 6a740ed09..9f63c1d5d 100644
--- a/test/e2e/pod_ps_test.go
+++ b/test/e2e/pod_ps_test.go
@@ -305,6 +305,45 @@ var _ = Describe("Podman ps", func() {
 		Expect(session.OutputToString()).To(Not(ContainSubstring(podWithoutNet)))
 	})
 
+	It("podman pod ps --format networks", func() {
+		session := podmanTest.Podman([]string{"pod", "create"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+
+		session = podmanTest.Podman([]string{"pod", "ps", "--format", "{{ .Networks }}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		if isRootless() {
+			// rootless container don't have a network by default
+			Expect(session.OutputToString()).To(Equal(""))
+		} else {
+			// default network name is podman
+			Expect(session.OutputToString()).To(Equal("podman"))
+		}
+
+		net1 := stringid.GenerateNonCryptoID()
+		session = podmanTest.Podman([]string{"network", "create", net1})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		defer podmanTest.removeCNINetwork(net1)
+		net2 := stringid.GenerateNonCryptoID()
+		session = podmanTest.Podman([]string{"network", "create", net2})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		defer podmanTest.removeCNINetwork(net2)
+
+		session = podmanTest.Podman([]string{"pod", "create", "--network", net1 + "," + net2})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		pid := session.OutputToString()
+
+		session = podmanTest.Podman([]string{"pod", "ps", "--format", "{{ .Networks }}", "--filter", "id=" + pid})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		// the output is not deterministic so check both possible orders
+		Expect(session.OutputToString()).To(Or(Equal(net1+","+net2), Equal(net2+","+net1)))
+	})
+
 	It("pod no infra should ps", func() {
 		session := podmanTest.Podman([]string{"pod", "create", "--infra=false"})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index 0d2bed485..13701fc3b 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -749,4 +749,43 @@ var _ = Describe("Podman ps", func() {
 		Expect(session.OutputToString()).To(Not(ContainSubstring(ctrWithoutNet)))
 	})
 
+	It("podman ps --format networks", func() {
+		session := podmanTest.Podman([]string{"create", ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+
+		session = podmanTest.Podman([]string{"ps", "--all", "--format", "{{ .Networks }}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		if isRootless() {
+			// rootless container don't have a network by default
+			Expect(session.OutputToString()).To(Equal(""))
+		} else {
+			// default network name is podman
+			Expect(session.OutputToString()).To(Equal("podman"))
+		}
+
+		net1 := stringid.GenerateNonCryptoID()
+		session = podmanTest.Podman([]string{"network", "create", net1})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		defer podmanTest.removeCNINetwork(net1)
+		net2 := stringid.GenerateNonCryptoID()
+		session = podmanTest.Podman([]string{"network", "create", net2})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		defer podmanTest.removeCNINetwork(net2)
+
+		session = podmanTest.Podman([]string{"create", "--network", net1 + "," + net2, ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		cid := session.OutputToString()
+
+		session = podmanTest.Podman([]string{"ps", "--all", "--format", "{{ .Networks }}", "--filter", "id=" + cid})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+		// the output is not deterministic so check both possible orders
+		Expect(session.OutputToString()).To(Or(Equal(net1+","+net2), Equal(net2+","+net1)))
+	})
+
 })
-- 
cgit v1.2.3-54-g00ecf