summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-09 11:47:52 +0200
committerGitHub <noreply@github.com>2021-06-09 11:47:52 +0200
commitc75d62c9877f56f6cc6253087b75ab05b8e4eac5 (patch)
tree0903be3a919964ee0be3fbc5663bfcc900b59159
parenta2e1df80bcf71c11d10cc78b49fab4b8909b86e5 (diff)
parent8e89d70713abd563602528d9a22d1ed1c1eb85e0 (diff)
downloadpodman-c75d62c9877f56f6cc6253087b75ab05b8e4eac5.tar.gz
podman-c75d62c9877f56f6cc6253087b75ab05b8e4eac5.tar.bz2
podman-c75d62c9877f56f6cc6253087b75ab05b8e4eac5.zip
Merge pull request #10607 from jwhonce/issues/10559
[CI:DOCS] Update swagger for inspect network
-rw-r--r--pkg/api/handlers/libpod/swagger.go3
-rw-r--r--pkg/api/server/register_networks.go4
-rw-r--r--test/apiv2/python/rest_api/test_v2_0_0_image.py11
3 files changed, 14 insertions, 4 deletions
diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go
index 2ac5009fc..6116a7274 100644
--- a/pkg/api/handlers/libpod/swagger.go
+++ b/pkg/api/handlers/libpod/swagger.go
@@ -4,6 +4,7 @@ import (
"net/http"
"os"
+ "github.com/containernetworking/cni/libcni"
"github.com/containers/image/v5/manifest"
"github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/pkg/api/handlers/utils"
@@ -102,7 +103,7 @@ type swagNetworkRmReport struct {
// swagger:response NetworkInspectReport
type swagNetworkInspectReport struct {
// in:body
- Body entities.NetworkInspectReport
+ Body libcni.NetworkConfigList
}
// Network list
diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go
index 69c6896b8..cacf83a7f 100644
--- a/pkg/api/server/register_networks.go
+++ b/pkg/api/server/register_networks.go
@@ -281,7 +281,9 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
// tags:
// - networks
// summary: Inspect a network
- // description: Display low level configuration for a CNI network
+ // description: |
+ // Display low level configuration for a CNI network.
+ // - In a 200 response, all of the fields named Bytes are returned as a Base64 encoded string.
// parameters:
// - in: path
// name: name
diff --git a/test/apiv2/python/rest_api/test_v2_0_0_image.py b/test/apiv2/python/rest_api/test_v2_0_0_image.py
index 2cd7bfa96..cea34e2e7 100644
--- a/test/apiv2/python/rest_api/test_v2_0_0_image.py
+++ b/test/apiv2/python/rest_api/test_v2_0_0_image.py
@@ -86,10 +86,17 @@ class ImageTestCase(APITestCase):
self.assertTrue(keys["id"], "Expected to find id stanza")
self.assertTrue(keys["images"], "Expected to find images stanza")
self.assertTrue(keys["stream"], "Expected to find stream progress stanza's")
+
def test_create(self):
- r = requests.post(self.podman_url + "/v1.40/images/create?fromImage=alpine&platform=linux/amd64/v8", timeout=15)
+ r = requests.post(
+ self.podman_url + "/v1.40/images/create?fromImage=alpine&platform=linux/amd64/v8",
+ timeout=15,
+ )
self.assertEqual(r.status_code, 200, r.text)
- r = requests.post(self.podman_url + "/v1.40/images/create?fromSrc=-&repo=fedora&message=testing123", timeout=15)
+ r = requests.post(
+ self.podman_url + "/v1.40/images/create?fromSrc=-&repo=fedora&message=testing123",
+ timeout=15,
+ )
self.assertEqual(r.status_code, 200, r.text)
def test_search_compat(self):