Add pod, volume, network to inspect package

podman inspect only had the capabilities to inspect containers and images. if a user wanted to inspect a pod, volume, or network, they would have to use `podman network inspect`, `podman pod inspect` etc. Docker's cli allowed users to inspect both volumes and networks using regular inspect, so this commit gives the user the functionality

If the inspect type is not specified using --type, the order of inspection is:

containers
images
volumes
networks
pods

meaning if container that has the same name as an image, podman inspect would return the container inspect.

To avoid duplicate code, podman network inspect and podman volume inspect now use the inspect package as well. Podman pod inspect does not because podman pod inspect returns a single json object while podman inspect can return multiple)

Signed-off-by: Ashley Cui <acui@redhat.com>

2 files changed, 149 insertions, 0 deletions

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 206c66f9f..d8e23b118 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -515,6 +515,14 @@ func (s *PodmanSessionIntegration) InspectPodToJSON() define.InspectPodData {
 	return i
 }
 
+// InspectPodToJSON takes the sessions output from an inspect and returns json
+func (s *PodmanSessionIntegration) InspectPodArrToJSON() []define.InspectPodData {
+	var i []define.InspectPodData
+	err := jsoniter.Unmarshal(s.Out.Contents(), &i)
+	Expect(err).To(BeNil())
+	return i
+}
+
 // CreatePod creates a pod with no infra container
 // it optionally takes a pod name
 func (p *PodmanTestIntegration) CreatePod(name string) (*PodmanSessionIntegration, int, string) {
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index d4de7a65c..e8a82f9a1 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -289,4 +289,145 @@ var _ = Describe("Podman inspect", func() {
 		Expect(baseJSON[0].HostConfig.SecurityOpt).To(Equal([]string{"label=type:spc_t,label=level:s0", "seccomp=unconfined"}))
 	})
 
+	It("podman inspect pod", func() {
+		podName := "testpod"
+		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", podName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.IsJSONOutputValid()).To(BeTrue())
+		podData := inspect.InspectPodArrToJSON()
+		Expect(podData[0].Name).To(Equal(podName))
+	})
+
+	It("podman inspect pod with type", func() {
+		podName := "testpod"
+		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "--type", "pod", podName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.IsJSONOutputValid()).To(BeTrue())
+		podData := inspect.InspectPodArrToJSON()
+		Expect(podData[0].Name).To(Equal(podName))
+	})
+
+	It("podman inspect latest pod", func() {
+		SkipIfRemote("--latest flag n/a")
+		podName := "testpod"
+		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "--type", "pod", "--latest"})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.IsJSONOutputValid()).To(BeTrue())
+		podData := inspect.InspectPodArrToJSON()
+		Expect(podData[0].Name).To(Equal(podName))
+	})
+	It("podman inspect latest defaults to latest container", func() {
+		SkipIfRemote("--latest flag n/a")
+		podName := "testpod"
+		pod := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		pod.WaitWithDefaultTimeout()
+		Expect(pod.ExitCode()).To(Equal(0))
+
+		inspect1 := podmanTest.Podman([]string{"inspect", "--type", "pod", podName})
+		inspect1.WaitWithDefaultTimeout()
+		Expect(inspect1.ExitCode()).To(Equal(0))
+		Expect(inspect1.IsJSONOutputValid()).To(BeTrue())
+		podData := inspect1.InspectPodArrToJSON()
+		infra := podData[0].Containers[0].Name
+
+		inspect := podmanTest.Podman([]string{"inspect", "--latest"})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.IsJSONOutputValid()).To(BeTrue())
+		containerData := inspect.InspectContainerToJSON()
+		Expect(containerData[0].Name).To(Equal(infra))
+	})
+
+	It("podman inspect network", func() {
+		name, path := generateNetworkConfig(podmanTest)
+		defer removeConf(path)
+
+		session := podmanTest.Podman([]string{"inspect", name, "--format", "{{.cniVersion}}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContains("0.3.0")).To(BeTrue())
+	})
+
+	It("podman inspect a volume", func() {
+		session := podmanTest.Podman([]string{"volume", "create", "myvol"})
+		session.WaitWithDefaultTimeout()
+		volName := session.OutputToString()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"inspect", volName})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.IsJSONOutputValid()).To(BeTrue())
+	})
+
+	It("podman inspect a volume with --format", func() {
+		session := podmanTest.Podman([]string{"volume", "create", "myvol"})
+		session.WaitWithDefaultTimeout()
+		volName := session.OutputToString()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"inspect", "--format", "{{.Name}}", volName})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.OutputToString()).To(Equal(volName))
+	})
+	It("podman inspect --type container on a pod should fail", func() {
+		podName := "testpod"
+		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "--type", "container", podName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect).To(ExitWithError())
+	})
+
+	It("podman inspect --type network on a container should fail", func() {
+		ctrName := "testctr"
+		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "--type", "network", ctrName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect).To(ExitWithError())
+	})
+
+	It("podman inspect --type pod on a container should fail", func() {
+		ctrName := "testctr"
+		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "--type", "pod", ctrName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect).To(ExitWithError())
+	})
+
+	It("podman inspect --type volume on a container should fail", func() {
+		ctrName := "testctr"
+		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE})
+		create.WaitWithDefaultTimeout()
+		Expect(create.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "--type", "volume", ctrName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect).To(ExitWithError())
+	})
+
 })