config: Add default_{vcpus, memory} configurations

Introduce two new configuration settings:
 * default_vcpus - defines default vCPU number for new created PODs
 * default_memory - defines default memory size for new created PODs

 Fixes #164.

Signed-off-by: Dmitry Voytik <[email protected]>

Makefile

@@ -147,6 +147,9 @@ const defaultRuntimeRun = "$(PKGRUNDIR)"
 const defaultShimPath = "$(SHIMPATH)"
 const pauseBinRelativePath = "$(PAUSEBINRELPATH)"
 
+const defaultDefaultVCPUs uint32 = 1
+const defaultDefaultMemSz uint32 = 256
+
 // Required to be modifiable (for the tests)
 var defaultRuntimeConfiguration = "$(DESTCONFIG)"
 var defaultProxyPath = "$(PROXYPATH)"

config.go

@@ -73,9 +73,11 @@ type tomlConfig struct {
 }
 
 type hypervisor struct {
-	Path   string
-	Kernel string
-	Image  string
+	Path         string
+	Kernel       string
+	Image        string
+	DefaultVCPUs uint32 `toml:"default_vcpus"`
+	DefaultMemSz uint32 `toml:"default_memory"`
 }
 
 type proxy struct {
@@ -118,6 +120,22 @@ func (h hypervisor) image() string {
 	return h.Image
 }
 
+func (h hypervisor) defaultVCPUs() uint32 {
+	if h.DefaultVCPUs == 0 {
+		return defaultDefaultVCPUs
+	}
+
+	return h.DefaultVCPUs
+}
+
+func (h hypervisor) defaultMemSz() uint32 {
+	if h.DefaultMemSz < 8 {
+		return defaultDefaultMemSz // MiB
+	}
+
+	return h.DefaultMemSz
+}
+
 func (p proxy) url() string {
 	if p.URL == "" {
 		return defaultProxyURL
@@ -158,6 +176,8 @@ func newQemuHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) {
 		HypervisorPath: hypervisor,
 		KernelPath:     kernel,
 		ImagePath:      image,
+		DefaultVCPUs:   h.defaultVCPUs(),
+		DefaultMemSz:   h.defaultMemSz(),
 	}, nil
 }
 
@@ -264,6 +284,8 @@ func loadConfiguration(configPath string, ignoreLogging bool) (resolvedConfigPat
 		HypervisorPath: defaultHypervisorPath,
 		KernelPath:     defaultKernelPath,
 		ImagePath:      defaultImagePath,
+		DefaultVCPUs:   defaultDefaultVCPUs,
+		DefaultMemSz:   defaultDefaultMemSz,
 	}
 
 	defaultAgentConfig := vc.HyperConfig{

config/configuration.toml.in

@@ -4,6 +4,11 @@
 path = "@QEMUPATH@"
 kernel = "@KERNELPATH@"
 image = "@IMAGEPATH@"
+# Default vCPU number per POD/VM. If unspecified then it will be set to 1.
+#default_vcpus = 1
+# Default memory size in MiB for POD/VM. If unspecified then it will be set
+# to 256 MiB.
+#default_memory = 256
 
 [proxy.cc]
 url = "@PROXYURL@"

config_test.go

@@ -21,6 +21,7 @@ import (
 	"path"
 	"path/filepath"
 	"reflect"
+	"strconv"
 	"strings"
 	"syscall"
 	"testing"
@@ -49,6 +50,8 @@ func makeRuntimeConfigFileData(hypervisor, hypervisorPath, kernelPath, imagePath
 	path = "` + hypervisorPath + `"
 	kernel = "` + kernelPath + `"
 	image = "` + imagePath + `"
+	default_vcpus = ` + strconv.FormatUint(uint64(defaultDefaultVCPUs), 10) + `
+	default_memory = ` + strconv.FormatUint(uint64(defaultDefaultMemSz), 10) + `
 
 	[proxy.cc]
 	url = "` + proxyURL + `"
@@ -131,6 +134,8 @@ func createAllRuntimeConfigFiles(dir, hypervisor string) (config testRuntimeConf
 		HypervisorPath: hypervisorPath,
 		KernelPath:     kernelPath,
 		ImagePath:      imagePath,
+		DefaultVCPUs:   defaultDefaultVCPUs,
+		DefaultMemSz:   defaultDefaultMemSz,
 	}
 
 	agentConfig := vc.HyperConfig{
@@ -586,6 +591,8 @@ func TestMinimalRuntimeConfig(t *testing.T) {
 		HypervisorPath: defaultHypervisorPath,
 		KernelPath:     defaultKernelPath,
 		ImagePath:      defaultImagePath,
+		DefaultVCPUs:   defaultDefaultVCPUs,
+		DefaultMemSz:   defaultDefaultMemSz,
 	}
 
 	expectedAgentConfig := vc.HyperConfig{
@@ -770,6 +777,8 @@ func TestHypervisorDefaults(t *testing.T) {
 	assert.Equal(t, h.path(), defaultHypervisorPath, "default hypervisor path wrong")
 	assert.Equal(t, h.kernel(), defaultKernelPath, "default hypervisor kernel wrong")
 	assert.Equal(t, h.image(), defaultImagePath, "default hypervisor image wrong")
+	assert.Equal(t, h.defaultVCPUs(), defaultDefaultVCPUs, "default vCPU number is wrong")
+	assert.Equal(t, h.defaultMemSz(), defaultDefaultMemSz, "default memory size is wrong")
 
 	path := "/foo"
 	h.Path = path
@@ -782,6 +791,14 @@ func TestHypervisorDefaults(t *testing.T) {
 	image := "foo"
 	h.Image = image
 	assert.Equal(t, h.image(), image, "custom hypervisor image wrong")
+
+	const vcpus uint32 = 2
+	h.DefaultVCPUs = vcpus
+	assert.Equal(t, h.defaultVCPUs(), vcpus, "default vCPU number is wrong")
+
+	const memSz uint32 = 1024
+	h.DefaultMemSz = memSz
+	assert.Equal(t, h.defaultMemSz(), memSz, "default memory size is wrong")
 }
 
 func TestProxyDefaults(t *testing.T) {