added short id for table printer

srl-labs · Jun 15, 2021 · bee3dab · bee3dab
1 parent 29134ba
commit bee3dab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/cmd/inspect.go b/cmd/inspect.go
@@ -133,7 +133,7 @@ func printContainerInspect(c *clab.CLab, containers []types.GenericContainer, br
 			IPv4Address: getContainerIPv4(cont, bridgeName),
 			IPv6Address: getContainerIPv6(cont, bridgeName),
 		}
-		cdet.ContainerID = cont.ID
+		cdet.ContainerID = cont.ShortID
 
 		if len(cont.Names) > 0 {
 			cdet.Name = strings.TrimLeft(cont.Names[0], "/")

diff --git a/runtime/containerd/containerd.go b/runtime/containerd/containerd.go
@@ -527,6 +527,7 @@ func (c *ContainerdRuntime) produceGenericContainerList(ctx context.Context, inp
 
 		ctr.Names = []string{i.ID()}
 		ctr.ID = i.ID()
+		ctr.ShortID = ctr.ID
 		ctr.Image = info.Image
 		ctr.Labels = info.Labels
 

diff --git a/runtime/docker/docker.go b/runtime/docker/docker.go
@@ -375,12 +375,13 @@ func (c *DockerRuntime) produceGenericContainerList(inputContainers []dockerType
 
 	for _, i := range inputContainers {
 		ctr := types.GenericContainer{
-			Names:  i.Names,
-			ID:     i.ID,
-			Image:  i.Image,
-			State:  i.State,
-			Status: i.Status,
-			Labels: i.Labels,
+			Names:   i.Names,
+			ID:      i.ID,
+			ShortID: i.ID[:12],
+			Image:   i.Image,
+			State:   i.State,
+			Status:  i.Status,
+			Labels:  i.Labels,
 			NetworkSettings: &types.GenericMgmtIPs{
 				Set: false,
 			},

diff --git a/types/types.go b/types/types.go
@@ -117,6 +117,7 @@ func (node *Node) GenerateConfig(dst, defaultTemplatePath string) error {
 type GenericContainer struct {
 	Names           []string
 	ID              string
+	ShortID         string // trimmed ID for display purposes
 	Image           string
 	State           string
 	Status          string