NOISSUE - Simplify local agent running in non sev-snp environment (#411)

* Add vtpm attestation support to agent service and server Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Update mockery version to v2.53.2 and refactor VM factory to include logger Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Send event notification when computation is stopped in agentService Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Remove redundant assignment of Stderr in qemuVM Start method Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Rename SVM references to CVM in tracing, logging, metrics, and service layers Signed-off-by: Sammy Oina <sammyoina@gmail.com> --------- Signed-off-by: Sammy Oina <sammyoina@gmail.com>
2026-06-23 04:10:25 +00:00 · 2025-04-01 22:59:11 +03:00
parent ebe119686f
commit 7e63921896
38 changed files with 845 additions and 290 deletions
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -71,7 +71,7 @@ func (_c *Storage_Add_Call) RunAndReturn(run func(*cvms.ClientStreamMessage) err
 	return _c
 }

-// Clear provides a mock function with given fields:
+// Clear provides a mock function with no fields
 func (_m *Storage) Clear() error {
 	ret := _m.Called()

@@ -116,7 +116,7 @@ func (_c *Storage_Clear_Call) RunAndReturn(run func() error) *Storage_Clear_Call
 	return _c
 }

-// Load provides a mock function with given fields:
+// Load provides a mock function with no fields
 func (_m *Storage) Load() ([]storage.Message, error) {
 	ret := _m.Called()

@@ -8,12 +8,12 @@ import (
 	"fmt"
 	"log/slog"

+	"github.com/google/go-sev-guest/client"
 	"github.com/ultravioletrs/cocos/agent"
 	agentgrpc "github.com/ultravioletrs/cocos/agent/api/grpc"
 	"github.com/ultravioletrs/cocos/agent/auth"
 	"github.com/ultravioletrs/cocos/internal/server"
 	grpcserver "github.com/ultravioletrs/cocos/internal/server/grpc"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
@@ -33,13 +33,15 @@ type agentServer struct {
 	logger *slog.Logger
 	svc    agent.Service
 	host   string
+	qp     client.LeveledQuoteProvider
 }

-func NewServer(logger *slog.Logger, svc agent.Service, host string) AgentServer {
+func NewServer(logger *slog.Logger, svc agent.Service, host string, qp client.LeveledQuoteProvider) AgentServer {
 	return &agentServer{
 		logger: logger,
 		svc:    svc,
 		host:   host,
+		qp:     qp,
 	}
 }

@@ -73,15 +75,9 @@ func (as *agentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error
 		return err
 	}

-	qp, err := quoteprovider.GetLeveledQuoteProvider()
-	if err != nil {
-		as.logger.Error(fmt.Sprintf("failed to create quote provider %s", err.Error()))
-		return err
-	}
-
 	ctx, cancel := context.WithCancel(context.Background())

-	as.gs = grpcserver.New(ctx, cancel, svcName, agentGrpcServerConfig, registerAgentServiceServer, as.logger, qp, authSvc)
+	as.gs = grpcserver.New(ctx, cancel, svcName, agentGrpcServerConfig, registerAgentServiceServer, as.logger, as.qp, authSvc)

 	go func() {
 		err := as.gs.Start()
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -70,7 +70,7 @@ func (_c *AgentServer_Start_Call) RunAndReturn(run func(agent.AgentConfig, agent
 	return _c
 }

-// Stop provides a mock function with given fields:
+// Stop provides a mock function with no fields
 func (_m *AgentServer) Stop() error {
 	ret := _m.Called()

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -56,7 +56,7 @@ func (_c *Service_SendEvent_Call) Return() *Service_SendEvent_Call {
 }

 func (_c *Service_SendEvent_Call) RunAndReturn(run func(string, string, string, json.RawMessage)) *Service_SendEvent_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -287,7 +287,7 @@ func (_c *Service_Result_Call) RunAndReturn(run func(context.Context) ([]byte, e
 	return _c
 }

-// State provides a mock function with given fields:
+// State provides a mock function with no fields
 func (_m *Service) State() string {
 	ret := _m.Called()

@@ -1,8 +1,8 @@
-// Code generated by mockery v2.43.2. DO NOT EDIT.
-
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

+// Code generated by mockery v2.53.2. DO NOT EDIT.
+
 package mocks

 import (
@@ -16,12 +16,20 @@ import (
 )

 // AgentService_AlgoClient is an autogenerated mock type for the AgentService_AlgoClient type
-type AgentService_AlgoClient struct {
+type AgentService_AlgoClient[Req interface{}, Res interface{}] struct {
 	mock.Mock
 }

-// CloseAndRecv provides a mock function with given fields:
-func (_m *AgentService_AlgoClient) CloseAndRecv() (*agent.AlgoResponse, error) {
+type AgentService_AlgoClient_Expecter[Req interface{}, Res interface{}] struct {
+	mock *mock.Mock
+}
+
+func (_m *AgentService_AlgoClient[Req, Res]) EXPECT() *AgentService_AlgoClient_Expecter[Req, Res] {
+	return &AgentService_AlgoClient_Expecter[Req, Res]{mock: &_m.Mock}
+}
+
+// CloseAndRecv provides a mock function with no fields
+func (_m *AgentService_AlgoClient[Req, Res]) CloseAndRecv() (*agent.AlgoResponse, error) {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -50,8 +58,35 @@ func (_m *AgentService_AlgoClient) CloseAndRecv() (*agent.AlgoResponse, error) {
 	return r0, r1
 }

-// CloseSend provides a mock function with given fields:
-func (_m *AgentService_AlgoClient) CloseSend() error {
+// AgentService_AlgoClient_CloseAndRecv_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseAndRecv'
+type AgentService_AlgoClient_CloseAndRecv_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// CloseAndRecv is a helper method to define mock.On call
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) CloseAndRecv() *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
+	return &AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]{Call: _e.mock.On("CloseAndRecv")}
+}
+
+func (_c *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]) Return(_a0 *agent.AlgoResponse, _a1 error) *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]) RunAndReturn(run func() (*agent.AlgoResponse, error)) *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CloseSend provides a mock function with no fields
+func (_m *AgentService_AlgoClient[Req, Res]) CloseSend() error {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -68,8 +103,35 @@ func (_m *AgentService_AlgoClient) CloseSend() error {
 	return r0
 }

-// Context provides a mock function with given fields:
-func (_m *AgentService_AlgoClient) Context() context.Context {
+// AgentService_AlgoClient_CloseSend_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseSend'
+type AgentService_AlgoClient_CloseSend_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// CloseSend is a helper method to define mock.On call
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) CloseSend() *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
+	return &AgentService_AlgoClient_CloseSend_Call[Req, Res]{Call: _e.mock.On("CloseSend")}
+}
+
+func (_c *AgentService_AlgoClient_CloseSend_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_CloseSend_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_CloseSend_Call[Req, Res]) RunAndReturn(run func() error) *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Context provides a mock function with no fields
+func (_m *AgentService_AlgoClient[Req, Res]) Context() context.Context {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -88,8 +150,35 @@ func (_m *AgentService_AlgoClient) Context() context.Context {
 	return r0
 }

-// Header provides a mock function with given fields:
-func (_m *AgentService_AlgoClient) Header() (metadata.MD, error) {
+// AgentService_AlgoClient_Context_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Context'
+type AgentService_AlgoClient_Context_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Context is a helper method to define mock.On call
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Context() *AgentService_AlgoClient_Context_Call[Req, Res] {
+	return &AgentService_AlgoClient_Context_Call[Req, Res]{Call: _e.mock.On("Context")}
+}
+
+func (_c *AgentService_AlgoClient_Context_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_Context_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Context_Call[Req, Res]) Return(_a0 context.Context) *AgentService_AlgoClient_Context_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Context_Call[Req, Res]) RunAndReturn(run func() context.Context) *AgentService_AlgoClient_Context_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Header provides a mock function with no fields
+func (_m *AgentService_AlgoClient[Req, Res]) Header() (metadata.MD, error) {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -118,8 +207,35 @@ func (_m *AgentService_AlgoClient) Header() (metadata.MD, error) {
 	return r0, r1
 }

+// AgentService_AlgoClient_Header_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Header'
+type AgentService_AlgoClient_Header_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Header is a helper method to define mock.On call
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Header() *AgentService_AlgoClient_Header_Call[Req, Res] {
+	return &AgentService_AlgoClient_Header_Call[Req, Res]{Call: _e.mock.On("Header")}
+}
+
+func (_c *AgentService_AlgoClient_Header_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_Header_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Header_Call[Req, Res]) Return(_a0 metadata.MD, _a1 error) *AgentService_AlgoClient_Header_Call[Req, Res] {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Header_Call[Req, Res]) RunAndReturn(run func() (metadata.MD, error)) *AgentService_AlgoClient_Header_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // RecvMsg provides a mock function with given fields: m
-func (_m *AgentService_AlgoClient) RecvMsg(m interface{}) error {
+func (_m *AgentService_AlgoClient[Req, Res]) RecvMsg(m interface{}) error {
 	ret := _m.Called(m)

 	if len(ret) == 0 {
@@ -136,8 +252,36 @@ func (_m *AgentService_AlgoClient) RecvMsg(m interface{}) error {
 	return r0
 }

+// AgentService_AlgoClient_RecvMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RecvMsg'
+type AgentService_AlgoClient_RecvMsg_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// RecvMsg is a helper method to define mock.On call
+//   - m interface{}
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) RecvMsg(m interface{}) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
+	return &AgentService_AlgoClient_RecvMsg_Call[Req, Res]{Call: _e.mock.On("RecvMsg", m)}
+}
+
+func (_c *AgentService_AlgoClient_RecvMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(interface{}))
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_RecvMsg_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_RecvMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Send provides a mock function with given fields: _a0
-func (_m *AgentService_AlgoClient) Send(_a0 *agent.AlgoRequest) error {
+func (_m *AgentService_AlgoClient[Req, Res]) Send(_a0 *agent.AlgoRequest) error {
 	ret := _m.Called(_a0)

 	if len(ret) == 0 {
@@ -154,8 +298,36 @@ func (_m *AgentService_AlgoClient) Send(_a0 *agent.AlgoRequest) error {
 	return r0
 }

+// AgentService_AlgoClient_Send_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Send'
+type AgentService_AlgoClient_Send_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Send is a helper method to define mock.On call
+//   - _a0 *agent.AlgoRequest
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Send(_a0 interface{}) *AgentService_AlgoClient_Send_Call[Req, Res] {
+	return &AgentService_AlgoClient_Send_Call[Req, Res]{Call: _e.mock.On("Send", _a0)}
+}
+
+func (_c *AgentService_AlgoClient_Send_Call[Req, Res]) Run(run func(_a0 *agent.AlgoRequest)) *AgentService_AlgoClient_Send_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*agent.AlgoRequest))
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Send_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_Send_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Send_Call[Req, Res]) RunAndReturn(run func(*agent.AlgoRequest) error) *AgentService_AlgoClient_Send_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SendMsg provides a mock function with given fields: m
-func (_m *AgentService_AlgoClient) SendMsg(m interface{}) error {
+func (_m *AgentService_AlgoClient[Req, Res]) SendMsg(m interface{}) error {
 	ret := _m.Called(m)

 	if len(ret) == 0 {
@@ -172,8 +344,36 @@ func (_m *AgentService_AlgoClient) SendMsg(m interface{}) error {
 	return r0
 }

-// Trailer provides a mock function with given fields:
-func (_m *AgentService_AlgoClient) Trailer() metadata.MD {
+// AgentService_AlgoClient_SendMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SendMsg'
+type AgentService_AlgoClient_SendMsg_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// SendMsg is a helper method to define mock.On call
+//   - m interface{}
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) SendMsg(m interface{}) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
+	return &AgentService_AlgoClient_SendMsg_Call[Req, Res]{Call: _e.mock.On("SendMsg", m)}
+}
+
+func (_c *AgentService_AlgoClient_SendMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(interface{}))
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_SendMsg_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_SendMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Trailer provides a mock function with no fields
+func (_m *AgentService_AlgoClient[Req, Res]) Trailer() metadata.MD {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -192,13 +392,40 @@ func (_m *AgentService_AlgoClient) Trailer() metadata.MD {
 	return r0
 }

+// AgentService_AlgoClient_Trailer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Trailer'
+type AgentService_AlgoClient_Trailer_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Trailer is a helper method to define mock.On call
+func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Trailer() *AgentService_AlgoClient_Trailer_Call[Req, Res] {
+	return &AgentService_AlgoClient_Trailer_Call[Req, Res]{Call: _e.mock.On("Trailer")}
+}
+
+func (_c *AgentService_AlgoClient_Trailer_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_Trailer_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Trailer_Call[Req, Res]) Return(_a0 metadata.MD) *AgentService_AlgoClient_Trailer_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_AlgoClient_Trailer_Call[Req, Res]) RunAndReturn(run func() metadata.MD) *AgentService_AlgoClient_Trailer_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // NewAgentService_AlgoClient creates a new instance of AgentService_AlgoClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewAgentService_AlgoClient(t interface {
+func NewAgentService_AlgoClient[Req interface{}, Res interface{}](t interface {
 	mock.TestingT
 	Cleanup(func())
-}) *AgentService_AlgoClient {
-	mock := &AgentService_AlgoClient{}
+}) *AgentService_AlgoClient[Req, Res] {
+	mock := &AgentService_AlgoClient[Req, Res]{}
 	mock.Mock.Test(t)

 	t.Cleanup(func() { mock.AssertExpectations(t) })
@@ -1,8 +1,8 @@
-// Code generated by mockery v2.43.2. DO NOT EDIT.
-
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

+// Code generated by mockery v2.53.2. DO NOT EDIT.
+
 package mocks

 import (
@@ -16,12 +16,20 @@ import (
 )

 // AgentService_DataClient is an autogenerated mock type for the AgentService_DataClient type
-type AgentService_DataClient struct {
+type AgentService_DataClient[Req interface{}, Res interface{}] struct {
 	mock.Mock
 }

-// CloseAndRecv provides a mock function with given fields:
-func (_m *AgentService_DataClient) CloseAndRecv() (*agent.DataResponse, error) {
+type AgentService_DataClient_Expecter[Req interface{}, Res interface{}] struct {
+	mock *mock.Mock
+}
+
+func (_m *AgentService_DataClient[Req, Res]) EXPECT() *AgentService_DataClient_Expecter[Req, Res] {
+	return &AgentService_DataClient_Expecter[Req, Res]{mock: &_m.Mock}
+}
+
+// CloseAndRecv provides a mock function with no fields
+func (_m *AgentService_DataClient[Req, Res]) CloseAndRecv() (*agent.DataResponse, error) {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -50,8 +58,35 @@ func (_m *AgentService_DataClient) CloseAndRecv() (*agent.DataResponse, error) {
 	return r0, r1
 }

-// CloseSend provides a mock function with given fields:
-func (_m *AgentService_DataClient) CloseSend() error {
+// AgentService_DataClient_CloseAndRecv_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseAndRecv'
+type AgentService_DataClient_CloseAndRecv_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// CloseAndRecv is a helper method to define mock.On call
+func (_e *AgentService_DataClient_Expecter[Req, Res]) CloseAndRecv() *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
+	return &AgentService_DataClient_CloseAndRecv_Call[Req, Res]{Call: _e.mock.On("CloseAndRecv")}
+}
+
+func (_c *AgentService_DataClient_CloseAndRecv_Call[Req, Res]) Run(run func()) *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_CloseAndRecv_Call[Req, Res]) Return(_a0 *agent.DataResponse, _a1 error) *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AgentService_DataClient_CloseAndRecv_Call[Req, Res]) RunAndReturn(run func() (*agent.DataResponse, error)) *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CloseSend provides a mock function with no fields
+func (_m *AgentService_DataClient[Req, Res]) CloseSend() error {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -68,8 +103,35 @@ func (_m *AgentService_DataClient) CloseSend() error {
 	return r0
 }

-// Context provides a mock function with given fields:
-func (_m *AgentService_DataClient) Context() context.Context {
+// AgentService_DataClient_CloseSend_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseSend'
+type AgentService_DataClient_CloseSend_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// CloseSend is a helper method to define mock.On call
+func (_e *AgentService_DataClient_Expecter[Req, Res]) CloseSend() *AgentService_DataClient_CloseSend_Call[Req, Res] {
+	return &AgentService_DataClient_CloseSend_Call[Req, Res]{Call: _e.mock.On("CloseSend")}
+}
+
+func (_c *AgentService_DataClient_CloseSend_Call[Req, Res]) Run(run func()) *AgentService_DataClient_CloseSend_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_CloseSend_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_CloseSend_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_DataClient_CloseSend_Call[Req, Res]) RunAndReturn(run func() error) *AgentService_DataClient_CloseSend_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Context provides a mock function with no fields
+func (_m *AgentService_DataClient[Req, Res]) Context() context.Context {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -88,8 +150,35 @@ func (_m *AgentService_DataClient) Context() context.Context {
 	return r0
 }

-// Header provides a mock function with given fields:
-func (_m *AgentService_DataClient) Header() (metadata.MD, error) {
+// AgentService_DataClient_Context_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Context'
+type AgentService_DataClient_Context_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Context is a helper method to define mock.On call
+func (_e *AgentService_DataClient_Expecter[Req, Res]) Context() *AgentService_DataClient_Context_Call[Req, Res] {
+	return &AgentService_DataClient_Context_Call[Req, Res]{Call: _e.mock.On("Context")}
+}
+
+func (_c *AgentService_DataClient_Context_Call[Req, Res]) Run(run func()) *AgentService_DataClient_Context_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_Context_Call[Req, Res]) Return(_a0 context.Context) *AgentService_DataClient_Context_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_DataClient_Context_Call[Req, Res]) RunAndReturn(run func() context.Context) *AgentService_DataClient_Context_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Header provides a mock function with no fields
+func (_m *AgentService_DataClient[Req, Res]) Header() (metadata.MD, error) {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -118,8 +207,35 @@ func (_m *AgentService_DataClient) Header() (metadata.MD, error) {
 	return r0, r1
 }

+// AgentService_DataClient_Header_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Header'
+type AgentService_DataClient_Header_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Header is a helper method to define mock.On call
+func (_e *AgentService_DataClient_Expecter[Req, Res]) Header() *AgentService_DataClient_Header_Call[Req, Res] {
+	return &AgentService_DataClient_Header_Call[Req, Res]{Call: _e.mock.On("Header")}
+}
+
+func (_c *AgentService_DataClient_Header_Call[Req, Res]) Run(run func()) *AgentService_DataClient_Header_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_Header_Call[Req, Res]) Return(_a0 metadata.MD, _a1 error) *AgentService_DataClient_Header_Call[Req, Res] {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *AgentService_DataClient_Header_Call[Req, Res]) RunAndReturn(run func() (metadata.MD, error)) *AgentService_DataClient_Header_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // RecvMsg provides a mock function with given fields: m
-func (_m *AgentService_DataClient) RecvMsg(m interface{}) error {
+func (_m *AgentService_DataClient[Req, Res]) RecvMsg(m interface{}) error {
 	ret := _m.Called(m)

 	if len(ret) == 0 {
@@ -136,8 +252,36 @@ func (_m *AgentService_DataClient) RecvMsg(m interface{}) error {
 	return r0
 }

+// AgentService_DataClient_RecvMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RecvMsg'
+type AgentService_DataClient_RecvMsg_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// RecvMsg is a helper method to define mock.On call
+//   - m interface{}
+func (_e *AgentService_DataClient_Expecter[Req, Res]) RecvMsg(m interface{}) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
+	return &AgentService_DataClient_RecvMsg_Call[Req, Res]{Call: _e.mock.On("RecvMsg", m)}
+}
+
+func (_c *AgentService_DataClient_RecvMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(interface{}))
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_RecvMsg_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_DataClient_RecvMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Send provides a mock function with given fields: _a0
-func (_m *AgentService_DataClient) Send(_a0 *agent.DataRequest) error {
+func (_m *AgentService_DataClient[Req, Res]) Send(_a0 *agent.DataRequest) error {
 	ret := _m.Called(_a0)

 	if len(ret) == 0 {
@@ -154,8 +298,36 @@ func (_m *AgentService_DataClient) Send(_a0 *agent.DataRequest) error {
 	return r0
 }

+// AgentService_DataClient_Send_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Send'
+type AgentService_DataClient_Send_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Send is a helper method to define mock.On call
+//   - _a0 *agent.DataRequest
+func (_e *AgentService_DataClient_Expecter[Req, Res]) Send(_a0 interface{}) *AgentService_DataClient_Send_Call[Req, Res] {
+	return &AgentService_DataClient_Send_Call[Req, Res]{Call: _e.mock.On("Send", _a0)}
+}
+
+func (_c *AgentService_DataClient_Send_Call[Req, Res]) Run(run func(_a0 *agent.DataRequest)) *AgentService_DataClient_Send_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(*agent.DataRequest))
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_Send_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_Send_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_DataClient_Send_Call[Req, Res]) RunAndReturn(run func(*agent.DataRequest) error) *AgentService_DataClient_Send_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // SendMsg provides a mock function with given fields: m
-func (_m *AgentService_DataClient) SendMsg(m interface{}) error {
+func (_m *AgentService_DataClient[Req, Res]) SendMsg(m interface{}) error {
 	ret := _m.Called(m)

 	if len(ret) == 0 {
@@ -172,8 +344,36 @@ func (_m *AgentService_DataClient) SendMsg(m interface{}) error {
 	return r0
 }

-// Trailer provides a mock function with given fields:
-func (_m *AgentService_DataClient) Trailer() metadata.MD {
+// AgentService_DataClient_SendMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SendMsg'
+type AgentService_DataClient_SendMsg_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// SendMsg is a helper method to define mock.On call
+//   - m interface{}
+func (_e *AgentService_DataClient_Expecter[Req, Res]) SendMsg(m interface{}) *AgentService_DataClient_SendMsg_Call[Req, Res] {
+	return &AgentService_DataClient_SendMsg_Call[Req, Res]{Call: _e.mock.On("SendMsg", m)}
+}
+
+func (_c *AgentService_DataClient_SendMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_DataClient_SendMsg_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(interface{}))
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_SendMsg_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_SendMsg_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_DataClient_SendMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_DataClient_SendMsg_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Trailer provides a mock function with no fields
+func (_m *AgentService_DataClient[Req, Res]) Trailer() metadata.MD {
 	ret := _m.Called()

 	if len(ret) == 0 {
@@ -192,13 +392,40 @@ func (_m *AgentService_DataClient) Trailer() metadata.MD {
 	return r0
 }

+// AgentService_DataClient_Trailer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Trailer'
+type AgentService_DataClient_Trailer_Call[Req interface{}, Res interface{}] struct {
+	*mock.Call
+}
+
+// Trailer is a helper method to define mock.On call
+func (_e *AgentService_DataClient_Expecter[Req, Res]) Trailer() *AgentService_DataClient_Trailer_Call[Req, Res] {
+	return &AgentService_DataClient_Trailer_Call[Req, Res]{Call: _e.mock.On("Trailer")}
+}
+
+func (_c *AgentService_DataClient_Trailer_Call[Req, Res]) Run(run func()) *AgentService_DataClient_Trailer_Call[Req, Res] {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *AgentService_DataClient_Trailer_Call[Req, Res]) Return(_a0 metadata.MD) *AgentService_DataClient_Trailer_Call[Req, Res] {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *AgentService_DataClient_Trailer_Call[Req, Res]) RunAndReturn(run func() metadata.MD) *AgentService_DataClient_Trailer_Call[Req, Res] {
+	_c.Call.Return(run)
+	return _c
+}
+
 // NewAgentService_DataClient creates a new instance of AgentService_DataClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewAgentService_DataClient(t interface {
+func NewAgentService_DataClient[Req interface{}, Res interface{}](t interface {
 	mock.TestingT
 	Cleanup(func())
-}) *AgentService_DataClient {
-	mock := &AgentService_DataClient{}
+}) *AgentService_DataClient[Req, Res] {
+	mock := &AgentService_DataClient[Req, Res]{}
 	mock.Mock.Test(t)

 	t.Cleanup(func() { mock.AssertExpectations(t) })
@@ -129,12 +129,13 @@ type agentService struct {
 	resultsConsumed bool                        // Indicates if the results have been consumed.
 	cancel          context.CancelFunc          // Cancels the computation context.
 	vmpl            int                         // VMPL at which the Agent is running.
+	vtpmAttest      vtpm.VtpmAttest             // Attestation function.
 }

 var _ Service = (*agentService)(nil)

 // New instantiates the agent service implementation.
-func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, quoteProvider client.LeveledQuoteProvider, vmlp int) Service {
+func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, quoteProvider client.LeveledQuoteProvider, vmlp int, vtpmAttest vtpm.VtpmAttest) Service {
 	sm := statemachine.NewStateMachine(Idle)
 	ctx, cancel := context.WithCancel(ctx)
 	svc := &agentService{
@@ -144,6 +145,7 @@ func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, quot
 		logger:        logger,
 		cancel:        cancel,
 		vmpl:          vmlp,
+		vtpmAttest:    vtpmAttest,
 	}

 	transitions := []statemachine.Transition{
@@ -213,6 +215,8 @@ func (as *agentService) StopComputation(ctx context.Context) error {
 	as.mu.Lock()
 	defer as.mu.Unlock()

+	as.eventSvc.SendEvent(as.computation.ID, "Stopped", "Stopped", json.RawMessage{})
+
 	as.cancel()

 	if as.algorithm != nil {
@@ -413,13 +417,13 @@ func (as *agentService) Attestation(ctx context.Context, reportData [quoteprovid
 		}
 		return rawQuote, nil
 	case config.VTPM:
-		vTPMQuote, err := vtpm.Attest(reportData[:], nonce[:], false)
+		vTPMQuote, err := as.vtpmAttest(reportData[:], nonce[:], false)
 		if err != nil {
 			return []byte{}, err
 		}
 		return vTPMQuote, nil
 	case config.SNPvTPM:
-		vTPMQuote, err := vtpm.Attest(reportData[:], nonce[:], true)
+		vTPMQuote, err := as.vtpmAttest(reportData[:], nonce[:], true)
 		if err != nil {
 			return []byte{}, err
 		}
@@ -121,7 +121,7 @@ func TestAlgo(t *testing.T) {

 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
-			svc := New(ctx, mglog.NewMock(), events, qp, 0)
+			svc := New(ctx, mglog.NewMock(), events, qp, 0, vtpm.EmptyAttest)

 			err := svc.InitComputation(ctx, testComputation(t))
 			require.NoError(t, err)
@@ -216,7 +216,7 @@ func TestData(t *testing.T) {
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()

-			svc := New(ctx, mglog.NewMock(), events, qp, 0)
+			svc := New(ctx, mglog.NewMock(), events, qp, 0, vtpm.EmptyAttest)

 			err := svc.InitComputation(ctx, testComputation(t))
 			require.NoError(t, err)
@@ -365,7 +365,7 @@ func TestAttestation(t *testing.T) {
 			}
 			defer getQuote.Unset()

-			svc := New(ctx, mglog.NewMock(), events, qp, 0)
+			svc := New(ctx, mglog.NewMock(), events, qp, 0, vtpm.EmptyAttest)
 			time.Sleep(300 * time.Millisecond)
 			_, err := svc.Attestation(ctx, tc.reportData, tc.nonce, 0)
 			assert.True(t, errors.Contains(err, tc.err), "expected %v, got %v", tc.err, err)
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -54,11 +54,11 @@ func (_c *StateMachine_AddTransition_Call) Return() *StateMachine_AddTransition_
 }

 func (_c *StateMachine_AddTransition_Call) RunAndReturn(run func(statemachine.Transition)) *StateMachine_AddTransition_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }

-// GetState provides a mock function with given fields:
+// GetState provides a mock function with no fields
 func (_m *StateMachine) GetState() statemachine.State {
 	ret := _m.Called()

@@ -134,7 +134,7 @@ func (_c *StateMachine_SendEvent_Call) Return() *StateMachine_SendEvent_Call {
 }

 func (_c *StateMachine_SendEvent_Call) RunAndReturn(run func(statemachine.Event)) *StateMachine_SendEvent_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }

@@ -168,7 +168,7 @@ func (_c *StateMachine_SetAction_Call) Return() *StateMachine_SetAction_Call {
 }

 func (_c *StateMachine_SetAction_Call) RunAndReturn(run func(statemachine.State, statemachine.Action)) *StateMachine_SetAction_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }

@@ -56,7 +56,7 @@ func (c *CLI) NewCreateVMCmd() *cobra.Command {
 				return
 			}

-			cmd.Println(color.New(color.FgGreen).Sprintf("✅ Virtual machine created successfully with id %s and port %s", res.SvmId, res.ForwardedPort))
+			cmd.Println(color.New(color.FgGreen).Sprintf("✅ Virtual machine created successfully with id %s and port %s", res.CvmId, res.ForwardedPort))
 		},
 	}

@@ -73,7 +73,7 @@ func (c *CLI) NewRemoveVMCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "remove-vm",
 		Short:   "Remove a virtual machine",
-		Example: `remove-vm <svm_id>`,
+		Example: `remove-vm <cvm_id>`,
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := c.InitializeManagerClient(cmd); err == nil {
@@ -87,7 +87,7 @@ func (c *CLI) NewRemoveVMCmd() *cobra.Command {

 			cmd.Println("🔗 Removing virtual machine")

-			_, err := c.managerClient.RemoveVm(cmd.Context(), &manager.RemoveReq{SvmId: args[0]})
+			_, err := c.managerClient.RemoveVm(cmd.Context(), &manager.RemoveReq{CvmId: args[0]})
 			if err != nil {
 				printError(cmd, "Error removing virtual machine: %v ❌ ", err)
 				return
@@ -32,6 +32,7 @@ import (
 	attestationconfig "github.com/ultravioletrs/cocos/pkg/attestation"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider/mocks"
+	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 	pkggrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	cvmsgrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc/cvm"
 	"golang.org/x/sync/errgroup"
@@ -83,12 +84,14 @@ func main() {
 	}

 	var qp client.LeveledQuoteProvider
+	vtpmAttest := vtpm.Attest

 	if !sevGuesDeviceExists() {
 		logger.Info("SEV-SNP device not found")
 		qpMock := new(mocks.LeveledQuoteProvider)
 		qpMock.On("GetRawQuoteAtLevel", mock.Anything, mock.Anything).Return([]uint8{}, errors.New("SEV-SNP device not found"))
 		qp = qpMock
+		vtpmAttest = vtpm.EmptyAttest
 	} else {
 		qp, err = quoteprovider.GetLeveledQuoteProvider()
 		if err != nil {
@@ -136,7 +139,7 @@ func main() {
 		return
 	}

-	svc := newService(ctx, logger, eventSvc, qp, cfg.Vmpl)
+	svc := newService(ctx, logger, eventSvc, qp, cfg.Vmpl, vtpmAttest)

 	if err := os.MkdirAll(storageDir, 0o755); err != nil {
 		logger.Error(fmt.Sprintf("failed to create storage directory: %s", err))
@@ -144,7 +147,7 @@ func main() {
 		return
 	}

-	mc, err := cvmsapi.NewClient(pc, svc, eventsLogsQueue, logger, server.NewServer(logger, svc, cfg.AgentGrpcHost), storageDir, reconnectFn)
+	mc, err := cvmsapi.NewClient(pc, svc, eventsLogsQueue, logger, server.NewServer(logger, svc, cfg.AgentGrpcHost, qp), storageDir, reconnectFn)
 	if err != nil {
 		logger.Error(err.Error())
 		exitCode = 1
@@ -191,8 +194,8 @@ func main() {
 	}
 }

-func newService(ctx context.Context, logger *slog.Logger, eventSvc events.Service, qp client.LeveledQuoteProvider, vmpl int) agent.Service {
-	svc := agent.New(ctx, logger, eventSvc, qp, vmpl)
+func newService(ctx context.Context, logger *slog.Logger, eventSvc events.Service, qp client.LeveledQuoteProvider, vmpl int, vtpmAttest vtpm.VtpmAttest) agent.Service {
+	svc := agent.New(ctx, logger, eventSvc, qp, vmpl, vtpmAttest)

 	svc = api.LoggingMiddleware(svc, logger)
 	counter, latency := prometheus.MakeMetrics(svcName, "api")
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -20,7 +20,7 @@ func (_m *Server) EXPECT() *Server_Expecter {
 	return &Server_Expecter{mock: &_m.Mock}
 }

-// Start provides a mock function with given fields:
+// Start provides a mock function with no fields
 func (_m *Server) Start() error {
 	ret := _m.Called()

@@ -65,7 +65,7 @@ func (_c *Server_Start_Call) RunAndReturn(run func() error) *Server_Start_Call {
 	return _c
 }

-// Stop provides a mock function with given fields:
+// Stop provides a mock function with no fields
 func (_m *Server) Stop() error {
 	ret := _m.Called()

@@ -19,7 +19,7 @@ The service is configured using the environment variables from the following tab
 | MANAGER_GRPC_SERVER_CA_CERTS               | The file path for the server CA certificate(s).                                                                  |                                |
 | MANAGER_GRPC_URL                           | The URL for the gRPC endpoint.                                                                                   | localhost:7001                 |
 | MANAGER_GRPC_TIMEOUT                       | The timeout for gRPC requests.                                                                                   | 60s                            |
-| MANAGER_EOS_VERSION                        | The EOS version used for booting SVMs.                                                                           |                                |
+| MANAGER_EOS_VERSION                        | The EOS version used for booting CVMs.                                                                           |                                |
 | MANAGER_INSTANCE_ID                        | Manager service instance ID                                                                                      |                                |
 | MANAGER_QEMU_MEMORY_SIZE                   | The total memory size for the virtual machine. Can be specified in a human-readable format like "2048M" or "4G". | 2048M                          |
 | MANAGER_QEMU_MEMORY_SLOTS                  | The number of memory slots for the virtual machine.                                                              | 5                              |
@@ -35,22 +35,22 @@ func (s *grpcServer) CreateVm(ctx context.Context, req *manager.CreateReq) (*man

 	return &manager.CreateRes{
 		ForwardedPort: port,
-		SvmId:         id,
+		CvmId:         id,
 	}, nil
 }

 func (s *grpcServer) RemoveVm(ctx context.Context, req *manager.RemoveReq) (*emptypb.Empty, error) {
-	if err := s.svc.RemoveVM(ctx, req.SvmId); err != nil {
+	if err := s.svc.RemoveVM(ctx, req.CvmId); err != nil {
 		return nil, err
 	}

 	return &emptypb.Empty{}, nil
 }

-func (s *grpcServer) SVMInfo(ctx context.Context, req *manager.SVMInfoReq) (*manager.SVMInfoRes, error) {
-	ovmf, cpunum, cputype, eosversion := s.svc.ReturnSVMInfo(ctx)
+func (s *grpcServer) CVMInfo(ctx context.Context, req *manager.CVMInfoReq) (*manager.CVMInfoRes, error) {
+	ovmf, cpunum, cputype, eosversion := s.svc.ReturnCVMInfo(ctx)

-	return &manager.SVMInfoRes{
+	return &manager.CVMInfoRes{
 		OvmfVersion: ovmf,
 		CpuNum:      int32(cpunum),
 		CpuType:     cputype,
@@ -67,11 +67,11 @@ func (lm *loggingMiddleware) FetchAttestationPolicy(ctx context.Context, cmpId s
 	return lm.svc.FetchAttestationPolicy(ctx, cmpId)
 }

-func (lm *loggingMiddleware) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
+func (lm *loggingMiddleware) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method ReturnSVMInfo for computation took %s to complete", time.Since(begin))
+		message := fmt.Sprintf("Method ReturnCVMInfo for computation took %s to complete", time.Since(begin))
 		lm.logger.Info(message)
 	}(time.Now())

-	return lm.svc.ReturnSVMInfo(ctx)
+	return lm.svc.ReturnCVMInfo(ctx)
 }
@@ -59,11 +59,11 @@ func (ms *metricsMiddleware) FetchAttestationPolicy(ctx context.Context, cmpId s
 	return ms.svc.FetchAttestationPolicy(ctx, cmpId)
 }

-func (ms *metricsMiddleware) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
+func (ms *metricsMiddleware) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
 	defer func(begin time.Time) {
-		ms.counter.With("method", "ReturnSVMInfo").Add(1)
-		ms.latency.With("method", "ReturnSVMInfo").Observe(time.Since(begin).Seconds())
+		ms.counter.With("method", "ReturnCVMInfo").Add(1)
+		ms.latency.With("method", "ReturnCVMInfo").Observe(time.Since(begin).Seconds())
 	}(time.Now())

-	return ms.svc.ReturnSVMInfo(ctx)
+	return ms.svc.ReturnCVMInfo(ctx)
 }
@@ -104,7 +104,7 @@ func (x *CreateReq) GetAgentCvmServerUrl() string {
 type CreateRes struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	ForwardedPort string                 `protobuf:"bytes,1,opt,name=forwarded_port,json=forwardedPort,proto3" json:"forwarded_port,omitempty"`
-	SvmId         string                 `protobuf:"bytes,2,opt,name=svm_id,json=svmId,proto3" json:"svm_id,omitempty"`
+	CvmId         string                 `protobuf:"bytes,2,opt,name=cvm_id,json=cvmId,proto3" json:"cvm_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -146,16 +146,16 @@ func (x *CreateRes) GetForwardedPort() string {
 	return ""
 }

-func (x *CreateRes) GetSvmId() string {
+func (x *CreateRes) GetCvmId() string {
 	if x != nil {
-		return x.SvmId
+		return x.CvmId
 	}
 	return ""
 }

 type RemoveReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	SvmId         string                 `protobuf:"bytes,1,opt,name=svm_id,json=svmId,proto3" json:"svm_id,omitempty"`
+	CvmId         string                 `protobuf:"bytes,1,opt,name=cvm_id,json=cvmId,proto3" json:"cvm_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -190,9 +190,9 @@ func (*RemoveReq) Descriptor() ([]byte, []int) {
 	return file_manager_manager_proto_rawDescGZIP(), []int{2}
 }

-func (x *RemoveReq) GetSvmId() string {
+func (x *RemoveReq) GetCvmId() string {
 	if x != nil {
-		return x.SvmId
+		return x.CvmId
 	}
 	return ""
 }
@@ -249,7 +249,7 @@ func (x *AttestationPolicyRes) GetId() string {
 	return ""
 }

-type SVMInfoRes struct {
+type CVMInfoRes struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	OvmfVersion   string                 `protobuf:"bytes,2,opt,name=ovmf_version,json=ovmfVersion,proto3" json:"ovmf_version,omitempty"`
@@ -261,20 +261,20 @@ type SVMInfoRes struct {
 	sizeCache     protoimpl.SizeCache
 }

-func (x *SVMInfoRes) Reset() {
-	*x = SVMInfoRes{}
+func (x *CVMInfoRes) Reset() {
+	*x = CVMInfoRes{}
 	mi := &file_manager_manager_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }

-func (x *SVMInfoRes) String() string {
+func (x *CVMInfoRes) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*SVMInfoRes) ProtoMessage() {}
+func (*CVMInfoRes) ProtoMessage() {}

-func (x *SVMInfoRes) ProtoReflect() protoreflect.Message {
+func (x *CVMInfoRes) ProtoReflect() protoreflect.Message {
 	mi := &file_manager_manager_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -286,47 +286,47 @@ func (x *SVMInfoRes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use SVMInfoRes.ProtoReflect.Descriptor instead.
-func (*SVMInfoRes) Descriptor() ([]byte, []int) {
+// Deprecated: Use CVMInfoRes.ProtoReflect.Descriptor instead.
+func (*CVMInfoRes) Descriptor() ([]byte, []int) {
 	return file_manager_manager_proto_rawDescGZIP(), []int{4}
 }

-func (x *SVMInfoRes) GetId() string {
+func (x *CVMInfoRes) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }

-func (x *SVMInfoRes) GetOvmfVersion() string {
+func (x *CVMInfoRes) GetOvmfVersion() string {
 	if x != nil {
 		return x.OvmfVersion
 	}
 	return ""
 }

-func (x *SVMInfoRes) GetCpuNum() int32 {
+func (x *CVMInfoRes) GetCpuNum() int32 {
 	if x != nil {
 		return x.CpuNum
 	}
 	return 0
 }

-func (x *SVMInfoRes) GetCpuType() string {
+func (x *CVMInfoRes) GetCpuType() string {
 	if x != nil {
 		return x.CpuType
 	}
 	return ""
 }

-func (x *SVMInfoRes) GetKernelCmd() string {
+func (x *CVMInfoRes) GetKernelCmd() string {
 	if x != nil {
 		return x.KernelCmd
 	}
 	return ""
 }

-func (x *SVMInfoRes) GetEosVersion() string {
+func (x *CVMInfoRes) GetEosVersion() string {
 	if x != nil {
 		return x.EosVersion
 	}
@@ -377,27 +377,27 @@ func (x *AttestationPolicyReq) GetId() string {
 	return ""
 }

-type SVMInfoReq struct {
+type CVMInfoReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }

-func (x *SVMInfoReq) Reset() {
-	*x = SVMInfoReq{}
+func (x *CVMInfoReq) Reset() {
+	*x = CVMInfoReq{}
 	mi := &file_manager_manager_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }

-func (x *SVMInfoReq) String() string {
+func (x *CVMInfoReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*SVMInfoReq) ProtoMessage() {}
+func (*CVMInfoReq) ProtoMessage() {}

-func (x *SVMInfoReq) ProtoReflect() protoreflect.Message {
+func (x *CVMInfoReq) ProtoReflect() protoreflect.Message {
 	mi := &file_manager_manager_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -409,12 +409,12 @@ func (x *SVMInfoReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use SVMInfoReq.ProtoReflect.Descriptor instead.
-func (*SVMInfoReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use CVMInfoReq.ProtoReflect.Descriptor instead.
+func (*CVMInfoReq) Descriptor() ([]byte, []int) {
 	return file_manager_manager_proto_rawDescGZIP(), []int{6}
 }

-func (x *SVMInfoReq) GetId() string {
+func (x *CVMInfoReq) GetId() string {
 	if x != nil {
 		return x.Id
 	}
@@ -447,15 +447,15 @@ var file_manager_manager_proto_rawDesc = string([]byte{
 	0x22, 0x49, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x12, 0x25, 0x0a,
 	0x0e, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64,
-	0x50, 0x6f, 0x72, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x76, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x76, 0x6d, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x09, 0x52,
-	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x76, 0x6d, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x76, 0x6d, 0x49, 0x64, 0x22,
+	0x50, 0x6f, 0x72, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x63, 0x76, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x76, 0x6d, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x09, 0x52,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x63, 0x76, 0x6d, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x76, 0x6d, 0x49, 0x64, 0x22,
 	0x3a, 0x0a, 0x14, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f,
 	0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xb3, 0x01, 0x0a, 0x0a,
-	0x53, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x43, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x76,
 	0x6d, 0x66, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x0b, 0x6f, 0x76, 0x6d, 0x66, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a,
@@ -468,7 +468,7 @@ var file_manager_manager_proto_rawDesc = string([]byte{
 	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6f, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
 	0x6e, 0x22, 0x26, 0x0a, 0x14, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
 	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x0a, 0x53, 0x56, 0x4d,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x0a, 0x43, 0x56, 0x4d,
 	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x32, 0x8c, 0x02, 0x0a, 0x0e, 0x4d, 0x61, 0x6e, 0x61,
 	0x67, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x08, 0x43, 0x72,
@@ -478,10 +478,10 @@ var file_manager_manager_proto_rawDesc = string([]byte{
 	0x12, 0x38, 0x0a, 0x08, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x56, 0x6d, 0x12, 0x12, 0x2e, 0x6d,
 	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71,
 	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x07, 0x53, 0x56,
+	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x07, 0x43, 0x56,
 	0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x13, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
-	0x53, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x6d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x2e, 0x53, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x22,
+	0x43, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x22,
 	0x00, 0x12, 0x53, 0x0a, 0x11, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
 	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1d, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
 	0x2e, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69,
@@ -509,19 +509,19 @@ var file_manager_manager_proto_goTypes = []any{
 	(*CreateRes)(nil),            // 1: manager.CreateRes
 	(*RemoveReq)(nil),            // 2: manager.RemoveReq
 	(*AttestationPolicyRes)(nil), // 3: manager.AttestationPolicyRes
-	(*SVMInfoRes)(nil),           // 4: manager.SVMInfoRes
+	(*CVMInfoRes)(nil),           // 4: manager.CVMInfoRes
 	(*AttestationPolicyReq)(nil), // 5: manager.AttestationPolicyReq
-	(*SVMInfoReq)(nil),           // 6: manager.SVMInfoReq
+	(*CVMInfoReq)(nil),           // 6: manager.CVMInfoReq
 	(*emptypb.Empty)(nil),        // 7: google.protobuf.Empty
 }
 var file_manager_manager_proto_depIdxs = []int32{
 	0, // 0: manager.ManagerService.CreateVm:input_type -> manager.CreateReq
 	2, // 1: manager.ManagerService.RemoveVm:input_type -> manager.RemoveReq
-	6, // 2: manager.ManagerService.SVMInfo:input_type -> manager.SVMInfoReq
+	6, // 2: manager.ManagerService.CVMInfo:input_type -> manager.CVMInfoReq
 	5, // 3: manager.ManagerService.AttestationPolicy:input_type -> manager.AttestationPolicyReq
 	1, // 4: manager.ManagerService.CreateVm:output_type -> manager.CreateRes
 	7, // 5: manager.ManagerService.RemoveVm:output_type -> google.protobuf.Empty
-	4, // 6: manager.ManagerService.SVMInfo:output_type -> manager.SVMInfoRes
+	4, // 6: manager.ManagerService.CVMInfo:output_type -> manager.CVMInfoRes
 	3, // 7: manager.ManagerService.AttestationPolicy:output_type -> manager.AttestationPolicyRes
 	4, // [4:8] is the sub-list for method output_type
 	0, // [0:4] is the sub-list for method input_type
@@ -12,7 +12,7 @@ option go_package = "./manager";
 service ManagerService {
  rpc CreateVm(CreateReq) returns (CreateRes) {}
  rpc RemoveVm(RemoveReq) returns (google.protobuf.Empty) {}
-  rpc SVMInfo(SVMInfoReq) returns (SVMInfoRes) {}
+  rpc CVMInfo(CVMInfoReq) returns (CVMInfoRes) {}
  rpc AttestationPolicy(AttestationPolicyReq) returns (AttestationPolicyRes) {}
 }

@@ -26,11 +26,11 @@ message CreateReq{

 message CreateRes{
  string forwarded_port = 1;
-  string svm_id = 2;
+  string cvm_id = 2;
 }

 message RemoveReq{
-  string svm_id = 1;
+  string cvm_id = 1;
 }

 message AttestationPolicyRes{
@@ -38,7 +38,7 @@ message AttestationPolicyRes{
  string id = 2;
 }

-message SVMInfoRes{
+message CVMInfoRes{
  string id = 1;
  string ovmf_version = 2;
  int32 cpu_num = 3;
@@ -51,7 +51,7 @@ message AttestationPolicyReq {
  string id = 1;
 }

-message SVMInfoReq {
+message CVMInfoReq {
  string id = 1;
 }

@@ -25,7 +25,7 @@ const _ = grpc.SupportPackageIsVersion9
 const (
 	ManagerService_CreateVm_FullMethodName          = "/manager.ManagerService/CreateVm"
 	ManagerService_RemoveVm_FullMethodName          = "/manager.ManagerService/RemoveVm"
-	ManagerService_SVMInfo_FullMethodName           = "/manager.ManagerService/SVMInfo"
+	ManagerService_CVMInfo_FullMethodName           = "/manager.ManagerService/CVMInfo"
 	ManagerService_AttestationPolicy_FullMethodName = "/manager.ManagerService/AttestationPolicy"
 )

@@ -35,7 +35,7 @@ const (
 type ManagerServiceClient interface {
 	CreateVm(ctx context.Context, in *CreateReq, opts ...grpc.CallOption) (*CreateRes, error)
 	RemoveVm(ctx context.Context, in *RemoveReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	SVMInfo(ctx context.Context, in *SVMInfoReq, opts ...grpc.CallOption) (*SVMInfoRes, error)
+	CVMInfo(ctx context.Context, in *CVMInfoReq, opts ...grpc.CallOption) (*CVMInfoRes, error)
 	AttestationPolicy(ctx context.Context, in *AttestationPolicyReq, opts ...grpc.CallOption) (*AttestationPolicyRes, error)
 }

@@ -67,10 +67,10 @@ func (c *managerServiceClient) RemoveVm(ctx context.Context, in *RemoveReq, opts
 	return out, nil
 }

-func (c *managerServiceClient) SVMInfo(ctx context.Context, in *SVMInfoReq, opts ...grpc.CallOption) (*SVMInfoRes, error) {
+func (c *managerServiceClient) CVMInfo(ctx context.Context, in *CVMInfoReq, opts ...grpc.CallOption) (*CVMInfoRes, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(SVMInfoRes)
-	err := c.cc.Invoke(ctx, ManagerService_SVMInfo_FullMethodName, in, out, cOpts...)
+	out := new(CVMInfoRes)
+	err := c.cc.Invoke(ctx, ManagerService_CVMInfo_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -93,7 +93,7 @@ func (c *managerServiceClient) AttestationPolicy(ctx context.Context, in *Attest
 type ManagerServiceServer interface {
 	CreateVm(context.Context, *CreateReq) (*CreateRes, error)
 	RemoveVm(context.Context, *RemoveReq) (*emptypb.Empty, error)
-	SVMInfo(context.Context, *SVMInfoReq) (*SVMInfoRes, error)
+	CVMInfo(context.Context, *CVMInfoReq) (*CVMInfoRes, error)
 	AttestationPolicy(context.Context, *AttestationPolicyReq) (*AttestationPolicyRes, error)
 	mustEmbedUnimplementedManagerServiceServer()
 }
@@ -111,8 +111,8 @@ func (UnimplementedManagerServiceServer) CreateVm(context.Context, *CreateReq) (
 func (UnimplementedManagerServiceServer) RemoveVm(context.Context, *RemoveReq) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveVm not implemented")
 }
-func (UnimplementedManagerServiceServer) SVMInfo(context.Context, *SVMInfoReq) (*SVMInfoRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SVMInfo not implemented")
+func (UnimplementedManagerServiceServer) CVMInfo(context.Context, *CVMInfoReq) (*CVMInfoRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CVMInfo not implemented")
 }
 func (UnimplementedManagerServiceServer) AttestationPolicy(context.Context, *AttestationPolicyReq) (*AttestationPolicyRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AttestationPolicy not implemented")
@@ -174,20 +174,20 @@ func _ManagerService_RemoveVm_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }

-func _ManagerService_SVMInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SVMInfoReq)
+func _ManagerService_CVMInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CVMInfoReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(ManagerServiceServer).SVMInfo(ctx, in)
+		return srv.(ManagerServiceServer).CVMInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: ManagerService_SVMInfo_FullMethodName,
+		FullMethod: ManagerService_CVMInfo_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ManagerServiceServer).SVMInfo(ctx, req.(*SVMInfoReq))
+		return srv.(ManagerServiceServer).CVMInfo(ctx, req.(*CVMInfoReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -226,8 +226,8 @@ var ManagerService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _ManagerService_RemoveVm_Handler,
 		},
 		{
-			MethodName: "SVMInfo",
-			Handler:    _ManagerService_SVMInfo_Handler,
+			MethodName: "CVMInfo",
+			Handler:    _ManagerService_CVMInfo_Handler,
 		},
 		{
 			MethodName: "AttestationPolicy",
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -103,6 +103,80 @@ func (_c *ManagerServiceClient_AttestationPolicy_Call) RunAndReturn(run func(con
 	return _c
 }

+// CVMInfo provides a mock function with given fields: ctx, in, opts
+func (_m *ManagerServiceClient) CVMInfo(ctx context.Context, in *manager.CVMInfoReq, opts ...grpc.CallOption) (*manager.CVMInfoRes, error) {
+	_va := make([]interface{}, len(opts))
+	for _i := range opts {
+		_va[_i] = opts[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx, in)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
+
+	if len(ret) == 0 {
+		panic("no return value specified for CVMInfo")
+	}
+
+	var r0 *manager.CVMInfoRes
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) (*manager.CVMInfoRes, error)); ok {
+		return rf(ctx, in, opts...)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) *manager.CVMInfoRes); ok {
+		r0 = rf(ctx, in, opts...)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*manager.CVMInfoRes)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) error); ok {
+		r1 = rf(ctx, in, opts...)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ManagerServiceClient_CVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CVMInfo'
+type ManagerServiceClient_CVMInfo_Call struct {
+	*mock.Call
+}
+
+// CVMInfo is a helper method to define mock.On call
+//   - ctx context.Context
+//   - in *manager.CVMInfoReq
+//   - opts ...grpc.CallOption
+func (_e *ManagerServiceClient_Expecter) CVMInfo(ctx interface{}, in interface{}, opts ...interface{}) *ManagerServiceClient_CVMInfo_Call {
+	return &ManagerServiceClient_CVMInfo_Call{Call: _e.mock.On("CVMInfo",
+		append([]interface{}{ctx, in}, opts...)...)}
+}
+
+func (_c *ManagerServiceClient_CVMInfo_Call) Run(run func(ctx context.Context, in *manager.CVMInfoReq, opts ...grpc.CallOption)) *ManagerServiceClient_CVMInfo_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		variadicArgs := make([]grpc.CallOption, len(args)-2)
+		for i, a := range args[2:] {
+			if a != nil {
+				variadicArgs[i] = a.(grpc.CallOption)
+			}
+		}
+		run(args[0].(context.Context), args[1].(*manager.CVMInfoReq), variadicArgs...)
+	})
+	return _c
+}
+
+func (_c *ManagerServiceClient_CVMInfo_Call) Return(_a0 *manager.CVMInfoRes, _a1 error) *ManagerServiceClient_CVMInfo_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *ManagerServiceClient_CVMInfo_Call) RunAndReturn(run func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) (*manager.CVMInfoRes, error)) *ManagerServiceClient_CVMInfo_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // CreateVm provides a mock function with given fields: ctx, in, opts
 func (_m *ManagerServiceClient) CreateVm(ctx context.Context, in *manager.CreateReq, opts ...grpc.CallOption) (*manager.CreateRes, error) {
 	_va := make([]interface{}, len(opts))
@@ -251,80 +325,6 @@ func (_c *ManagerServiceClient_RemoveVm_Call) RunAndReturn(run func(context.Cont
 	return _c
 }

-// SVMInfo provides a mock function with given fields: ctx, in, opts
-func (_m *ManagerServiceClient) SVMInfo(ctx context.Context, in *manager.SVMInfoReq, opts ...grpc.CallOption) (*manager.SVMInfoRes, error) {
-	_va := make([]interface{}, len(opts))
-	for _i := range opts {
-		_va[_i] = opts[_i]
-	}
-	var _ca []interface{}
-	_ca = append(_ca, ctx, in)
-	_ca = append(_ca, _va...)
-	ret := _m.Called(_ca...)
-
-	if len(ret) == 0 {
-		panic("no return value specified for SVMInfo")
-	}
-
-	var r0 *manager.SVMInfoRes
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) (*manager.SVMInfoRes, error)); ok {
-		return rf(ctx, in, opts...)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) *manager.SVMInfoRes); ok {
-		r0 = rf(ctx, in, opts...)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*manager.SVMInfoRes)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) error); ok {
-		r1 = rf(ctx, in, opts...)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// ManagerServiceClient_SVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SVMInfo'
-type ManagerServiceClient_SVMInfo_Call struct {
-	*mock.Call
-}
-
-// SVMInfo is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *manager.SVMInfoReq
-//   - opts ...grpc.CallOption
-func (_e *ManagerServiceClient_Expecter) SVMInfo(ctx interface{}, in interface{}, opts ...interface{}) *ManagerServiceClient_SVMInfo_Call {
-	return &ManagerServiceClient_SVMInfo_Call{Call: _e.mock.On("SVMInfo",
-		append([]interface{}{ctx, in}, opts...)...)}
-}
-
-func (_c *ManagerServiceClient_SVMInfo_Call) Run(run func(ctx context.Context, in *manager.SVMInfoReq, opts ...grpc.CallOption)) *ManagerServiceClient_SVMInfo_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		variadicArgs := make([]grpc.CallOption, len(args)-2)
-		for i, a := range args[2:] {
-			if a != nil {
-				variadicArgs[i] = a.(grpc.CallOption)
-			}
-		}
-		run(args[0].(context.Context), args[1].(*manager.SVMInfoReq), variadicArgs...)
-	})
-	return _c
-}
-
-func (_c *ManagerServiceClient_SVMInfo_Call) Return(_a0 *manager.SVMInfoRes, _a1 error) *ManagerServiceClient_SVMInfo_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *ManagerServiceClient_SVMInfo_Call) RunAndReturn(run func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) (*manager.SVMInfoRes, error)) *ManagerServiceClient_SVMInfo_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // NewManagerServiceClient creates a new instance of ManagerServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
 func NewManagerServiceClient(t interface {
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -195,12 +195,12 @@ func (_c *Service_RemoveVM_Call) RunAndReturn(run func(context.Context, string)
 	return _c
 }

-// ReturnSVMInfo provides a mock function with given fields: ctx
-func (_m *Service) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
+// ReturnCVMInfo provides a mock function with given fields: ctx
+func (_m *Service) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
 	ret := _m.Called(ctx)

 	if len(ret) == 0 {
-		panic("no return value specified for ReturnSVMInfo")
+		panic("no return value specified for ReturnCVMInfo")
 	}

 	var r0 string
@@ -237,30 +237,30 @@ func (_m *Service) ReturnSVMInfo(ctx context.Context) (string, int, string, stri
 	return r0, r1, r2, r3
 }

-// Service_ReturnSVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReturnSVMInfo'
-type Service_ReturnSVMInfo_Call struct {
+// Service_ReturnCVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReturnCVMInfo'
+type Service_ReturnCVMInfo_Call struct {
 	*mock.Call
 }

-// ReturnSVMInfo is a helper method to define mock.On call
+// ReturnCVMInfo is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *Service_Expecter) ReturnSVMInfo(ctx interface{}) *Service_ReturnSVMInfo_Call {
-	return &Service_ReturnSVMInfo_Call{Call: _e.mock.On("ReturnSVMInfo", ctx)}
+func (_e *Service_Expecter) ReturnCVMInfo(ctx interface{}) *Service_ReturnCVMInfo_Call {
+	return &Service_ReturnCVMInfo_Call{Call: _e.mock.On("ReturnCVMInfo", ctx)}
 }

-func (_c *Service_ReturnSVMInfo_Call) Run(run func(ctx context.Context)) *Service_ReturnSVMInfo_Call {
+func (_c *Service_ReturnCVMInfo_Call) Run(run func(ctx context.Context)) *Service_ReturnCVMInfo_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		run(args[0].(context.Context))
 	})
 	return _c
 }

-func (_c *Service_ReturnSVMInfo_Call) Return(_a0 string, _a1 int, _a2 string, _a3 string) *Service_ReturnSVMInfo_Call {
+func (_c *Service_ReturnCVMInfo_Call) Return(_a0 string, _a1 int, _a2 string, _a3 string) *Service_ReturnCVMInfo_Call {
 	_c.Call.Return(_a0, _a1, _a2, _a3)
 	return _c
 }

-func (_c *Service_ReturnSVMInfo_Call) RunAndReturn(run func(context.Context) (string, int, string, string)) *Service_ReturnSVMInfo_Call {
+func (_c *Service_ReturnCVMInfo_Call) RunAndReturn(run func(context.Context) (string, int, string, string)) *Service_ReturnCVMInfo_Call {
 	_c.Call.Return(run)
 	return _c
 }
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -69,7 +69,7 @@ func (_c *Persistence_DeleteVM_Call) RunAndReturn(run func(string) error) *Persi
 	return _c
 }

-// LoadVMs provides a mock function with given fields:
+// LoadVMs provides a mock function with no fields
 func (_m *Persistence) LoadVMs() ([]qemu.VMState, error) {
 	ret := _m.Called()

@@ -4,6 +4,7 @@ package qemu

 import (
 	"fmt"
+	"log/slog"
 	"os"
 	"os/exec"
 	"syscall"
@@ -30,17 +31,19 @@ type VMInfo struct {
 }

 type qemuVM struct {
-	vmi           VMInfo
-	cmd           *exec.Cmd
-	computationId string
+	vmi    VMInfo
+	cmd    *exec.Cmd
+	cvmId  string
+	logger *slog.Logger
 	vm.StateMachine
 }

-func NewVM(config interface{}, computationId string) vm.VM {
+func NewVM(config interface{}, cvmId string, logger *slog.Logger) vm.VM {
 	return &qemuVM{
-		vmi:           config.(VMInfo),
-		computationId: computationId,
-		StateMachine:  vm.NewStateMachine(),
+		vmi:          config.(VMInfo),
+		cvmId:        cvmId,
+		StateMachine: vm.NewStateMachine(),
+		logger:       logger,
 	}
 }

@@ -76,8 +79,8 @@ func (v *qemuVM) Start() (err error) {
 	}

 	v.cmd = exec.Command(exe, args...)
-	v.cmd.Stdout = os.Stdout
-	v.cmd.Stderr = os.Stderr
+	v.cmd.Stdout = &vm.Stdout{StateMachine: v.StateMachine, Logger: v.logger.With(slog.String("cvm", v.cvmId))}
+	v.cmd.Stderr = &vm.Stderr{StateMachine: v.StateMachine, Logger: v.logger.With(slog.String("cvm", v.cvmId))}

 	return v.cmd.Start()
 }
@@ -3,6 +3,7 @@
 package qemu

 import (
+	"log/slog"
 	"os"
 	"os/exec"
 	"testing"
@@ -17,7 +18,7 @@ const testComputationID = "test-computation"
 func TestNewVM(t *testing.T) {
 	config := VMInfo{Config: Config{}}

-	vm := NewVM(config, testComputationID)
+	vm := NewVM(config, testComputationID, slog.Default())

 	assert.NotNil(t, vm)
 	assert.IsType(t, &qemuVM{}, vm)
@@ -36,7 +37,7 @@ func TestStart(t *testing.T) {
 		QemuBinPath: "echo",
 	}}

-	vm := NewVM(config, testComputationID).(*qemuVM)
+	vm := NewVM(config, testComputationID, slog.Default()).(*qemuVM)

 	err = vm.Start()
 	assert.NoError(t, err)
@@ -59,7 +60,7 @@ func TestStartSudo(t *testing.T) {
 		UseSudo:     true,
 	}}

-	vm := NewVM(config, testComputationID).(*qemuVM)
+	vm := NewVM(config, testComputationID, slog.Default()).(*qemuVM)

 	err = vm.Start()
 	assert.NoError(t, err)
@@ -78,8 +78,8 @@ type Service interface {
 	RemoveVM(ctx context.Context, computationID string) error
 	// FetchAttestationPolicy measures and fetches the attestation policy.
 	FetchAttestationPolicy(ctx context.Context, computationID string) ([]byte, error)
-	// ReturnSVMInfo returns SVM information needed for attestation verification and validation.
-	ReturnSVMInfo(ctx context.Context) (string, int, string, string)
+	// ReturnCVMInfo returns CVM information needed for attestation verification and validation.
+	ReturnCVMInfo(ctx context.Context) (string, int, string, string)
 }

 type managerService struct {
@@ -216,7 +216,7 @@ func (ms *managerService) CreateVM(ctx context.Context, req *CreateReq) (string,
 		cfg.Config.SevConfig.HostData = base64.StdEncoding.EncodeToString(todo[:])
 	}

-	cvm := ms.vmFactory(cfg, id)
+	cvm := ms.vmFactory(cfg, id, ms.logger)
 	if err = cvm.Start(); err != nil {
 		return "", id, err
 	}
@@ -263,7 +263,7 @@ func (ms *managerService) RemoveVM(ctx context.Context, computationID string) er
 	return nil
 }

-func (ms *managerService) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
+func (ms *managerService) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
 	return ms.qemuCfg.OVMFCodeConfig.Version, ms.qemuCfg.SMPCount, ms.qemuCfg.CPU, ms.eosVersion
 }

@@ -350,7 +350,7 @@ func (ms *managerService) restoreVMs() error {
 			continue
 		}

-		cvm := ms.vmFactory(state.VMinfo, state.ID)
+		cvm := ms.vmFactory(state.VMinfo, state.ID, ms.logger)

 		if err = cvm.SetProcess(state.PID); err != nil {
 			ms.logger.Warn("Failed to reattach to process", "computation", state.ID, "pid", state.PID, "error", err)
@@ -42,9 +42,9 @@ func (tm *tracingMiddleware) FetchAttestationPolicy(ctx context.Context, computa
 	return tm.svc.FetchAttestationPolicy(ctx, computationId)
 }

-func (tm *tracingMiddleware) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
-	_, span := tm.tracer.Start(ctx, "return_svm_info")
+func (tm *tracingMiddleware) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
+	_, span := tm.tracer.Start(ctx, "return_cvm_info")
 	defer span.End()

-	return tm.svc.ReturnSVMInfo(ctx)
+	return tm.svc.ReturnCVMInfo(ctx)
 }
@@ -0,0 +1,81 @@
+// Copyright (c) Ultraviolet
+// SPDX-License-Identifier: Apache-2.0
+package vm
+
+import (
+	"bytes"
+	"io"
+	"log/slog"
+	"strings"
+)
+
+var (
+	_ io.Writer = &Stdout{}
+	_ io.Writer = &Stderr{}
+)
+
+const bufSize = 1024
+
+type Stdout struct {
+	StateMachine StateMachine
+	Logger       *slog.Logger
+}
+
+// Write implements io.Writer.
+func (s *Stdout) Write(p []byte) (n int, err error) {
+	inBuf := bytes.NewBuffer(p)
+
+	buf := make([]byte, bufSize)
+
+	for {
+		n, err := inBuf.Read(buf)
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return len(p) - inBuf.Len(), err
+		}
+
+		args := []any{
+			slog.String("state", s.StateMachine.State()),
+		}
+
+		s.Logger.Info(string(buf[:n]), args...)
+	}
+
+	return len(p), nil
+}
+
+type Stderr struct {
+	StateMachine StateMachine
+	Logger       *slog.Logger
+}
+
+// Write implements io.Writer.
+func (s *Stderr) Write(p []byte) (n int, err error) {
+	inBuf := bytes.NewBuffer(p)
+
+	buf := make([]byte, bufSize)
+
+	for {
+		n, err := inBuf.Read(buf)
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return len(p) - inBuf.Len(), err
+		}
+
+		args := []any{
+			slog.String("state", s.StateMachine.State()),
+		}
+
+		if strings.Contains(string(buf[:n]), "Error") {
+			s.Logger.Error(string(buf[:n]), args...)
+		} else {
+			s.Logger.Warn(string(buf[:n]), args...)
+		}
+	}
+
+	return len(p), nil
+}
@@ -1,12 +1,15 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

 import (
+	slog "log/slog"
+
 	mock "github.com/stretchr/testify/mock"
+
 	vm "github.com/ultravioletrs/cocos/manager/vm"
 )

@@ -23,17 +26,17 @@ func (_m *Provider) EXPECT() *Provider_Expecter {
 	return &Provider_Expecter{mock: &_m.Mock}
 }

-// Execute provides a mock function with given fields: config, computationId
-func (_m *Provider) Execute(config interface{}, computationId string) vm.VM {
-	ret := _m.Called(config, computationId)
+// Execute provides a mock function with given fields: config, computationId, logger
+func (_m *Provider) Execute(config interface{}, computationId string, logger *slog.Logger) vm.VM {
+	ret := _m.Called(config, computationId, logger)

 	if len(ret) == 0 {
 		panic("no return value specified for Execute")
 	}

 	var r0 vm.VM
-	if rf, ok := ret.Get(0).(func(interface{}, string) vm.VM); ok {
-		r0 = rf(config, computationId)
+	if rf, ok := ret.Get(0).(func(interface{}, string, *slog.Logger) vm.VM); ok {
+		r0 = rf(config, computationId, logger)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(vm.VM)
@@ -51,13 +54,14 @@ type Provider_Execute_Call struct {
 // Execute is a helper method to define mock.On call
 //   - config interface{}
 //   - computationId string
-func (_e *Provider_Expecter) Execute(config interface{}, computationId interface{}) *Provider_Execute_Call {
-	return &Provider_Execute_Call{Call: _e.mock.On("Execute", config, computationId)}
+//   - logger *slog.Logger
+func (_e *Provider_Expecter) Execute(config interface{}, computationId interface{}, logger interface{}) *Provider_Execute_Call {
+	return &Provider_Execute_Call{Call: _e.mock.On("Execute", config, computationId, logger)}
 }

-func (_c *Provider_Execute_Call) Run(run func(config interface{}, computationId string)) *Provider_Execute_Call {
+func (_c *Provider_Execute_Call) Run(run func(config interface{}, computationId string, logger *slog.Logger)) *Provider_Execute_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(interface{}), args[1].(string))
+		run(args[0].(interface{}), args[1].(string), args[2].(*slog.Logger))
 	})
 	return _c
 }
@@ -67,7 +71,7 @@ func (_c *Provider_Execute_Call) Return(_a0 vm.VM) *Provider_Execute_Call {
 	return _c
 }

-func (_c *Provider_Execute_Call) RunAndReturn(run func(interface{}, string) vm.VM) *Provider_Execute_Call {
+func (_c *Provider_Execute_Call) RunAndReturn(run func(interface{}, string, *slog.Logger) vm.VM) *Provider_Execute_Call {
 	_c.Call.Return(run)
 	return _c
 }
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -23,7 +23,7 @@ func (_m *StateMachine) EXPECT() *StateMachine_Expecter {
 	return &StateMachine_Expecter{mock: &_m.Mock}
 }

-// State provides a mock function with given fields:
+// State provides a mock function with no fields
 func (_m *StateMachine) State() string {
 	ret := _m.Called()

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -25,7 +25,7 @@ func (_m *VM) EXPECT() *VM_Expecter {
 	return &VM_Expecter{mock: &_m.Mock}
 }

-// GetCID provides a mock function with given fields:
+// GetCID provides a mock function with no fields
 func (_m *VM) GetCID() int {
 	ret := _m.Called()

@@ -70,7 +70,7 @@ func (_c *VM_GetCID_Call) RunAndReturn(run func() int) *VM_GetCID_Call {
 	return _c
 }

-// GetConfig provides a mock function with given fields:
+// GetConfig provides a mock function with no fields
 func (_m *VM) GetConfig() interface{} {
 	ret := _m.Called()

@@ -117,7 +117,7 @@ func (_c *VM_GetConfig_Call) RunAndReturn(run func() interface{}) *VM_GetConfig_
 	return _c
 }

-// GetProcess provides a mock function with given fields:
+// GetProcess provides a mock function with no fields
 func (_m *VM) GetProcess() int {
 	ret := _m.Called()

@@ -254,7 +254,7 @@ func (_c *VM_SetProcess_Call) RunAndReturn(run func(int) error) *VM_SetProcess_C
 	return _c
 }

-// Start provides a mock function with given fields:
+// Start provides a mock function with no fields
 func (_m *VM) Start() error {
 	ret := _m.Called()

@@ -299,7 +299,7 @@ func (_c *VM_Start_Call) RunAndReturn(run func() error) *VM_Start_Call {
 	return _c
 }

-// State provides a mock function with given fields:
+// State provides a mock function with no fields
 func (_m *VM) State() string {
 	ret := _m.Called()

@@ -344,7 +344,7 @@ func (_c *VM_State_Call) RunAndReturn(run func() string) *VM_State_Call {
 	return _c
 }

-// Stop provides a mock function with given fields:
+// Stop provides a mock function with no fields
 func (_m *VM) Stop() error {
 	ret := _m.Called()

@@ -3,6 +3,8 @@
 package vm

 import (
+	"log/slog"
+
 	"github.com/ultravioletrs/cocos/agent"
 	pkgmanager "github.com/ultravioletrs/cocos/pkg/manager"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -21,7 +23,7 @@ type VM interface {
 	GetConfig() interface{}
 }

-type Provider func(config interface{}, computationId string) VM
+type Provider func(config interface{}, computationId string, logger *slog.Logger) VM

 type Event struct {
 	EventType     string
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -82,7 +82,7 @@ func (_c *LeveledQuoteProvider_GetRawQuoteAtLevel_Call) RunAndReturn(run func([6
 	return _c
 }

-// IsSupported provides a mock function with given fields:
+// IsSupported provides a mock function with no fields
 func (_m *LeveledQuoteProvider) IsSupported() bool {
 	ret := _m.Called()

@@ -127,7 +127,7 @@ func (_c *LeveledQuoteProvider_IsSupported_Call) RunAndReturn(run func() bool) *
 	return _c
 }

-// Product provides a mock function with given fields:
+// Product provides a mock function with no fields
 func (_m *LeveledQuoteProvider) Product() *sevsnp.SevProduct {
 	ret := _m.Called()

@@ -42,6 +42,8 @@ var (
 	ErrNoHashAlgo = errors.New("hash algo is not supported")
 )

+type VtpmAttest func(teeNonce []byte, vTPMNonce []byte, teeAttestaion bool) ([]byte, error)
+
 type tpmWrapper struct {
 	io.ReadWriteCloser
 }
@@ -163,6 +165,11 @@ func VTPMVerify(quote []byte, pubKeyTLS []byte, teeNonce []byte, vtpmNonce []byt
 	return nil
 }

+// EmptyAttest is a dummy attestation function that returns an empty attestation report.
+func EmptyAttest(teeNonce []byte, vTPMNonce []byte, teeAttestaion bool) ([]byte, error) {
+	return []byte{}, nil
+}
+
 func publicKeyToBytes(pubKey interface{}) ([]byte, error) {
 	derBytes, err := x509.MarshalPKIXPublicKey(pubKey)
 	if err != nil {
@@ -77,7 +77,7 @@ func TestSendAlgorithm(t *testing.T) {
 			req, err = os.Open(req.Name())
 			assert.NoError(t, err)

-			algoStream := new(mocks.AgentService_AlgoClient)
+			algoStream := new(mocks.AgentService_AlgoClient[agent.AlgoRequest, agent.AlgoResponse])
 			algoStream.On("Send", mock.Anything).Return(tc.sendError)
 			algoStream.On("CloseAndRecv").Return(&agent.AlgoResponse{}, tc.closeRecvError)
 			mockStream := &mockAlgoStream{stream: algoStream}
@@ -141,7 +141,7 @@ func TestSendData(t *testing.T) {
 			dataset, err = os.Open(dataset.Name())
 			assert.NoError(t, err)

-			dataStream := new(mocks.AgentService_DataClient)
+			dataStream := new(mocks.AgentService_DataClient[agent.DataRequest, agent.DataResponse])
 			dataStream.On("Send", mock.Anything).Return(tc.sendError)
 			dataStream.On("CloseAndRecv").Return(&agent.DataResponse{}, tc.closeRecvError)
 			mockStream := &mockDataStream{stream: dataStream}
@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0

-// Code generated by mockery v2.43.2. DO NOT EDIT.
+// Code generated by mockery v2.53.2. DO NOT EDIT.

 package mocks

@@ -205,7 +205,7 @@ Here we will use the docker with the linear regression example (`lin_reg.py`). T
 cocos
 ```

-The docker image must have a `cocos` directory containing the `datasets` and `results` directories. The Agent will run this image inside the SVM and will mount the datasets and results onto the `/cocos/datasets` and `/cocos/results` directories inside the image. The docker image must also contain the command that will be run when the docker container is run.
+The docker image must have a `cocos` directory containing the `datasets` and `results` directories. The Agent will run this image inside the CVM and will mount the datasets and results onto the `/cocos/datasets` and `/cocos/results` directories inside the image. The docker image must also contain the command that will be run when the docker container is run.

 Run the build command and then save the docker image as a `tar` file.