vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add server impl of list pod sandboxes

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-09-26 12:20:59 -07:00
parent 7c9aaf34cd
commit ecda01c284
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
server/sandbox.go
View file

@ -316,6 +316,9 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
podInfraContainerName := sb.name + "-infra" podInfraContainerName := sb.name + "-infra"
podInfraContainer := sb.getContainer(podInfraContainerName) podInfraContainer := sb.getContainer(podInfraContainerName)
if err := s.runtime.UpdateStatus(podInfraContainer); err != nil {
return nil, err
}
cState := s.runtime.ContainerStatus(podInfraContainer) cState := s.runtime.ContainerStatus(podInfraContainer)
created := cState.Created.Unix() created := cState.Created.Unix()
@ -332,7 +335,7 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
} }
rStatus := pb.PodSandBoxState_NOTREADY rStatus := pb.PodSandBoxState_NOTREADY
if cState.Status == "running" { if cState.Status == ContainerStateRunning {
rStatus = pb.PodSandBoxState_READY rStatus = pb.PodSandBoxState_READY
} }
@ -351,7 +354,32 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
}, nil }, nil
} }
// ListPodSandbox returns a list of SandBox. // ListPodSandbox returns a list of SandBoxes.
func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb.ListPodSandboxResponse, error) { func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb.ListPodSandboxResponse, error) {
return nil, nil var pods []*pb.PodSandbox
for _, sb := range s.state.sandboxes {
podInfraContainerName := sb.name + "-infra"
podInfraContainer := sb.getContainer(podInfraContainerName)
if err := s.runtime.UpdateStatus(podInfraContainer); err != nil {
return nil, err
}
cState := s.runtime.ContainerStatus(podInfraContainer)
created := cState.Created.Unix()
rStatus := pb.PodSandBoxState_NOTREADY
if cState.Status == ContainerStateRunning {
rStatus = pb.PodSandBoxState_READY
}
pod := &pb.PodSandbox{
Id: &sb.id,
CreatedAt: int64Ptr(created),
State: &rStatus,
}
pods = append(pods, pod)
}
return &pb.ListPodSandboxResponse{
Items: pods,
}, nil
} }