mirror of
https://github.com/moby/moby.git
synced 2025-07-29 07:21:35 +03:00
api: remove code for ContainerInspect on api v1.20
API v1.23 and older are deprecated, so we can remove the code to adjust responses for API v1.20. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@ -15,7 +15,6 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/api/types/versions/v1p20"
|
||||
"github.com/docker/docker/integration-cli/cli"
|
||||
"github.com/docker/docker/integration-cli/daemon"
|
||||
"github.com/docker/docker/libnetwork/driverapi"
|
||||
@ -1015,22 +1014,14 @@ func (s *DockerCLINetworkSuite) TestInspectAPIMultipleNetworks(c *testing.T) {
|
||||
cli.DockerCmd(c, "network", "connect", "mybridge1", id)
|
||||
cli.DockerCmd(c, "network", "connect", "mybridge2", id)
|
||||
|
||||
body := getInspectBody(c, "v1.20", id)
|
||||
var inspect120 v1p20.ContainerJSON
|
||||
err := json.Unmarshal(body, &inspect120)
|
||||
assert.NilError(c, err)
|
||||
|
||||
versionedIP := inspect120.NetworkSettings.IPAddress
|
||||
|
||||
// Current API version (API v1.21 and up)
|
||||
body = getInspectBody(c, "", id)
|
||||
body := getInspectBody(c, "", id)
|
||||
var inspectCurrent types.ContainerJSON
|
||||
err = json.Unmarshal(body, &inspectCurrent)
|
||||
err := json.Unmarshal(body, &inspectCurrent)
|
||||
assert.NilError(c, err)
|
||||
assert.Equal(c, len(inspectCurrent.NetworkSettings.Networks), 3)
|
||||
|
||||
bridge := inspectCurrent.NetworkSettings.Networks["bridge"]
|
||||
assert.Equal(c, bridge.IPAddress, versionedIP)
|
||||
assert.Equal(c, bridge.IPAddress, inspectCurrent.NetworkSettings.IPAddress)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user