summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-24 09:29:53 -0400
committerGitHub <noreply@github.com>2020-06-24 09:29:53 -0400
commit179731bb1460f22cbe9b5d755562f598de8035d8 (patch)
tree6947836974126684ea789f264df3e5f2aed98f97 /pkg
parentc48a5420135ecbff294e1fbce95be0adf9fc2931 (diff)
parent5fbac502bd839587523be92e91e5a1cf461c41ac (diff)
downloadpodman-179731bb1460f22cbe9b5d755562f598de8035d8.tar.gz
podman-179731bb1460f22cbe9b5d755562f598de8035d8.tar.bz2
podman-179731bb1460f22cbe9b5d755562f598de8035d8.zip
Merge pull request #6738 from maybe-sybr/maybe/apiv2/fix-network-compat-urls
APIv2:fix: Remove `/json` from compat network EPs
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/server/register_networks.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go
index 2c60b2b27..3ea16f81a 100644
--- a/pkg/api/server/register_networks.go
+++ b/pkg/api/server/register_networks.go
@@ -32,7 +32,7 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
// $ref: "#/responses/InternalError"
r.HandleFunc(VersionedPath("/networks/{name}"), s.APIHandler(compat.RemoveNetwork)).Methods(http.MethodDelete)
r.HandleFunc("/networks/{name}", s.APIHandler(compat.RemoveNetwork)).Methods(http.MethodDelete)
- // swagger:operation GET /networks/{name}/json compat compatInspectNetwork
+ // swagger:operation GET /networks/{name} compat compatInspectNetwork
// ---
// tags:
// - networks (compat)
@@ -53,9 +53,9 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
// $ref: "#/responses/NoSuchNetwork"
// 500:
// $ref: "#/responses/InternalError"
- r.HandleFunc(VersionedPath("/networks/{name}/json"), s.APIHandler(compat.InspectNetwork)).Methods(http.MethodGet)
- r.HandleFunc("/networks/{name}/json", s.APIHandler(compat.InspectNetwork)).Methods(http.MethodGet)
- // swagger:operation GET /networks/json compat compatListNetwork
+ r.HandleFunc(VersionedPath("/networks/{name}"), s.APIHandler(compat.InspectNetwork)).Methods(http.MethodGet)
+ r.HandleFunc("/networks/{name}", s.APIHandler(compat.InspectNetwork)).Methods(http.MethodGet)
+ // swagger:operation GET /networks compat compatListNetwork
// ---
// tags:
// - networks (compat)
@@ -68,7 +68,7 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
// $ref: "#/responses/CompatNetworkList"
// 500:
// $ref: "#/responses/InternalError"
- r.HandleFunc(VersionedPath("/networks/json"), s.APIHandler(compat.ListNetworks)).Methods(http.MethodGet)
+ r.HandleFunc(VersionedPath("/networks"), s.APIHandler(compat.ListNetworks)).Methods(http.MethodGet)
r.HandleFunc("/networks", s.APIHandler(compat.ListNetworks)).Methods(http.MethodGet)
// swagger:operation POST /networks/create compat compatCreateNetwork
// ---