Merge pull request #9581 from baude/issue9529

Add network summary to compat ps
containers · Mar 3, 2021 · 8a1955f · 8a1955f
2 parents 259bb5f + 8f21929
commit 8a1955f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
@@ -321,6 +321,19 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 			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{
 		ID:         l.ID(),
@@ -339,7 +352,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 			NetworkMode string `json:",omitempty"`
 		}{
 			"host"},
-		NetworkSettings: nil,
+		NetworkSettings: &networkSettings,
 		Mounts:          nil,
 	},
 		ContainerCreateConfig: types.ContainerCreateConfig{},

diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
@@ -31,6 +31,13 @@ t GET libpod/containers/json?all=true 200 \
   .[0].ExitCode=0 \
   .[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.
 t GET libpod/containers/json?limit=1 200 \
   length=1 \