Merge pull request #34 from madhanrm/memproc

* Expose Memory/Processor changes to Virtual Machine

pkg/virtualization/core/memory/memorysettingdata.go

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+package memory
+
+import (
+	wmi "github.com/microsoft/wmi/pkg/wmiinstance"
+	"github.com/microsoft/wmi/server2019/root/virtualization/v2"
+)
+
+type MemorySettingData struct {
+	*v2.Msvm_MemorySettingData
+}
+
+// NewMemorySettingData
+func NewMemorySettingData(instance *wmi.WmiInstance) (*MemorySettingData, error) {
+	wmivm, err := v2.NewMsvm_MemorySettingDataEx1(instance)
+	if err != nil {
+		return nil, err
+	}
+	return &MemorySettingData{wmivm}, nil
+}
+
+func (msd *MemorySettingData) SetSizeMB(size uint64) (err error) {
+	return msd.SetPropertyVirtualQuantity(size)
+}

pkg/virtualization/core/processor/processorsettingdata.go

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+package processor
+
+import (
+	wmi "github.com/microsoft/wmi/pkg/wmiinstance"
+	"github.com/microsoft/wmi/server2019/root/virtualization/v2"
+)
+
+type ProcessorSettingData struct {
+	*v2.Msvm_ProcessorSettingData
+}
+
+// NewProcessorSettingData
+func NewProcessorSettingData(instance *wmi.WmiInstance) (*ProcessorSettingData, error) {
+	wmivm, err := v2.NewMsvm_ProcessorSettingDataEx1(instance)
+	if err != nil {
+		return nil, err
+	}
+	return &ProcessorSettingData{wmivm}, nil
+}
+
+func (msd *ProcessorSettingData) SetCPUCount(count uint64) (err error) {
+	return msd.SetPropertyVirtualQuantity(count)
+}

pkg/virtualization/core/service/virtualmachine.go

@@ -211,3 +211,35 @@ func (vmms *VirtualSystemManagementService) RemoveTPM(resource *resourceallocati
 	err = vmms.RemoveVirtualSystemResource(resource.CIM_ResourceAllocationSettingData)
 	return
 }
+
+func (vmms *VirtualSystemManagementService) SetProcessorCount(vm *virtualsystem.VirtualMachine, count uint64) (err error) {
+	proc, err := vm.GetProcessor()
+	if err != nil {
+		return
+	}
+	defer proc.Close()
+
+	err = proc.SetCPUCount(count)
+	if err != nil {
+		return
+	}
+
+	err = vmms.ModifyVirtualSystemResourceEx(proc.WmiInstance)
+	return
+}
+
+func (vmms *VirtualSystemManagementService) SetMemoryMB(vm *virtualsystem.VirtualMachine, sizeMB uint64) (err error) {
+	mem, err := vm.GetMemory()
+	if err != nil {
+		return
+	}
+	defer mem.Close()
+
+	err = mem.SetSizeMB(sizeMB)
+	if err != nil {
+		return
+	}
+
+	err = vmms.ModifyVirtualSystemResourceEx(mem.WmiInstance)
+	return
+}

pkg/virtualization/core/service/virtualmachinemanagementservice_test.go

