mirror of
https://github.com/containers/podman.git
synced 2025-06-23 02:18:13 +08:00
Merge pull request #9581 from baude/issue9529
Add network summary to compat ps
This commit is contained in:
@ -321,6 +321,19 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
|
|||||||
Type: portMapping.Protocol,
|
Type: portMapping.Protocol,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
inspect, err := l.Inspect(false)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
n, err := json.Marshal(inspect.NetworkSettings)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
networkSettings := types.SummaryNetworkSettings{}
|
||||||
|
if err := json.Unmarshal(n, &networkSettings); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
return &handlers.Container{Container: types.Container{
|
return &handlers.Container{Container: types.Container{
|
||||||
ID: l.ID(),
|
ID: l.ID(),
|
||||||
@ -339,7 +352,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
|
|||||||
NetworkMode string `json:",omitempty"`
|
NetworkMode string `json:",omitempty"`
|
||||||
}{
|
}{
|
||||||
"host"},
|
"host"},
|
||||||
NetworkSettings: nil,
|
NetworkSettings: &networkSettings,
|
||||||
Mounts: nil,
|
Mounts: nil,
|
||||||
},
|
},
|
||||||
ContainerCreateConfig: types.ContainerCreateConfig{},
|
ContainerCreateConfig: types.ContainerCreateConfig{},
|
||||||
|
@ -31,6 +31,13 @@ t GET libpod/containers/json?all=true 200 \
|
|||||||
.[0].ExitCode=0 \
|
.[0].ExitCode=0 \
|
||||||
.[0].IsInfra=false
|
.[0].IsInfra=false
|
||||||
|
|
||||||
|
# Test compat API for Network Settings
|
||||||
|
t GET /containers/json?all=true 200 \
|
||||||
|
length=1 \
|
||||||
|
.[0].Id~[0-9a-f]\\{64\\} \
|
||||||
|
.[0].Image=$IMAGE \
|
||||||
|
.[0].NetworkSettings.Networks.podman.NetworkID=podman
|
||||||
|
|
||||||
# Make sure `limit` works.
|
# Make sure `limit` works.
|
||||||
t GET libpod/containers/json?limit=1 200 \
|
t GET libpod/containers/json?limit=1 200 \
|
||||||
length=1 \
|
length=1 \
|
||||||
|
Reference in New Issue
Block a user