diff options
| -rw-r--r-- | pkg/api/handlers/swagger/swagger.go | 18 | ||||
| -rw-r--r-- | pkg/api/handlers/types.go | 9 | ||||
| -rw-r--r-- | pkg/api/server/register_images.go | 2 | ||||
| -rw-r--r-- | test/apiv2/python/rest_api/test_v2_0_0_image.py | 6 |
4 files changed, 16 insertions, 19 deletions
diff --git a/pkg/api/handlers/swagger/swagger.go b/pkg/api/handlers/swagger/swagger.go index ef3d12df8..83ff5914e 100644 --- a/pkg/api/handlers/swagger/swagger.go +++ b/pkg/api/handlers/swagger/swagger.go @@ -8,6 +8,15 @@ import ( "github.com/docker/docker/api/types" ) +// Tree response +// swagger:response TreeResponse +type swagTree struct { + // in:body + Body struct { + entities.ImageTreeReport + } +} + // History response // swagger:response DocsHistory type swagHistory struct { @@ -183,12 +192,3 @@ type swagInspectVolumeResponse struct { define.InspectVolumeData } } - -// Image tree response -// swagger:response LibpodImageTreeResponse -type swagImageTreeResponse struct { - // in:body - Body struct { - handlers.ImageTreeResponse - } -} diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 2ffd9b0cb..f94c9a1f5 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -148,15 +148,6 @@ type HistoryResponse struct { Comment string } -type ImageLayer struct{} - -type ImageTreeResponse struct { - ID string `json:"id"` - Tags []string `json:"tags"` - Size string `json:"size"` - Layers []ImageLayer `json:"layers"` -} - type ExecCreateConfig struct { docker.ExecConfig } diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index b32c0df20..9634bd83b 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -747,7 +747,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // - application/json // responses: // 200: - // $ref: '#/responses/LibpodImageTreeResponse' + // $ref: "#/responses/TreeResponse" // 404: // $ref: '#/responses/NoSuchImage' // 500: 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 99f513608..243b1d5f5 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 @@ -160,6 +160,12 @@ class ImageTestCase(APITestCase): for k in required_keys: self.assertIn(k, change) + def test_tree(self): + r = requests.get(self.uri("/images/alpine/tree")) + self.assertEqual(r.status_code, 200, r.text) + tree = r.json() + self.assertTrue(tree["Tree"].startswith("Image ID:"), r.text) + if __name__ == "__main__": unittest.main() |