opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 09:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reformat inspect network settings

Browse Source 
Reformat ports of inspect network settings to compatible with docker inspect. Close #5380

Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
Qi Wang
2020-06-23 11:29:11 -04:00
parent 81f4204e4e
commit f586c006f8
3 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/define/container_inspect.go
View File

@ -5,7 +5,6 @@ import (
"github.com/containers/image/v5/manifest" "github.com/containers/image/v5/manifest"
"github.com/containers/libpod/libpod/driver" "github.com/containers/libpod/libpod/driver"
"github.com/cri-o/ocicni/pkg/ocicni"
) )
// InspectContainerConfig holds further data about how a container was initially // InspectContainerConfig holds further data about how a container was initially
@ -576,7 +575,7 @@ type InspectNetworkSettings struct {
HairpinMode bool `json:"HairpinMode"` HairpinMode bool `json:"HairpinMode"`
LinkLocalIPv6Address string `json:"LinkLocalIPv6Address"` LinkLocalIPv6Address string `json:"LinkLocalIPv6Address"`
LinkLocalIPv6PrefixLen int `json:"LinkLocalIPv6PrefixLen"` LinkLocalIPv6PrefixLen int `json:"LinkLocalIPv6PrefixLen"`
Ports []ocicni.PortMapping `json:"Ports"` Ports map[string][]InspectHostPort `json:"Ports"`
SandboxKey string `json:"SandboxKey"` SandboxKey string `json:"SandboxKey"`
// Networks contains information on non-default CNI networks this // Networks contains information on non-default CNI networks this
// container has joined. // container has joined.

16
libpod/networking_linux.go
View File

@ -587,10 +587,20 @@ func getContainerNetIO(ctr *Container) (*netlink.LinkStatistics, error) {
// network. // network.
func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) { func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) {
settings := new(define.InspectNetworkSettings) settings := new(define.InspectNetworkSettings)
settings.Ports = []ocicni.PortMapping{} settings.Ports = make(map[string][]define.InspectHostPort)
if c.config.PortMappings != nil { if c.config.PortMappings != nil {
// TODO: This may not be safe. for _, port := range c.config.PortMappings {
settings.Ports = c.config.PortMappings key := fmt.Sprintf("%d/%s", port.ContainerPort, port.Protocol)
mapping := settings.Ports[key]
if mapping == nil {
mapping = []define.InspectHostPort{}
}
mapping = append(mapping, define.InspectHostPort{
HostIP: port.HostIP,
HostPort: fmt.Sprintf("%d", port.HostPort),
})
settings.Ports[key] = mapping
}
} }
// We can't do more if the network is down. // We can't do more if the network is down.

76
test/e2e/run_networking_test.go
View File

@ -71,10 +71,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(80))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/tcp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostPort).To(Equal("80"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("tcp")) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostIP).To(Equal(""))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal(""))
}) })
It("podman run -p 8080:80", func() { It("podman run -p 8080:80", func() {
@ -84,10 +83,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(8080))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/tcp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostPort).To(Equal("8080"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("tcp")) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostIP).To(Equal(""))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal(""))
}) })
It("podman run -p 80/udp", func() { It("podman run -p 80/udp", func() {
@ -97,10 +95,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(80))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/udp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostPort).To(Equal("80"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("udp")) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostIP).To(Equal(""))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal(""))
}) })
It("podman run -p 127.0.0.1:8080:80", func() { It("podman run -p 127.0.0.1:8080:80", func() {
@ -110,10 +107,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(8080))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/tcp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostPort).To(Equal("8080"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("tcp")) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostIP).To(Equal("127.0.0.1"))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal("127.0.0.1"))
}) })
It("podman run -p 127.0.0.1:8080:80/udp", func() { It("podman run -p 127.0.0.1:8080:80/udp", func() {
@ -123,10 +119,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(8080))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/udp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostPort).To(Equal("8080"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("udp")) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostIP).To(Equal("127.0.0.1"))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal("127.0.0.1"))
}) })
It("podman run -p [::1]:8080:80/udp", func() { It("podman run -p [::1]:8080:80/udp", func() {
@ -136,10 +131,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(8080))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/udp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostPort).To(Equal("8080"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("udp")) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostIP).To(Equal("::1"))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal("::1"))
}) })
It("podman run -p [::1]:8080:80/tcp", func() { It("podman run -p [::1]:8080:80/tcp", func() {
@ -149,10 +143,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(8080))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/tcp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostPort).To(Equal("8080"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("tcp")) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostIP).To(Equal("::1"))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal("::1"))
}) })
It("podman run --expose 80 -P", func() { It("podman run --expose 80 -P", func() {
@ -162,10 +155,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Not(Equal(int32(0)))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/tcp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostPort).To(Not(Equal("0")))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("tcp")) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostIP).To(Equal(""))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal(""))
}) })
It("podman run --expose 80/udp -P", func() { It("podman run --expose 80/udp -P", func() {
@ -175,10 +167,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Not(Equal(int32(0)))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/udp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostPort).To(Not(Equal("0")))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("udp")) Expect(inspectOut[0].NetworkSettings.Ports["80/udp"][0].HostIP).To(Equal(""))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal(""))
}) })
It("podman run --expose 80 -p 80", func() { It("podman run --expose 80 -p 80", func() {
@ -188,10 +179,9 @@ var _ = Describe("Podman run networking", func() {
inspectOut := podmanTest.InspectContainer(name) inspectOut := podmanTest.InspectContainer(name)
Expect(len(inspectOut)).To(Equal(1)) Expect(len(inspectOut)).To(Equal(1))
Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1)) Expect(len(inspectOut[0].NetworkSettings.Ports)).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostPort).To(Equal(int32(80))) Expect(len(inspectOut[0].NetworkSettings.Ports["80/tcp"])).To(Equal(1))
Expect(inspectOut[0].NetworkSettings.Ports[0].ContainerPort).To(Equal(int32(80))) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostPort).To(Equal("80"))
Expect(inspectOut[0].NetworkSettings.Ports[0].Protocol).To(Equal("tcp")) Expect(inspectOut[0].NetworkSettings.Ports["80/tcp"][0].HostIP).To(Equal(""))
Expect(inspectOut[0].NetworkSettings.Ports[0].HostIP).To(Equal(""))
}) })
It("podman run network expose host port 80 to container port 8000", func() { It("podman run network expose host port 80 to container port 8000", func() {
@ -214,7 +204,7 @@ var _ = Describe("Podman run networking", func() {
results := podmanTest.Podman([]string{"inspect", "-l"}) results := podmanTest.Podman([]string{"inspect", "-l"})
results.Wait(30) results.Wait(30)
Expect(results.ExitCode()).To(Equal(0)) Expect(results.ExitCode()).To(Equal(0))
Expect(results.OutputToString()).To(ContainSubstring(": 80,")) Expect(results.OutputToString()).To(ContainSubstring(`"80/tcp":`))
}) })
It("podman run network expose duplicate host port results in error", func() { It("podman run network expose duplicate host port results in error", func() {
@ -229,7 +219,9 @@ var _ = Describe("Podman run networking", func() {
Expect(inspect.ExitCode()).To(Equal(0)) Expect(inspect.ExitCode()).To(Equal(0))
containerConfig := inspect.InspectContainerToJSON() containerConfig := inspect.InspectContainerToJSON()
Expect(containerConfig[0].NetworkSettings.Ports[0].HostPort).ToNot(Equal(80)) Expect(containerConfig[0].NetworkSettings.Ports).To(Not(BeNil()))
Expect(containerConfig[0].NetworkSettings.Ports["80/tcp"]).To(Not(BeNil()))
Expect(containerConfig[0].NetworkSettings.Ports["80/tcp"][0].HostPort).ToNot(Equal(80))
}) })
It("podman run hostname test", func() { It("podman run hostname test", func() {