second round of @karimra's comments

srl-labs · Jun 16, 2021 · 839b164 · 839b164
1 parent 9158e9e
commit 839b164
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/clab/config.go b/clab/config.go
@@ -661,8 +661,7 @@ func (c *CLab) VerifyContainersUniqueness(ctx context.Context) error {
 	nctx, cancel := context.WithTimeout(ctx, c.timeout)
 	defer cancel()
 
-	labels := []*types.GenericFilter{}
-	containers, err := c.Runtime.ListContainers(nctx, labels)
+	containers, err := c.Runtime.ListContainers(nctx, nil)
 	if err != nil {
 		return fmt.Errorf("could not list containers: %v", err)
 	}

diff --git a/runtime/containerd/containerd.go b/runtime/containerd/containerd.go
@@ -406,7 +406,7 @@ func (c *ContainerdRuntime) StartContainer(ctx context.Context, containername st
 func (c *ContainerdRuntime) StopContainer(ctx context.Context, containername string, dur *time.Duration) error {
 	ctask, err := c.getContainerTask(ctx, containername)
 	if err != nil {
-		log.Debugf("no task found for container %s", containername)
+		log.Debugf("container %s: %v", containername, err)
 		return nil
 	}
 	taskstatus, err := ctask.Status(ctx)
@@ -481,10 +481,8 @@ func (c *ContainerdRuntime) getContainerTask(ctx context.Context, containername
 func (c *ContainerdRuntime) ListContainers(ctx context.Context, filter []*types.GenericFilter) ([]types.GenericContainer, error) {
 	log.Debug("listing containers")
 	ctx = namespaces.WithNamespace(ctx, containerdNamespace)
-	// TODO add containerlab label as filter criteria
 
 	filterstring := c.buildFilterString(filter)
-
 	containerlist, err := c.client.Containers(ctx, filterstring)
 	if err != nil {
 		return nil, err