@@ -43,12 +43,42 @@ func TestCreateVirtualMachines(t *testing.T) {
 	defer setting.Close()
 	t.Logf("Create VMSettings")
 
-	_, err = vmms.CreateVirtualMachine(setting)
+	vm, err := vmms.CreateVirtualMachine(setting)
 	if err != nil {
 		t.Fatal("Failed " + err.Error())
 	}
 	t.Logf("Created VM [%s]", "test")
-	//defer vm.Close()
+	defer func() {
+		if vm != nil {
+			vm.Close()
+		}
+	}()
+	return
+}
+
+func TestModifyVirtualMachine(t *testing.T) {
+	vmms, err := GetVirtualSystemManagementService(whost)
+	if err != nil {
+		t.Fatal("Failed " + err.Error())
+	}
+
+	vm, err := vmms.GetVirtualMachineByName("test")
+	if err != nil {
+		t.Fatal("Failed " + err.Error())
+	}
+	t.Logf("Found [%s] VMs", "test")
+	defer vm.Close()
+
+	t.Logf("Setting Memory [%d] [%s] VMs", 2048, "test")
+	err = vmms.SetMemoryMB(vm, 2048)
+	if err != nil {
+		t.Fatalf("Failed [%+v]", err)
+	}
+	t.Logf("Setting Processor [%d] [%s] VMs", 4, "test")
+	err = vmms.SetProcessorCount(vm, 4)
+	if err != nil {
+		t.Fatalf("Failed [%+v]", err)
+	}
 }
 
 func TestGetVirtualMachines(t *testing.T) {
@@ -312,6 +342,15 @@ func TestVirtualMachineDelete(t *testing.T) {
 	}
 
 	defer vm.Close()
+	err = vm.Start()
+	if err != nil {
+		t.Fatalf("Failed [%+v]", err)
+	}
+
+	err = vm.Stop(true)
+	if err != nil {
+		t.Fatalf("Failed [%+v]", err)
+	}
 	err = vmms.DeleteVirtualMachine(vm)
 	if err != nil {
 		t.Fatal("Failed " + err.Error())

pkg/virtualization/core/virtualsystem/virtualmachine.go

@@ -14,6 +14,8 @@ import (
 	"github.com/microsoft/wmi/pkg/errors"
 
 	"github.com/microsoft/wmi/pkg/virtualization/core/job"
+	"github.com/microsoft/wmi/pkg/virtualization/core/memory"
+	"github.com/microsoft/wmi/pkg/virtualization/core/processor"
 	"github.com/microsoft/wmi/pkg/virtualization/core/resource"
 	"github.com/microsoft/wmi/pkg/virtualization/core/resource/resourceallocation"
 	"github.com/microsoft/wmi/pkg/virtualization/core/resource/resourcepool"
@@ -512,3 +514,24 @@ func (vm *VirtualMachine) GetResourceAllocationSettingData(rtype v2.ResourcePool
 	}
 	return
 }
+
+func (vm *VirtualMachine) GetMemory() (vmmemory *memory.MemorySettingData, err error) {
+	settings, err := vm.GetVirtualSystemSettingData()
+	if err != nil {
+		return
+	}
+	defer settings.Close()
+	vmmemory, err = settings.GetMemorySetting()
+	return
+}
+
+func (vm *VirtualMachine) GetProcessor() (vmprocessor *processor.ProcessorSettingData, err error) {
+	settings, err := vm.GetVirtualSystemSettingData()
+	if err != nil {
+		return
+	}
+	defer settings.Close()
+	vmprocessor, err = settings.GetProcessorSetting()
+	return
+
+}

pkg/virtualization/core/virtualsystem/virtualsystemsettingdata.go

@@ -12,6 +12,8 @@ import (
 	"github.com/microsoft/wmi/pkg/base/query"
 	"github.com/microsoft/wmi/pkg/constant"
 	"github.com/microsoft/wmi/pkg/errors"
+	"github.com/microsoft/wmi/pkg/virtualization/core/memory"
+	"github.com/microsoft/wmi/pkg/virtualization/core/processor"
 	"github.com/microsoft/wmi/pkg/virtualization/core/storage/disk"
 	na "github.com/microsoft/wmi/pkg/virtualization/network/virtualnetworkadapter"
 	wmi "github.com/microsoft/wmi/pkg/wmiinstance"
@@ -181,3 +183,21 @@ func (vm *VirtualSystemSettingData) getResourceAllocationSettingData(rtype v2.Re
 	col, err = vm.GetAllRelatedWithQuery(query)
 	return
 }
+
+func (vm *VirtualSystemSettingData) GetMemorySetting() (out *memory.MemorySettingData, err error) {
+	msd, err := vm.GetRelated("Msvm_MemorySettingData")
+	if err != nil {
+		return nil, err
+	}
+
+	return memory.NewMemorySettingData(msd)
+}
+
+func (vm *VirtualSystemSettingData) GetProcessorSetting() (out *processor.ProcessorSettingData, err error) {
+	psd, err := vm.GetRelated("Msvm_ProcessorSettingData")
+	if err != nil {
+		return nil, err
+	}
+
+	return processor.NewProcessorSettingData(psd)
+}