From 89b5484734be74e113e43889530bb6d80a3345d1 Mon Sep 17 00:00:00 2001
From: Nan Deng <dengnan@google.com>
Date: Thu, 12 Jun 2014 15:03:18 -0700
Subject: [PATCH] changed actual handlers

---
 container/docker/handler.go          | 15 ++++++++++-----
 container/lmctfy/lmctfy_container.go |  9 +++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/container/docker/handler.go b/container/docker/handler.go
index 80cb7fc7..58b2cb90 100644
--- a/container/docker/handler.go
+++ b/container/docker/handler.go
@@ -285,12 +285,12 @@ func (self *dockerContainerHandler) GetStats() (stats *info.ContainerStats, err
 	return
 }
 
-func (self *dockerContainerHandler) ListContainers(listType container.ListType) ([]string, error) {
+func (self *dockerContainerHandler) ListContainers(listType container.ListType) ([]info.ContainerRef, error) {
 	if self.isDockerContainer() {
 		return nil, nil
 	}
 	if self.isRootContainer() && listType == container.LIST_SELF {
-		return []string{"/docker"}, nil
+		return []info.ContainerRef{info.ContainerRef{Name: "/docker"}}, nil
 	}
 	opt := docker.ListContainersOptions{
 		All: true,
@@ -299,16 +299,21 @@ func (self *dockerContainerHandler) ListContainers(listType container.ListType)
 	if err != nil {
 		return nil, err
 	}
-	ret := make([]string, 0, len(containers)+1)
+	ret := make([]info.ContainerRef, 0, len(containers)+1)
 	for _, c := range containers {
 		if !strings.HasPrefix(c.Status, "Up ") {
 			continue
 		}
 		path := fmt.Sprintf("/docker/%v", c.ID)
-		ret = append(ret, path)
+		aliases := c.Names
+		ref := info.ContainerRef{
+			Name:    path,
+			Aliases: aliases,
+		}
+		ret = append(ret, ref)
 	}
 	if self.isRootContainer() {
-		ret = append(ret, "/docker")
+		ret = append(ret, info.ContainerRef{Name: "/docker"})
 	}
 	return ret, nil
 }
diff --git a/container/lmctfy/lmctfy_container.go b/container/lmctfy/lmctfy_container.go
index d0d33860..39d5d2c5 100644
--- a/container/lmctfy/lmctfy_container.go
+++ b/container/lmctfy/lmctfy_container.go
@@ -157,7 +157,7 @@ func (c *lmctfyContainerHandler) GetStats() (*info.ContainerStats, error) {
 }
 
 // Gets all subcontainers.
-func (c *lmctfyContainerHandler) ListContainers(listType container.ListType) ([]string, error) {
+func (c *lmctfyContainerHandler) ListContainers(listType container.ListType) ([]info.ContainerRef, error) {
 	// Prepare the arguments.
 	args := []string{"list", "containers", "-v"}
 	if listType == container.LIST_RECURSIVE {
@@ -174,13 +174,14 @@ func (c *lmctfyContainerHandler) ListContainers(listType container.ListType) ([]
 
 	// Parse lines as container names.
 	if len(data) == 0 {
-		return []string{}, nil
+		return nil, nil
 	}
 	names := strings.Split(string(data), "\n")
-	containerNames := make([]string, 0, len(names))
+	containerNames := make([]info.ContainerRef, 0, len(names))
 	for _, name := range names {
 		if len(name) != 0 {
-			containerNames = append(containerNames, name)
+			ref := info.ContainerRef{Name: name}
+			containerNames = append(containerNames, ref)
 		}
 	}
 	return containerNames, nil