From 7081620128d822b783226441cb70d1a3a16d0666 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Tue, 11 Apr 2017 14:09:17 +0200
Subject: [PATCH] server: expose mounts in container status

Fix 5 more tests from k8s's conformance tests
```
Ran 5 of 213 Specs in 76.068 seconds
SUCCESS! -- 5 Passed | 0 Failed | 0 Pending | 208 Skipped PASS
```

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 server/container_status.go | 52 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/server/container_status.go b/server/container_status.go
index 4c60cecc..138a78e5 100644
--- a/server/container_status.go
+++ b/server/container_status.go
@@ -1,8 +1,11 @@
 package server
 
 import (
+	"encoding/json"
+
 	"github.com/Sirupsen/logrus"
 	"github.com/kubernetes-incubator/cri-o/oci"
+	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/net/context"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
 )
@@ -32,6 +35,12 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
 		},
 	}
 
+	mounts, err := s.getMounts(containerID)
+	if err != nil {
+		return nil, err
+	}
+	resp.Status.Mounts = mounts
+
 	status, err := s.images.ImageStatus(s.imageContext, image.Image)
 	if err != nil {
 		return nil, err
@@ -69,3 +78,46 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
 	logrus.Debugf("ContainerStatusResponse: %+v", resp)
 	return resp, nil
 }
+
+func (s *Server) getMounts(id string) ([]*pb.Mount, error) {
+	config, err := s.store.GetFromContainerDirectory(id, "config.json")
+	if err != nil {
+		return nil, err
+	}
+	var m rspec.Spec
+	if err = json.Unmarshal(config, &m); err != nil {
+		return nil, err
+	}
+	isRO := func(m rspec.Mount) bool {
+		var ro bool
+		for _, o := range m.Options {
+			if o == "ro" {
+				ro = true
+				break
+			}
+		}
+		return ro
+	}
+	isBind := func(m rspec.Mount) bool {
+		var bind bool
+		for _, o := range m.Options {
+			if o == "bind" || o == "rbind" {
+				bind = true
+				break
+			}
+		}
+		return bind
+	}
+	mounts := []*pb.Mount{}
+	for _, b := range m.Mounts {
+		if !isBind(b) {
+			continue
+		}
+		mounts = append(mounts, &pb.Mount{
+			ContainerPath: b.Destination,
+			HostPath:      b.Source,
+			Readonly:      isRO(b),
+		})
+	}
+	return mounts, nil
+}