summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-17 06:35:49 -0400
committerGitHub <noreply@github.com>2021-04-17 06:35:49 -0400
commit6ff56ab50a10e2350013c4ff1bf4b8d5d7b5aa87 (patch)
treee4dd52405640b76a25c22734bbd43f491205aee5 /pkg
parent676c33f07950b29b657370df5e767452692be648 (diff)
parent1af1c35efb08bd0dbd80c35d9d47b30f7a386354 (diff)
downloadpodman-6ff56ab50a10e2350013c4ff1bf4b8d5d7b5aa87.tar.gz
podman-6ff56ab50a10e2350013c4ff1bf4b8d5d7b5aa87.tar.bz2
podman-6ff56ab50a10e2350013c4ff1bf4b8d5d7b5aa87.zip
Merge pull request #10018 from jmguzik/more-network-bindings-tests
Add network bindings tests: remove and list
Diffstat (limited to 'pkg')
-rw-r--r--pkg/bindings/test/networks_test.go86
-rw-r--r--pkg/bindings/test/volumes_test.go8
2 files changed, 92 insertions, 2 deletions
diff --git a/pkg/bindings/test/networks_test.go b/pkg/bindings/test/networks_test.go
index df7d7cd1c..b53fc4bd3 100644
--- a/pkg/bindings/test/networks_test.go
+++ b/pkg/bindings/test/networks_test.go
@@ -2,10 +2,12 @@ package test_bindings
import (
"context"
+ "fmt"
"net/http"
"time"
"github.com/containers/podman/v3/pkg/bindings"
+ "github.com/containers/podman/v3/pkg/bindings/containers"
"github.com/containers/podman/v3/pkg/bindings/network"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -116,4 +118,88 @@ var _ = Describe("Podman networks", func() {
Expect(err).To(BeNil())
Expect(data[0]["name"]).To(Equal(name))
})
+
+ It("list networks", func() {
+ // create a bunch of named networks and make verify with list
+ netNames := []string{"homer", "bart", "lisa", "maggie", "marge"}
+ for i := 0; i < 5; i++ {
+ opts := network.CreateOptions{
+ Name: &netNames[i],
+ }
+ _, err = network.Create(connText, &opts)
+ Expect(err).To(BeNil())
+ }
+ list, err := network.List(connText, nil)
+ Expect(err).To(BeNil())
+ Expect(len(list)).To(BeNumerically(">=", 5))
+ for _, n := range list {
+ if n.Name != "podman" {
+ Expect(StringInSlice(n.Name, netNames)).To(BeTrue())
+ }
+ }
+
+ // list with bad filter should be 500
+ filters := make(map[string][]string)
+ filters["foobar"] = []string{"1234"}
+ options := new(network.ListOptions).WithFilters(filters)
+ _, err = network.List(connText, options)
+ Expect(err).ToNot(BeNil())
+ code, _ := bindings.CheckResponseCode(err)
+ Expect(code).To(BeNumerically("==", http.StatusInternalServerError))
+
+ // filter list with success
+ filters = make(map[string][]string)
+ filters["name"] = []string{"homer"}
+ options = new(network.ListOptions).WithFilters(filters)
+ list, err = network.List(connText, options)
+ Expect(err).To(BeNil())
+ Expect(len(list)).To(BeNumerically("==", 1))
+ Expect(list[0].Name).To(Equal("homer"))
+ })
+
+ It("remove network", func() {
+ // removing a noName network should result in 404
+ _, err := network.Remove(connText, "noName", nil)
+ code, err := bindings.CheckResponseCode(err)
+ Expect(err).To(BeNil())
+ Expect(code).To(BeNumerically("==", http.StatusNotFound))
+
+ // Removing an unused network should work
+ name := "unused"
+ opts := network.CreateOptions{
+ Name: &name,
+ }
+ _, err = network.Create(connText, &opts)
+ Expect(err).To(BeNil())
+ report, err := network.Remove(connText, name, nil)
+ Expect(err).To(BeNil())
+ Expect(report[0].Name).To(Equal(name))
+
+ // Removing a network that is being used without force should be 500
+ name = "used"
+ opts = network.CreateOptions{
+ Name: &name,
+ }
+ _, err = network.Create(connText, &opts)
+ Expect(err).To(BeNil())
+
+ // Start container and wait
+ container := "ntest"
+ session := bt.runPodman([]string{"run", "-dt", fmt.Sprintf("--network=%s", name), "--name", container, alpine.name, "top"})
+ session.Wait(45)
+ Expect(session.ExitCode()).To(BeZero())
+
+ _, err = network.Remove(connText, name, nil)
+ code, err = bindings.CheckResponseCode(err)
+ Expect(err).To(BeNil())
+ Expect(code).To(BeNumerically("==", http.StatusInternalServerError))
+
+ // Removing with a network in use with force should work with a stopped container
+ err = containers.Stop(connText, container, new(containers.StopOptions).WithTimeout(0))
+ Expect(err).To(BeNil())
+ options := new(network.RemoveOptions).WithForce(true)
+ report, err = network.Remove(connText, name, options)
+ Expect(err).To(BeNil())
+ Expect(report[0].Name).To(Equal(name))
+ })
})
diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go
index 91f6444cc..14bda114e 100644
--- a/pkg/bindings/test/volumes_test.go
+++ b/pkg/bindings/test/volumes_test.go
@@ -83,7 +83,8 @@ var _ = Describe("Podman volumes", func() {
It("remove volume", func() {
// removing a bogus volume should result in 404
err := volumes.Remove(connText, "foobar", nil)
- code, _ := bindings.CheckResponseCode(err)
+ code, err := bindings.CheckResponseCode(err)
+ Expect(err).To(BeNil())
Expect(code).To(BeNumerically("==", http.StatusNotFound))
// Removing an unused volume should work
@@ -97,9 +98,12 @@ var _ = Describe("Podman volumes", func() {
Expect(err).To(BeNil())
session := bt.runPodman([]string{"run", "-dt", "-v", fmt.Sprintf("%s:/foobar", vol.Name), "--name", "vtest", alpine.name, "top"})
session.Wait(45)
+ Expect(session.ExitCode()).To(BeZero())
+
err = volumes.Remove(connText, vol.Name, nil)
Expect(err).ToNot(BeNil())
- code, _ = bindings.CheckResponseCode(err)
+ code, err = bindings.CheckResponseCode(err)
+ Expect(err).To(BeNil())
Expect(code).To(BeNumerically("==", http.StatusConflict))
// Removing with a volume in use with force should work with a stopped container