5 files changed, 79 insertions, 37 deletions
diff --git a/pkg/api/handlers/generic/config.go b/pkg/api/handlers/generic/config.go
new file mode 100644
index 000000000..f715d25eb
--- /dev/null
+++ b/pkg/api/handlers/generic/config.go
@@ -0,0 +1,9 @@
+package generic
+
+// ContainerCreateResponse is the response struct for creating a container
+type ContainerCreateResponse struct {
+	// ID of the container created
+	Id string `json:"Id"`
+	// Warnings during container creation
+	Warnings []string `json:"Warnings"`
+}
diff --git a/pkg/api/handlers/generic/containers_create.go b/pkg/api/handlers/generic/containers_create.go
index ef5337abd..f98872690 100644
--- a/pkg/api/handlers/generic/containers_create.go
+++ b/pkg/api/handlers/generic/containers_create.go
@@ -71,11 +71,7 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	type ctrCreateResponse struct {
-		Id       string   `json:"Id"`
-		Warnings []string `json:"Warnings"`
-	}
-	response := ctrCreateResponse{
+	response := ContainerCreateResponse{
 		Id:       ctr.ID(),
 		Warnings: []string{}}
 
diff --git a/pkg/api/handlers/generic/containers_stats.go b/pkg/api/handlers/generic/containers_stats.go
index 0c4efc1df..26c8efa15 100644
--- a/pkg/api/handlers/generic/containers_stats.go
+++ b/pkg/api/handlers/generic/containers_stats.go
@@ -43,28 +43,26 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// If the container isn't returning, then let's not bother and return
+	// immediately.
 	state, err := ctnr.State()
 	if err != nil {
 		utils.InternalServerError(w, err)
 		return
 	}
 	if state != define.ContainerStateRunning && !query.Stream {
-		utils.WriteJSON(w, http.StatusOK, &handlers.Stats{StatsJSON: docker.StatsJSON{
-			Name: ctnr.Name(),
-			ID:   ctnr.ID(),
-		}})
+		utils.InternalServerError(w, define.ErrCtrStateInvalid)
 		return
 	}
 
-	var preRead time.Time
-	var preCPUStats docker.CPUStats
-
 	stats, err := ctnr.GetContainerStats(&libpod.ContainerStats{})
 	if err != nil {
 		utils.InternalServerError(w, errors.Wrapf(err, "Failed to obtain Container %s stats", name))
 		return
 	}
 
+	var preRead time.Time
+	var preCPUStats docker.CPUStats
 	if query.Stream {
 		preRead = time.Now()
 		preCPUStats = docker.CPUStats{
@@ -78,25 +76,44 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 			OnlineCPUs:     0,
 			ThrottlingData: docker.ThrottlingData{},
 		}
-		time.Sleep(DefaultStatsPeriod)
 	}
 
-	cgroupPath, _ := ctnr.CGroupPath()
-	cgroup, _ := cgroups.Load(cgroupPath)
-
 	for ok := true; ok; ok = query.Stream {
-		state, _ := ctnr.State()
-		if state != define.ContainerStateRunning {
-			time.Sleep(10 * time.Second)
-			continue
+		// Container stats
+		stats, err := ctnr.GetContainerStats(stats)
+		if err != nil {
+			utils.InternalServerError(w, err)
+			return
+		}
+		inspect, err := ctnr.Inspect(false)
+		if err != nil {
+			utils.InternalServerError(w, err)
+			return
+		}
+		// Cgroup stats
+		cgroupPath, err := ctnr.CGroupPath()
+		if err != nil {
+			utils.InternalServerError(w, err)
+			return
+		}
+		cgroup, err := cgroups.Load(cgroupPath)
+		if err != nil {
+			utils.InternalServerError(w, err)
+			return
+		}
+		cgroupStat, err := cgroup.Stat()
+		if err != nil {
+			utils.InternalServerError(w, err)
+			return
 		}
 
-		stats, _ := ctnr.GetContainerStats(stats)
-		cgroupStat, _ := cgroup.Stat()
-		inspect, _ := ctnr.Inspect(false)
-
+		// FIXME: network inspection does not yet work entirely
 		net := make(map[string]docker.NetworkStats)
-		net[inspect.NetworkSettings.EndpointID] = docker.NetworkStats{
+		networkName := inspect.NetworkSettings.EndpointID
+		if networkName == "" {
+			networkName = "network"
+		}
+		net[networkName] = docker.NetworkStats{
 			RxBytes:    stats.NetInput,
 			RxPackets:  0,
 			RxErrors:   0,
@@ -127,13 +144,6 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 					IoTimeRecursive:         nil,
 					SectorsRecursive:        nil,
 				},
-				NumProcs: 0,
-				StorageStats: docker.StorageStats{
-					ReadCountNormalized:  0,
-					ReadSizeBytes:        0,
-					WriteCountNormalized: 0,
-					WriteSizeBytes:       0,
-				},
 				CPUStats: docker.CPUStats{
 					CPUUsage: docker.CPUUsage{
 						TotalUsage:        cgroupStat.CPU.Usage.Total,
@@ -174,17 +184,21 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 		preRead = s.Read
 		bits, err := json.Marshal(s.CPUStats)
 		if err != nil {
-			logrus.Errorf("unable to marshal cpu stats: %q", err)
+			logrus.Errorf("Unable to marshal cpu stats: %q", err)
 		}
 		if err := json.Unmarshal(bits, &preCPUStats); err != nil {
-			logrus.Errorf("unable to unmarshal previous stats: %q", err)
+			logrus.Errorf("Unable to unmarshal previous stats: %q", err)
+		}
+
+		// Only sleep when we're streaming.
+		if query.Stream {
+			time.Sleep(DefaultStatsPeriod)
 		}
-		time.Sleep(DefaultStatsPeriod)
 	}
 }
 
 func toBlkioStatEntry(entries []cgroups.BlkIOEntry) []docker.BlkioStatEntry {
-	results := make([]docker.BlkioStatEntry, 0, len(entries))
+	results := make([]docker.BlkioStatEntry, len(entries))
 	for i, e := range entries {
 		bits, err := json.Marshal(e)
 		if err != nil {
diff --git a/pkg/api/handlers/generic/images.go b/pkg/api/handlers/generic/images.go
index 8029ee861..395f64064 100644
--- a/pkg/api/handlers/generic/images.go
+++ b/pkg/api/handlers/generic/images.go
@@ -350,7 +350,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Failed get images"))
 		return
 	}
-	var summaries = make([]*handlers.ImageSummary, len(images))
+	var summaries = make([]*handlers.ImageSummary, len(images)+1)
 	for j, img := range images {
 		is, err := handlers.ImageToImageSummary(img)
 		if err != nil {
diff --git a/pkg/api/handlers/generic/swagger.go b/pkg/api/handlers/generic/swagger.go
new file mode 100644
index 000000000..27e1fc18d
--- /dev/null
+++ b/pkg/api/handlers/generic/swagger.go
@@ -0,0 +1,23 @@
+package generic
+
+// Create container
+// swagger:response ContainerCreateResponse
+type swagCtrCreateResponse struct {
+	// in:body
+	Body struct {
+		ContainerCreateResponse
+	}
+}
+
+// Wait container
+// swagger:response ContainerWaitResponse
+type swagCtrWaitResponse struct {
+	// in:body
+	Body struct {
+		// container exit code
+		StatusCode int
+		Error      struct {
+			Message string
+		}
+	}
+}