containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10607 from jwhonce/issues/10559 

[CI:DOCS] Update swagger for inspect network
This commit is contained in:
OpenShift Merge Robot 2021-06-09 11:47:52 +02:00 committed by GitHub
parent a2e1df80bc 8e89d70713
commit c75d62c987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/handlers/libpod/swagger.go
View File

@ -4,6 +4,7 @@ import (
"net/http" "net/http"
"os" "os"
"github.com/containernetworking/cni/libcni"
"github.com/containers/image/v5/manifest" "github.com/containers/image/v5/manifest"
"github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/pkg/api/handlers/utils" "github.com/containers/podman/v3/pkg/api/handlers/utils"
@ -102,7 +103,7 @@ type swagNetworkRmReport struct {
// swagger:response NetworkInspectReport // swagger:response NetworkInspectReport
type swagNetworkInspectReport struct { type swagNetworkInspectReport struct {
// in:body // in:body
Body entities.NetworkInspectReport Body libcni.NetworkConfigList
} }
// Network list // Network list

4
pkg/api/server/register_networks.go
View File

@ -281,7 +281,9 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
// tags: // tags:
// - networks // - networks
// summary: Inspect a network // 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: // parameters:
// - in: path // - in: path
// name: name // name: name

11
test/apiv2/python/rest_api/test_v2_0_0_image.py
View File

@ -86,10 +86,17 @@ class ImageTestCase(APITestCase):
self.assertTrue(keys["id"], "Expected to find id stanza") self.assertTrue(keys["id"], "Expected to find id stanza")
self.assertTrue(keys["images"], "Expected to find images stanza") self.assertTrue(keys["images"], "Expected to find images stanza")
self.assertTrue(keys["stream"], "Expected to find stream progress stanza's") self.assertTrue(keys["stream"], "Expected to find stream progress stanza's")
def test_create(self): 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) 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) self.assertEqual(r.status_code, 200, r.text)
def test_search_compat(self): def test_search_compat(self):