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

Fix podman pod inspect show wrong MAC string

Browse Source 
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
This commit is contained in:
zhangguanzhang
2020-11-18 16:52:49 +08:00
parent a6f7afd417
commit 76a38fc3f2
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/define/pod_inspect.go
View File

@ -67,7 +67,7 @@ type InspectPodInfraConfig struct {
StaticIP net.IP StaticIP net.IP
// StaticMAC is a static MAC address that will be assigned to the infra // StaticMAC is a static MAC address that will be assigned to the infra
// container and then used by the pod. // container and then used by the pod.
StaticMAC net.HardwareAddr StaticMAC string
// NoManageResolvConf indicates that the pod will not manage resolv.conf // NoManageResolvConf indicates that the pod will not manage resolv.conf
// and instead each container will handle their own. // and instead each container will handle their own.
NoManageResolvConf bool NoManageResolvConf bool

2
libpod/pod_api.go
View File

@ -535,7 +535,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
infraConfig = new(define.InspectPodInfraConfig) infraConfig = new(define.InspectPodInfraConfig)
infraConfig.HostNetwork = p.config.InfraContainer.HostNetwork infraConfig.HostNetwork = p.config.InfraContainer.HostNetwork
infraConfig.StaticIP = p.config.InfraContainer.StaticIP infraConfig.StaticIP = p.config.InfraContainer.StaticIP
infraConfig.StaticMAC = p.config.InfraContainer.StaticMAC infraConfig.StaticMAC = p.config.InfraContainer.StaticMAC.String()
infraConfig.NoManageResolvConf = p.config.InfraContainer.UseImageResolvConf infraConfig.NoManageResolvConf = p.config.InfraContainer.UseImageResolvConf
infraConfig.NoManageHosts = p.config.InfraContainer.UseImageHosts infraConfig.NoManageHosts = p.config.InfraContainer.UseImageHosts

19
test/e2e/pod_inspect_test.go
View File

@ -99,4 +99,23 @@ var _ = Describe("Podman pod inspect", func() {
Expect(len(inspectJSON.InfraConfig.PortBindings["80/tcp"])).To(Equal(1)) Expect(len(inspectJSON.InfraConfig.PortBindings["80/tcp"])).To(Equal(1))
Expect(inspectJSON.InfraConfig.PortBindings["80/tcp"][0].HostPort).To(Equal("8080")) Expect(inspectJSON.InfraConfig.PortBindings["80/tcp"][0].HostPort).To(Equal("8080"))
}) })
It("podman pod inspect outputs show correct MAC", func() {
SkipIfRootless("--mac-address is not supported in rootless mode")
podName := "testPod"
macAddr := "42:43:44:00:00:01"
create := podmanTest.Podman([]string{"pod", "create", "--name", podName, "--mac-address", macAddr})
create.WaitWithDefaultTimeout()
Expect(create.ExitCode()).To(Equal(0))
create = podmanTest.Podman([]string{"run", "-d", "--pod", podName, ALPINE, "top"})
create.WaitWithDefaultTimeout()
Expect(create.ExitCode()).To(Equal(0))
inspectOut := podmanTest.Podman([]string{"pod", "inspect", podName})
inspectOut.WaitWithDefaultTimeout()
Expect(inspectOut.ExitCode()).To(Equal(0))
Expect(inspectOut.OutputToString()).To(ContainSubstring(macAddr))
})
}) })