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

Correct compat network prune response

Browse Source 
Correcting the structure of the compat network prune response.  They
should follow {"NetworksDeleted": [<network_name>",...]}

Fixes: #9310

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2021-02-10 15:48:14 -06:00
parent 4d604c1089
commit f28b08fe96
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/handlers/compat/networks.go
View File

@ -400,6 +400,9 @@ func Prune(w http.ResponseWriter, r *http.Request) {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err) utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err)
return return
} }
type response struct {
NetworksDeleted []string
}
var prunedNetworks []string //nolint var prunedNetworks []string //nolint
for _, pr := range pruneReports { for _, pr := range pruneReports {
if pr.Error != nil { if pr.Error != nil {
@ -408,5 +411,5 @@ func Prune(w http.ResponseWriter, r *http.Request) {
} }
prunedNetworks = append(prunedNetworks, pr.Name) prunedNetworks = append(prunedNetworks, pr.Name)
} }
utils.WriteResponse(w, http.StatusOK, prunedNetworks) utils.WriteResponse(w, http.StatusOK, response{NetworksDeleted: prunedNetworks})
} }

8
test/apiv2/rest_api/test_rest_v2_0_0.py
View File

@ -483,8 +483,16 @@ class TestApi(unittest.TestCase):
inspect = requests.get(PODMAN_URL + f"/v1.40/networks/{ident}") inspect = requests.get(PODMAN_URL + f"/v1.40/networks/{ident}")
self.assertEqual(inspect.status_code, 404, inspect.content) self.assertEqual(inspect.status_code, 404, inspect.content)
# network prune
prune_name = "Network_" + "".join(random.choice(string.ascii_letters) for i in range(10))
prune_create = requests.post(PODMAN_URL + "/v1.40/networks/create", json={"Name": prune_name})
self.assertEqual(create.status_code, 201, prune_create.content)
prune = requests.post(PODMAN_URL + "/v1.40/networks/prune") prune = requests.post(PODMAN_URL + "/v1.40/networks/prune")
self.assertEqual(prune.status_code, 200, prune.content) self.assertEqual(prune.status_code, 200, prune.content)
obj = json.loads(prune.content)
self.assertTrue(prune_name in obj["NetworksDeleted"])
def test_volumes_compat(self): def test_volumes_compat(self):
name = "Volume_" + "".join(random.choice(string.ascii_letters) for i in range(10)) name = "Volume_" + "".join(random.choice(string.ascii_letters) for i in range(10))