diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-03 09:13:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 09:13:40 -0400 |
| commit | 96ece0ca56fca249bcf84061de0e944f3c092ea5 (patch) | |
| tree | c6f1f28ae3481f6b617f5931da9d91f323de556d /pkg/api/handlers/compat/networks.go | |
| parent | de5eb3831190262169eab36e64c41992dc22766a (diff) | |
| parent | 45b100d21ce1ca1843e26366466d09eac2d4add0 (diff) | |
| download | podman-96ece0ca56fca249bcf84061de0e944f3c092ea5.tar.gz podman-96ece0ca56fca249bcf84061de0e944f3c092ea5.tar.bz2 podman-96ece0ca56fca249bcf84061de0e944f3c092ea5.zip | |
Merge pull request #7188 from zhangguanzhang/network-404
API returns 500 in case network is not found instead of 404
Diffstat (limited to 'pkg/api/handlers/compat/networks.go')
| -rw-r--r-- | pkg/api/handlers/compat/networks.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 1e80cc91d..80b7505df 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -10,6 +10,7 @@ import ( "github.com/containernetworking/cni/libcni" "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/podman/v2/pkg/domain/infra/abi" @@ -44,9 +45,7 @@ func InspectNetwork(w http.ResponseWriter, r *http.Request) { name := utils.GetName(r) _, err = network.InspectNetwork(config, name) if err != nil { - // TODO our network package does not distinguish between not finding a - // specific network vs not being able to read it - utils.InternalServerError(w, err) + utils.NetworkNotFound(w, name, err) return } report, err := getNetworkResourceByName(name, runtime) @@ -285,7 +284,7 @@ func RemoveNetwork(w http.ResponseWriter, r *http.Request) { return } if !exists { - utils.Error(w, "network not found", http.StatusNotFound, network.ErrNetworkNotFound) + utils.Error(w, "network not found", http.StatusNotFound, define.ErrNoSuchNetwork) return } if err := network.RemoveNetwork(config, name); err != nil { |