parse original resource params to virt engine

Author: CMGS

engine/virt/helper.go

@@ -1,12 +1,14 @@
 package virt
 
 import (
+	"encoding/json"
 	"fmt"
 	"path/filepath"
 	"strconv"
 	"strings"
 
 	"github.com/cockroachdb/errors"
+	resourcetypes "github.com/projecteru2/core/resource/types"
 	coretypes "github.com/projecteru2/core/types"
 	virttypes "github.com/projecteru2/libyavirt/types"
 )
@@ -84,3 +86,12 @@ func combineUserImage(user, imageName string) string {
 	}
 	return fmt.Sprintf("%s%s%s", user, sep, imageName)
 }
+
+func convertEngineParamsToResources(engineParams resourcetypes.Resources) map[string][]byte {
+	r := map[string][]byte{}
+	for p, res := range engineParams {
+		b, _ := json.Marshal(res) // nolint
+		r[p] = b
+	}
+	return r
+}

engine/virt/virt.go

@@ -213,6 +213,7 @@ func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.Virtu
 		Cmd:        opts.Cmd,
 		Lambda:     opts.Lambda,
 		Stdin:      opts.Stdin,
+		Resources:  convertEngineParamsToResources(opts.EngineParams),
 	}
 
 	var resp virttypes.Guest
@@ -350,9 +351,10 @@ func (v *Virt) VirtualizationUpdateResource(ctx context.Context, ID string, engi
 	}
 
 	args := virttypes.ResizeGuestReq{
-		CPU:     int(resourceOpts.Quota),
-		Mem:     resourceOpts.Memory,
-		Volumes: vols,
+		CPU:       int(resourceOpts.Quota),
+		Mem:       resourceOpts.Memory,
+		Volumes:   vols,
+		Resources: convertEngineParamsToResources(engineParams),
 	}
 	args.ID = ID
 

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
 	github.com/panjf2000/ants/v2 v2.7.3
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/projecteru2/libyavirt v0.0.0-20230514051104-0d756894b738
+	github.com/projecteru2/libyavirt v0.0.0-20230517062159-0c31f81550f3
 	github.com/prometheus/client_golang v1.15.0
 	github.com/rs/zerolog v1.29.1
 	github.com/sanity-io/litter v1.5.5

go.sum

@@ -459,8 +459,8 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/projecteru2/libyavirt v0.0.0-20230514051104-0d756894b738 h1:hX9chCbN+i5dbonLgzCBuWJX99kRCSnOC8vlXs+Wb3s=
-github.com/projecteru2/libyavirt v0.0.0-20230514051104-0d756894b738/go.mod h1:N41KaKmqbailweGs4x/mt2H0O0Y7MizObZQ+igLdzpw=
+github.com/projecteru2/libyavirt v0.0.0-20230517062159-0c31f81550f3 h1:pjNFOoEalyROX9YfdxFXaNg4liZV/RASfhaVqJ4EnBQ=
+github.com/projecteru2/libyavirt v0.0.0-20230517062159-0c31f81550f3/go.mod h1:N41KaKmqbailweGs4x/mt2H0O0Y7MizObZQ+igLdzpw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=