Merge pull request #594 from Kern--/vsock-path

Kern-- · web-flow · commit b1c4e3284956 · 2022-03-23T16:40:47.000-07:00
Add VSockPath to GetVmInfoResponse
diff --git a/proto/firecracker.pb.go b/proto/firecracker.pb.go
diff --git a/proto/firecracker.proto b/proto/firecracker.proto
@@ -74,6 +74,7 @@ message GetVMInfoResponse {
     string LogFifoPath = 3;
     string MetricsFifoPath = 4;
     string CgroupPath = 5;
+    string VSockPath = 6;
 }
 
 message SetVMMetadataRequest {
diff --git a/runtime/service.go b/runtime/service.go
@@ -711,6 +711,7 @@ func (s *service) GetVMInfo(requestCtx context.Context, request *proto.GetVMInfo
 		LogFifoPath:     s.machineConfig.LogPath,
 		MetricsFifoPath: s.machineConfig.MetricsPath,
 		CgroupPath:      cgroupPath,
+		VSockPath:       s.shimDir.FirecrackerVSockPath(),
 	}, nil
 }
 
diff --git a/runtime/service_integ_test.go b/runtime/service_integ_test.go
@@ -409,6 +409,7 @@ func TestMultipleVMs_Isolated(t *testing.T) {
 				return err
 			}
 			if vmInfoResp.SocketPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "firecracker.sock") ||
+				vmInfoResp.VSockPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "firecracker.vsock") ||
 				vmInfoResp.LogFifoPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "fc-logs.fifo") ||
 				vmInfoResp.MetricsFifoPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "fc-metrics.fifo") ||
 				resp.CgroupPath != vmInfoResp.CgroupPath {

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ message GetVMInfoResponse {`
`74`	`74`	`string LogFifoPath = 3;`
`75`	`75`	`string MetricsFifoPath = 4;`
`76`	`76`	`string CgroupPath = 5;`
	`77`	`+ string VSockPath = 6;`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`message SetVMMetadataRequest {`
Original file line number	Diff line number	Diff line change
`@@ -711,6 +711,7 @@ func (s service) GetVMInfo(requestCtx context.Context, request proto.GetVMInfo`
`711`	`711`	`LogFifoPath: s.machineConfig.LogPath,`
`712`	`712`	`MetricsFifoPath: s.machineConfig.MetricsPath,`
`713`	`713`	`CgroupPath: cgroupPath,`
	`714`	`+ VSockPath: s.shimDir.FirecrackerVSockPath(),`
`714`	`715`	`}, nil`
`715`	`716`	`}`
`716`	`717`
Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,7 @@ func TestMultipleVMs_Isolated(t *testing.T) {`
`409`	`409`	`return err`
`410`	`410`	`}`
`411`	`411`	`if vmInfoResp.SocketPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "firecracker.sock") \|\|`
	`412`	`+ vmInfoResp.VSockPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "firecracker.vsock") \|\|`
`412`	`413`	`vmInfoResp.LogFifoPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "fc-logs.fifo") \|\|`
`413`	`414`	`vmInfoResp.MetricsFifoPath != filepath.Join(cfg.ShimBaseDir, nspVMid, "fc-metrics.fifo") \|\|`
`414`	`415`	`resp.CgroupPath != vmInfoResp.CgroupPath {`