Merge pull request #400 from YaoZengzeng/rename-gRPC

add container rename grpc api

Author: laijs

integration/client.go

@@ -249,6 +249,21 @@ func (c *HyperClient) CreateContainer(podID string, spec *types.UserContainer) (
 	return resp.ContainerID, nil
 }
 
+// RenameContainer renames a container
+func (c *HyperClient) RenameContainer(oldName string, newName string) error {
+	req := types.ContainerRenameRequest{
+		OldContainerName: oldName,
+		NewContainerName: newName,
+	}
+	_, err := c.client.ContainerRename(c.ctx, &req)
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // RemovePod removes a pod by podID
 func (c *HyperClient) RemovePod(podID string) error {
 	_, err := c.client.PodRemove(

integration/hyper_test.go

@@ -210,6 +210,37 @@ func (s *TestSuite) TestCreateContainer(c *C) {
 	c.Assert(err, IsNil)
 }
 
+func (s *TestSuite) TestRenameContainer(c *C) {
+	err := s.client.PullImage("busybox", "latest", nil)
+	c.Assert(err, IsNil)
+
+	spec := types.UserPod{}
+	pod, err := s.client.CreatePod(&spec)
+	c.Assert(err, IsNil)
+	c.Logf("Pod created: %s", pod)
+
+	container, err := s.client.CreateContainer(pod, &types.UserContainer{
+		Image: "busybox",
+	})
+	c.Assert(err, IsNil)
+	c.Logf("Container created: %s", container)
+
+	info, err := s.client.GetContainerInfo(container)
+	c.Assert(err, IsNil)
+
+	oldName := info.Container.Name[1:]
+	newName := "busybox0123456789"
+	err = s.client.RenameContainer(oldName, newName)
+	c.Assert(err, IsNil)
+
+	info, err = s.client.GetContainerInfo(container)
+	c.Assert(err, IsNil)
+	c.Assert(info.Container.Name[1:], Equals, newName)
+
+	err = s.client.RemovePod(pod)
+	c.Assert(err, IsNil)
+}
+
 func (s *TestSuite) TestPullImage(c *C) {
 	err := s.client.PullImage("alpine", "latest", nil)
 	c.Assert(err, IsNil)

serverrpc/container.go

@@ -33,3 +33,16 @@ func (s *ServerRPC) ContainerStop(c context.Context, req *types.ContainerStopReq
 
 	return &types.ContainerStopResponse{}, nil
 }
+
+// ContainerRename rename a container
+func (s *ServerRPC) ContainerRename(c context.Context, req *types.ContainerRenameRequest) (*types.ContainerRenameResponse, error) {
+	glog.V(3).Infof("ContainerRename with request %v", req.String())
+
+	err := s.daemon.ContainerRename(req.OldContainerName, req.NewContainerName)
+	if err != nil {
+		glog.Errorf("ContainerRename error: %v", err)
+		return nil, err
+	}
+
+	return &types.ContainerRenameResponse{}, nil
+}

types/types.pb.go

@@ -576,6 +576,13 @@ message ContainerCreateResponse {
   string containerID = 1;
 }
 
+message ContainerRenameRequest {
+  string oldContainerName = 1;
+  string newContainerName = 2;
+}
+
+message ContainerRenameResponse {}
+
 message AuthConfig {
   string username = 1;
   string password = 2;
@@ -760,7 +767,8 @@ service PublicAPI {
     rpc ContainerLogs(ContainerLogsRequest) returns (stream ContainerLogsResponse) {}
     // ContainerCreate creates a container in specified pod
     rpc ContainerCreate(ContainerCreateRequest) returns (ContainerCreateResponse) {}
-    // TODO: ContainerRename renames a container
+    // ContainerRename renames a container
+    rpc ContainerRename(ContainerRenameRequest) returns (ContainerRenameResponse) {}
     // TODO: ContainerCommit commits the changes of the specified container
     // TODO: ContainerSignal sends a singla to specified container
     // TODO: ContainerLabels updates labels of the specified container