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

rename --cni-config-dir to --network-config-dir

Browse Source 
Since this option will also be used for netavark we should rename it to
something more generic. It is important that --cni-config-dir still
works otherwise we could break existing container cleanup commands.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-01-18 16:17:53 +01:00
parent 55ad6188b0
commit c0e0723463
14 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/network_test.go
View File

@ -38,6 +38,26 @@ var _ = Describe("Podman network", func() {
})
It("podman --cni-config-dir backwards compat", func() {
SkipIfRemote("--cni-config-dir only works locally")
netDir, err := CreateTempDirInTempDir()
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(netDir)
session := podmanTest.Podman([]string{"--cni-config-dir", netDir, "network", "ls", "--noheading"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
// default network always exists
Expect(session.OutputToStringArray()).To(HaveLen(1))
// check that the only file in the directory is the network lockfile
dir, err := os.Open(netDir)
Expect(err).ToNot(HaveOccurred())
names, err := dir.Readdirnames(5)
Expect(err).ToNot(HaveOccurred())
Expect(names).To(HaveLen(1))
Expect(names[0]).To(Or(Equal("netavark.lock"), Equal("cni.lock")))
})
It("podman network list", func() {
name, path := generateNetworkConfig(podmanTest)
defer removeConf(path)