diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-16 11:31:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 11:31:33 +0100 |
| commit | 0f954e2371265c1da2a337172c390eaae3a04229 (patch) | |
| tree | 1b53295917b1e37a2337f93e60510206529f3f29 | |
| parent | d9f84692c13406f7e4e22d4bb16db4e8a7d086ab (diff) | |
| parent | 7b0155cf780f396f6ffc4455ae5825f5fc14ca79 (diff) | |
| download | podman-0f954e2371265c1da2a337172c390eaae3a04229.tar.gz podman-0f954e2371265c1da2a337172c390eaae3a04229.tar.bz2 podman-0f954e2371265c1da2a337172c390eaae3a04229.zip | |
Merge pull request #9695 from jmguzik/array-inspect-network-fix
Fix array instead of one elem network http api
| -rw-r--r-- | pkg/api/handlers/libpod/networks.go | 2 | ||||
| -rw-r--r-- | pkg/api/handlers/libpod/swagger.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/network/network.go | 3 | ||||
| -rw-r--r-- | test/apiv2/35-networks.at | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index a6c4f6d64..48cd37994 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -128,7 +128,7 @@ func InspectNetwork(w http.ResponseWriter, r *http.Request) { utils.InternalServerError(w, err) return } - utils.WriteResponse(w, http.StatusOK, reports) + utils.WriteResponse(w, http.StatusOK, reports[0]) } // Connect adds a container to a network diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go index 1bececa1a..2631f19ac 100644 --- a/pkg/api/handlers/libpod/swagger.go +++ b/pkg/api/handlers/libpod/swagger.go @@ -102,7 +102,7 @@ type swagNetworkRmReport struct { // swagger:response NetworkInspectReport type swagNetworkInspectReport struct { // in:body - Body []entities.NetworkInspectReport + Body entities.NetworkInspectReport } // Network list diff --git a/pkg/bindings/network/network.go b/pkg/bindings/network/network.go index 46a3719fe..6f3aa8594 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -40,6 +40,7 @@ func Create(ctx context.Context, options *CreateOptions) (*entities.NetworkCreat // Inspect returns low level information about a CNI network configuration func Inspect(ctx context.Context, nameOrID string, options *InspectOptions) ([]entities.NetworkInspectReport, error) { var reports []entities.NetworkInspectReport + reports = append(reports, entities.NetworkInspectReport{}) if options == nil { options = new(InspectOptions) } @@ -52,7 +53,7 @@ func Inspect(ctx context.Context, nameOrID string, options *InspectOptions) ([]e if err != nil { return nil, err } - return reports, response.Process(&reports) + return reports, response.Process(&reports[0]) } // Remove deletes a defined CNI network configuration by name. The optional force boolean diff --git a/test/apiv2/35-networks.at b/test/apiv2/35-networks.at index 98786e914..ce7ca628a 100644 --- a/test/apiv2/35-networks.at +++ b/test/apiv2/35-networks.at @@ -30,6 +30,10 @@ t GET libpod/networks/json?filters='{"name":["network1"]}' 200 \ .[0].Name=network1 t GET networks 200 +#inspect network +t GET libpod/networks/network1/json 200 \ + .name="network1" + #network list docker endpoint t GET networks?filters='{"name":["network1","network2"]}' 200 \ length=2 |