opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix network create macvlan with subnet option

Browse Source 
Creating a macvlan network with the subnet or ipRange option should set
the ipam plugin type to `host-local`. We also have to insert the default
route.

Fixes #10283

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
This commit is contained in:
Paul Holzinger
2021-05-20 11:23:03 +02:00
parent 959d6a0c40
commit 5a0257d463
3 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/e2e/network_test.go
View File

@ -533,7 +533,11 @@ var _ = Describe("Podman network", func() {
out, err := inspect.jq(".[0].plugins[0].master")
Expect(err).To(BeNil())
Expect(out).To(Equal("\"lo\""))
Expect(out).To(Equal(`"lo"`))
ipamType, err := inspect.jq(".[0].plugins[0].ipam.type")
Expect(err).To(BeNil())
Expect(ipamType).To(Equal(`"dhcp"`))
nc = podmanTest.Podman([]string{"network", "rm", net})
nc.WaitWithDefaultTimeout()
@ -571,13 +575,29 @@ var _ = Describe("Podman network", func() {
Expect(err).To(BeNil())
Expect(mtu).To(Equal("1500"))
name, err := inspect.jq(".[0].plugins[0].type")
Expect(err).To(BeNil())
Expect(name).To(Equal(`"macvlan"`))
netInt, err := inspect.jq(".[0].plugins[0].master")
Expect(err).To(BeNil())
Expect(netInt).To(Equal(`"lo"`))
ipamType, err := inspect.jq(".[0].plugins[0].ipam.type")
Expect(err).To(BeNil())
Expect(ipamType).To(Equal(`"host-local"`))
gw, err := inspect.jq(".[0].plugins[0].ipam.ranges[0][0].gateway")
Expect(err).To(BeNil())
Expect(gw).To(Equal("\"192.168.1.254\""))
Expect(gw).To(Equal(`"192.168.1.254"`))
subnet, err := inspect.jq(".[0].plugins[0].ipam.ranges[0][0].subnet")
Expect(err).To(BeNil())
Expect(subnet).To(Equal("\"192.168.1.0/24\""))
Expect(subnet).To(Equal(`"192.168.1.0/24"`))
routes, err := inspect.jq(".[0].plugins[0].ipam.routes[0].dst")
Expect(err).To(BeNil())
Expect(routes).To(Equal(`"0.0.0.0/0"`))
nc = podmanTest.Podman([]string{"network", "rm", net})
nc.WaitWithDefaultTimeout()