Add a NetNS (network namespace) parameter to the CreateVM request

CuriousGeorgiy · CuriousGeorgiy · commit 509353015a9e · 2023-08-24T14:14:23.000+06:00
The current NetNS (network namespace) parameter nested in the JailerConfig
parameter requires specifying the entire jailer configuration, which is not
convenient. It is also not compatible with using a noop jailer.

To overcome this limitation, add a new NetNS parameter to the CreateVM
request.

Signed-off-by: Georgiy Lebedev &lt;lebedev.gk@phystech.edu&gt;
diff --git a/proto/firecracker.pb.go b/proto/firecracker.pb.go
diff --git a/proto/firecracker.proto b/proto/firecracker.proto
@@ -41,6 +41,9 @@ message CreateVMRequest {
     string MetricsFifoPath = 13;
 
     FirecrackerBalloonDevice BalloonDevice = 14;
+
+    // The network namespace of the VM.
+    string NetNS = 15;
 }
 
 message CreateVMResponse {
diff --git a/runtime/service.go b/runtime/service.go
@@ -985,6 +985,8 @@ func (s *service) buildVMConfiguration(req *proto.CreateVMRequest) (*firecracker
 
 	if req.JailerConfig != nil {
 		cfg.NetNS = req.JailerConfig.NetNS
+	} else {
+		cfg.NetNS = req.NetNS
 	}
 
 	s.logger.Debugf("using socket path: %s", cfg.SocketPath)

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ message CreateVMRequest {`
`41`	`41`	`string MetricsFifoPath = 13;`
`42`	`42`
`43`	`43`	`FirecrackerBalloonDevice BalloonDevice = 14;`
	`44`	`+`
	`45`	`+ // The network namespace of the VM.`
	`46`	`+ string NetNS = 15;`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`message CreateVMResponse {`
Original file line number	Diff line number	Diff line change
`@@ -985,6 +985,8 @@ func (s service) buildVMConfiguration(req proto.CreateVMRequest) (*firecracker`
`985`	`985`
`986`	`986`	`if req.JailerConfig != nil {`
`987`	`987`	`cfg.NetNS = req.JailerConfig.NetNS`
	`988`	`+ } else {`
	`989`	`+ cfg.NetNS = req.NetNS`
`988`	`990`	`}`
`989`	`991`
`990`	`992`	`s.logger.Debugf("using socket path: %s", cfg.SocketPath)`