Merge pull request #433 from olibearo/populate-createvm-response

Populate response for CreateVM in Runtime shim

Author: Kazuyoshi Kato

runtime/service.go

@@ -336,7 +336,6 @@ func (s *service) StartShim(shimCtx context.Context, containerID, containerdBina
 		if err != nil {
 			return "", errors.Wrap(err, "failed to generate UUID for VMID")
 		}
-
 		s.vmID = uuid.String()
 
 		// This request is handled by a short-lived shim process to find its control socket.
@@ -457,7 +456,6 @@ func (s *service) CreateVM(requestCtx context.Context, request *proto.CreateVMRe
 		err = s.createVM(ctxWithTimeout, request)
 		createRan = true
 	})
-
 	if !createRan {
 		return nil, status.Error(codes.AlreadyExists, "shim cannot create VM more than once")
 	}
@@ -485,9 +483,14 @@ func (s *service) CreateVM(requestCtx context.Context, request *proto.CreateVMRe
 	// let all the other methods know that the VM is ready for tasks
 	close(s.vmReady)
 
+	resp.VMID = s.vmID
+	resp.MetricsFifoPath = s.machineConfig.MetricsFifo
+	resp.LogFifoPath = s.machineConfig.LogFifo
+	resp.SocketPath = s.shimDir.FirecrackerSockPath()
 	if c, ok := s.jailer.(cgroupPather); ok {
 		resp.CgroupPath = c.CgroupPath()
 	}
+
 	return &resp, nil
 }
 

runtime/service_integ_test.go

@@ -1849,14 +1849,16 @@ func TestCreateVM_Isolated(t *testing.T) {
 		t.Run(subtest.name, func(t *testing.T) {
 			request.VMID = testNameToVMID(t.Name())
 
-			_, err = fcClient.CreateVM(ctx, &request)
+			resp, err := fcClient.CreateVM(ctx, &request)
 			validate(t, err)
-
 			if err != nil {
 				// No VM to stop.
 				return
 			}
 
+			// Ensure the response fields are populated correctly
+			assert.Equal(t, request.VMID, resp.VMID)
+
 			_, err = fcClient.StopVM(ctx, &proto.StopVMRequest{VMID: request.VMID})
 			require.Equal(t, status.Code(err), codes.OK)
 		})