diff --git a/cmd/vfkit/main.go b/cmd/vfkit/main.go index ea02dc02..0ce82fc4 100644 --- a/cmd/vfkit/main.go +++ b/cmd/vfkit/main.go @@ -134,7 +134,7 @@ func runVFKit(vmConfig *config.VirtualMachine, opts *cmdline.Options) error { // Do not enable the rests server if user sets scheme to None if opts.RestfulURI != cmdline.DefaultRestfulURI { - restVM := restvf.NewVzVirtualMachine(vm, vzVMConfig) + restVM := restvf.NewVzVirtualMachine(vm, vzVMConfig, vmConfig) srv, err := rest.NewServer(restVM, restVM, opts.RestfulURI) if err != nil { return err diff --git a/pkg/rest/vf/vm_config.go b/pkg/rest/vf/vm_config.go index 82fc7a33..93671966 100644 --- a/pkg/rest/vf/vm_config.go +++ b/pkg/rest/vf/vm_config.go @@ -4,28 +4,30 @@ import ( "net/http" "github.com/Code-Hex/vz/v3" + "github.com/crc-org/vfkit/pkg/config" "github.com/crc-org/vfkit/pkg/rest/define" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" ) type VzVirtualMachine struct { - VzVM *vz.VirtualMachine - config *vz.VirtualMachineConfiguration + VzVM *vz.VirtualMachine + config *vz.VirtualMachineConfiguration + vmConfig *config.VirtualMachine } -func NewVzVirtualMachine(vm *vz.VirtualMachine, config *vz.VirtualMachineConfiguration) *VzVirtualMachine { - return &VzVirtualMachine{config: config, VzVM: vm} +func NewVzVirtualMachine(vm *vz.VirtualMachine, config *vz.VirtualMachineConfiguration, vmConfig *config.VirtualMachine) *VzVirtualMachine { + return &VzVirtualMachine{config: config, VzVM: vm, vmConfig: vmConfig} } // inspect returns information about the virtual machine like hw resources // and devices func (vm *VzVirtualMachine) Inspect(c *gin.Context) { ii := define.InspectResponse{ - // TODO complete me - CPUs: 1, - Memory: 2048, - //Devices: vm.Devices, + CPUs: vm.vmConfig.Vcpus, + Memory: vm.vmConfig.MemoryBytes, + // TODO: add devices (VirtioDevice type needs to be improved) @Black-Hole1 + //Devices: vm.vmConfig.Devices, } c.JSON(http.StatusOK, ii) }