Merge pull request #7460 from AkihiroSuda/allow-rootless-cni

rootless: support `podman network create` (CNI-in-slirp4netns)

3 files changed, 21 insertions, 11 deletions

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index ed55484e3..b6bbae15b 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -245,6 +245,12 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
 	}
 	os.Setenv("DISABLE_HC_SYSTEMD", "true")
 	CNIConfigDir := "/etc/cni/net.d"
+	if rootless.IsRootless() {
+		CNIConfigDir = filepath.Join(os.Getenv("HOME"), ".config/cni/net.d")
+	}
+	if err := os.MkdirAll(CNIConfigDir, 0755); err != nil {
+		panic(err)
+	}
 
 	storageFs := STORAGE_FS
 	if rootless.IsRootless() {
diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go
index f97e6c1f1..13d515d8e 100644
--- a/test/e2e/network_create_test.go
+++ b/test/e2e/network_create_test.go
@@ -74,7 +74,6 @@ var _ = Describe("Podman network create", func() {
 	)
 
 	BeforeEach(func() {
-		SkipIfRootless()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
@@ -180,6 +179,7 @@ var _ = Describe("Podman network create", func() {
 
 	It("podman network create with name and IPv6 subnet", func() {
 		SkipIfRemote()
+		SkipIfRootless()
 		var (
 			results []network.NcList
 		)
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index 55f12f16a..c35b82fc1 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/podman/v2/pkg/rootless"
 	. "github.com/containers/podman/v2/test/utils"
 	"github.com/containers/storage/pkg/stringid"
 	. "github.com/onsi/ginkgo"
@@ -32,7 +33,6 @@ var _ = Describe("Podman network", func() {
 	)
 
 	BeforeEach(func() {
-		SkipIfRootless()
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
@@ -74,13 +74,12 @@ var _ = Describe("Podman network", func() {
       }
     ]
 }`
-		cniPath = "/etc/cni/net.d"
 	)
 
 	It("podman network list", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)
 
@@ -93,7 +92,7 @@ var _ = Describe("Podman network", func() {
 	It("podman network list -q", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)
 
@@ -106,7 +105,7 @@ var _ = Describe("Podman network", func() {
 	It("podman network list --filter success", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)
 
@@ -119,7 +118,7 @@ var _ = Describe("Podman network", func() {
 	It("podman network list --filter failure", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)
 
@@ -138,7 +137,7 @@ var _ = Describe("Podman network", func() {
 	It("podman network rm", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)
 
@@ -166,11 +165,16 @@ var _ = Describe("Podman network", func() {
 	It("podman network inspect", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)
 
-		session := podmanTest.Podman([]string{"network", "inspect", "podman-integrationtest", "podman"})
+		expectedNetworks := []string{"podman-integrationtest"}
+		if !rootless.IsRootless() {
+			// rootful image contains "podman/cni/87-podman-bridge.conflist" for "podman" network
+			expectedNetworks = append(expectedNetworks, "podman")
+		}
+		session := podmanTest.Podman(append([]string{"network", "inspect"}, expectedNetworks...))
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
 		Expect(session.IsJSONOutputValid()).To(BeTrue())
@@ -179,7 +183,7 @@ var _ = Describe("Podman network", func() {
 	It("podman network inspect", func() {
 		// Setup, use uuid to prevent conflict with other tests
 		uuid := stringid.GenerateNonCryptoID()
-		secondPath := filepath.Join(cniPath, fmt.Sprintf("%s.conflist", uuid))
+		secondPath := filepath.Join(podmanTest.CNIConfigDir, fmt.Sprintf("%s.conflist", uuid))
 		writeConf([]byte(secondConf), secondPath)
 		defer removeConf(secondPath)