Merge branch 'containerd' of github.com:steiler/container-lab into co…

…ntainerd

clab/srl.go

@@ -88,7 +88,7 @@ func initSRLNode(c *CLab, nodeCfg NodeConfig, node *types.Node, user string, env
 		log.Fatalf("wrong node type. '%s' doesn't exist. should be any of %s", node.NodeType, strings.Join(keys, ", "))
 	}
 
-	// initialize specifc container information
+	// the addition touch is needed to support non docker runtimes
 	node.Cmd = "sudo bash -c 'touch /.dockerenv && /opt/srlinux/bin/sr_linux'"
 
 	kindEnv := map[string]string{"SRLINUX": "1"}

cmd/destroy.go

@@ -126,7 +126,7 @@ func deleteEntriesFromHostsFile(containers []types.GenericContainer, bridgeName
 	if bridgeName == "" {
 		return fmt.Errorf("missing bridge name")
 	}
-	f, err := os.OpenFile("/etc/hosts", os.O_RDWR, 0644)
+	f, err := os.OpenFile("/etc/hosts", os.O_RDWR, 0644) // skipcq: GSC-G302
 	if err != nil {
 		return err
 	}
@@ -207,12 +207,12 @@ func destroyLab(ctx context.Context, c *clab.CLab) (err error) {
 						log.Debugf("Worker %d terminating...", i)
 						return
 					}
-					//if len(cont.Names) > 0 {
-					//	name = strings.TrimLeft(cont.Names[0], "/")
-					//}
+					if len(cont.Names) > 0 {
+						name = strings.TrimLeft(cont.Names[0], "/")
+					}
 					err := c.Runtime.DeleteContainer(ctx, cont)
 					if err != nil {
-						log.Errorf("could not remove container: %v", err)
+						log.Errorf("could not remove container %s: %v", name, err)
 					}
 				case <-ctx.Done():
 					return

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], "/")

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
 

runtime/docker/docker.go

@@ -12,6 +12,7 @@ import (
 	"io/ioutil"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 
 	dockerTypes "github.com/docker/docker/api/types"
@@ -374,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,
 			},
@@ -480,12 +482,12 @@ func (c *DockerRuntime) DeleteContainer(ctx context.Context, container *types.Ge
 			force = true
 		}
 	}
-	log.Debugf("Removing container: %s", container.Names[0])
+	log.Debugf("Removing container: %s", strings.TrimLeft(container.Names[0], "/"))
 	err = c.Client.ContainerRemove(ctx, container.ID, dockerTypes.ContainerRemoveOptions{Force: force})
 	if err != nil {
 		return err
 	}
-	log.Infof("Removed container: %s", container.Names[0])
+	log.Infof("Removed container: %s", strings.TrimLeft(container.Names[0], "/"))
 	return nil
 }
 

tests/01-smoke/04-generate.robot

@@ -24,4 +24,8 @@ Verify nodes
 
 *** Keywords ***
 Cleanup
-    Run    sudo containerlab destroy -t ${CURDIR}/${lab-name}.clab.yml --cleanup
+    ${rc}    ${output} =    Run And Return Rc And Output
+    ...    sudo containerlab destroy -t ${lab-name}.clab.yml --cleanup
+    Log    ${output}
+    Should Be Equal As Integers    ${rc}    0
+    OperatingSystem.Remove File    ${lab-name}.clab.yml

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